Skip to content

Commit 575af73

Browse files
yadavan88yadavan88
committed
resolved conflicts
2 parents dc6eebf + ead9591 commit 575af73

File tree

37 files changed

+62
-83
lines changed

37 files changed

+62
-83
lines changed

‎build.sbt

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ lazy val scala_akka_2 = (project in file("scala-akka-2"))
188188
.enablePlugins(AkkaGrpcPlugin)
189189
.settings(
190190
name := "scala-akka-2",
191-
scalaVersion := "2.13.10",
192191
libraryDependencies ++= Seq(
193192
"com.typesafe.akka" %% "akka-actor-typed" % "2.6.19",
194193
"com.typesafe.akka" %% "akka-http" % "10.2.10",
@@ -236,9 +235,11 @@ val monixVersion = "3.4.0"
236235
val elastic4sVersion = "7.16.0"
237236
val sparkVersion = "3.2.1"
238237

238+
val sparkCoreDep = "org.apache.spark" %% "spark-core" % sparkVersion
239+
val sparkSqlDep = "org.apache.spark" %% "spark-sql" % sparkVersion
240+
239241
lazy val scala_libraries_2 = (project in file("scala-libraries-2"))
240242
.settings(
241-
scalaVersion := "2.12.15",
242243
name := "scala-libraries",
243244
libraryDependencies ++= scalaTestDeps,
244245
libraryDependencies ++= Seq(
@@ -252,23 +253,19 @@ lazy val scala_libraries_2 = (project in file("scala-libraries-2"))
252253
"com.beachape" %% "enumeratum" % "1.7.0"
253254
),
254255
libraryDependencies ++= Seq(
255-
"com.typesafe.play" %% "play-slick" % "5.0.0",
256+
"com.typesafe.play" %% "play-slick" % "5.1.0",
256257
"org.postgresql" % "postgresql" % "42.2.12"
257258
),
258259
libraryDependencies ++= Seq(
259260
"io.monix" %% "monix" % monixVersion
260261
),
261-
libraryDependencies ++= Seq(
262-
"org.apache.spark" %% "spark-core" % sparkVersion,
263-
"org.apache.spark" %% "spark-sql" % sparkVersion
264-
),
265262
dependencyOverrides := Seq(
266-
"com.typesafe.akka" %% "akka-protobuf-v3" % "2.6.16",
267-
"com.typesafe.akka" %% "akka-stream" % "2.6.16",
268-
"com.typesafe.akka" %% "akka-serialization-jackson" % "2.6.16"
263+
"com.typesafe.akka" %% "akka-protobuf-v3" % "2.6.19",
264+
"com.typesafe.akka" %% "akka-stream" % "2.6.19",
265+
"com.typesafe.akka" %% "akka-serialization-jackson" % "2.6.19"
269266
),
270267
libraryDependencies ++= Seq(
271-
"com.typesafe.akka" %% "akka-actor-testkit-typed" % "2.6.16" % Test,
268+
"com.typesafe.akka" %% "akka-actor-testkit-typed" % "2.6.19" % Test,
272269
"org.scalacheck" %% "scalacheck" % "1.14.1" % Test,
273270
"com.lihaoyi" %% "requests" % "0.6.9"
274271
) ++ scalaTestDeps,
@@ -286,8 +283,8 @@ lazy val scala_libraries_3 = (project in file("scala-libraries-3"))
286283
name := "scala-libraries",
287284
libraryDependencies ++= scalaTestDeps,
288285
libraryDependencies ++= Seq(
289-
"org.apache.spark" %% "spark-core" % sparkVersion,
290-
"org.apache.spark" %% "spark-sql" % sparkVersion
286+
sparkSqlDep,
287+
sparkCoreDep
291288
),
292289
libraryDependencies ++= Seq(
293290
"org.http4s" %% "http4s-dsl" % http4sVersion,
@@ -328,11 +325,9 @@ lazy val scala_libraries_4 = (project in file("scala-libraries-4"))
328325
libraryDependencies ++= Seq(
329326
"org.scala-lang.modules" %% "scala-async" % "1.0.1",
330327
"org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided,
331-
"org.tpolecat" %% "skunk-core" % "0.3.2"
332-
),
333-
libraryDependencies ++= Seq(
334-
"org.apache.spark" %% "spark-core" % sparkVersion,
335-
"org.apache.spark" %% "spark-sql" % sparkVersion
328+
"org.tpolecat" %% "skunk-core" % "0.3.2",
329+
sparkSqlDep,
330+
sparkCoreDep
336331
),
337332
scalacOptions += "-Xasync"
338333
)
@@ -416,4 +411,4 @@ lazy val scala212 = (project in file("scala212"))
416411
scalaVersion := "2.12.17",
417412
name := "scala212",
418413
libraryDependencies ++= scalaTestDeps
419-
)
414+
)

‎play-scala/async-tasks/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ version := "1.0-SNAPSHOT"
55

66
lazy val root = (project in file(".")).enablePlugins(PlayScala)
77

8-
scalaVersion := "2.13.2"
8+
scalaVersion := "2.13.10"
99

1010
libraryDependencies += guice

‎play-scala/caching-in-play/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ version := "1.0-SNAPSHOT"
55

66
lazy val root = (project in file(".")).enablePlugins(PlayScala)
77

8-
scalaVersion := "2.13.3"
8+
scalaVersion := "2.13.10"
99

1010
libraryDependencies += guice
1111
libraryDependencies += caffeine

‎play-scala/configuration-access/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ version := "1.0-SNAPSHOT"
55

66
lazy val root = (project in file(".")).enablePlugins(PlayScala)
77

8-
scalaVersion := "2.13.3"
8+
scalaVersion := "2.13.10"
99

1010
libraryDependencies += guice
1111
libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "5.0.0" % Test

‎play-scala/custom-error-handling/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ version := "1.0-SNAPSHOT"
55

66
lazy val root = (project in file(".")).enablePlugins(PlayScala)
77

8-
scalaVersion := "2.13.2"
8+
scalaVersion := "2.13.10"
99

1010
libraryDependencies += guice
1111
libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "5.0.0" % Test

‎play-scala/dependency-injection/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version := "1.0-SNAPSHOT"
44

55
lazy val root = (project in file(".")).enablePlugins(PlayScala)
66

7-
scalaVersion := "2.13.6"
7+
scalaVersion := "2.13.10"
88

99
libraryDependencies += guice
1010
libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "5.0.0" % Test

‎play-scala/introduction-to-play/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ version := "1.0-SNAPSHOT"
44

55
lazy val root = (project in file(".")).enablePlugins(PlayScala)
66

7-
scalaVersion := "2.13.2"
7+
scalaVersion := "2.13.10"
88

99
libraryDependencies += guice libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "5.0.0" % Test

‎play-scala/play-templates/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ version := "1.0-SNAPSHOT"
55

66
lazy val root = (project in file(".")).enablePlugins(PlayScala)
77

8-
scalaVersion := "2.13.2"
8+
scalaVersion := "2.13.10"
99

1010
libraryDependencies += guice
1111
libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "5.0.0" % Test

‎play-scala/rest-api/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ version := "1.0-SNAPSHOT"
55

66
lazy val root = (project in file(".")).enablePlugins(PlayScala)
77

8-
scalaVersion := "2.13.2"
8+
scalaVersion := "2.13.10"
99

1010
libraryDependencies += guice
1111
libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "5.0.0" % Test

‎scala-akka/src/main/scala/com/baeldung/scala/akka/scheduler/Greetings.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ final case class Greeted(msg: String)
88
class Greetings extends Actor {
99
override def receive: Receive = {
1010
case greet: Greet =>
11-
sender ! Greeted(s"${greet.by}: Hello, ${greet.to}")
11+
sender() ! Greeted(s"${greet.by}: Hello, ${greet.to}")
1212
}
1313
}

‎scala-akka/src/main/scala/com/baeldung/scala/akka/stopping/MessageProcessorActor.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class MessageProcessorActor extends Actor {
1515

1616
override def receive: Receive = {
1717
case msg: MessageProcessorActor.Greet =>
18-
sender ! MessageProcessorActor.Reply("Hey, " + msg.msg)
18+
sender() ! MessageProcessorActor.Reply("Hey, " + msg.msg)
1919
}
2020

2121
}

‎scala-core-2/src/main/scala/com/baeldung/scala/concurrency/FutureAndPromise.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ object ScalaAndPromise {
5252
} yield User(name, email, hashedPassword, avatar)
5353

5454
def runByPromise[T](block: => T)(implicit ec: ExecutionContext): Future[T] = {
55-
val p = Promise[T]
55+
val p = Promise[T]()
5656
ec.execute { () =>
5757
try {
5858
p.success(block)

‎scala-core-2/src/main/scala/com/baeldung/scala/exceptionhandling/ExceptionHandling.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ object ExceptionHandling {
2121
try {
2222
divide(a, 0)
2323
} catch {
24-
case e: DivideByZero => null
24+
case _: DivideByZero => null
2525
} finally {
2626
println("Finished")
2727
}

‎scala-core-3/src/main/scala/com/baeldung/scala/await/AwaitFuture.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ object AwaitFuture {
1010
Source.fromURL(url).getLines().mkString
1111
}
1212

13-
def fetchDataFrom(url : String, waitTime : Long = 0l) : Future[String] = Future {
13+
def fetchDataFrom(url : String, waitTime : Long = 0L) : Future[String] = Future {
1414
Thread.sleep(waitTime)
1515
Source.fromURL(url).getLines().mkString
1616
}

‎scala-core-3/src/main/scala/com/baeldung/scala/typecasts/ErrorHandling.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ object ErrorHandling extends App {
3232
case Failure(e: UnknownHostException) =>
3333
println(s"Unknown host specified: ${e.getMessage}")
3434
case Failure(e: IOException) =>
35-
println("Network failure: ${e.getMessage}")
35+
println(s"Network failure: ${e.getMessage}")
3636
case Failure(t) =>
3737
t.printStackTrace()
3838
}

‎scala-core-4/src/main/scala/com/baeldung/scala/assertvsrequire/RequireUsage.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ object RequireUsage extends App {
1212
issueDrivingLicense("Jr. Darwin", 5) // prints "Failed in require precondition"
1313
} catch {
1414
case e: IllegalArgumentException =>
15-
println("Failed in require precondition")
15+
println("Failed in require precondition-"+e.getMessage)
1616
}
1717

1818
}

‎scala-core-5/src/main/scala/com/baeldung/scala/datesandtimes/JavaUtilDate.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package com.baeldung.scala.datesandtimes
22
import java.text.SimpleDateFormat
33
import scala.concurrent.duration.Duration
44
import scala.concurrent.{Await, Future}
5-
import scala.languageFeature.experimental.macros
65

76
object JavaUtilDate extends App{
87

@@ -28,5 +27,5 @@ object JavaUtilDate extends App{
2827
val date1 = Await.result(r1, Duration.Inf)
2928
val date2 = Await.result(r2, Duration.Inf)
3029

31-
println(date1, date2) // Prints "Wed Jul 01 2020, Fri Aug 21 2020"
30+
println(date1 +", "+ date2) // Prints "Wed Jul 01 2020, Fri Aug 21 2020"
3231
}

‎scala-design-patterns/src/main/scala/com/baeldung/scala/cakepattern/CakePattern.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.baeldung.scala.cakepattern
22

3-
import scala.collection.JavaConverters._
3+
import scala.jdk.CollectionConverters._
44

55
object CakePattern {
66

‎scala-js/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ lazy val root = (project in file("."))
99
jsEnv := new org.scalajs.jsenv.jsdomnodejs.JSDOMNodeJSEnv()
1010
)
1111

12-
scalaVersion := "2.13.1"
12+
scalaVersion := "2.13.10"
1313

1414
scalaJSUseMainModuleInitializer := true
1515
libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "2.2.0"

‎scala-lagom/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ organization in ThisBuild := "com.baeldung"
22
version in ThisBuild := "1.0-SNAPSHOT"
33

44
// the Scala version that will be used for cross-compiled libraries
5-
scalaVersion in ThisBuild := "2.13.0"
5+
scalaVersion in ThisBuild := "2.13.10"
66

77
val macwire = "com.softwaremill.macwire" %% "macros" % "2.3.3" % "provided"
88
val scalaTest = "org.scalatest" %% "scalatest" % "3.1.1" % Test

‎scala-lang-2/src/main/scala/com/baeldung/scala/voidtypes/UnitReturnType.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ object UnitReturnType extends App{
1010
println("result of function returning Unit: %s".format(functionReturnUnit))
1111

1212
def functionReturnImplicitUnit{
13-
"""
13+
s"""
1414
do something, don't return anything
1515
"""
1616
}

‎scala-libraries-2/src/main/scala/com/baeldung/cache/service/AsyncQueryMemoizeService.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import scalacache._
44
import scalacache.guava._
55
import com.google.common.cache.CacheBuilder
66
import scalacache.modes.scalaFuture._
7-
import scalacache.serialization.binary._
87
import scalacache.memoization._
98
import scala.concurrent.ExecutionContext.Implicits.global
109

‎scala-libraries-2/src/main/scala/com/baeldung/cache/service/CatsService.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import com.google.common.cache.CacheBuilder
55
import scalacache._
66
import scalacache.memoization._
77
import scalacache.guava.GuavaCache
8-
import scala.concurrent.duration._
98

109
object GuavaCacheCatsConfig {
1110
val underlyingGuavaCacheCats =

‎scala-libraries-2/src/main/scala/com/baeldung/cache/service/SyncQueryCustomMemoizeKeyService.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
package com.baeldung.cache.service
22

3+
import com.google.common.cache.CacheBuilder
34
import scalacache._
45
import scalacache.guava._
5-
import com.google.common.cache.CacheBuilder
6-
import scalacache.memoization.MethodCallToStringConverter.onlyMethodParams
7-
import scalacache.modes.sync._
8-
import scalacache.serialization.binary._
96
import scalacache.memoization._
7+
import scalacache.modes.sync._
108

119
import scala.concurrent.duration._
1210

‎scala-libraries-2/src/main/scala/com/baeldung/cache/service/SyncQueryMemoizeService.scala

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package com.baeldung.cache.service
22

3+
import com.google.common.cache.CacheBuilder
34
import scalacache._
45
import scalacache.guava._
5-
import com.google.common.cache.CacheBuilder
6-
import scalacache.serialization.binary._
76
import scalacache.memoization._
87

98
import scala.concurrent.duration._
10-
import scala.util.{Failure, Try}
9+
import scala.util.Try
1110

1211
object GuavaCacheMemoizationConfig {
1312
val memoizedUnderlyingGuavaCache =
@@ -18,8 +17,8 @@ object GuavaCacheMemoizationConfig {
1817
}
1918

2019
class SyncQueryMemoizeService {
21-
import scalacache.modes.sync._
2220
import GuavaCacheMemoizationConfig._
21+
import scalacache.modes.sync._
2322

2423
var queryCount = 0
2524

@@ -44,8 +43,8 @@ class SyncQueryMemoizeService {
4443
}
4544

4645
class TryMemoizeService {
47-
import scalacache.modes.try_._
4846
import GuavaCacheMemoizationConfig._
47+
import scalacache.modes.try_._
4948

5049
var queryCount = 0
5150
var failQueryCount = 0

‎scala-libraries-2/src/test/scala/com/baeldung/akka/Tests.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class GreeterTest extends TestService {
7272
sender ! Greeter.GreetingRequest(greeting, probe.ref)
7373
probe.expectMessage(Greeter.GreetingResponse(greeting))
7474
// no other message should be received by the greeter actor
75-
probe.expectNoMessage(50 millis)
75+
probe.expectNoMessage(50.millis)
7676
}
7777

7878
class TrafficLightTest extends TestService {
@@ -83,29 +83,29 @@ class TrafficLightTest extends TestService {
8383
// ensure that initial state is RED
8484
sender ! TrafficLight.SignalCommand.GetSignal(probe.ref)
8585
probe.expectMessage(TrafficLight.CurrentSignal(TrafficLight.Signal.RED))
86-
probe.expectNoMessage(50 millis)
86+
probe.expectNoMessage(50.millis)
8787

8888

8989
// now try to change signal
9090
sender ! TrafficLight.SignalCommand.ChangeSignal(probe.ref)
9191
probe.expectMessage(TrafficLight.CurrentSignal(TrafficLight.Signal.YELLOW))
9292
// ensure no other message is received
93-
probe.expectNoMessage(50 millis)
93+
probe.expectNoMessage(50.millis)
9494

9595
// ensure that the state is preserved
9696
sender ! TrafficLight.SignalCommand.ChangeSignal(probe.ref)
9797
probe.expectMessage(TrafficLight.CurrentSignal(TrafficLight.Signal.GREEN))
98-
probe.expectNoMessage(50 millis)
98+
probe.expectNoMessage(50.millis)
9999
//ensure that the state is preserved
100100
sender ! TrafficLight.SignalCommand.ChangeSignal(probe.ref)
101101
probe.expectMessage(TrafficLight.CurrentSignal(TrafficLight.Signal.RED))
102-
probe.expectNoMessage(50 millis)
102+
probe.expectNoMessage(50.millis)
103103
}
104104

105105
class TrafficLightTestFut extends TestService {
106106
import scala.concurrent.duration._
107107
val sender = testKit.spawn(TrafficLight(), "traffic")
108-
val duration = 300 millis
108+
val duration = 300.millis
109109
implicit val timeout = Timeout(duration)
110110

111111
val signalFut = sender.ask(replyTo =>TrafficLight.SignalCommand.GetSignal(replyTo))

0 commit comments

Comments
 (0)