Merge pull request #1 from Baeldung/master

updating pr

Author: TomRose

.gitignore

@@ -16,6 +16,7 @@ project/plugins/project/
 .scala_dependencies
 .worksheet
 .idea
+!/project/Versions.scala
 /project/
 !project/build.properties
 out

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = 3.7.7
+version = 3.7.10
 runner.dialect = scala3
 fileOverride {
   "glob:**/scala-2-modules/**" {

README.md

@@ -11,6 +11,7 @@ In this repository, we have classified the tests in 4 categories.
 
 
 Here is a table describing about the different categories of tests and how they can be executed in this project.
+Note that these commands are defined at the root level of the project and hence are accessible only from the root project(not directly within each submodule).
 
 | Category                | Sbt command       | Test class location                    | Test class name format                                                                                                  |
 |-------------------------|-------------------|----------------------------------------|-------------------------------------------------------------------------------------------------------------------------|

alias.sbt

@@ -1,3 +1,6 @@
-addCommandAlias("specialTests", "testOnly com.baeldung.scala.scalatest.runner.ScalaTestRunnerTests -- -z \"spaces\" -n \"BooleanTests\"")
+addCommandAlias(
+  "specialTests",
+  "testOnly com.baeldung.scala.scalatest.runner.ScalaTestRunnerTests -- -z \"spaces\" -n \"BooleanTests\""
+)
 
-addCommandAlias("compileAndRunSpecialTest","compile;specialTests")
+addCommandAlias("compileAndRunSpecialTest", "compile;specialTests")

build.sbt

@@ -1,5 +1,5 @@
-val scalaV = "2.13.11"
-val scala3Version = "3.2.2"
+val scalaV = ScalaVersions.scala2Version
+val scala3Version = ScalaVersions.scala3Version
 ThisBuild / scalaVersion := scalaV
 ThisBuild / version := "1.0-SNAPSHOT"
 ThisBuild / organization := "com.baeldung"
@@ -10,7 +10,7 @@ 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 embedMongoVersion = "4.7.0"
+val embedMongoVersion = "4.7.1"
 
 val scalaTestDeps = Seq(
   "org.scalatest" %% "scalatest" % "3.2.16" % Test,
@@ -46,7 +46,7 @@ lazy val scala_core_3 = (project in file("scala-core-3"))
     libraryDependencies ++= scalaTestDeps,
     libraryDependencies += jUnitInterface,
     libraryDependencies += scalaReflection,
-    libraryDependencies += "org.scala-lang.modules" %% "scala-xml" % "2.1.0"
+    libraryDependencies += "org.scala-lang.modules" %% "scala-xml" % "2.2.0"
   )
 
 lazy val scala_core_4 = (project in file("scala-core-4"))
@@ -175,7 +175,7 @@ lazy val scala_akka_dependencies: Seq[ModuleID] = Seq(
   "com.typesafe.akka" %% "akka-actor-testkit-typed" % AkkaVersion % Test,
   "com.lightbend.akka" %% "akka-stream-alpakka-mongodb" % "5.0.0",
   "com.typesafe.akka" %% "akka-stream" % AkkaVersion,
-  "org.mongodb.scala" %% "mongo-scala-driver" % "4.10.1",
+  "org.mongodb.scala" %% "mongo-scala-driver" % "4.10.2",
   "com.lightbend.akka" %% "akka-stream-alpakka-file" % "5.0.0",
   jUnitInterface,
   embeddedMongo % Test,
@@ -230,7 +230,6 @@ val fs2Version = "3.7.0"
 val AkkaVersion = "2.8.0"
 val AkkaHttpVersion = "10.5.0"
 val reactiveMongo = "1.0.10"
-val spireVersion = "0.18.0"
 
 lazy val scala_libraries = (project in file("scala-libraries"))
   .settings(
@@ -241,7 +240,7 @@ lazy val scala_libraries = (project in file("scala-libraries"))
       "com.github.julien-truffaut" %% "monocle-macro" % monocleVersion,
       "com.github.julien-truffaut" %% "monocle-law" % monocleVersion % "test",
       "com.typesafe.slick" %% "slick" % slickVersion,
-      "com.h2database" % "h2" % "2.1.214",
+      "com.h2database" % "h2" % "2.2.220",
       "com.chuusai" %% "shapeless" % shapelessVersion,
       "org.scalaz" %% "scalaz-core" % scalazVersion,
       "co.fs2" %% "fs2-core" % fs2Version,
@@ -260,7 +259,7 @@ lazy val scala_libraries = (project in file("scala-libraries"))
 
 val circeVersion = "0.14.5"
 val monixVersion = "3.4.1"
-val elastic4sVersion = "8.7.1"
+val elastic4sVersion = "8.8.1"
 val sparkVersion = "3.4.1"
 
 val sparkCoreDep = "org.apache.spark" %% "spark-core" % sparkVersion
@@ -280,7 +279,7 @@ lazy val scala_libraries_2 = (project in file("scala-libraries-2"))
       "com.github.cb372" %% "scalacache-guava" % "0.28.0",
       "com.github.cb372" %% "scalacache-cats-effect" % "0.28.0",
       "com.github.cb372" %% "scalacache-caffeine" % "0.28.0",
-      "com.beachape" %% "enumeratum" % "1.7.2"
+      "com.beachape" %% "enumeratum" % "1.7.3"
     ),
     libraryDependencies ++= Seq(
       "com.typesafe.play" %% "play-slick" % "5.1.0",
@@ -308,7 +307,7 @@ lazy val scala_libraries_2 = (project in file("scala-libraries-2"))
   )
 
 val http4sBlaze = "0.23.15"
-val http4sVersion = "0.23.22"
+val http4sVersion = "0.23.23"
 val osLibVersion = "0.9.1"
 lazy val scala_libraries_3 = (project in file("scala-libraries-3"))
   .settings(
@@ -322,7 +321,7 @@ lazy val scala_libraries_3 = (project in file("scala-libraries-3"))
       "org.http4s" %% "http4s-dsl" % http4sVersion,
       "org.http4s" %% "http4s-blaze-server" % http4sBlaze,
       "org.http4s" %% "http4s-blaze-client" % http4sBlaze,
-      "com.beachape" %% "enumeratum" % "1.7.2",
+      "com.beachape" %% "enumeratum" % "1.7.3",
       "com.github.pureconfig" %% "pureconfig" % "0.17.4",
       "com.github.pureconfig" %% "pureconfig-enumeratum" % "0.17.4",
       "com.typesafe" % "config" % "1.4.2",
@@ -373,8 +372,8 @@ lazy val scala_libraries_4 = (project in file("scala-libraries-4"))
       "org.testcontainers" % "pulsar" % "1.18.3" % IntegrationTest
     ),
     libraryDependencies ++= Seq(
-      "software.amazon.awssdk" % "s3" % "2.20.98",
-      "com.amazonaws" % "aws-java-sdk-s3" % "1.12.501" % IntegrationTest,
+      "software.amazon.awssdk" % "s3" % "2.20.111",
+      "com.amazonaws" % "aws-java-sdk-s3" % "1.12.514" % IntegrationTest,
       "com.dimafeng" %% "testcontainers-scala-scalatest" % "0.40.17" % IntegrationTest,
       "com.dimafeng" %% "testcontainers-scala-localstack-v2" % "0.40.17" % IntegrationTest
     ),
@@ -386,15 +385,34 @@ lazy val scala_libraries_4 = (project in file("scala-libraries-4"))
     IntegrationTest / fork := true
   )
 
+val spireVersion = "0.18.0"
+val kafkaVersion = "3.5.0"
+val pureconfigVersion = "0.17.4"
+val jackSonVersion = "2.15.1"
+val log4jApiScalaVersion = "12.0"
+val log4jVersion = "2.20.0"
+val avro4sVersion = "3.1.1"
+val kafkaAvroSerializer = "6.0.0"
+
 lazy val scala_libraries_5 = (project in file("scala-libraries-5"))
   .settings(
     name := "scala-libraries-5",
+    resolvers += "Kafka avro serializer" at "https://packages.confluent.io/maven",
     scalaVersion := scalaV,
     libraryDependencies ++= scalaTestDeps,
     libraryDependencies ++= Seq(
       sparkSqlDep,
       sparkCoreDep,
-      "org.typelevel" %% "spire" % spireVersion
+      "org.typelevel" %% "spire" % spireVersion,
+      "org.apache.kafka" % "kafka-clients" % kafkaVersion,
+      "com.github.pureconfig" %% "pureconfig" % pureconfigVersion,
+      "com.fasterxml.jackson.core" % "jackson-databind" % jackSonVersion,
+      "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % jackSonVersion,
+      "com.fasterxml.jackson.module" %% "jackson-module-scala" % jackSonVersion,
+      "com.sksamuel.avro4s" %% "avro4s-core" % avro4sVersion,
+      "io.confluent" % "kafka-avro-serializer" % kafkaAvroSerializer,
+      "org.apache.logging.log4j" %% "log4j-api-scala" % log4jApiScalaVersion,
+      "org.apache.logging.log4j" % "log4j-core" % log4jVersion % Runtime
     )
   )
 
@@ -483,7 +501,7 @@ Test / testOptions += Tests.Argument(TestFrameworks.ScalaTest, "-eG")
 
 lazy val scala212 = (project in file("scala-2-modules/scala212"))
   .settings(
-    scalaVersion := "2.12.18",
+    scalaVersion := ScalaVersions.scala212Version,
     name := "scala212",
     libraryDependencies ++= scalaTestDeps
   )
@@ -512,3 +530,5 @@ addCommandAlias(
   "liveTests",
   """;ci; set ThisBuild/IntegrationTest/testOptions += Tests.Filter(t => t.endsWith("LiveTest")); it:test""".stripMargin
 )
+
+lazy val playGroup = (project in file("play-scala"))

play-scala/application-tests/app/com/baeldung/arrival/controller/ArrivalController.scala

@@ -7,7 +7,11 @@ import play.api.mvc.{BaseController, ControllerComponents}
 import javax.inject.Inject
 import scala.concurrent.ExecutionContext
 
-class ArrivalController @Inject()(arrivalService: ArrivalService, val controllerComponents: ControllerComponents)(implicit ec: ExecutionContext) extends BaseController {
+class ArrivalController @Inject() (
+  arrivalService: ArrivalService,
+  val controllerComponents: ControllerComponents
+)(implicit ec: ExecutionContext)
+  extends BaseController {
 
   def index() = Action.async { _ =>
     arrivalService.getArrivals().map(arrivals => Ok(Json.toJson(arrivals)))

play-scala/application-tests/app/com/baeldung/arrival/controller/action/SourceActions.scala

@@ -6,20 +6,27 @@ import scala.concurrent.{ExecutionContext, Future}
 
 trait SourceActions {
 
-  def SourceActionFilter(implicit ec: ExecutionContext): ActionFilter[Request] = new ActionFilter[Request] {
-    override protected def filter[A](request: Request[A]): Future[Option[Result]] = {
-      Future.successful {
-        request.headers.get("source") match {
-          case Some(_) => None
-          case None => Some(Results.BadRequest("Source header is absent"))
+  def SourceActionFilter(implicit ec: ExecutionContext): ActionFilter[Request] =
+    new ActionFilter[Request] {
+      override protected def filter[A](
+        request: Request[A]
+      ): Future[Option[Result]] = {
+        Future.successful {
+          request.headers.get("source") match {
+            case Some(_) => None
+            case None    => Some(Results.BadRequest("Source header is absent"))
+          }
         }
       }
-    }
 
-    override protected def executionContext: ExecutionContext = ec
-  }
+      override protected def executionContext: ExecutionContext = ec
+    }
 
-  def SourceAction(anyContentParser: BodyParser[AnyContent])(implicit ec: ExecutionContext): ActionBuilder[Request, AnyContent] =
-    new ActionBuilderImpl[AnyContent](anyContentParser) andThen SourceActionFilter
+  def SourceAction(
+    anyContentParser: BodyParser[AnyContent]
+  )(implicit ec: ExecutionContext): ActionBuilder[Request, AnyContent] =
+    new ActionBuilderImpl[AnyContent](
+      anyContentParser
+    ) andThen SourceActionFilter
 
 }

play-scala/application-tests/app/com/baeldung/arrival/db/manager/H2Manager.scala

@@ -5,4 +5,5 @@ import slick.jdbc.H2Profile
 
 import javax.inject.Inject
 
-class H2Manager @Inject()(val dbConfig: DatabaseConfig[H2Profile]) extends DbManager
+class H2Manager @Inject() (val dbConfig: DatabaseConfig[H2Profile])
+  extends DbManager

play-scala/application-tests/app/com/baeldung/arrival/db/manager/PostgresManager.scala

@@ -5,4 +5,5 @@ import slick.jdbc.PostgresProfile
 
 import javax.inject.Inject
 
-class PostgresManager @Inject()(val dbConfig: DatabaseConfig[PostgresProfile]) extends DbManager
+class PostgresManager @Inject() (val dbConfig: DatabaseConfig[PostgresProfile])
+  extends DbManager

play-scala/application-tests/app/com/baeldung/arrival/db/repository/ArrivalRepository.scala

@@ -3,7 +3,12 @@ package com.baeldung.arrival.db.repository
 import play.api.libs.json.{Json, OFormat}
 import slick.dbio.DBIO
 
-case class Arrival(planeId: Long, origin: String, destination: String, plane: String)
+case class Arrival(
+  planeId: Long,
+  origin: String,
+  destination: String,
+  plane: String
+)
 
 object Arrival {
   implicit val format: OFormat[Arrival] = Json.format[Arrival]

play-scala/application-tests/app/com/baeldung/arrival/db/repository/SlickArrivalRepository.scala

@@ -5,8 +5,9 @@ import slick.jdbc.JdbcProfile
 import javax.inject.Inject
 import scala.concurrent.ExecutionContext
 
-class SlickArrivalRepository @Inject()(val dbProfile: JdbcProfile)(implicit ec: ExecutionContext) extends ArrivalRepository {
-
+class SlickArrivalRepository @Inject() (val dbProfile: JdbcProfile)(implicit
+  ec: ExecutionContext
+) extends ArrivalRepository {
 
   import dbProfile.api._
 
@@ -20,14 +21,18 @@ class SlickArrivalRepository @Inject()(val dbProfile: JdbcProfile)(implicit ec:
 
     def plane = column[String]("plane")
 
-    def * = (id, origin, destination, plane) <> ((Arrival.apply _).tupled, Arrival.unapply)
+    def * = (
+      id,
+      origin,
+      destination,
+      plane
+    ) <> ((Arrival.apply _).tupled, Arrival.unapply)
   }
 
-  /**
-   * The starting point for all queries on the people table.
-   */
+  /** The starting point for all queries on the people table.
+    */
   private val arrivals = TableQuery[ArrivalTable]
 
   def getArrivals: DBIO[Seq[Arrival]] = arrivals.result
 
-}
+}

play-scala/application-tests/app/com/baeldung/arrival/modules/H2Module.scala

@@ -14,12 +14,16 @@ class H2Module extends AbstractModule {
   }
 
   @Provides
-  def dbProfile(@NamedDatabase("h2") dbConfigProvider: DatabaseConfigProvider): JdbcProfile = {
+  def dbProfile(
+    @NamedDatabase("h2") dbConfigProvider: DatabaseConfigProvider
+  ): JdbcProfile = {
     dbConfigProvider.get[H2Profile].profile
   }
 
   @Provides
-  def dbConfig(@NamedDatabase("h2") dbConfigProvider: DatabaseConfigProvider): DatabaseConfig[H2Profile] = {
+  def dbConfig(
+    @NamedDatabase("h2") dbConfigProvider: DatabaseConfigProvider
+  ): DatabaseConfig[H2Profile] = {
     dbConfigProvider.get[H2Profile]
   }
 

play-scala/application-tests/app/com/baeldung/arrival/modules/MockDbModule.scala

@@ -1,6 +1,9 @@
 package com.baeldung.arrival.modules
 
-import com.baeldung.arrival.db.repository.{ArrivalRepository, MockArrivalRepository}
+import com.baeldung.arrival.db.repository.{
+  ArrivalRepository,
+  MockArrivalRepository
+}
 import com.google.inject.AbstractModule
 
 class MockDbModule extends AbstractModule {

play-scala/application-tests/app/com/baeldung/arrival/modules/PostgresModule.scala

@@ -14,12 +14,16 @@ class PostgresModule extends AbstractModule {
   }
 
   @Provides
-  def dbProfile(@NamedDatabase("postgres") dbConfigProvider: DatabaseConfigProvider): JdbcProfile = {
+  def dbProfile(
+    @NamedDatabase("postgres") dbConfigProvider: DatabaseConfigProvider
+  ): JdbcProfile = {
     dbConfigProvider.get[PostgresProfile].profile
   }
 
   @Provides
-  def dbConfig(@NamedDatabase("postgres") dbConfigProvider: DatabaseConfigProvider): DatabaseConfig[PostgresProfile] = {
+  def dbConfig(
+    @NamedDatabase("postgres") dbConfigProvider: DatabaseConfigProvider
+  ): DatabaseConfig[PostgresProfile] = {
     dbConfigProvider.get[PostgresProfile]
   }
 

play-scala/application-tests/app/com/baeldung/arrival/modules/SlickModule.scala

@@ -1,6 +1,9 @@
 package com.baeldung.arrival.modules
 
-import com.baeldung.arrival.db.repository.{ArrivalRepository, SlickArrivalRepository}
+import com.baeldung.arrival.db.repository.{
+  ArrivalRepository,
+  SlickArrivalRepository
+}
 import com.google.inject.AbstractModule
 
 class SlickModule extends AbstractModule {

play-scala/application-tests/app/com/baeldung/arrival/service/ArrivalDecoratorService.scala

@@ -13,17 +13,26 @@ trait Size {
   def long: Boolean
 }
 
-class ArrivalDecoratorService @Inject()(configuration: Configuration) {
+class ArrivalDecoratorService @Inject() (configuration: Configuration) {
 
   private val maximumShortNameLength = configuration.get[Int]("short-name-max")
-  private val maximumMediumNameLength = configuration.get[Int]("medium-name-max")
-
-  def decorate(undecorated: Arrival): Arrival with Size = new Arrival(undecorated.planeId, undecorated.origin, undecorated.destination, undecorated.plane) with Size {
-    override def short: Boolean = undecorated.plane.length <= maximumShortNameLength
-
-    override def medium: Boolean = undecorated.plane.length > maximumShortNameLength && undecorated.plane.length <= maximumMediumNameLength
-
-    override def long: Boolean = undecorated.plane.length > maximumMediumNameLength
+  private val maximumMediumNameLength =
+    configuration.get[Int]("medium-name-max")
+
+  def decorate(undecorated: Arrival): Arrival with Size = new Arrival(
+    undecorated.planeId,
+    undecorated.origin,
+    undecorated.destination,
+    undecorated.plane
+  ) with Size {
+    override def short: Boolean =
+      undecorated.plane.length <= maximumShortNameLength
+
+    override def medium: Boolean =
+      undecorated.plane.length > maximumShortNameLength && undecorated.plane.length <= maximumMediumNameLength
+
+    override def long: Boolean =
+      undecorated.plane.length > maximumMediumNameLength
   }
 
 }