Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): Bump org.springframework.boot from 3.2.5 to 3.3.2 #1197

Merged
merged 3 commits into from
Jul 27, 2024
Merged

chore(deps): Bump org.springframework.boot from 3.2.5 to 3.3.2 #1197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
91d9b04
chore(deps): Bump org.springframework.boot from 3.2.5 to 3.3.2
dependabot[bot] Jul 18, 2024
91cc0c0
chore: misc Spring Boot 3.3.x migrations
bobeal Jul 19, 2024
16a3fcb
fix: avoid random rounding problems in stddev function
bobeal Jul 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ 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
java
`kotlin-dsl`
// only apply the plugin in the subprojects requiring it because it expects a Spring Boot app
// and the shared lib is obviously not one
id("org.springframework.boot") version "3.2.5" apply false
id("org.springframework.boot") version "3.3.2" apply false
id("io.spring.dependency-management") version "1.1.6" apply false
id("org.graalvm.buildtools.native") version "0.10.2"
kotlin("jvm") version "1.9.24" apply false
Expand Down
1 change: 1 addition & 0 deletions search-service/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion search-service/src/main/kotlin/com/egm/stellio/search/util/DBAggregationUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ private fun sqlAggregateForJsonNumber(aggregate: TemporalQuery.Aggregate): Strin
TemporalQuery.Aggregate.AVG -> "avg(measured_value)"
TemporalQuery.Aggregate.MIN -> "min(measured_value)"
TemporalQuery.Aggregate.MAX -> "max(measured_value)"
TemporalQuery.Aggregate.STDDEV -> "stddev_samp(measured_value)"
TemporalQuery.Aggregate.STDDEV -> "round(stddev_samp(measured_value)::numeric,10)"
TemporalQuery.Aggregate.SUMSQ -> "sum(power(measured_value,2))"
}

Expand Down
2 changes: 1 addition & 1 deletion search-service/src/test/kotlin/com/egm/stellio/search/service/AggregatedQueryServiceTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class AggregatedQueryServiceTests : WithTimescaleContainer, WithKafkaContainer {
"avg, 5.5",
"min, 1.0",
"max, 10.0",
"stddev, 3.0276503540974917",
"stddev, 3.0276503541",
"sumsq, 385.0"
)
fun `it should correctly aggregate on JSON Number values`(aggrMethod: String, expectedValue: String) = runTest {
Expand Down
2 changes: 1 addition & 1 deletion shared/src/main/kotlin/com/egm/stellio/shared/model/NgsiLdEntity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
13 changes: 3 additions & 10 deletions shared/src/test/kotlin/com/egm/stellio/shared/util/JsonUtilsTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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")
}
}
1 change: 1 addition & 0 deletions subscription-service/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ dependencies {

developmentOnly("org.springframework.boot:spring-boot-devtools")

runtimeOnly("org.flywaydb:flyway-database-postgresql")
thomasBousselin marked this conversation as resolved.
Show resolved Hide resolved
runtimeOnly("org.postgresql:postgresql")

testImplementation("org.wiremock:wiremock-standalone:3.3.1")
Expand Down
Loading