Upgrade to Spring Framework 7.0

* Upgrade to Spring Data `2025.1.0`
* Upgrade to Spring Security `7.0`
* Fix all the compilation errors, including for Kotlin (not clear how they passed before upgrade to SF `7.0`)

Author: artembilan

build.gradle

@@ -109,12 +109,12 @@ ext {
     servletApiVersion = '6.1.0'
     smackVersion = '4.4.8'
     springAmqpVersion = '3.2.5'
-    springDataVersion = '2025.0.0'
+    springDataVersion = '2025.1.0-SNAPSHOT'
     springGraphqlVersion = '1.4.0'
     springKafkaVersion = '3.3.6'
     springRetryVersion = '2.0.12'
-    springSecurityVersion = '6.5.0'
-    springVersion = '6.2.7'
+    springSecurityVersion = '7.0.0-SNAPSHOT'
+    springVersion = '7.0.0-SNAPSHOT'
     springWsVersion = '4.1.0'
     testcontainersVersion = '1.21.1'
     tomcatVersion = '11.0.7'

spring-integration-core/src/main/kotlin/org/springframework/integration/dsl/KotlinEnricherSpec.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 the original author or authors.
+ * Copyright 2020-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -69,7 +69,7 @@ class KotlinEnricherSpec(override val delegate: EnricherSpec)
 		this.delegate.requestPayloadExpression(requestPayloadExpression)
 	}
 
-	fun <P> requestPayload(function: (Message<P>) -> Any) {
+	fun <P: Any> requestPayload(function: (Message<P>) -> Any) {
 		this.delegate.requestPayload(function)
 	}
 
@@ -93,7 +93,7 @@ class KotlinEnricherSpec(override val delegate: EnricherSpec)
 		this.delegate.propertyExpression(key, expression)
 	}
 
-	fun <P> propertyFunction(key: String, function: (Message<P>) -> Any) {
+	fun <P: Any> propertyFunction(key: String, function: (Message<P>) -> Any) {
 		this.delegate.propertyFunction(key, function)
 	}
 
@@ -105,7 +105,7 @@ class KotlinEnricherSpec(override val delegate: EnricherSpec)
 		this.delegate.header(name, expression, overwrite)
 	}
 
