Merge branch 'main' of github.com:spring-projects/spring-integration into jspecify-kafka

Author: mjd507

.github/dependabot.yml

@@ -137,57 +137,11 @@ updates:
           - com.thoughtworks.xstream:xstream
           - org.springframework.security*
 
-  - package-ecosystem: gradle
-    target-branch: 6.3.x
-    directory: /
-    schedule:
-      interval: weekly
-      day: sunday
-    ignore:
-      - dependency-name: '*'
-        update-types:
-          - version-update:semver-major
-          - version-update:semver-minor
-    open-pull-requests-limit: 10
-    labels:
-      - 'type: dependency-upgrade'
-    groups:
-      development-dependencies:
-        update-types:
-          - patch
-        patterns:
-          - org.gradle.*
-          - com.github.spotbugs
-          - io.spring.*
-          - org.ajoberstar.grgit
-          - org.antora
-          - com.google.protobuf
-          - io.micrometer:micrometer-docs-generator
-          - com.willowtreeapps.assertk:assertk-jvm
-          - org.jetbrains.dokka
-          - org.apache.activemq*
-          - org.aspectj*
-          - org.awaitility:awaitility
-          - org.apache.commons:commons-dbcp2
-          - org.apache.derby
-          - com.icegreen:greenmail
-          - org.hibernate.orm*
-          - org.testcontainers*
-          - org.hsqldb:hsqldb
-          - com.h2database:h2
-          - org.postgresql:postgresql
-          - mysql:mysql-connector-java
-          - com.oracle.database.jdbc:ojdbc11
-          - org.apache.tomcat.embed:tomcat-embed-websocket
-          - org.xmlunit:xmlunit-assertj3
-          - com.thoughtworks.xstream:xstream
-          - org.springframework.security*
-
   - package-ecosystem: github-actions
     directory: /
     schedule:
       interval: weekly
-      day: saturday
+      day: sunday
     labels:
       - 'type: task'
     groups:
@@ -200,7 +154,7 @@ updates:
     directory: /
     schedule:
       interval: weekly
-      day: saturday
+      day: sunday
     labels:
       - 'type: task'
     groups:
@@ -213,23 +167,10 @@ updates:
     directory: /
     schedule:
       interval: weekly
-      day: saturday
+      day: sunday
     labels:
       - 'type: task'
     groups:
       development-dependencies:
         patterns:
           - '*'
-
-  - package-ecosystem: github-actions
-    target-branch: 6.3.x
-    directory: /
-    schedule:
-      interval: weekly
-      day: saturday
-    labels:
-      - 'type: task'
-    groups:
-      development-dependencies:
-        patterns:
-          - '*'

.github/workflows/release.yml

@@ -12,16 +12,17 @@ jobs:
       contents: write
       issues: write
 
-    uses: spring-io/spring-github-workflows/.github/workflows/spring-artifactory-gradle-release.yml@v5
+    uses: spring-io/spring-github-workflows/.github/workflows/spring-artifactory-gradle-release.yml@main
+    with:
+      deployMilestoneToCentral: true
     secrets:
       GH_ACTIONS_REPO_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
       DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
       JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
       ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
       ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
-      OSSRH_S01_TOKEN_USERNAME: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }}
-      OSSRH_S01_TOKEN_PASSWORD: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }}
-      OSSRH_STAGING_PROFILE_NAME: ${{ secrets.OSSRH_STAGING_PROFILE_NAME }}
+      CENTRAL_TOKEN_USERNAME: ${{ secrets.CENTRAL_TOKEN_USERNAME }}
+      CENTRAL_TOKEN_PASSWORD: ${{ secrets.CENTRAL_TOKEN_PASSWORD }}
       GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
       GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
       SPRING_RELEASE_CHAT_WEBHOOK_URL: ${{ secrets.SPRING_RELEASE_GCHAT_WEBHOOK_URL }}

build.gradle

