Skip to content

Commit 3389ab0

Browse files
authored
Merge pull request #1360 from yadavan88/warning-rewrite
Fixed many compiler warnings after Scala 3.4 migration
2 parents 87b70bd + 032dcde commit 3389ab0

File tree

63 files changed

+148
-133
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+148
-133
lines changed

play-scala/dependency-injection/app/models/Order.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ package models
33
import play.api.libs.json.Json
44

55
object Order {
6-
implicit val writes = Json.writes[Order]
6+
implicit val writes: play.api.libs.json.OWrites[models.Order] =
7+
Json.writes[Order]
78
}
89

910
case class Order(id: Long, userId: Long, date: Long, isEnterprise: Boolean)

play-scala/dependency-injection/app/models/User.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ import play.api.libs.json.Json
55
case class User(id: Long, name: String)
66

77
object User {
8-
implicit val writes = Json.writes[User]
8+
implicit val writes: play.api.libs.json.OWrites[models.User] =
9+
Json.writes[User]
910
}

play-scala/rest-api/app/controllers/TodoListController.scala

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@ class TodoListController @Inject() (
1414
todoList += TodoListItem(1, "test", true)
1515
todoList += TodoListItem(2, "some other value", false)
1616

17-
implicit val todoListJson = Json.format[TodoListItem]
18-
implicit val newTodoListJson = Json.format[NewTodoListItem]
17+
implicit val todoListJson: play.api.libs.json.OFormat[models.TodoListItem] =
18+
Json.format[TodoListItem]
19+
implicit val newTodoListJson
20+
: play.api.libs.json.OFormat[models.NewTodoListItem] =
21+
Json.format[NewTodoListItem]
1922

2023
// curl localhost:9000/todo
2124
def getAll(): Action[AnyContent] = Action {

scala-2-modules/scala2-core/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@
88
- [Introduction to Macros in Scala 2](https://www.baeldung.com/scala/scala2-macros)
99
- [Demystifying View and Context Bounds](https://www.baeldung.com/scala/view-context-bounds)
1010
- [Introduction to Scala](https://www.baeldung.com/scala/scala-intro)
11-
- [Exception Handling in Scala](https://www.baeldung.com/scala/exception-handling)
11+
- [Exception Handling in Scala](https://www.baeldung.com/scala/exception-handling)
12+
- [Usages of Underscore (_) in Scala](https://www.baeldung.com/scala/underscore)

scala-2-modules/scala2-core/src/main/scala-2/com/baeldung/scala/uniontypes/ArbitraryArityUnionType.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ object ArbitraryArityUnionType extends App {
2525

2626
sealed trait AOrB[A, B]
2727
object AOrB {
28-
implicit def aInstance[A, B](a: A) = new AOrB[A, B] {}
29-
implicit def bInstance[A, B](b: B) = new AOrB[A, B] {}
28+
implicit def aInstance[A, B](a: A): AOrB[A, B] = new AOrB[A, B] {}
29+
implicit def bInstance[A, B](b: B): AOrB[A, B] = new AOrB[A, B] {}
3030
}
3131

3232
def isIntOrString[T <% String AOrB Int](t: T): String = t match {
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package com.baeldung.scala.underscore
22

3-
import com.baeldung.scala.underscore.UnderscoreUsages._
43
import org.scalatest.matchers.should.Matchers
54
import org.scalatest.wordspec.AnyWordSpec
5+
import UnderscoreUsages._
6+
67
class UnderscoreUsagesUnitTest extends AnyWordSpec with Matchers {
78

89
"The underscore" should {
@@ -48,7 +49,7 @@ class UnderscoreUsagesUnitTest extends AnyWordSpec with Matchers {
4849
b shouldBe "b"
4950

5051
text = "a,b,c,d,e"
51-
val Array(a2, _*) = text.split(",")
52+
val Array(a2, _*) = text.split(","): @unchecked
5253
a2 shouldBe "a"
5354

5455
val Array(a3, b3, _, d, e) = text.split(",")

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@ object GuavaCacheCustomMemoizationKeyConfig {
2828
val memoizedUnderlyingCustomKeyGuavaCache =
2929
CacheBuilder.newBuilder().maximumSize(10000L).build[String, Entry[User]]
3030

31-
implicit val customKeyCacheConfig = CacheConfig(memoization =
32-
MemoizationConfig(toStringConverter = CustomKeyGenerator)
33-
)
31+
implicit val customKeyCacheConfig: scalacache.CacheConfig =
32+
CacheConfig(memoization =
33+
MemoizationConfig(toStringConverter = CustomKeyGenerator)
34+
)
3435

3536
implicit val guavaCache: Cache[User] = GuavaCache(
3637
memoizedUnderlyingCustomKeyGuavaCache

scala-2-modules/scala2-libraries/src/main/scala-2/com/baeldung/scala/pureconfig/Configs.scala

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,15 @@ object Protocol {
1818
}
1919

2020
object impl {
21-
implicit val localDateConvert = localDateConfigConvert(
22-
DateTimeFormatter.ISO_DATE
23-
)
24-
implicit val localDateTimeConvert = localDateTimeConfigConvert(
25-
DateTimeFormatter.ISO_DATE_TIME
26-
)
21+
implicit val localDateConvert: pureconfig.ConfigConvert[java.time.LocalDate] =
22+
localDateConfigConvert(
23+
DateTimeFormatter.ISO_DATE
24+
)
25+
implicit val localDateTimeConvert
26+
: pureconfig.ConfigConvert[java.time.LocalDateTime] =
27+
localDateTimeConfigConvert(
28+
DateTimeFormatter.ISO_DATE_TIME
29+
)
2730
}
2831

2932
final case class Port(number: Int) extends AnyVal

scala-2-modules/scala2-libraries/src/test/scala-2/com/baeldung/scala/shapeless/ShapelessUnitTest.scala

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,12 @@ class ShapelessUnitTest extends AnyWordSpec with Matchers {
138138
"calculate length of variant input types" in {
139139
import shapeless._
140140
object polyLength extends Poly1 {
141-
implicit val listCase = at[List[Int]](i => i.length)
142-
implicit val stringCase = at[String](d => d.length)
143-
implicit val arrayCase = at[Array[Int]](d => d.length)
141+
implicit val listCase: polyLength.Case.Aux[List[Int], Int] =
142+
at[List[Int]](i => i.length)
143+
implicit val stringCase: polyLength.Case.Aux[String, Int] =
144+
at[String](d => d.length)
145+
implicit val arrayCase: polyLength.Case.Aux[Array[Int], Int] =
146+
at[Array[Int]](d => d.length)
144147
}
145148

146149
val list = List(1, 2) :: "123" :: Array(1, 2, 3, 4) :: HNil

0 commit comments

Comments
 (0)