Skip to content

Commit 1357db5

Browse files
committed
Upgrade dependencies; prepare for release
* Fix Nullability in the `R2dbcMessageHandler`
1 parent f3e9bed commit 1357db5

File tree

2 files changed

+25
-26
lines changed

2 files changed

+25
-26
lines changed

build.gradle

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ ext {
4545
linkScmConnection = 'scm:git:git://github.com/spring-projects/spring-integration.git'
4646
linkScmDevConnection = 'scm:git:ssh://git@github.com:spring-projects/spring-integration.git'
4747

48-
apacheSshdVersion = '2.15.0'
48+
apacheSshdVersion = '2.16.0'
4949
artemisVersion = '2.42.0'
5050
aspectjVersion = '1.9.24'
5151
assertjVersion = '3.27.4'
5252
assertkVersion = '0.28.1'
5353
avroVersion = '1.12.0'
5454
awaitilityVersion = '4.3.0'
55-
camelVersion = '4.13.0'
55+
camelVersion = '4.14.0'
5656
commonsDbcp2Version = '2.13.0'
5757
commonsIoVersion = '2.20.0'
5858
commonsNetVersion = '3.12.0'
@@ -62,7 +62,7 @@ ext {
6262
ftpServerVersion = '1.2.1'
6363
graalvmVersion = '24.2.2'
6464
greenmailVersion = '2.1.5'
65-
groovyVersion = '4.0.28'
65+
groovyVersion = '5.0.1'
6666
hamcrestVersion = '3.0'
6767
hazelcastVersion = '5.5.0'
6868
hibernateVersion = '7.1.1.Final'
@@ -78,35 +78,35 @@ ext {
7878
jrubyVersion = '10.0.2.0'
7979
jsonpathVersion = '2.9.0'
8080
junit4Version = '4.13.2'
81-
junitJupiterVersion = '6.0.0-RC2'
81+
junitJupiterVersion = '6.0.0-RC3'
8282
kotlinCoroutinesVersion = '1.10.2'
8383
kryoVersion = '5.6.2'
8484
lettuceVersion = '6.8.1.RELEASE'
8585
log4jVersion = '2.25.1'
8686
mailVersion = '2.0.4'
87-
micrometerTracingVersion = '1.6.0-M2'
88-
micrometerVersion = '1.16.0-M2'
87+
micrometerTracingVersion = '1.6.0-M3'
88+
micrometerVersion = '1.16.0-M3'
8989
mockitoVersion = '5.19.0'
90-
mongoDriverVersion = '5.5.1'
90+
mongoDriverVersion = '5.6.0'
9191
mysqlVersion = '9.4.0'
9292
oracleVersion = '23.9.0.25.07'
9393
pahoMqttClientVersion = '1.2.5'
9494
postgresVersion = '42.7.7'
9595
protobufVersion = '4.32.1'
9696
r2dbch2Version = '1.0.0.RELEASE'
97-
reactorVersion = '2025.0.0-M6'
97+
reactorVersion = '2025.0.0-M7'
9898
resilience4jVersion = '2.3.0'
9999
romeToolsVersion = '2.1.0'
100100
rsocketVersion = '1.1.5'
101101
servletApiVersion = '6.1.0'
102102
smackVersion = '4.4.8'
103-
springAmqpVersion = '4.0.0-SNAPSHOT'
104-
springDataVersion = '2025.1.0-M5'
105-
springGraphqlVersion = '2.0.0-SNAPSHOT'
106-
springKafkaVersion = '4.0.0-SNAPSHOT'
107-
springSecurityVersion = '7.0.0-SNAPSHOT'
108-
springVersion = '7.0.0-SNAPSHOT'
109-
springWsVersion = '5.0.0-SNAPSHOT'
103+
springAmqpVersion = '4.0.0-M5'
104+
springDataVersion = '2025.1.0-M6'
105+
springGraphqlVersion = '2.0.0-M3'
106+
springKafkaVersion = '4.0.0-M5'
107+
springSecurityVersion = '7.0.0-M3'
108+
springVersion = '7.0.0-M9'
109+
springWsVersion = '5.0.0-M1'
110110
testcontainersVersion = '1.21.3'
111111
tomcatVersion = '11.0.11'
112112
xmlUnitVersion = '2.10.4'
@@ -245,7 +245,6 @@ configure(javaProjects) { subproject ->
245245
jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
246246
javaParameters = true
247247
allWarningsAsErrors = true
248-
freeCompilerArgs = [ '-Xannotation-default-target=param-property' ] // Upcoming default, see https://youtrack.jetbrains.com/issue/KT-73255
249248
}
250249
}
251250

@@ -341,7 +340,7 @@ configure(javaProjects) { subproject ->
341340

342341
checkstyle {
343342
configDirectory.set(rootProject.file('src/checkstyle'))
344-
toolVersion = project.hasProperty('checkstyleVersion') ? project.checkstyleVersion : '11.0.0'
343+
toolVersion = project.hasProperty('checkstyleVersion') ? project.checkstyleVersion : '11.0.1'
345344
}
346345

347346
jar {

spring-integration-r2dbc/src/main/java/org/springframework/integration/r2dbc/outbound/R2dbcMessageHandler.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,8 @@ private Mono<Void> handleUpdate(Message<?> message) {
187187
if (this.tableNameExpression != null) {
188188
String tableName = this.tableNameExpression.getValue(this.evaluationContext, message, String.class);
189189
Assert.notNull(tableName, "'tableNameExpression' must not evaluate to null");
190-
Map<String, Object> values = evaluateValuesExpression(message);
191-
Map<SqlIdentifier, Object> updateMap = transformIntoSqlIdentifierMap(values);
190+
Map<String, @Nullable Object> values = evaluateValuesExpression(message);
191+
Map<SqlIdentifier, @Nullable Object> updateMap = transformIntoSqlIdentifierMap(values);
192192
Criteria criteria = evaluateCriteriaExpression(message);
193193

194194
StatementMapper.UpdateSpec updateSpec =
@@ -205,8 +205,8 @@ private Mono<Void> handleUpdate(Message<?> message) {
205205
}
206206
}
207207

208-
private Map<SqlIdentifier, Object> transformIntoSqlIdentifierMap(Map<String, Object> values) {
209-
Map<SqlIdentifier, Object> sqlIdentifierObjectMap = new HashMap<>();
208+
private Map<SqlIdentifier, @Nullable Object> transformIntoSqlIdentifierMap(Map<String, @Nullable Object> values) {
209+
Map<SqlIdentifier, @Nullable Object> sqlIdentifierObjectMap = new HashMap<>();
210210
values.forEach((k, v) -> sqlIdentifierObjectMap.put(SqlIdentifier.unquoted(k), v));
211211
return sqlIdentifierObjectMap;
212212
}
@@ -216,11 +216,11 @@ private Mono<Void> handleInsert(Message<?> message) {
216216
if (this.tableNameExpression != null) {
217217
String tableName = this.tableNameExpression.getValue(this.evaluationContext, message, String.class);
218218
Assert.notNull(tableName, "'tableNameExpression' must not evaluate to null");
219-
Map<String, Object> values = evaluateValuesExpression(message);
219+
Map<String, @Nullable Object> values = evaluateValuesExpression(message);
220220

221221
StatementMapper.InsertSpec insertSpec = this.statementMapper.createInsert(tableName);
222222

223-
for (Map.Entry<String, Object> entry : values.entrySet()) {
223+
for (Map.Entry<String, @Nullable Object> entry : values.entrySet()) {
224224
insertSpec = insertSpec.withColumn(entry.getKey(),
225225
Parameter.fromOrEmpty(entry.getValue(), Object.class));
226226
}
@@ -237,11 +237,11 @@ private Mono<Void> handleInsert(Message<?> message) {
237237
}
238238

239239
@SuppressWarnings("unchecked")
240-
private Map<String, Object> evaluateValuesExpression(Message<?> message) {
240+
private Map<String, @Nullable Object> evaluateValuesExpression(Message<?> message) {
241241
Assert.notNull(this.valuesExpression,
242242
"'this.valuesExpression' must not be null when 'tableNameExpression' mode is used");
243-
Map<String, Object> fieldValues =
244-
(Map<String, Object>) this.valuesExpression.getValue(this.evaluationContext, message, Map.class);
243+
Map<String, @Nullable Object> fieldValues =
244+
(Map<String, @Nullable Object>) this.valuesExpression.getValue(this.evaluationContext, message, Map.class);
245245
Assert.notNull(fieldValues, "'valuesExpression' must not evaluate to null");
246246
return fieldValues;
247247
}

0 commit comments

Comments
 (0)