@@ -117,9 +117,9 @@ ext {
     springSecurityVersion = '7.0.0-SNAPSHOT'
     springVersion = '7.0.0-SNAPSHOT'
     springWsVersion = '5.0.0-SNAPSHOT'
-    testcontainersVersion = '1.21.1'
+    testcontainersVersion = '1.21.2'
     tomcatVersion = '11.0.8'
-    xmlUnitVersion = '2.10.2'
+    xmlUnitVersion = '2.10.3'
     xstreamVersion = '1.4.21'
     ztZipVersion = '1.17'
 

spring-integration-core/src/main/java/org/springframework/integration/aggregator/AbstractCorrelatingMessageHandler.java

@@ -968,18 +968,6 @@ private static boolean compareSequences(Message<?> msg1, Message<?> msg2) {
 
 	}
 
-	/**
-	 * Probably the method is {@code protected} by mistake.
-	 * @param elements the group processor result.
-	 * @deprecated without replacement - out of use from now on.
-	 */
-	@Deprecated(since = "6.5", forRemoval = true)
-	protected void verifyResultCollectionConsistsOfMessages(Collection<?> elements) {
-		Class<?> commonElementType = CollectionUtils.findCommonElementType(elements);
-		Assert.isAssignable(Message.class, commonElementType, () ->
-				"The expected collection of Messages contains non-Message element: " + commonElementType);
-	}
-
 	private static boolean isResultCollectionOfMessages(Object result) {
 		if (result instanceof Collection<?> resultCollection) {
 			Class<?> commonElementType = CollectionUtils.findCommonElementType(resultCollection);

spring-integration-core/src/main/java/org/springframework/integration/dsl/BaseIntegrationFlowDefinition.java

@@ -513,34 +513,6 @@ public B wireTap(WireTapSpec wireTapSpec) {
 		return _this();
 	}
 
-	/**
-	 * Populate the {@code Control Bus} EI Pattern specific {@link MessageHandler} implementation
-	 * at the current {@link IntegrationFlow} chain position.
-	 * @return the current {@link BaseIntegrationFlowDefinition}.
-	 * @since 6.4
-	 * @deprecated since 6.5 in favor of {@link #controlBus()}
-	 * @see ControlBusMessageProcessor
-	 */
-	@Deprecated(since = "6.5", forRemoval = true)
-	public B controlBusOnRegistry() {
-		return controlBus();
-	}
-
-	/**
-	 * Populate the {@code Control Bus} EI Pattern specific {@link MessageHandler} implementation
-	 * at the current {@link IntegrationFlow} chain position.
-	 * @param endpointConfigurer the {@link Consumer} to accept integration endpoint options.
-	 * @return the current {@link BaseIntegrationFlowDefinition}.
-	 * @since 6.4
-	 * @deprecated since 6.5 in favor of {@link #controlBus(Consumer)}
-	 * @see GenericEndpointSpec
-	 * @see ControlBusMessageProcessor
-	 */
-	@Deprecated(since = "6.5", forRemoval = true)
-	public B controlBusOnRegistry(@Nullable Consumer<GenericEndpointSpec<ServiceActivatingHandler>> endpointConfigurer) {
-		return controlBus(endpointConfigurer);
-	}
-
 	/**
 	 * Populate the {@code Control Bus} EI Pattern specific {@link MessageHandler} implementation
 	 * at the current {@link IntegrationFlow} chain position.

spring-integration-core/src/main/java/org/springframework/integration/support/locks/DefaultLockRegistry.java

@@ -31,6 +31,7 @@
  *
  * @author Oleg Zhurakousky
  * @author Gary Russell
+ *
  * @since 2.1.1
  *
  */
@@ -41,15 +42,15 @@ public final class DefaultLockRegistry implements LockRegistry<Lock> {
 	private final int mask;
 
 	/**
-	 * Constructs a DefaultLockRegistry with the default
+	 * Construct a DefaultLockRegistry with the default
 	 * mask 0xFF with 256 locks.
 	 */
 	public DefaultLockRegistry() {
 		this(0xFF); // NOSONAR magic number
 	}
 
 	/**
-	 * Constructs a DefaultLockRegistry with the supplied
+	 * Construct a DefaultLockRegistry with the supplied
 	 * mask - the mask must have a value Math.pow(2, n) - 1 where n
 	 * is 1 to 31, creating a hash of Math.pow(2, n) locks.
 	 * <p> Examples:
@@ -61,7 +62,8 @@ public DefaultLockRegistry() {
 	 */
 	public DefaultLockRegistry(int mask) {
 		String bits = Integer.toBinaryString(mask);
-		Assert.isTrue(bits.length() < 32 && (mask == 0 || bits.lastIndexOf('0') < bits.indexOf('1')), "Mask must be a power of 2 - 1"); // NOSONAR magic number
+		Assert.isTrue(bits.length() < 32 && (mask == 0 || bits.lastIndexOf('0') < bits.indexOf('1')),
+				"Mask must be a power of 2 - 1"); // NOSONAR magic number
 		this.mask = mask;
 		int arraySize = this.mask + 1;
 		this.lockTable = new ReentrantLock[arraySize];
@@ -71,14 +73,14 @@ public DefaultLockRegistry(int mask) {
 	}
 
 	/**
-	 * Obtains a lock by masking the lockKey's hashCode() with
+	 * Obtain a lock by masking the lockKey's hashCode() with
 	 * the mask and using the result as an index to the lock table.
 	 * @param lockKey the object used to derive the lock index.
 	 */
 	@Override
 	public Lock obtain(Object lockKey) {
 		Assert.notNull(lockKey, "'lockKey' must not be null");
-		Integer lockIndex = lockKey.hashCode() & this.mask;
+		int lockIndex = lockKey.hashCode() & this.mask;
 		return this.lockTable[lockIndex];
 	}
 

spring-integration-core/src/main/java/org/springframework/integration/util/CheckedCallable.java

@@ -58,16 +58,4 @@ else if (t instanceof Error error) { // NOSONAR
 		};
 	}
 
-	/**
-	 * Wrap the {@link #call()} into unchecked {@link Callable}.
-	 * Re-throw its exception wrapped with a {@link IllegalStateException}.
-	 * @return the unchecked {@link Callable}.
-	 * @since 6.3.7
-	 * @deprecated since 6.5 in favor of {@link #unchecked()}.
-	 */
-	@Deprecated(since = "6.5", forRemoval = true)
-	default Callable<T> uncheckedCallable() {
-		return unchecked();
-	}
-
 }

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

@@ -280,16 +280,6 @@ class KotlinIntegrationFlowDefinition(@PublishedApi internal val delegate: Integ
 		this.delegate.wireTap(wireTapSpec)
 	}
 
-	/**
-	 * Populate the `Control Bus` EI Pattern specific [MessageHandler] implementation
-	 * at the current [IntegrationFlow] chain position.
-	 * @since 6.4
-	 */
-	@Deprecated("Use 'controlBus()' instead.", replaceWith = ReplaceWith("controlBus()"))
-	fun controlBusOnRegistry(endpointConfigurer: GenericEndpointSpec<ServiceActivatingHandler>.() -> Unit = {}) {
-		controlBus(endpointConfigurer)
-	}
-
 	/**
 	 * Populate the `Control Bus` EI Pattern specific [MessageHandler] implementation
 	 * at the current [IntegrationFlow] chain position.

spring-integration-core/src/test/java/org/springframework/integration/handler/advice/LockRequestHandlerAdviceTests.java

@@ -114,7 +114,7 @@ void verifyLockAroundHandler() throws ExecutionException, InterruptedException,
 	public static class Config {
 
 		@Bean
-		LockRegistry lockRegistry() {
+		LockRegistry<?> lockRegistry() {
 			return new DefaultLockRegistry();
 		}
 
@@ -124,7 +124,7 @@ QueueChannel discardChannel() {
 		}
 
 		@Bean
-		LockRequestHandlerAdvice lockRequestHandlerAdvice(LockRegistry lockRegistry, QueueChannel discardChannel) {
+		LockRequestHandlerAdvice lockRequestHandlerAdvice(LockRegistry<?> lockRegistry, QueueChannel discardChannel) {
 			LockRequestHandlerAdvice lockRequestHandlerAdvice =
 					new LockRequestHandlerAdvice(lockRegistry, (message) -> message.getHeaders().get(LOCK_KEY_HEADER));
 			lockRequestHandlerAdvice.setDiscardChannel(discardChannel);

spring-integration-groovy/src/main/groovy/org/springframework/integration/groovy/dsl/GroovyIntegrationFlowDefinition.groovy

@@ -264,23 +264,6 @@ class GroovyIntegrationFlowDefinition {
 		this
 	}
 
-	/**
-	 * Populate the {@code Control Bus} EI Pattern specific {@link MessageHandler} implementation
-	 * at the current {@link IntegrationFlow} chain position.
-	 * @param endpointConfigurer the {@link Consumer} to accept integration endpoint options.
-	 * @since 6.4
-	 * @deprecated in favor of {@link #controlBus}
-	 */
-	@Deprecated(since = '6.5', forRemoval = true)
-	@SuppressWarnings('removal')
-	GroovyIntegrationFlowDefinition controlBusOnRegistry(
-			@DelegatesTo(value = GenericEndpointSpec<ServiceActivatingHandler>, strategy = Closure.DELEGATE_FIRST)
-			@ClosureParams(value = SimpleType.class, options = 'org.springframework.integration.dsl.GenericEndpointSpec')
-					Closure<?> endpointConfigurer = null) {
-
-		controlBus endpointConfigurer
-	}
-
 	/**
 	 * Populate the {@code Control Bus} EI Pattern specific {@link MessageHandler} implementation
 	 * at the current {@link IntegrationFlow} chain position.