chore: misc Spring Boot 3.3.x migrations

stellio-hub · Jul 19, 2024 · 210cb71 · 210cb71
1 parent d8a8e3e
commit 210cb71
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 12 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -10,7 +10,7 @@ buildscript {
     }
 }
 
-extra["springCloudVersion"] = "2023.0.0"
+extra["springCloudVersion"] = "2023.0.3"
 
 plugins {
     // https://docs.spring.io/spring-boot/docs/current/gradle-plugin/reference/htmlsingle/#reacting-to-other-plugins.java

diff --git a/search-service/build.gradle.kts b/search-service/build.gradle.kts
@@ -27,6 +27,7 @@ dependencies {
 
     developmentOnly("org.springframework.boot:spring-boot-devtools")
 
+    runtimeOnly("org.flywaydb:flyway-database-postgresql")
     runtimeOnly("org.postgresql:postgresql")
 
     testImplementation("org.testcontainers:postgresql")

diff --git a/shared/src/main/kotlin/com/egm/stellio/shared/model/NgsiLdEntity.kt b/shared/src/main/kotlin/com/egm/stellio/shared/model/NgsiLdEntity.kt
@@ -453,7 +453,7 @@ class NgsiLdVocabPropertyInstance private constructor(
             ensureNotNull(vocab) {
                 BadRequestDataException("VocabProperty $name has an instance without a vocab member")
             }
-            ensure(vocab is List<*> && vocab.all { it is Map<*, *> && it.size == 1 && it.containsKey(JSONLD_ID) }) {
+            ensure(vocab.all { it is Map<*, *> && it.size == 1 && it.containsKey(JSONLD_ID) }) {
                 BadRequestDataException(
                     "VocabProperty $name has a vocab member that is not a string, nor an array of string"
                 )

diff --git a/shared/src/test/kotlin/com/egm/stellio/shared/util/JsonUtilsTests.kt b/shared/src/test/kotlin/com/egm/stellio/shared/util/JsonUtilsTests.kt
@@ -7,6 +7,7 @@ import com.egm.stellio.shared.util.JsonUtils.deserializeAsMap
 import com.egm.stellio.shared.util.JsonUtils.serializeObject
 import com.egm.stellio.shared.web.DEFAULT_TENANT_NAME
 import kotlinx.coroutines.test.runTest
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
@@ -156,15 +157,7 @@ class JsonUtilsTests {
         val exception = assertThrows<InvalidRequestException> {
             rawEntity.deserializeAsMap()
         }
-        Assertions.assertEquals(
-            """
-            Unexpected character (',' (code 44)): was expecting double-quote to start field name
-             at [Source: (String)"{
-                "id": "urn:ngsi-ld:Device:01234",,
-                "type": "Device"
-            }"; line: 2, column: 39]
-            """.trimIndent(),
-            exception.message
-        )
+        assertThat(exception.message)
+            .startsWith("Unexpected character (',' (code 44)): was expecting double-quote to start field name")
     }
 }
diff --git a/subscription-service/build.gradle.kts b/subscription-service/build.gradle.kts
@@ -25,6 +25,7 @@ dependencies {
 
     developmentOnly("org.springframework.boot:spring-boot-devtools")
 
+    runtimeOnly("org.flywaydb:flyway-database-postgresql")
     runtimeOnly("org.postgresql:postgresql")
 
     testImplementation("org.wiremock:wiremock-standalone:3.3.1")