Merge branch 'master' into update/s3-2.20.128

yadavan88 · web-flow · commit 675687249a4e · 2023-08-29T20:11:02.000+02:00
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -0,0 +1,2 @@
+# Scala Steward: Reformat with scalafmt 3.7.12
+ca5770e327fea2fad0a3bf2f79f896e7a507d2d5
diff --git a/.github/workflows/scala-steward.yml b/.github/workflows/scala-steward.yml
@@ -0,0 +1,17 @@
+on:
+  schedule:
+    - cron: '0 0 * * 0'
+
+name: Launch Scala Steward
+
+jobs:
+  scala-steward:
+    runs-on: ubuntu-22.04
+    name: Launch Scala Steward
+    steps:
+      - name: Launch Scala Steward
+        uses: scala-steward-org/scala-steward-action@v2
+        with:
+          github-app-id: ${{ secrets.APP_ID }}
+          github-app-installation-id: ${{ secrets.APP_INSTALLATION_ID }}
+          github-app-key: ${{ secrets.APP_PRIVATE_KEY }}
diff --git a/.mergify.yml b/.mergify.yml
@@ -0,0 +1,15 @@
+pull_request_rules:
+  - name: Automatic merge on approval
+    conditions:
+      - label!=early-semver-major
+      - label!=semver-spec-major
+      - "#files=1"
+      - "#approved-reviews-by>=1"    
+      - check-success=CI - Jenkins
+      - author=scala-steward
+      - or:
+        - label=early-semver-minor
+        - label=early-semver-patch
+    actions:
+      merge:
+        method: merge
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.7.10
+version = 3.7.12
 runner.dialect = scala3
 fileOverride {
   "glob:**/scala-2-modules/**" {
diff --git a/README.md b/README.md
@@ -1,5 +1,24 @@
+[![Scala Steward badge](https://img.shields.io/badge/Scala_Steward-helping-blue.svg?style=flat&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAQCAMAAAARSr4IAAAAVFBMVEUAAACHjojlOy5NWlrKzcYRKjGFjIbp293YycuLa3pYY2LSqql4f3pCUFTgSjNodYRmcXUsPD/NTTbjRS+2jomhgnzNc223cGvZS0HaSD0XLjbaSjElhIr+AAAAAXRSTlMAQObYZgAAAHlJREFUCNdNyosOwyAIhWHAQS1Vt7a77/3fcxxdmv0xwmckutAR1nkm4ggbyEcg/wWmlGLDAA3oL50xi6fk5ffZ3E2E3QfZDCcCN2YtbEWZt+Drc6u6rlqv7Uk0LdKqqr5rk2UCRXOk0vmQKGfc94nOJyQjouF9H/wCc9gECEYfONoAAAAASUVORK5CYII=)](https://scala-steward.org)
+
 # scala-tutorials
+This is the main repo for all the sample code used in the scala tutorials.
+
+# Compiling and Running Tests
+This repo uses a multi-module build with many sub modules.
+To compile the entire module, you may use the command `sbt compile`. However, this loads all the modules and compiles all of them, which might take some time.
+If you are interested in only a particular module, you can compile it by starting sbt shell and using the command `<sub-module-name>/compile`.
+Similarly, you can run the tests per module as `<module-name>/test`. 
+
+Here are some of the useful commands that can be used within tbe sbt shell
+
+| SBT Command               | Description                                                                                           |
+|---------------------------|-------------------------------------------------------------------------------------------------------|
+| project <sub-module-name> | Switch to a particular module. After this, the command `compile`, `test` etc runs only on that module |
+| <sub-module>/compile | Compile only the provided module |
+| projects | Lists all the sub modules |
+| <sub-module>/run | Run the main class within the sub-module |
 
+# Test Naming Standards
 In this repository, we have classified the tests in 4 categories. 
 
 | Category | Description                                                                                                                                                   |
@@ -21,6 +40,6 @@ Note that these commands are defined at the root level of the project and hence
 | Live Test               | `sbt liveTests`   | `src/it/scala` or `src/it/scala-2` | Test class name must end with `LiveTest`                                                                                |
 | Manual Test             | `sbt manualTests` | `src/it/scala` or `src/it/scala-2` | Test class name must end with `ManualTest`                                                                              |
 
-# Code fomatting
+# Code formatting
 
-Before creating a PR, make sure the code is correctly formatted running `sbt scalafmt`. 
+Before creating a PR, run `sbt scalafmtAll` to automatically format the entire codebase. To check if there are any formatting issues(without fixing them), you may run `sbt scalafmtCheckAll` 
diff --git a/build.sbt b/build.sbt
@@ -9,7 +9,7 @@ val jUnitInterface = "com.github.sbt" % "junit-interface" % "0.13.3" % "test"
 val catsEffect = "org.typelevel" %% "cats-effect" % "3.5.1"
 val catEffectTest = "org.typelevel" %% "cats-effect-testkit" % "3.5.1" % Test
 val scalaReflection = "org.scala-lang" % "scala-reflect" % scalaV
-val logback = "ch.qos.logback" % "logback-classic" % "1.3.8"
+val logback = "ch.qos.logback" % "logback-classic" % "1.3.11"
 val embedMongoVersion = "4.7.1"
 
 val scalaTestDeps = Seq(
@@ -81,7 +81,7 @@ lazy val scala_core_7 = (project in file("scala-core-7"))
     libraryDependencies ++= scalaTestDeps,
     libraryDependencies += jUnitInterface,
     libraryDependencies += "com.github.scopt" %% "scopt" % "4.1.0",
-    libraryDependencies += "org.rogach" %% "scallop" % "4.1.0",
+    libraryDependencies += "org.rogach" %% "scallop" % "5.0.0",
     libraryDependencies += "org.backuity.clist" %% "clist-core" % "3.5.1",
     libraryDependencies += "org.backuity.clist" %% "clist-macros" % "3.5.1" % "provided",
     libraryDependencies += "args4j" % "args4j" % "2.33"
@@ -219,14 +219,15 @@ lazy val scala_akka_2 = (project in file("scala-akka-2"))
       "com.lightbend.akka" %% "akka-stream-alpakka-sse" % "5.0.0",
       "com.typesafe.akka" %% "akka-persistence-typed" % AkkaVersion,
       "com.typesafe.akka" %% "akka-actor-testkit-typed" % AkkaVersion % "it,test",
-      "com.typesafe.akka" %% "akka-http-testkit" % AkkaHttpVersion % "it,test"
+      "com.typesafe.akka" %% "akka-http-testkit" % AkkaHttpVersion % "it,test",
+      "com.typesafe.akka" %% "akka-stream-testkit" % AkkaVersion % Test
     ) ++ scalaTestDeps.map(_.withConfigurations(Some("it,test")))
   )
 val monocleVersion = "2.1.0"
 val slickVersion = "3.4.1"
 val shapelessVersion = "2.3.10"
 val scalazVersion = "7.3.7"
-val fs2Version = "3.7.0"
+val fs2Version = "3.8.0"
 val AkkaVersion = "2.8.0"
 val AkkaHttpVersion = "10.5.0"
 val reactiveMongo = "1.0.10"
@@ -259,7 +260,7 @@ lazy val scala_libraries = (project in file("scala-libraries"))
 
 val circeVersion = "0.14.5"
 val monixVersion = "3.4.1"
-val elastic4sVersion = "8.8.1"
+val elastic4sVersion = "8.8.3"
 val sparkVersion = "3.4.1"
 
 val sparkCoreDep = "org.apache.spark" %% "spark-core" % sparkVersion
@@ -364,7 +365,7 @@ lazy val scala_libraries_4 = (project in file("scala-libraries-4"))
       sparkCoreDep,
       logback,
       "com.typesafe.scala-logging" %% "scala-logging" % "3.9.5",
-      "org.typelevel" %% "cats-core" % "2.9.0"
+      "org.typelevel" %% "cats-core" % "2.10.0"
     ),
     libraryDependencies ++= Seq(
       "com.clever-cloud.pulsar4s" %% "pulsar4s-core" % "2.9.0",
@@ -373,7 +374,7 @@ lazy val scala_libraries_4 = (project in file("scala-libraries-4"))
     ),
     libraryDependencies ++= Seq(
       "software.amazon.awssdk" % "s3" % "2.20.128",
-      "com.amazonaws" % "aws-java-sdk-s3" % "1.12.514" % IntegrationTest,
+      "com.amazonaws" % "aws-java-sdk-s3" % "1.12.532" % IntegrationTest,
       "com.dimafeng" %% "testcontainers-scala-scalatest" % "0.40.17" % IntegrationTest,
       "com.dimafeng" %% "testcontainers-scala-localstack-v2" % "0.40.17" % IntegrationTest
     ),
@@ -386,13 +387,13 @@ lazy val scala_libraries_4 = (project in file("scala-libraries-4"))
   )
 
 val spireVersion = "0.18.0"
-val kafkaVersion = "3.5.0"
+val kafkaVersion = "3.5.1"
 val pureconfigVersion = "0.17.4"
-val jackSonVersion = "2.15.1"
+val jackSonVersion = "2.15.2"
 val log4jApiScalaVersion = "12.0"
 val log4jVersion = "2.20.0"
 val avro4sVersion = "3.1.1"
-val kafkaAvroSerializer = "6.0.0"
+val kafkaAvroSerializer = "6.0.14"
 
 lazy val scala_libraries_5 = (project in file("scala-libraries-5"))
   .settings(
@@ -508,7 +509,7 @@ lazy val scala212 = (project in file("scala-2-modules/scala212"))
 
 addCommandAlias(
   "ci",
-  ";clean;compile;test:compile;it:compile;scalafmtCheckAll;test"
+  ";compile;test:compile;it:compile;scalafmtCheckAll;test"
 )
 
 addCommandAlias(
@@ -518,7 +519,7 @@ addCommandAlias(
 
 addCommandAlias(
   "ciFull",
-  """;ci; set ThisBuild/IntegrationTest/testOptions += Tests.Filter(t => !t.endsWith("ManualTest") && !t.endsWith("LiveTest") ); it:test""".stripMargin
+  """;clean; ci; set ThisBuild/IntegrationTest/testOptions += Tests.Filter(t => !t.endsWith("ManualTest") && !t.endsWith("LiveTest") ); it:test""".stripMargin
 )
 
 addCommandAlias(
@@ -532,3 +533,8 @@ addCommandAlias(
 )
 
 lazy val playGroup = (project in file("play-scala"))
+
+//Uncomment this to enable scala-js module. It needs nodejs module as well in local machine
+//lazy val scalajs = project in file("scala-js")
+lazy val scalatra = project in file("scalatra")
+lazy val benchmark = project in file("specialized-benchmark")
diff --git a/play-scala/application-tests/build.sbt b/play-scala/application-tests/build.sbt
@@ -8,8 +8,8 @@ enablePlugins(PlayScala)
 scalaVersion := ScalaVersions.scala2Version
 
 libraryDependencies += "com.google.inject" % "guice" % "6.0.0"
-libraryDependencies += "com.h2database" % "h2" % "1.4.192"
-libraryDependencies += "org.postgresql" % "postgresql" % "42.2.14"
+libraryDependencies += "com.h2database" % "h2" % "1.4.200"
+libraryDependencies += "org.postgresql" % "postgresql" % "42.2.27"
 libraryDependencies += "com.typesafe.play" %% "play-slick" % "5.1.0"
 libraryDependencies += "com.typesafe.play" %% "play-slick-evolutions" % "5.1.0"
 libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "5.1.0" % Test
diff --git a/play-scala/caching-in-play/build.sbt b/play-scala/caching-in-play/build.sbt
@@ -11,6 +11,6 @@ libraryDependencies += guice
 libraryDependencies += caffeine
 libraryDependencies += ws
 libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "5.0.0" % Test
-libraryDependencies += "org.mockito" % "mockito-core" % "3.5.13" % Test
+libraryDependencies += "org.mockito" % "mockito-core" % "3.5.15" % Test
 
 PlayKeys.devSettings += "play.server.http.port" -> "9000"
diff --git a/play-scala/configuration-access/build.sbt b/play-scala/configuration-access/build.sbt
@@ -9,7 +9,7 @@ scalaVersion := ScalaVersions.scala2Version
 
 libraryDependencies += guice
 libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "5.0.0" % Test
-libraryDependencies += "org.mockito" % "mockito-scala_2.13" % "1.15.0" % Test
+libraryDependencies += "org.mockito" % "mockito-scala_2.13" % "1.15.1" % Test
 
 // Adds additional packages into Twirl
 //TwirlKeys.templateImports += "com.baeldung.controllers._"
diff --git a/play-scala/dependency-injection/build.sbt b/play-scala/dependency-injection/build.sbt
@@ -8,5 +8,5 @@ scalaVersion := ScalaVersions.scala2Version
 
 libraryDependencies += guice
 libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "5.0.0" % Test
-libraryDependencies += "com.softwaremill.macwire" %% "macros" % "2.4.0" % Provided
-libraryDependencies += "com.softwaremill.macwire" %% "util" % "2.4.0"
+libraryDependencies += "com.softwaremill.macwire" %% "macros" % "2.4.2" % Provided
+libraryDependencies += "com.softwaremill.macwire" %% "util" % "2.4.2"
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -7,3 +7,13 @@ addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.2.1")
 libraryDependencies += "ai.kien" %% "python-native-libs" % "0.2.4"
 addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.19")
 ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
+
+addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.4.2")
+addSbtPlugin("com.earldouglas" % "xsbt-web-plugin" % "4.2.1")
+
+addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.3")
+libraryDependencies += "org.scala-js" %% "scalajs-env-jsdom-nodejs" % "1.0.0"
+
+resolvers += Resolver.jcenterRepo
+
+addSbtPlugin("net.aichler" % "sbt-jupiter-interface" % "0.8.3")
diff --git a/scala-akka-2/README.md b/scala-akka-2/README.md
@@ -8,3 +8,4 @@
 - [Reading Query Parameters in Akka HTTP](https://www.baeldung.com/scala/akka-http-reading-query-parameters)
 - [Difference Between tell and forward in Akka Actor](https://www.baeldung.com/scala/akka-actor-tell-vs-forward)
 - [Testing an Akka HTTP Application](https://www.baeldung.com/scala/akka-http-testing)
+- [Introduction to Akka-Streams in Scala](https://www.baeldung.com/scala/akka-streams)
diff --git a/scala-akka-2/src/main/scala/com/baeldung/scala/akka/stream/Main.scala b/scala-akka-2/src/main/scala/com/baeldung/scala/akka/stream/Main.scala
@@ -0,0 +1,20 @@
+package com.baeldung.scala.akka.stream
+
+import akka.actor.ActorSystem
+
+import scala.util.{Failure, Success}
+
+object Main extends App {
+  implicit val system: ActorSystem = ActorSystem("baeldung")
+
+  source
+    .via(parse)
+    .via(compare)
+    .runWith(sink)
+    .andThen {
+      case Failure(exception) => println(exception)
+      case Success((correct, total)) =>
+        println(s"$correct/$total correct answers")
+    }(system.dispatcher)
+    .onComplete(_ => system.terminate())(system.dispatcher)
+}
diff --git a/scala-akka-2/src/main/scala/com/baeldung/scala/akka/stream/package.scala b/scala-akka-2/src/main/scala/com/baeldung/scala/akka/stream/package.scala
@@ -0,0 +1,29 @@
+package com.baeldung.scala.akka
+
+import akka.NotUsed
+import akka.stream.scaladsl.{Flow, Sink, Source}
+
+import scala.concurrent.Future
+
+package object stream {
+  val source: Source[String, NotUsed] = Source(
+    Seq("5,10", "15,15", "78,79", "12,12", "0,0", "456,456")
+  )
+
+  val parse: Flow[String, (Int, Int), NotUsed] =
+    Flow[String]
+      .map { pair =>
+        val parts = pair.split(",")
+        (parts(0).toInt, parts(1).toInt)
+      }
+
+  val compare: Flow[(Int, Int), Boolean, NotUsed] =
+    Flow[(Int, Int)]
+      .map { case (userAnswer, correctAnswer) => userAnswer == correctAnswer }
+
+  val sink: Sink[Boolean, Future[(Int, Int)]] = Sink.fold((0, 0)) {
+    case ((correctCount, total), wasCorrect) =>
+      if (wasCorrect) (correctCount + 1, total + 1)
+      else (correctCount, total + 1)
+  }
+}
diff --git a/scala-akka-2/src/test/scala/com/baeldung/scala/akka/stream/StreamTest.scala b/scala-akka-2/src/test/scala/com/baeldung/scala/akka/stream/StreamTest.scala
@@ -0,0 +1,53 @@
+package com.baeldung.scala.akka.stream
+
+import akka.actor.ActorSystem
+import akka.stream.scaladsl.Keep
+import akka.stream.testkit.scaladsl.{TestSink, TestSource}
+import org.scalatest.concurrent.ScalaFutures.convertScalaFuture
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
+
+class StreamTest extends AnyFlatSpec with Matchers {
+  implicit val system: ActorSystem = ActorSystem("baeldung")
+
+  "The parse flow" should "parse pairs of integers" in {
+    val (pub, sub) = TestSource[String]()
+      .via(parse)
+      .toMat(TestSink[(Int, Int)]())(Keep.both)
+      .run()
+
+    pub.sendNext("1,1")
+    pub.sendNext("145,146")
+    pub.sendComplete()
+
+    sub.requestNext((1, 1))
+    sub.requestNext((145, 146))
+    sub.expectComplete()
+  }
+
+  "The compare flow" should "compare pairs of integers" in {
+    val (pub, sub) = TestSource[(Int, Int)]()
+      .via(compare)
+      .toMat(TestSink[Boolean]())(Keep.both)
+      .run()
+
+    pub.sendNext((1, 1))
+    pub.sendNext((145, 146))
+    pub.sendComplete()
+
+    sub.requestNext(true)
+    sub.requestNext(false)
+    sub.expectComplete()
+  }
+
+  "The sink sink" should "count the number of trues" in {
+    val (probe, result) = TestSource[Boolean]().toMat(sink)(Keep.both).run()
+
+    probe.sendNext(true)
+    probe.sendNext(false)
+    probe.sendNext(false)
+    probe.sendComplete()
+
+    result.futureValue shouldBe (1, 3)
+  }
+}
diff --git a/scala-core-8/README.md b/scala-core-8/README.md
@@ -7,3 +7,4 @@
 - [Get Difference Between Two Dates](https://www.baeldung.com/scala/difference-between-two-dates)
 - [The Either Type in Scala](https://www.baeldung.com/scala/either-type)
 - [Understanding the Differences: reduceLeft, reduceRight, foldLeft, foldRight, scanLeft, and scanRight in Scala](https://www.baeldung.com/scala/reduce-fold-scan-left-right)
+- [Different Ways to Reverse a Sequence in Scala](https://www.baeldung.com/scala/reverse-sequence)
diff --git a/scala-core-collections-2/README.md b/scala-core-collections-2/README.md
@@ -6,3 +6,4 @@
 - [Get a Subarray in Scala](https://www.baeldung.com/scala/extract-subarray)
 - [Finding the First Element Matching a Condition in a Collection](https://www.baeldung.com/scala/find-first-match-in-collection)
 - [Append an Element to an Array in Scala](https://www.baeldung.com/scala/array-append-element)
+- [Create a Random Sample of Fixed Size From a Scala List](https://www.baeldung.com/scala/list-uniform-sample)
diff --git a/scala-core/build.sbt b/scala-core/build.sbt
@@ -1,6 +1,6 @@
 // Scala 3 configuration
 lazy val Scala3Test = config("scala3Test").extend(Test)
 // Source directories
-scalaSource in Scala3Test := baseDirectory.value / "src" / "main" / "scala-3"
+Scala3Test / scalaSource := baseDirectory.value / "src" / "main" / "scala-3"
 // Test directories
-scalaSource in Scala3Test := baseDirectory.value / "src" / "test" / "scala-3"
+Scala3Test / scalaSource := baseDirectory.value / "src" / "test" / "scala-3"
diff --git a/scala-js/build.sbt b/scala-js/build.sbt
@@ -3,14 +3,13 @@ organization := "com.baeldung"
 
 version := "1.0-SNAPSHOT"
 
-lazy val root = (project in file("."))
-  .enablePlugins(ScalaJSPlugin)
-  .settings(
-    jsEnv := new org.scalajs.jsenv.jsdomnodejs.JSDOMNodeJSEnv()
-  )
+enablePlugins(ScalaJSPlugin)
 
 scalaVersion := "2.13.10"
 
 scalaJSUseMainModuleInitializer := true
 libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "2.2.0"
 libraryDependencies += "org.scalatest" %%% "scalatest" % "3.1.2" % Test
+
+//enable the below setting after installing npm package jsdom.
+jsEnv := new org.scalajs.jsenv.jsdomnodejs.JSDOMNodeJSEnv()
diff --git a/scala-sbt/sbt-info/build.sbt b/scala-sbt/sbt-info/build.sbt
@@ -43,4 +43,4 @@ ThisBuild / coverageEnabled := true
 
 ThisBuild / coverageExcludedFiles := """.*SlickTables;.*/scalaz/.*"""
 
-ThisBuild / coverageExcludedPackages := "<empty>;.*CollectionMonoid.*;.*reactivemongo.*"
+ThisBuild / coverageExcludedPackages := "<empty>;.*CollectionMonoid.*;.*reactivemongo.*"
diff --git a/scala-test-junit5/project/build.properties b/scala-test-junit5/project/build.properties
diff --git a/scala-test-junit5/project/plugins.sbt b/scala-test-junit5/project/plugins.sbt
@@ -1,3 +1 @@
-resolvers += Resolver.jcenterRepo
 
-addSbtPlugin("net.aichler" % "sbt-jupiter-interface" % "0.8.3")
diff --git a/scala-test/README.md b/scala-test/README.md
diff --git a/scala-test/src/test/scala-2/com/baeldung/scala/scalatest/.scala-build/ide-inputs.json b/scala-test/src/test/scala-2/com/baeldung/scala/scalatest/.scala-build/ide-inputs.json
diff --git a/scala-test/src/test/scala-2/com/baeldung/scala/scalatest/.scala-build/ide-options-v2.json b/scala-test/src/test/scala-2/com/baeldung/scala/scalatest/.scala-build/ide-options-v2.json
diff --git a/scala-test/src/test/scala-2/com/baeldung/scala/scalatest/IfCompilesTest.scala b/scala-test/src/test/scala-2/com/baeldung/scala/scalatest/IfCompilesTest.scala
diff --git a/scala-test/src/test/scala-2/com/baeldung/scala/scalatest/stringtest/CaseInsensitiveStringComparisonUnitTest.scala b/scala-test/src/test/scala-2/com/baeldung/scala/scalatest/stringtest/CaseInsensitiveStringComparisonUnitTest.scala
diff --git a/scalatra/build.sbt b/scalatra/build.sbt
diff --git a/scalatra/project/plugins.sbt b/scalatra/project/plugins.sbt
diff --git a/specialized-benchmark/project/plugins.sbt b/specialized-benchmark/project/plugins.sbt
diff --git a/zio/README.md b/zio/README.md

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# Scala Steward: Reformat with scalafmt 3.7.12`
	`2`	`+ca5770e327fea2fad0a3bf2f79f896e7a507d2d5`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version = 3.7.10`
	`1`	`+version = 3.7.12`
`2`	`2`	`runner.dialect = scala3`
`3`	`3`	`fileOverride {`
`4`	`4`	`"glob:/scala-2-modules/" {`