Skip to content

Commit 5ac617e

Browse files
committed
fix(scala): rename local var to avoid named arg shadowing in Scala 3.8.2
Scala 3.8.2 resolves 'additionalProperties = ...' inside copy() to the local variable instead of the named parameter, causing type mismatch errors. Rename the local variable from 'additionalProperties' to 'extraProperties' and use dot notation for copy() calls.
1 parent 31bc4c9 commit 5ac617e

File tree

31 files changed

+86
-86
lines changed

31 files changed

+86
-86
lines changed

clients/algoliasearch-client-scala/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
organization := "com.algolia"
22
name := "algoliasearch-scala"
33
description := "Scala client for Algolia Search API"
4-
scalaVersion := "3.8.2"
4+
scalaVersion := "2.13.18"
55
crossScalaVersions := Seq("2.13.12", "3.6.3")
66
Test / publishArtifact := false
77
licenses += ("MIT", url("https://opensource.org/licenses/MIT"))

clients/algoliasearch-client-scala/src/main/scala/algoliasearch/abtesting/ErrorBase.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ class ErrorBaseSerializer extends Serializer[ErrorBase] {
4343
val obj = Extraction.extract[ErrorBase](jobject)(formats, mf)
4444

4545
val fields = Set("message")
46-
val additionalProperties = jobject removeField {
46+
val extraProperties = jobject removeField {
4747
case (name, _) if fields.contains(name) => true
4848
case _ => false
4949
}
50-
additionalProperties match {
51-
case JObject(fieldsList) => obj copy (additionalProperties = Some(fieldsList))
50+
extraProperties match {
51+
case JObject(fieldsList) => obj.copy(additionalProperties = Some(fieldsList))
5252
case _ => obj
5353
}
5454
case _ => throw new IllegalArgumentException(s"Can't deserialize $json as ErrorBase")

clients/algoliasearch-client-scala/src/main/scala/algoliasearch/abtestingv3/ErrorBase.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ class ErrorBaseSerializer extends Serializer[ErrorBase] {
4343
val obj = Extraction.extract[ErrorBase](jobject)(formats, mf)
4444

4545
val fields = Set("message")
46-
val additionalProperties = jobject removeField {
46+
val extraProperties = jobject removeField {
4747
case (name, _) if fields.contains(name) => true
4848
case _ => false
4949
}
50-
additionalProperties match {
51-
case JObject(fieldsList) => obj copy (additionalProperties = Some(fieldsList))
50+
extraProperties match {
51+
case JObject(fieldsList) => obj.copy(additionalProperties = Some(fieldsList))
5252
case _ => obj
5353
}
5454
case _ => throw new IllegalArgumentException(s"Can't deserialize $json as ErrorBase")

clients/algoliasearch-client-scala/src/main/scala/algoliasearch/analytics/ErrorBase.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ class ErrorBaseSerializer extends Serializer[ErrorBase] {
4848
val obj = Extraction.extract[ErrorBase](jobject)(formats, mf)
4949

5050
val fields = Set("message")
51-
val additionalProperties = jobject removeField {
51+
val extraProperties = jobject removeField {
5252
case (name, _) if fields.contains(name) => true
5353
case _ => false
5454
}
55-
additionalProperties match {
56-
case JObject(fieldsList) => obj copy (additionalProperties = Some(fieldsList))
55+
extraProperties match {
56+
case JObject(fieldsList) => obj.copy(additionalProperties = Some(fieldsList))
5757
case _ => obj
5858
}
5959
case _ => throw new IllegalArgumentException(s"Can't deserialize $json as ErrorBase")

clients/algoliasearch-client-scala/src/main/scala/algoliasearch/composition/BaseSearchResponse.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,12 +160,12 @@ class BaseSearchResponseSerializer extends Serializer[BaseSearchResponse] {
160160
"queryID",
161161
"_automaticInsights"
162162
)
163-
val additionalProperties = jobject removeField {
163+
val extraProperties = jobject removeField {
164164
case (name, _) if fields.contains(name) => true
165165
case _ => false
166166
}
167-
additionalProperties match {
168-
case JObject(fieldsList) => obj copy (additionalProperties = Some(fieldsList))
167+
extraProperties match {
168+
case JObject(fieldsList) => obj.copy(additionalProperties = Some(fieldsList))
169169
case _ => obj
170170
}
171171
case _ => throw new IllegalArgumentException(s"Can't deserialize $json as BaseSearchResponse")

clients/algoliasearch-client-scala/src/main/scala/algoliasearch/composition/CompositionRunSearchResponse.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ class CompositionRunSearchResponseSerializer extends Serializer[CompositionRunSe
5454
val obj = Extraction.extract[CompositionRunSearchResponse](jobject)(formats, mf)
5555

5656
val fields = Set("objectID", "appliedRules")
57-
val additionalProperties = jobject removeField {
57+
val extraProperties = jobject removeField {
5858
case (name, _) if fields.contains(name) => true
5959
case _ => false
6060
}
61-
additionalProperties match {
62-
case JObject(fieldsList) => obj copy (additionalProperties = Some(fieldsList))
61+
extraProperties match {
62+
case JObject(fieldsList) => obj.copy(additionalProperties = Some(fieldsList))
6363
case _ => obj
6464
}
6565
case _ => throw new IllegalArgumentException(s"Can't deserialize $json as CompositionRunSearchResponse")

clients/algoliasearch-client-scala/src/main/scala/algoliasearch/composition/CompositionsSearchResponse.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ class CompositionsSearchResponseSerializer extends Serializer[CompositionsSearch
5050
val obj = Extraction.extract[CompositionsSearchResponse](jobject)(formats, mf)
5151

5252
val fields = Set("run")
53-
val additionalProperties = jobject removeField {
53+
val extraProperties = jobject removeField {
5454
case (name, _) if fields.contains(name) => true
5555
case _ => false
5656
}
57-
additionalProperties match {
58-
case JObject(fieldsList) => obj copy (additionalProperties = Some(fieldsList))
57+
extraProperties match {
58+
case JObject(fieldsList) => obj.copy(additionalProperties = Some(fieldsList))
5959
case _ => obj
6060
}
6161
case _ => throw new IllegalArgumentException(s"Can't deserialize $json as CompositionsSearchResponse")

clients/algoliasearch-client-scala/src/main/scala/algoliasearch/composition/ErrorBase.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ class ErrorBaseSerializer extends Serializer[ErrorBase] {
4848
val obj = Extraction.extract[ErrorBase](jobject)(formats, mf)
4949

5050
val fields = Set("message")
51-
val additionalProperties = jobject removeField {
51+
val extraProperties = jobject removeField {
5252
case (name, _) if fields.contains(name) => true
5353
case _ => false
5454
}
55-
additionalProperties match {
56-
case JObject(fieldsList) => obj copy (additionalProperties = Some(fieldsList))
55+
extraProperties match {
56+
case JObject(fieldsList) => obj.copy(additionalProperties = Some(fieldsList))
5757
case _ => obj
5858
}
5959
case _ => throw new IllegalArgumentException(s"Can't deserialize $json as ErrorBase")

clients/algoliasearch-client-scala/src/main/scala/algoliasearch/composition/Hit.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,12 @@ class HitSerializer extends Serializer[Hit] {
7474
val obj = Extraction.extract[Hit](renamedObject)(formats, mf)
7575

7676
val fields = Set("objectID", "_highlightResult", "_snippetResult", "_rankingInfo", "_distinctSeqID", "_extra")
77-
val additionalProperties = jobject removeField {
77+
val extraProperties = jobject removeField {
7878
case (name, _) if fields.contains(name) => true
7979
case _ => false
8080
}
81-
additionalProperties match {
82-
case JObject(fieldsList) => obj copy (additionalProperties = Some(fieldsList))
81+
extraProperties match {
82+
case JObject(fieldsList) => obj.copy(additionalProperties = Some(fieldsList))
8383
case _ => obj
8484
}
8585
case _ => throw new IllegalArgumentException(s"Can't deserialize $json as Hit")

clients/algoliasearch-client-scala/src/main/scala/algoliasearch/composition/HitMetadata.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@ class HitMetadataSerializer extends Serializer[HitMetadata] {
6060
val obj = Extraction.extract[HitMetadata](renamedObject)(formats, mf)
6161

6262
val fields = Set("_injectedItemKey")
63-
val additionalProperties = jobject removeField {
63+
val extraProperties = jobject removeField {
6464
case (name, _) if fields.contains(name) => true
6565
case _ => false
6666
}
67-
additionalProperties match {
68-
case JObject(fieldsList) => obj copy (additionalProperties = Some(fieldsList))
67+
extraProperties match {
68+
case JObject(fieldsList) => obj.copy(additionalProperties = Some(fieldsList))
6969
case _ => obj
7070
}
7171
case _ => throw new IllegalArgumentException(s"Can't deserialize $json as HitMetadata")

0 commit comments

Comments
 (0)