GH-1473: Remove Unnecessary Deprecated Interfaces

See #1473 See #1480 Migration interfaces to assist moving to `CompletableFuture` have been removed from 2.4.x due to Boot auto configuration issues. Therefore, these interfaces never existed in a released version of 2.4.x.
spring-projects · Sep 13, 2022 · 80f8c9c · 80f8c9c
1 parent f073c5f
commit 80f8c9c
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 194 deletions.
diff --git a/spring-amqp/src/main/java/org/springframework/amqp/core/AsyncAmqpTemplate2.java b/spring-amqp/src/main/java/org/springframework/amqp/core/AsyncAmqpTemplate2.java
diff --git a/...eam/src/main/java/org/springframework/rabbit/stream/producer/RabbitStreamOperations2.java b/...eam/src/main/java/org/springframework/rabbit/stream/producer/RabbitStreamOperations2.java
diff --git a/...tream/src/main/java/org/springframework/rabbit/stream/producer/RabbitStreamTemplate2.java b/...tream/src/main/java/org/springframework/rabbit/stream/producer/RabbitStreamTemplate2.java
diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/AsyncRabbitTemplate2.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/AsyncRabbitTemplate2.java
diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/CorrelationData.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/CorrelationData.java
@@ -94,17 +94,6 @@ public CompletableFuture<Confirm> getFuture() {
 		return this.future;
 	}
 
-	/**
-	 * Return a future to check the success/failure of the publish operation.
-	 * @return the future.
-	 * @since 2.4.7
-	 * @deprecated as of 3.0, in favor of {@link #getFuture()}.
-	 */
-	@Deprecated
-	public CompletableFuture<Confirm> getCompletableFuture() {
-		return this.future;
-	}
-
 	/**
 	 * Get the returned message and metadata, if any. Guaranteed to be populated before
 	 * the future is set.

diff --git a/src/reference/asciidoc/amqp.adoc b/src/reference/asciidoc/amqp.adoc
@@ -4677,7 +4677,7 @@ Version 2.0 introduced variants of these methods (`convertSendAndReceiveAsType`)
 You must configure the underlying `RabbitTemplate` with a `SmartMessageConverter`.
 See <<json-complex>> for more information.
 
-The `AsyncRabbitTemplate2` (added to assist with migration to this release) is now deprecated in favor of `AsyncRabbitTemplate` which now returns `CompletableFuture` s instead of `ListenableFuture` s.
+IMPORTANT: Starting with version 3.0, the `AsyncRabbitTemplate` methods now return `CompletableFuture` s instead of `ListenableFuture` s.
 
 [[remoting]]
 ===== Spring Remoting with AMQP

diff --git a/src/reference/asciidoc/appendix.adoc b/src/reference/asciidoc/appendix.adoc
@@ -34,11 +34,6 @@ Support remoting using Spring Framework’s RMI support is deprecated and will b
 The `Jackson2JsonMessageConverter` can now determine the charset from the `contentEncoding` header.
 See <<json-message-converter>> for more information.
 
-==== AsyncRabbitTemplate
-
-The `AsyncRabbitTemplate` is deprecated in favor of `AsyncRabbitTemplate2` which returns `CompletableFuture` s instead of `ListenableFuture` s.
-See <<async-template>> for more information.
-
 ==== Message Converter Changes
 
 The `Jackson2JsonMessageConverter` can now determine the charset from the `contentEncoding` header.

diff --git a/src/reference/asciidoc/stream.adoc b/src/reference/asciidoc/stream.adoc
@@ -16,13 +16,13 @@ The `RabbitStreamTemplate` provides a subset of the `RabbitTemplate` (AMQP) func
 ----
 public interface RabbitStreamOperations extends AutoCloseable {
 
-	ListenableFuture<Boolean> send(Message message);
+	ConvertableFuture<Boolean> send(Message message);
 
-	ListenableFuture<Boolean> convertAndSend(Object message);
+	ConvertableFuture<Boolean> convertAndSend(Object message);
 
-	ListenableFuture<Boolean> convertAndSend(Object message, @Nullable MessagePostProcessor mpp);
+	ConvertableFuture<Boolean> convertAndSend(Object message, @Nullable MessagePostProcessor mpp);
 
-	ListenableFuture<Boolean> send(com.rabbitmq.stream.Message message);
+	ConvertableFuture<Boolean> send(com.rabbitmq.stream.Message message);
 
 	MessageBuilder messageBuilder();
 
@@ -67,7 +67,7 @@ The `ProducerCustomizer` provides a mechanism to customize the producer before i
 
 Refer to the https://rabbitmq.github.io/rabbitmq-stream-java-client/stable/htmlsingle/[Java Client Documentation] about customizing the `Environment` and `Producer`.
 
-IMPORTANT: In version 2.4.7 `RabbitStreamOperations2` and `RabbitStreamTemplate2` were added to assist migration to this version; `RabbitStreamOperations2` and `RabbitStreamTemplate2` are now deprecated in favor of `RabbitStreamOperations` and `RabbitStreamTemplate` respectively.
+IMPORTANT: Starting with version 3.0, the method return types are `CompletableFuture` instead of `ListenableFuture`.
 
 ==== Receiving Messages
 

diff --git a/src/reference/asciidoc/whats-new.adoc b/src/reference/asciidoc/whats-new.adoc
@@ -13,13 +13,12 @@ The remoting feature (using RMI) is no longer supported.
 
 ==== AsyncRabbitTemplate
 
-The `AsyncRabbitTemplate2`, which was added in 2.4.7 to aid migration to this release, is deprecated in favor of `AsyncRabbitTemplate`.
-The `AsyncRabbitTemplate` now returns `CompletableFuture` s instead of `ListenableFuture` s.
+IMPORTANT: The `AsyncRabbitTemplate` now returns `CompletableFuture` s instead of `ListenableFuture` s.
 See <<async-template>> for more information.
 
 ==== Stream Support Changes
 
-`RabbitStreamOperations2` and `RabbitStreamTemplate2` have been deprecated in favor of `RabbitStreamOperations` and `RabbitStreamTemplate` respectively.
+IMPORTANT: `RabbitStreamOperations` and `RabbitStreamTemplate` methods now return `CompletableFuture` instead of `ListenableFuture`.
 
 Super streams and single active consumers thereon are now supported.