resolved conflicts

yadavan88 · yadavan88 · commit 575af732173e · 2023-01-20T22:18:54.000+01:00
diff --git a/build.sbt b/build.sbt
@@ -188,7 +188,6 @@ lazy val scala_akka_2 = (project in file("scala-akka-2"))
   .enablePlugins(AkkaGrpcPlugin)
   .settings(
     name := "scala-akka-2",
-    scalaVersion := "2.13.10",
     libraryDependencies ++= Seq(
       "com.typesafe.akka" %% "akka-actor-typed" % "2.6.19",
       "com.typesafe.akka" %% "akka-http" % "10.2.10",
@@ -236,9 +235,11 @@ val monixVersion = "3.4.0"
 val elastic4sVersion = "7.16.0"
 val sparkVersion = "3.2.1"
 
+val sparkCoreDep = "org.apache.spark" %% "spark-core" % sparkVersion
+val sparkSqlDep = "org.apache.spark" %% "spark-sql" % sparkVersion
+
 lazy val scala_libraries_2 = (project in file("scala-libraries-2"))
   .settings(
-    scalaVersion := "2.12.15",
     name := "scala-libraries",
     libraryDependencies ++= scalaTestDeps,
     libraryDependencies ++= Seq(
@@ -252,23 +253,19 @@ lazy val scala_libraries_2 = (project in file("scala-libraries-2"))
       "com.beachape" %% "enumeratum" % "1.7.0"
     ),
     libraryDependencies ++= Seq(
-      "com.typesafe.play" %% "play-slick" % "5.0.0",
+      "com.typesafe.play" %% "play-slick" % "5.1.0",
       "org.postgresql" % "postgresql" % "42.2.12"
     ),
     libraryDependencies ++= Seq(
       "io.monix" %% "monix" % monixVersion
     ),
-    libraryDependencies ++= Seq(
-      "org.apache.spark" %% "spark-core" % sparkVersion,
-      "org.apache.spark" %% "spark-sql" % sparkVersion
-    ),
     dependencyOverrides := Seq(
-      "com.typesafe.akka" %% "akka-protobuf-v3" % "2.6.16",
-      "com.typesafe.akka" %% "akka-stream" % "2.6.16",
-      "com.typesafe.akka" %% "akka-serialization-jackson" % "2.6.16"
+      "com.typesafe.akka" %% "akka-protobuf-v3" % "2.6.19",
+      "com.typesafe.akka" %% "akka-stream" % "2.6.19",
+      "com.typesafe.akka" %% "akka-serialization-jackson" % "2.6.19"
     ),
     libraryDependencies ++= Seq(
-      "com.typesafe.akka" %% "akka-actor-testkit-typed" % "2.6.16" % Test,
+      "com.typesafe.akka" %% "akka-actor-testkit-typed" % "2.6.19" % Test,
       "org.scalacheck" %% "scalacheck" % "1.14.1" % Test,
       "com.lihaoyi" %% "requests" % "0.6.9"
     ) ++ scalaTestDeps,
@@ -286,8 +283,8 @@ lazy val scala_libraries_3 = (project in file("scala-libraries-3"))
     name := "scala-libraries",
     libraryDependencies ++= scalaTestDeps,
     libraryDependencies ++= Seq(
-      "org.apache.spark" %% "spark-core" % sparkVersion,
-      "org.apache.spark" %% "spark-sql" % sparkVersion
+      sparkSqlDep,
+      sparkCoreDep
     ),
     libraryDependencies ++= Seq(
       "org.http4s" %% "http4s-dsl" % http4sVersion,
@@ -328,11 +325,9 @@ lazy val scala_libraries_4 = (project in file("scala-libraries-4"))
     libraryDependencies ++= Seq(
       "org.scala-lang.modules" %% "scala-async" % "1.0.1",
       "org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided,
-      "org.tpolecat" %% "skunk-core" % "0.3.2"
-    ),
-     libraryDependencies ++= Seq(
-      "org.apache.spark" %% "spark-core" % sparkVersion,
-      "org.apache.spark" %% "spark-sql" % sparkVersion
+      "org.tpolecat" %% "skunk-core" % "0.3.2",
+      sparkSqlDep,
+      sparkCoreDep
     ),
     scalacOptions += "-Xasync"
   )
@@ -416,4 +411,4 @@ lazy val scala212 = (project in file("scala212"))
     scalaVersion := "2.12.17",
     name := "scala212",
     libraryDependencies ++= scalaTestDeps
-  )
+  )
diff --git a/play-scala/async-tasks/build.sbt b/play-scala/async-tasks/build.sbt
@@ -5,6 +5,6 @@ version := "1.0-SNAPSHOT"
 
 lazy val root = (project in file(".")).enablePlugins(PlayScala)
 
-scalaVersion := "2.13.2"
+scalaVersion := "2.13.10"
 
 libraryDependencies += guice
diff --git a/play-scala/caching-in-play/build.sbt b/play-scala/caching-in-play/build.sbt
@@ -5,7 +5,7 @@ version := "1.0-SNAPSHOT"
 
 lazy val root = (project in file(".")).enablePlugins(PlayScala)
 
-scalaVersion := "2.13.3"
+scalaVersion := "2.13.10"
 
 libraryDependencies += guice
 libraryDependencies += caffeine
diff --git a/play-scala/configuration-access/build.sbt b/play-scala/configuration-access/build.sbt
@@ -5,7 +5,7 @@ version := "1.0-SNAPSHOT"
 
 lazy val root = (project in file(".")).enablePlugins(PlayScala)
 
-scalaVersion := "2.13.3"
+scalaVersion := "2.13.10"
 
 libraryDependencies += guice
 libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "5.0.0" % Test
diff --git a/play-scala/custom-error-handling/build.sbt b/play-scala/custom-error-handling/build.sbt
@@ -5,7 +5,7 @@ version := "1.0-SNAPSHOT"
 
 lazy val root = (project in file(".")).enablePlugins(PlayScala)
 
-scalaVersion := "2.13.2"
+scalaVersion := "2.13.10"
 
 libraryDependencies += guice
 libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "5.0.0" % Test
diff --git a/play-scala/dependency-injection/build.sbt b/play-scala/dependency-injection/build.sbt
@@ -4,7 +4,7 @@ version := "1.0-SNAPSHOT"
 
 lazy val root = (project in file(".")).enablePlugins(PlayScala)
 
-scalaVersion := "2.13.6"
+scalaVersion := "2.13.10"
 
 libraryDependencies += guice
 libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "5.0.0" % Test
diff --git a/play-scala/introduction-to-play/build.sbt b/play-scala/introduction-to-play/build.sbt
@@ -4,6 +4,6 @@ version := "1.0-SNAPSHOT"
 
 lazy val root = (project in file(".")).enablePlugins(PlayScala)
 
-scalaVersion := "2.13.2"
+scalaVersion := "2.13.10"
 
 libraryDependencies += guice libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "5.0.0" % Test
diff --git a/play-scala/play-templates/build.sbt b/play-scala/play-templates/build.sbt
@@ -5,7 +5,7 @@ version := "1.0-SNAPSHOT"
 
 lazy val root = (project in file(".")).enablePlugins(PlayScala)
 
-scalaVersion := "2.13.2"
+scalaVersion := "2.13.10"
 
 libraryDependencies += guice
 libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "5.0.0" % Test
diff --git a/play-scala/rest-api/build.sbt b/play-scala/rest-api/build.sbt
@@ -5,7 +5,7 @@ version := "1.0-SNAPSHOT"
 
 lazy val root = (project in file(".")).enablePlugins(PlayScala)
 
-scalaVersion := "2.13.2"
+scalaVersion := "2.13.10"
 
 libraryDependencies += guice
 libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "5.0.0" % Test
diff --git a/scala-akka/src/main/scala/com/baeldung/scala/akka/scheduler/Greetings.scala b/scala-akka/src/main/scala/com/baeldung/scala/akka/scheduler/Greetings.scala
@@ -8,6 +8,6 @@ final case class Greeted(msg: String)
 class Greetings extends Actor {
   override def receive: Receive = {
     case greet: Greet =>
-      sender ! Greeted(s"${greet.by}: Hello, ${greet.to}")
+      sender() ! Greeted(s"${greet.by}: Hello, ${greet.to}")
   }
 }
diff --git a/scala-akka/src/main/scala/com/baeldung/scala/akka/stopping/MessageProcessorActor.scala b/scala-akka/src/main/scala/com/baeldung/scala/akka/stopping/MessageProcessorActor.scala
@@ -15,7 +15,7 @@ class MessageProcessorActor extends Actor {
 
   override def receive: Receive = {
     case msg: MessageProcessorActor.Greet =>
-      sender ! MessageProcessorActor.Reply("Hey, " + msg.msg)
+      sender() ! MessageProcessorActor.Reply("Hey, " + msg.msg)
   }
 
 }
diff --git a/scala-core-2/src/main/scala/com/baeldung/scala/concurrency/FutureAndPromise.scala b/scala-core-2/src/main/scala/com/baeldung/scala/concurrency/FutureAndPromise.scala
@@ -52,7 +52,7 @@ object ScalaAndPromise {
     } yield User(name, email, hashedPassword, avatar)
 
   def runByPromise[T](block: => T)(implicit ec: ExecutionContext): Future[T] = {
-    val p = Promise[T]
+    val p = Promise[T]()
     ec.execute { () =>
       try {
         p.success(block)
diff --git a/scala-core-2/src/main/scala/com/baeldung/scala/exceptionhandling/ExceptionHandling.scala b/scala-core-2/src/main/scala/com/baeldung/scala/exceptionhandling/ExceptionHandling.scala
@@ -21,7 +21,7 @@ object ExceptionHandling {
     try {
       divide(a, 0)
     } catch {
-      case e: DivideByZero => null
+      case _: DivideByZero => null
     } finally {
       println("Finished")
     }
diff --git a/scala-core-3/src/main/scala/com/baeldung/scala/await/AwaitFuture.scala b/scala-core-3/src/main/scala/com/baeldung/scala/await/AwaitFuture.scala
@@ -10,7 +10,7 @@ object AwaitFuture  {
     Source.fromURL(url).getLines().mkString
   }
 
-  def fetchDataFrom(url : String, waitTime : Long = 0l) : Future[String] =  Future {
+  def fetchDataFrom(url : String, waitTime : Long = 0L) : Future[String] =  Future {
     Thread.sleep(waitTime)
     Source.fromURL(url).getLines().mkString
   }
diff --git a/scala-core-3/src/main/scala/com/baeldung/scala/typecasts/ErrorHandling.scala b/scala-core-3/src/main/scala/com/baeldung/scala/typecasts/ErrorHandling.scala
@@ -32,7 +32,7 @@ object ErrorHandling extends App {
     case Failure(e: UnknownHostException) =>
       println(s"Unknown host specified: ${e.getMessage}")
     case Failure(e: IOException) =>
-      println("Network failure: ${e.getMessage}")
+      println(s"Network failure: ${e.getMessage}")
     case Failure(t) =>
       t.printStackTrace()
   }
diff --git a/scala-core-4/src/main/scala/com/baeldung/scala/assertvsrequire/RequireUsage.scala b/scala-core-4/src/main/scala/com/baeldung/scala/assertvsrequire/RequireUsage.scala
@@ -12,7 +12,7 @@ object RequireUsage extends App {
     issueDrivingLicense("Jr. Darwin", 5) // prints "Failed in require precondition"
   } catch {
     case e: IllegalArgumentException =>
-      println("Failed in require precondition")
+      println("Failed in require precondition-"+e.getMessage)
   }
 
 }
diff --git a/scala-core-5/src/main/scala/com/baeldung/scala/datesandtimes/JavaUtilDate.scala b/scala-core-5/src/main/scala/com/baeldung/scala/datesandtimes/JavaUtilDate.scala
@@ -2,7 +2,6 @@ package com.baeldung.scala.datesandtimes
 import java.text.SimpleDateFormat
 import scala.concurrent.duration.Duration
 import scala.concurrent.{Await, Future}
-import scala.languageFeature.experimental.macros
 
 object JavaUtilDate extends App{
 
@@ -28,5 +27,5 @@ object JavaUtilDate extends App{
   val date1 = Await.result(r1, Duration.Inf)
   val date2 = Await.result(r2, Duration.Inf)
 
-  println(date1, date2) // Prints "Wed Jul 01 2020, Fri Aug 21 2020"
+  println(date1 +", "+ date2) // Prints "Wed Jul 01 2020, Fri Aug 21 2020"
 }
diff --git a/scala-design-patterns/src/main/scala/com/baeldung/scala/cakepattern/CakePattern.scala b/scala-design-patterns/src/main/scala/com/baeldung/scala/cakepattern/CakePattern.scala
@@ -1,6 +1,6 @@
 package com.baeldung.scala.cakepattern
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 object CakePattern {
 
diff --git a/scala-js/build.sbt b/scala-js/build.sbt
@@ -9,7 +9,7 @@ lazy val root = (project in file("."))
     jsEnv := new org.scalajs.jsenv.jsdomnodejs.JSDOMNodeJSEnv()
   )
 
-scalaVersion := "2.13.1"
+scalaVersion := "2.13.10"
 
 scalaJSUseMainModuleInitializer := true
 libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "2.2.0"
diff --git a/scala-lagom/build.sbt b/scala-lagom/build.sbt
@@ -2,7 +2,7 @@ organization in ThisBuild := "com.baeldung"
 version in ThisBuild := "1.0-SNAPSHOT"
 
 // the Scala version that will be used for cross-compiled libraries
-scalaVersion in ThisBuild := "2.13.0"
+scalaVersion in ThisBuild := "2.13.10"
 
 val macwire = "com.softwaremill.macwire" %% "macros" % "2.3.3" % "provided"
 val scalaTest = "org.scalatest" %% "scalatest" % "3.1.1" % Test
diff --git a/scala-lang-2/src/main/scala/com/baeldung/scala/voidtypes/UnitReturnType.scala b/scala-lang-2/src/main/scala/com/baeldung/scala/voidtypes/UnitReturnType.scala
@@ -10,7 +10,7 @@ object UnitReturnType extends App{
   println("result of function returning Unit: %s".format(functionReturnUnit))
 
   def functionReturnImplicitUnit{
-    """
+    s"""
       do something, don't return anything
     """
   }
diff --git a/scala-libraries-2/src/main/scala/com/baeldung/cache/service/AsyncQueryMemoizeService.scala b/scala-libraries-2/src/main/scala/com/baeldung/cache/service/AsyncQueryMemoizeService.scala
@@ -4,7 +4,6 @@ import scalacache._
 import scalacache.guava._
 import com.google.common.cache.CacheBuilder
 import scalacache.modes.scalaFuture._
-import scalacache.serialization.binary._
 import scalacache.memoization._
 import scala.concurrent.ExecutionContext.Implicits.global
 
diff --git a/scala-libraries-2/src/main/scala/com/baeldung/cache/service/CatsService.scala b/scala-libraries-2/src/main/scala/com/baeldung/cache/service/CatsService.scala
@@ -5,7 +5,6 @@ import com.google.common.cache.CacheBuilder
 import scalacache._
 import scalacache.memoization._
 import scalacache.guava.GuavaCache
-import scala.concurrent.duration._
 
 object GuavaCacheCatsConfig {
   val underlyingGuavaCacheCats =
diff --git a/scala-libraries-2/src/main/scala/com/baeldung/cache/service/SyncQueryCustomMemoizeKeyService.scala b/scala-libraries-2/src/main/scala/com/baeldung/cache/service/SyncQueryCustomMemoizeKeyService.scala
@@ -1,12 +1,10 @@
 package com.baeldung.cache.service
 
+import com.google.common.cache.CacheBuilder
 import scalacache._
 import scalacache.guava._
-import com.google.common.cache.CacheBuilder
-import scalacache.memoization.MethodCallToStringConverter.onlyMethodParams
-import scalacache.modes.sync._
-import scalacache.serialization.binary._
 import scalacache.memoization._
+import scalacache.modes.sync._
 
 import scala.concurrent.duration._
 
diff --git a/scala-libraries-2/src/main/scala/com/baeldung/cache/service/SyncQueryMemoizeService.scala b/scala-libraries-2/src/main/scala/com/baeldung/cache/service/SyncQueryMemoizeService.scala
@@ -1,13 +1,12 @@
 package com.baeldung.cache.service
 
+import com.google.common.cache.CacheBuilder
 import scalacache._
 import scalacache.guava._
-import com.google.common.cache.CacheBuilder
-import scalacache.serialization.binary._
 import scalacache.memoization._
 
 import scala.concurrent.duration._
-import scala.util.{Failure, Try}
+import scala.util.Try
 
 object GuavaCacheMemoizationConfig {
   val memoizedUnderlyingGuavaCache =
@@ -18,8 +17,8 @@ object GuavaCacheMemoizationConfig {
 }
 
 class SyncQueryMemoizeService {
-  import scalacache.modes.sync._
   import GuavaCacheMemoizationConfig._
+  import scalacache.modes.sync._
 
   var queryCount = 0
 
@@ -44,8 +43,8 @@ class SyncQueryMemoizeService {
 }
 
 class TryMemoizeService {
-  import scalacache.modes.try_._
   import GuavaCacheMemoizationConfig._
+  import scalacache.modes.try_._
 
   var queryCount = 0
   var failQueryCount = 0
diff --git a/scala-libraries-2/src/test/scala/com/baeldung/akka/Tests.scala b/scala-libraries-2/src/test/scala/com/baeldung/akka/Tests.scala
@@ -72,7 +72,7 @@ class GreeterTest extends TestService {
   sender ! Greeter.GreetingRequest(greeting, probe.ref)
   probe.expectMessage(Greeter.GreetingResponse(greeting))
   // no other message should be received by the greeter actor
-  probe.expectNoMessage(50 millis)
+  probe.expectNoMessage(50.millis)
 }
 
 class TrafficLightTest extends TestService {
@@ -83,29 +83,29 @@ class TrafficLightTest extends TestService {
   // ensure that initial state is RED
   sender ! TrafficLight.SignalCommand.GetSignal(probe.ref)
   probe.expectMessage(TrafficLight.CurrentSignal(TrafficLight.Signal.RED))
-  probe.expectNoMessage(50 millis)
+  probe.expectNoMessage(50.millis)
 
 
   // now try to change signal
   sender ! TrafficLight.SignalCommand.ChangeSignal(probe.ref)
   probe.expectMessage(TrafficLight.CurrentSignal(TrafficLight.Signal.YELLOW))
   // ensure no other message is received
-  probe.expectNoMessage(50 millis)
+  probe.expectNoMessage(50.millis)
 
   // ensure that the state is preserved
   sender ! TrafficLight.SignalCommand.ChangeSignal(probe.ref)
   probe.expectMessage(TrafficLight.CurrentSignal(TrafficLight.Signal.GREEN))
-  probe.expectNoMessage(50 millis)
+  probe.expectNoMessage(50.millis)
   //ensure that the state is preserved
   sender ! TrafficLight.SignalCommand.ChangeSignal(probe.ref)
   probe.expectMessage(TrafficLight.CurrentSignal(TrafficLight.Signal.RED))
-  probe.expectNoMessage(50 millis)
+  probe.expectNoMessage(50.millis)
 }
 
 class TrafficLightTestFut extends TestService {
   import scala.concurrent.duration._
   val sender = testKit.spawn(TrafficLight(), "traffic")
-  val duration = 300 millis
+  val duration = 300.millis
   implicit val timeout = Timeout(duration)
 
   val signalFut =  sender.ask(replyTo =>TrafficLight.SignalCommand.GetSignal(replyTo))
diff --git a/scala-libraries-3/src/main/scala/com/baeldung/scala/pureconfig/Configs.scala b/scala-libraries-3/src/main/scala/com/baeldung/scala/pureconfig/Configs.scala
diff --git a/scala-libraries-3/src/main/scala/com/baeldung/scala/spark/RDDToDataframe.scala b/scala-libraries-3/src/main/scala/com/baeldung/scala/spark/RDDToDataframe.scala
diff --git a/scala-libraries-3/src/main/scala/com/baeldung/scala/spark/rdd/PrintRDD.scala b/scala-libraries-3/src/main/scala/com/baeldung/scala/spark/rdd/PrintRDD.scala
diff --git a/scala-libraries-3/src/main/scala/com/baeldung/scala/spark/rdd/RDDTutorial.scala b/scala-libraries-3/src/main/scala/com/baeldung/scala/spark/rdd/RDDTutorial.scala
diff --git a/scala-libraries-os/src/main/scala/com/baeldung/scala/os/ScalaSysApp.scala b/scala-libraries-os/src/main/scala/com/baeldung/scala/os/ScalaSysApp.scala
diff --git a/scala-libraries/src/main/scala/com/baeldung/scala/fs2/Fs2Examples.scala b/scala-libraries/src/main/scala/com/baeldung/scala/fs2/Fs2Examples.scala
diff --git a/scala-sbt/intro-to-sbt/build.sbt b/scala-sbt/intro-to-sbt/build.sbt
diff --git a/scala-test-junit5/build.sbt b/scala-test-junit5/build.sbt
diff --git a/scala-test/src/test/scala/com/baeldung/scala/scalatest/mockito/InventoryServiceTest.scala b/scala-test/src/test/scala/com/baeldung/scala/scalatest/mockito/InventoryServiceTest.scala
diff --git a/scalatra/build.sbt b/scalatra/build.sbt
diff --git a/zio/src/main/scala/com/baeldung/scala/zio/resources/ResourceHandling.scala b/zio/src/main/scala/com/baeldung/scala/zio/resources/ResourceHandling.scala

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,6 @@ final case class Greeted(msg: String)`
`8`	`8`	`class Greetings extends Actor {`
`9`	`9`	`override def receive: Receive = {`
`10`	`10`	`case greet: Greet =>`
`11`		`- sender ! Greeted(s"${greet.by}: Hello, ${greet.to}")`
	`11`	`+ sender() ! Greeted(s"${greet.by}: Hello, ${greet.to}")`
`12`	`12`	`}`
`13`	`13`	`}`