udpate javadoc for CompletableFuture and rx migration information (Azure#26687)

yiliuTo · web-flow · commit 930c8c569b61 · 2022-01-25T10:29:56.000+08:00
diff --git a/sdk/spring/azure-spring-integration-core/src/main/java/com/azure/spring/integration/core/AzureCheckpointer.java b/sdk/spring/azure-spring-integration-core/src/main/java/com/azure/spring/integration/core/AzureCheckpointer.java
@@ -12,9 +12,8 @@
 /**
  * Azure implementation for check point callback.
  *
- * @deprecated {@link CompletableFuture} API will be dropped in version 4.0.0, please migrate to reactor API in
- * {@link com.azure.spring.integration.core.api.reactor.AzureCheckpointer}. From version 4.0.0, the reactor API support
- * will be moved to com.azure.spring.messaging.core.checkpoint.AzureCheckpointer.
+ * @deprecated {@link CompletableFuture} API will be dropped in version 4.x, please migrate to reactor API in 4.x.
+ * The reactor API support will be moved to com.azure.spring.messaging.checkpoint.AzureCheckpointer.
  */
 @Deprecated
 public class AzureCheckpointer implements Checkpointer {
diff --git a/sdk/spring/azure-spring-integration-core/src/main/java/com/azure/spring/integration/core/DefaultMessageHandler.java b/sdk/spring/azure-spring-integration-core/src/main/java/com/azure/spring/integration/core/DefaultMessageHandler.java
@@ -37,9 +37,9 @@
  * It delegates real operation to {@link SendOperation} which supports synchronous and asynchronous sending.
  *
  * @author Warren Zhu
- * @deprecated {@link CompletableFuture} API will be dropped in version 4.0.0, please migrate to reactor API in
+ * @deprecated {@link CompletableFuture} API will be dropped in version 4.x, please migrate to reactor API in
  * {@link com.azure.spring.integration.core.api.reactor.DefaultMessageHandler}. From version 4.0.0, the reactor API support
- * will be moved to com.azure.spring.messaging.core.DefaultMessageHandler.
+ * will be moved to com.azure.spring.integration.handler.DefaultMessageHandler.
  */
 @Deprecated
 public class DefaultMessageHandler extends AbstractMessageProducingHandler {
diff --git a/sdk/spring/azure-spring-integration-core/src/main/java/com/azure/spring/integration/core/api/BatchSendOperation.java b/sdk/spring/azure-spring-integration-core/src/main/java/com/azure/spring/integration/core/api/BatchSendOperation.java
@@ -14,7 +14,7 @@
  *
  * @author Warren Zhu
  *
- * @deprecated {@link CompletableFuture} API will be dropped in version 4.0.0, please migrate to reactor API in
+ * @deprecated {@link CompletableFuture} API will be dropped in version 4.x, please migrate to reactor API in
  * {@link com.azure.spring.integration.core.api.reactor.BatchSendOperation}. From version 4.0.0, the reactor API support
  * will be moved to com.azure.spring.messaging.core.BatchSendOperation.
  */
diff --git a/sdk/spring/azure-spring-integration-core/src/main/java/com/azure/spring/integration/core/api/Checkpointer.java b/sdk/spring/azure-spring-integration-core/src/main/java/com/azure/spring/integration/core/api/Checkpointer.java
@@ -9,9 +9,8 @@
  * A callback to perform checkpoint.
  *
  * @author Warren Zhu
- * @deprecated {@link CompletableFuture} API will be dropped in version 4.0.0, please migrate to reactor API in
- * {@link com.azure.spring.integration.core.api.reactor.Checkpointer}. From version 4.0.0, the reactor PAI support will
- * be move to com.azure.spring.messaging.core.checkpoint.Checkpointer.
+ * @deprecated {@link CompletableFuture} API will be dropped in version 4.x, please migrate to reactor API in 4.x.
+ * The reactor PAI support will be move to com.azure.spring.messaging.checkpoint.Checkpointer.
  */
 @Deprecated
 public interface Checkpointer {
diff --git a/sdk/spring/azure-spring-integration-core/src/main/java/com/azure/spring/integration/core/api/RxSendOperation.java b/sdk/spring/azure-spring-integration-core/src/main/java/com/azure/spring/integration/core/api/RxSendOperation.java
@@ -11,7 +11,7 @@
  *
  * @author Warren Zhu
  *
- * @deprecated {@link rx} API will be dropped in version 4.0.0, please migrate to reactor API in
+ * @deprecated {@link rx} API will be dropped in version 4.x, please migrate to reactor API in
  * {@link com.azure.spring.integration.core.api.reactor.SendOperation}. From version 4.0.0, the reactor API support will
  * be moved to com.azure.spring.messaging.core.SendOperation.
  */
diff --git a/sdk/spring/azure-spring-integration-core/src/main/java/com/azure/spring/integration/core/api/RxSubscribeByGroupOperation.java b/sdk/spring/azure-spring-integration-core/src/main/java/com/azure/spring/integration/core/api/RxSubscribeByGroupOperation.java
@@ -10,9 +10,8 @@
  * Operations for subscribing to a destination with a consumer group in a reactive way.
  *
  * @author Warren Zhu
- * @deprecated {@link rx} API will be dropped in version 4.0.0, please migrate to reactor API in
- * {@link SubscribeByGroupOperation}. From version 4.0.0, the reactor API support will be moved to
- * com.azure.spring.messaging.core.SubscribeByGroupOperation.
+ * @deprecated {@link SubscribeByGroupOperation} will be dropped in version 4.x and use
+ * com.azure.spring.eventhubs.core.EventHubsProcessorContainer and com.azure.spring.servicebus.core.ServiceBusProcessorContainer instead.
  */
 @Deprecated
 public interface RxSubscribeByGroupOperation extends Checkpointable {
diff --git a/sdk/spring/azure-spring-integration-core/src/main/java/com/azure/spring/integration/core/api/RxSubscribeOperation.java b/sdk/spring/azure-spring-integration-core/src/main/java/com/azure/spring/integration/core/api/RxSubscribeOperation.java
@@ -10,9 +10,7 @@
  * Operations for subscribing to a destination in reactive way.
  *
  * @author Warren Zhu
- * @deprecated {@link rx} API will be dropped in version 4.0.0, please migrate to reactor API in
- * {@link SubscribeOperation}. From version 4.0.0, the reactor API support will be moved to
- * com.azure.spring.messaging.core.SubscribeOperation.
+ * @deprecated {@link SubscribeOperation} will be dropped in version 4.x and use com.azure.spring.servicebus.core.ServiceBusProcessorContainer instead.
  */
 @Deprecated
 public interface RxSubscribeOperation {
diff --git a/sdk/spring/azure-spring-integration-eventhubs/src/main/java/com/azure/spring/integration/eventhub/api/EventHubRxOperation.java b/sdk/spring/azure-spring-integration-eventhubs/src/main/java/com/azure/spring/integration/eventhub/api/EventHubRxOperation.java
@@ -12,9 +12,9 @@
  *
  * @author Warren Zhu
  *
- * @deprecated {@link rx} API will be dropped in version 4.0.0, please migrate to reactor API in
- * {@link EventHubOperation}. From version 4.0.0, the reactor API support will be moved to
- * com.azure.spring.eventhubs.core.EventHubOperation.
+ * @deprecated {@link rx} API will be dropped in version 4.x, please migrate to reactor API in
+ * {@link EventHubOperation}. From version 4.0.0, {@link EventHubOperation} will be dropped
+ * and use com.azure.spring.messaging.core.SendOperation instead.
  */
 @Deprecated
 public interface EventHubRxOperation extends RxSendOperation, RxSubscribeByGroupOperation {
diff --git a/sdk/spring/azure-spring-integration-eventhubs/src/main/java/com/azure/spring/integration/eventhub/impl/EventHubRxTemplate.java b/sdk/spring/azure-spring-integration-eventhubs/src/main/java/com/azure/spring/integration/eventhub/impl/EventHubRxTemplate.java
@@ -20,7 +20,7 @@
  * @author Warren Zhu
  * @author Xiaolu Dai
  *
- * @deprecated {@link rx} API will be dropped in version 4.0.0, please migrate to reactor API in
+ * @deprecated {@link rx} API will be dropped in version 4.x, please migrate to reactor API in
  * {@link EventHubTemplate}. From version 4.0.0, the reactor API support will be moved to
  * com.azure.spring.eventhubs.core.EventHubTemplate.
  */

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`*`
`15`	`15`	`* @author Warren Zhu`
`16`	`16`	`*`
`17`		`- * @deprecated {@link CompletableFuture} API will be dropped in version 4.0.0, please migrate to reactor API in`
	`17`	`+ * @deprecated {@link CompletableFuture} API will be dropped in version 4.x, please migrate to reactor API in`
`18`	`18`	`* {@link com.azure.spring.integration.core.api.reactor.BatchSendOperation}. From version 4.0.0, the reactor API support`
`19`	`19`	`* will be moved to com.azure.spring.messaging.core.BatchSendOperation.`
`20`	`20`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`* @author Warren Zhu`
`13`	`13`	`*`
`14`		`- * @deprecated {@link rx} API will be dropped in version 4.0.0, please migrate to reactor API in`
	`14`	`+ * @deprecated {@link rx} API will be dropped in version 4.x, please migrate to reactor API in`
`15`	`15`	`* {@link com.azure.spring.integration.core.api.reactor.SendOperation}. From version 4.0.0, the reactor API support will`
`16`	`16`	`* be moved to com.azure.spring.messaging.core.SendOperation.`
`17`	`17`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@`
`12`	`12`	`*`
`13`	`13`	`* @author Warren Zhu`
`14`	`14`	`*`
`15`		`- * @deprecated {@link rx} API will be dropped in version 4.0.0, please migrate to reactor API in`
`16`		`- * {@link EventHubOperation}. From version 4.0.0, the reactor API support will be moved to`
`17`		`- * com.azure.spring.eventhubs.core.EventHubOperation.`
	`15`	`+ * @deprecated {@link rx} API will be dropped in version 4.x, please migrate to reactor API in`
	`16`	`+ * {@link EventHubOperation}. From version 4.0.0, {@link EventHubOperation} will be dropped`
	`17`	`+ * and use com.azure.spring.messaging.core.SendOperation instead.`
`18`	`18`	`*/`
`19`	`19`	`@Deprecated`
`20`	`20`	`public interface EventHubRxOperation extends RxSendOperation, RxSubscribeByGroupOperation {`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`* @author Warren Zhu`
`21`	`21`	`* @author Xiaolu Dai`
`22`	`22`	`*`
`23`		`- * @deprecated {@link rx} API will be dropped in version 4.0.0, please migrate to reactor API in`
	`23`	`+ * @deprecated {@link rx} API will be dropped in version 4.x, please migrate to reactor API in`
`24`	`24`	`* {@link EventHubTemplate}. From version 4.0.0, the reactor API support will be moved to`
`25`	`25`	`* com.azure.spring.eventhubs.core.EventHubTemplate.`
`26`	`26`	`*/`