-	fun <P> headerFunction(name: String, function: (Message<P>) -> Any, overwrite: Boolean?) {
+	fun <P: Any> headerFunction(name: String, function: (Message<P>) -> Any, overwrite: Boolean?) {
 		this.delegate.header(name, function, overwrite)
 	}
 

spring-integration-core/src/main/kotlin/org/springframework/integration/dsl/KotlinIntegrationFlowDefinition.kt

@@ -901,7 +901,7 @@ class KotlinIntegrationFlowDefinition(@PublishedApi internal val delegate: Integ
 	 * the `org.springframework.integration.handler.LoggingHandler`
 	 * as a default logging category and function for the log message.
 	 */
-	fun <P> log(function: (Message<P>) -> Any) {
+	fun <P: Any> log(function: (Message<P>) -> Any) {
 		this.delegate.log(function)
 	}
 
@@ -948,7 +948,7 @@ class KotlinIntegrationFlowDefinition(@PublishedApi internal val delegate: Integ
 	 * the `org.springframework.integration.handler.LoggingHandler`
 	 * as a default logging category and function for the log message.
 	 */
-	fun <P> log(level: LoggingHandler.Level, function: (Message<P>) -> Any) {
+	fun <P: Any> log(level: LoggingHandler.Level, function: (Message<P>) -> Any) {
 		this.delegate.log(level, function)
 	}
 
@@ -958,7 +958,7 @@ class KotlinIntegrationFlowDefinition(@PublishedApi internal val delegate: Integ
 	 * [LoggingHandler.Level] logging level,
 	 * the provided logging category and function for the log message.
 	 */
-	fun <P> log(category: String, function: (Message<P>) -> Any) {
+	fun <P: Any> log(category: String, function: (Message<P>) -> Any) {
 		this.delegate.log(category, function)
 	}
 
@@ -968,7 +968,7 @@ class KotlinIntegrationFlowDefinition(@PublishedApi internal val delegate: Integ
 	 * [LoggingHandler.Level] logging level, logging category
 	 * and function for the log message.
 	 */
-	fun <P> log(level: LoggingHandler.Level, category: String, function: (Message<P>) -> Any) {
+	fun <P: Any> log(level: LoggingHandler.Level, category: String, function: (Message<P>) -> Any) {
 		this.delegate.log(level, category, function)
 	}
 
@@ -1075,7 +1075,7 @@ class KotlinIntegrationFlowDefinition(@PublishedApi internal val delegate: Integ
 	 * wrap it to a [Flux], apply provided function via [Flux.transform]
 	 * and emit the result to one more [FluxMessageChannel], subscribed in the downstream flow.
 	 */
-	fun <I, O> fluxTransform(fluxFunction: (Flux<Message<I>>) -> Publisher<O>) {
+	fun <I: Any, O> fluxTransform(fluxFunction: (Flux<Message<I>>) -> Publisher<O>) {
 		this.delegate.fluxTransform(fluxFunction)
 	}
 

spring-integration-core/src/test/kotlin/org/springframework/integration/dsl/KotlinDslTests.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors.
+ * Copyright 2020-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -197,7 +197,7 @@ class KotlinDslTests {
 
 		val receive = replyChannel.receive(10_000)
 		assertThat(receive?.payload).isNotNull().isEqualTo("TEST")
-		assertThat(receive.headers).doesNotContain("headerToRemove", null)
+		assertThat(receive?.headers).isNotNull().doesNotContain("headerToRemove", null)
 		assertThat(this.wireTapChannel.receive(10_000)?.payload).isNotNull().isEqualTo("test")
 	}
 

spring-integration-http/src/main/java/org/springframework/integration/http/aot/HttpRuntimeHints.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 the original author or authors.
+ * Copyright 2022-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 
 package org.springframework.integration.http.aot;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.aot.hint.MemberCategory;
 import org.springframework.aot.hint.ReflectionHints;
 import org.springframework.aot.hint.RuntimeHints;
@@ -34,7 +36,7 @@
 class HttpRuntimeHints implements RuntimeHintsRegistrar {
 
 	@Override
-	public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
+	public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
 		ReflectionHints reflectionHints = hints.reflection();
 		reflectionHints.registerType(WebHandler.class, MemberCategory.INVOKE_PUBLIC_METHODS);
 

spring-integration-http/src/main/java/org/springframework/integration/http/aot/package-info.java

@@ -1,6 +1,5 @@
 /**
  * Provides classes to support Spring AOT.
  */
-@org.springframework.lang.NonNullApi
-@org.springframework.lang.NonNullFields
+@org.jspecify.annotations.NullMarked
 package org.springframework.integration.http.aot;

spring-integration-http/src/main/java/org/springframework/integration/http/dsl/Http.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,12 +19,13 @@
 import java.net.URI;
 import java.util.function.Function;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.expression.Expression;
 import org.springframework.expression.common.LiteralExpression;
 import org.springframework.integration.expression.FunctionExpression;
 import org.springframework.integration.http.inbound.HttpRequestHandlingController;
 import org.springframework.integration.http.inbound.HttpRequestHandlingMessagingGateway;
-import org.springframework.lang.Nullable;
 import org.springframework.messaging.Message;
 import org.springframework.util.Assert;
 import org.springframework.web.client.RestTemplate;

spring-integration-http/src/main/java/org/springframework/integration/http/dsl/HttpInboundEndpointSupportSpec.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,8 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.core.ResolvableType;
 import org.springframework.expression.Expression;
 import org.springframework.http.HttpEntity;
@@ -36,7 +38,6 @@
 import org.springframework.integration.http.inbound.RequestMapping;
 import org.springframework.integration.http.support.DefaultHttpHeaderMapper;
 import org.springframework.integration.mapping.HeaderMapper;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.validation.Validator;
 import org.springframework.web.bind.annotation.RequestMethod;

spring-integration-http/src/main/java/org/springframework/integration/http/dsl/HttpMessageHandlerSpec.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,13 +19,14 @@
 import java.net.URI;
 import java.util.Arrays;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.expression.Expression;
 import org.springframework.expression.common.LiteralExpression;
 import org.springframework.http.client.ClientHttpRequestFactory;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.integration.expression.ValueExpression;
 import org.springframework.integration.http.outbound.HttpRequestExecutingMessageHandler;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.web.client.ResponseErrorHandler;
 import org.springframework.web.client.RestTemplate;

spring-integration-http/src/main/java/org/springframework/integration/http/dsl/package-info.java

@@ -1,6 +1,5 @@
 /**
  * Provides HTTP Components support for Spring Integration Java DSL.
  */
-@org.springframework.lang.NonNullApi
-@org.springframework.lang.NonNullFields
+@org.jspecify.annotations.NullMarked
 package org.springframework.integration.http.dsl;