Remove API deprecated in previous versions

Author: artembilan

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/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-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.