Bump kotlin.version from 1.9.10 to 2.1.10 (#696)

Author: dependabot[bot]

common/src/main/kotlin/streams/extensions/CommonExtensions.kt

@@ -44,7 +44,7 @@ fun Relationship.asStreamsMap(): Map<String, Any?> {
 }
 
 fun String.toPointCase(): String {
-    return this.split("(?<=[a-z])(?=[A-Z])".toRegex()).joinToString(separator = ".").toLowerCase()
+    return this.split("(?<=[a-z])(?=[A-Z])".toRegex()).joinToString(separator = ".").lowercase(Locale.ROOT)
 }
 
 fun String.quote(): String = if (SourceVersion.isIdentifier(this)) this else "`$this`"

common/src/main/kotlin/streams/service/Topics.kt

@@ -1,6 +1,7 @@
 package streams.service
 
 import streams.service.sink.strategy.*
+import java.util.Locale
 import kotlin.reflect.jvm.javaType
 
 class TopicValidationException(message: String): RuntimeException(message)
@@ -45,7 +46,7 @@ data class Topics(val cypherTopics: Map<String, String> = emptyMap(),
     companion object {
         fun from(map: Map<String, Any?>, replacePrefix: Pair<String, String> = ("" to ""), dbName: String = "", invalidTopics: List<String> = emptyList()): Topics {
             val config = map
-                    .filterKeys { if (dbName.isNotBlank()) it.toLowerCase().endsWith(".to.$dbName") else !it.contains(".to.") }
+                    .filterKeys { if (dbName.isNotBlank()) it.lowercase(Locale.ROOT).endsWith(".to.$dbName") else !it.contains(".to.") }
                     .mapKeys { if (dbName.isNotBlank()) it.key.replace(".to.$dbName", "", true) else it.key }
             val cypherTopicPrefix = TopicType.CYPHER.replaceKeyBy(replacePrefix)
             val sourceIdKey = TopicType.CDC_SOURCE_ID.replaceKeyBy(replacePrefix)

common/src/main/kotlin/streams/service/sink/strategy/CUDIngestionStrategy.kt

@@ -9,6 +9,7 @@ import streams.service.sink.strategy.CUDIngestionStrategy.Companion.TO_KEY
 import streams.utils.IngestionUtils.getLabelsAsString
 import streams.utils.IngestionUtils.getNodeKeysAsString
 import streams.utils.StreamsUtils
+import java.util.Locale
 
 
 enum class CUDOperations { create, merge, update, delete, match }
@@ -75,7 +76,7 @@ class CUDIngestionStrategy: IngestionStrategy {
 
     private fun CUDRelationship.isValidOperation(): Boolean = from.op in LIST_VALID_CUD_NODE_REL && to.op in LIST_VALID_CUD_NODE_REL && op in LIST_VALID_CUD_REL
 
-    private fun NodeRelMetadata.getOperation() = op.toString().toUpperCase()
+    private fun NodeRelMetadata.getOperation() = op.toString().uppercase(Locale.ROOT)
 
     private fun buildNodeLookupByIds(keyword: String = "MATCH", ids: Set<String>, labels: List<String>, identifier: String = "n", field: String = ""): String {
         val fullField = if (field.isNotBlank()) "$field." else field

pom.xml

@@ -40,7 +40,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>
-        <kotlin.version>1.9.10</kotlin.version>
+        <kotlin.version>2.1.10</kotlin.version>
         <kotlin.coroutines.version>1.7.3</kotlin.coroutines.version>
         <neo4j.version>4.4.40</neo4j.version>
         <!-- 3.4 is the minimum version for CVE-2023-25194 -->

producer/src/main/kotlin/streams/RoutingConfiguration.kt

@@ -7,6 +7,7 @@ import org.neo4j.graphdb.Node
 import org.neo4j.graphdb.Relationship
 import org.neo4j.logging.Log
 import streams.events.*
+import java.util.Locale
 
 
 private val PATTERN_REG: Regex = "^(\\s*\\:*\\s*\\`*\\s*\\w+\\s*(?:\\:*\\s*\\`*\\s*\\:?(?:[\\w\\`|\\*]+)\\s*)*\\`*\\:?)\\s*(?:\\{\\s*(-?[\\w|\\*]+\\s*(?:,\\s*-?[\\w|\\*]+\\s*)*)\\})?\$".toRegex()
@@ -189,9 +190,9 @@ data class RelationshipRoutingConfiguration(val name: String = "",
                     val properties = RoutingProperties.from(matcher)
 
                     val relKeyStrategy = try {
-                        RelKeyStrategy.valueOf(keyStrategyString.toUpperCase())
+                        RelKeyStrategy.valueOf(keyStrategyString.uppercase(Locale.ROOT))
                     } catch (e: IllegalArgumentException) {
-                        log?.warn("Invalid key strategy setting, switching to default value ${RelKeyStrategy.DEFAULT.toString().toLowerCase()}")
+                        log?.warn("Invalid key strategy setting, switching to default value ${RelKeyStrategy.DEFAULT.toString().lowercase(Locale.ROOT)}")
                         RelKeyStrategy.DEFAULT
                     }
 

producer/src/main/kotlin/streams/StreamsEventRouterConfiguration.kt

@@ -5,6 +5,7 @@ import org.neo4j.logging.Log
 import streams.config.StreamsConfig
 import streams.events.EntityType
 import streams.events.RelKeyStrategy
+import java.util.Locale
 
 
 private inline fun <reified T> filterMap(config: Map<String, String>, routingPrefix: String, dbName: String = "", routingSuffix: String? = null, log: Log? = null): List<T> {
@@ -31,7 +32,7 @@ private inline fun <reified T> filterMap(config: Map<String, String>, routingPre
                 val keyStrategy = routingSuffix?.let { suffix ->
                     print("suffix - $suffix")
                     config.entries.firstOrNull{ it.key.startsWith(prefixAndTopic) && it.key.endsWith(suffix) }?.value
-                } ?: RelKeyStrategy.DEFAULT.toString().toLowerCase()
+                } ?: RelKeyStrategy.DEFAULT.toString().lowercase(Locale.ROOT)
 
                 RoutingConfigurationFactory
                     .getRoutingConfiguration(prefixAndTopic.replace(routingPrefix, StringUtils.EMPTY),

producer/src/test/kotlin/streams/RoutingConfigurationTest.kt

@@ -189,7 +189,7 @@ class RoutingConfigurationTest {
         assertEquals(listOf("two"),routing[0].exclude)
 
         // valid relKeyStrategy ALL
-        routing = RoutingConfigurationFactory.getRoutingConfiguration("topic6", "KNOWS{*}", EntityType.relationship, RelKeyStrategy.ALL.toString().toLowerCase()) as List<RelationshipRoutingConfiguration>
+        routing = RoutingConfigurationFactory.getRoutingConfiguration("topic6", "KNOWS{*}", EntityType.relationship, RelKeyStrategy.ALL.toString().lowercase()) as List<RelationshipRoutingConfiguration>
         assertEquals(1, routing.size)
         assertEquals("topic6", routing[0].topic)
         assertEquals(RelKeyStrategy.ALL, routing[0].relKeyStrategy)
@@ -199,7 +199,7 @@ class RoutingConfigurationTest {
         assertTrue { routing[0].exclude.isEmpty() }
 
         // valid relKeyStrategy DEFAULT
-        routing = RoutingConfigurationFactory.getRoutingConfiguration("topic7", "LOVES{-p1, -p2 }", EntityType.relationship, RelKeyStrategy.DEFAULT.toString().toLowerCase()) as List<RelationshipRoutingConfiguration>
+        routing = RoutingConfigurationFactory.getRoutingConfiguration("topic7", "LOVES{-p1, -p2 }", EntityType.relationship, RelKeyStrategy.DEFAULT.toString().lowercase()) as List<RelationshipRoutingConfiguration>
         assertEquals(1, routing.size)
         assertEquals("topic7", routing[0].topic)
         assertEquals(RelKeyStrategy.DEFAULT, routing[0].relKeyStrategy)

producer/src/test/kotlin/streams/integrations/KafkaEventRouterCompactionStrategyTSE.kt

@@ -450,8 +450,8 @@ class KafkaEventRouterCompactionStrategyTSE : KafkaEventRouterBaseTSE() {
                 "streams.source.topic.relationships.$topicWithStrategyAll" to "$allProps{*}",
                 "streams.source.topic.relationships.$topicWithStrategyFirst" to "$oneProp{*}",
                 "streams.source.topic.relationships.$topicWithoutStrategy" to "$defaultProp{*}",
-                "streams.source.topic.relationships.$topicWithStrategyAll.key_strategy" to RelKeyStrategy.ALL.toString().toLowerCase(),
-                "streams.source.topic.relationships.$topicWithStrategyFirst.key_strategy" to RelKeyStrategy.DEFAULT.toString().toLowerCase())
+                "streams.source.topic.relationships.$topicWithStrategyAll.key_strategy" to RelKeyStrategy.ALL.toString().lowercase(),
+                "streams.source.topic.relationships.$topicWithStrategyFirst.key_strategy" to RelKeyStrategy.DEFAULT.toString().lowercase())
 
         val constraints = listOf("CREATE CONSTRAINT ON (p:$labelStart) ASSERT p.name IS UNIQUE",
                 "CREATE CONSTRAINT ON (p:$labelStart) ASSERT p.surname IS UNIQUE",

producer/src/test/kotlin/streams/integrations/KafkaEventRouterEnterpriseTSE.kt

@@ -89,9 +89,9 @@ class KafkaEventRouterEnterpriseTSE {
                         .withNeo4jConfig("streams.source.topic.relationships.$TOPIC_WITH_TOMBSTONE.from.$DB_TOMBSTONE_WITH_COMPACT", "KNOWS{*}")
 
                         .withNeo4jConfig("streams.source.topic.relationships.$TOPIC_STRATEGY_ALL.from.$DB_STRATEGY_ALL", "ALPHA{*}")
-                        .withNeo4jConfig("streams.source.topic.relationships.$TOPIC_STRATEGY_ALL.from.$DB_STRATEGY_ALL.key_strategy", RelKeyStrategy.ALL.toString().toLowerCase())
+                        .withNeo4jConfig("streams.source.topic.relationships.$TOPIC_STRATEGY_ALL.from.$DB_STRATEGY_ALL.key_strategy", RelKeyStrategy.ALL.toString().lowercase())
                         .withNeo4jConfig("streams.source.topic.relationships.$TOPIC_STRATEGY_DEFAULT.from.$DB_STRATEGY_DEFAULT", "ALPHA{*}")
-                        .withNeo4jConfig("streams.source.topic.relationships.$TOPIC_STRATEGY_DEFAULT.from.$DB_STRATEGY_DEFAULT.key_strategy", RelKeyStrategy.DEFAULT.toString().toLowerCase())
+                        .withNeo4jConfig("streams.source.topic.relationships.$TOPIC_STRATEGY_DEFAULT.from.$DB_STRATEGY_DEFAULT.key_strategy", RelKeyStrategy.DEFAULT.toString().lowercase())
 
                 neo4j.withDatabases("foo", "bar", "baz", "deletedb",
                         DB_TEST_REL_WITH_COMPACT, DB_TEST_NODE_WITH_COMPACT, DB_TOMBSTONE_WITH_COMPACT,

producer/src/test/kotlin/streams/integrations/KafkaEventRouterWithMultipleNodeConstraintsTSE.kt

@@ -39,8 +39,8 @@ class KafkaEventRouterWithMultipleNodeConstraintsTSE: KafkaEventRouterBaseTSE()
                 "streams.source.topic.relationships.$topicWithStrategyAll" to "$keyStrategyAll{*}",
                 "streams.source.topic.relationships.$topicWithStrategyDefault" to "$keyStrategyDefault{*}",
                 "streams.source.topic.relationships.$topicWithoutStrategy" to "$noKeyStrategy{*}",
-                "streams.source.topic.relationships.$topicWithStrategyAll.key_strategy" to RelKeyStrategy.ALL.toString().toLowerCase(),
-                "streams.source.topic.relationships.$topicWithStrategyDefault.key_strategy" to RelKeyStrategy.DEFAULT.toString().toLowerCase())
+                "streams.source.topic.relationships.$topicWithStrategyAll.key_strategy" to RelKeyStrategy.ALL.toString().lowercase(),
+                "streams.source.topic.relationships.$topicWithStrategyDefault.key_strategy" to RelKeyStrategy.DEFAULT.toString().lowercase())
         val queries = listOf("CREATE CONSTRAINT ON (p:$labelStart) ASSERT p.surname IS UNIQUE",
                 "CREATE CONSTRAINT ON (p:$labelStart) ASSERT p.name IS UNIQUE",
                 "CREATE CONSTRAINT ON (p:$labelEnd) ASSERT p.name IS UNIQUE")