drop rxjava and completableFuture api (#24326)

Azure · Sep 27, 2021 · 6fadec5 · 6fadec5
1 parent e4b7904
commit 6fadec5
Show file tree

Hide file tree

Showing 76 changed files with 511 additions and 1,697 deletions.
diff --git a/...main/java/com/azure/spring/cloud/autoconfigure/eventhub/resourcemanager/package-info.java b/...main/java/com/azure/spring/cloud/autoconfigure/eventhub/resourcemanager/package-info.java
diff --git a/...ng/cloud/autoconfigure/resourcemanager/AzureEventHubResourceManagerAutoConfiguration.java b/...ng/cloud/autoconfigure/resourcemanager/AzureEventHubResourceManagerAutoConfiguration.java
@@ -5,9 +5,9 @@
 
 import com.azure.resourcemanager.AzureResourceManager;
 import com.azure.spring.cloud.autoconfigure.eventhub.AzureEventHubProperties;
-import com.azure.spring.cloud.autoconfigure.eventhub.resourcemanager.DefaultEventHubProvisioner;
+import com.azure.spring.eventhubs.provisioning.arm.DefaultEventHubProvisioner;
 import com.azure.spring.cloud.resourcemanager.connectionstring.EventHubArmConnectionStringProvider;
-import com.azure.spring.eventhubs.core.EventHubProvisioner;
+import com.azure.spring.eventhubs.provisioning.EventHubProvisioner;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;

diff --git a/.../cloud/autoconfigure/resourcemanager/AzureServiceBusResourceManagerAutoConfiguration.java b/.../cloud/autoconfigure/resourcemanager/AzureServiceBusResourceManagerAutoConfiguration.java
@@ -5,11 +5,11 @@
 
 import com.azure.resourcemanager.AzureResourceManager;
 import com.azure.spring.cloud.autoconfigure.servicebus.AzureServiceBusProperties;
-import com.azure.spring.cloud.autoconfigure.servicebus.resourcemanager.DefaultServiceBusQueueProvisioner;
-import com.azure.spring.cloud.autoconfigure.servicebus.resourcemanager.DefaultServiceBusTopicProvisioner;
+import com.azure.spring.servicebus.provisioning.arm.DefaultServiceBusQueueProvisioner;
+import com.azure.spring.servicebus.provisioning.arm.DefaultServiceBusTopicProvisioner;
 import com.azure.spring.cloud.resourcemanager.connectionstring.ServiceBusArmConnectionStringProvider;
-import com.azure.spring.servicebus.core.ServiceBusQueueProvisioner;
-import com.azure.spring.servicebus.core.ServiceBusTopicProvisioner;
+import com.azure.spring.servicebus.provisioning.ServiceBusQueueProvisioner;
+import com.azure.spring.servicebus.provisioning.ServiceBusTopicProvisioner;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;

diff --git a/...spring/cloud/autoconfigure/servicebus/AzureServiceBusQueueOperationAutoConfiguration.java b/...spring/cloud/autoconfigure/servicebus/AzureServiceBusQueueOperationAutoConfiguration.java
@@ -6,7 +6,7 @@
 import com.azure.messaging.servicebus.ServiceBusClientBuilder;
 import com.azure.spring.servicebus.core.DefaultServiceBusQueueClientFactory;
 import com.azure.spring.servicebus.core.ServiceBusQueueClientFactory;
-import com.azure.spring.servicebus.core.ServiceBusQueueProvisioner;
+import com.azure.spring.servicebus.provisioning.ServiceBusQueueProvisioner;
 import com.azure.spring.servicebus.core.queue.ServiceBusQueueOperation;
 import com.azure.spring.servicebus.core.queue.ServiceBusQueueTemplate;
 import com.azure.spring.servicebus.support.converter.ServiceBusMessageConverter;

diff --git a/...spring/cloud/autoconfigure/servicebus/AzureServiceBusTopicOperationAutoConfiguration.java b/...spring/cloud/autoconfigure/servicebus/AzureServiceBusTopicOperationAutoConfiguration.java
@@ -6,7 +6,7 @@
 import com.azure.messaging.servicebus.ServiceBusClientBuilder;
 import com.azure.spring.servicebus.core.DefaultServiceBusTopicClientFactory;
 import com.azure.spring.servicebus.core.ServiceBusTopicClientFactory;
-import com.azure.spring.servicebus.core.ServiceBusTopicProvisioner;
+import com.azure.spring.servicebus.provisioning.ServiceBusTopicProvisioner;
 import com.azure.spring.servicebus.core.topic.ServiceBusTopicOperation;
 import com.azure.spring.servicebus.core.topic.ServiceBusTopicTemplate;
 import com.azure.spring.servicebus.support.converter.ServiceBusMessageConverter;

diff --git a/...in/java/com/azure/spring/cloud/autoconfigure/servicebus/resourcemanager/package-info.java b/...in/java/com/azure/spring/cloud/autoconfigure/servicebus/resourcemanager/package-info.java
diff --git a/sdk/spring/azure-spring-eventhubs/pom.xml b/sdk/spring/azure-spring-eventhubs/pom.xml
@@ -40,7 +40,12 @@
       <artifactId>azure-messaging-eventhubs</artifactId>
       <version>5.10.1</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;dependency} -->
     </dependency>
-
+    <dependency>
+      <groupId>com.azure.spring</groupId>
+      <artifactId>azure-spring-cloud-resourcemanager</artifactId>
+      <version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-resourcemanager;current} -->
+      <optional>true</optional>
+    </dependency>
     <!-- Contains Azure Storage Blobs checkpoint store when using EventProcessorClient -->
     <dependency>
       <groupId>com.azure</groupId>

diff --git a/...ure-spring-eventhubs/src/main/java/com/azure/spring/eventhubs/core/EventHubOperation.java b/...ure-spring-eventhubs/src/main/java/com/azure/spring/eventhubs/core/EventHubOperation.java
@@ -5,8 +5,8 @@
 
 import com.azure.spring.eventhubs.support.StartPosition;
 import com.azure.spring.messaging.core.SubscribeByGroupOperation;
-import com.azure.spring.messaging.core.reactor.BatchSendOperation;
-import com.azure.spring.messaging.core.reactor.SendOperation;
+import com.azure.spring.messaging.core.BatchSendOperation;
+import com.azure.spring.messaging.core.SendOperation;
 
 /**
  * Azure event hub operation to support send data asynchronously and subscribe

diff --git a/...ure-spring-eventhubs/src/main/java/com/azure/spring/eventhubs/core/EventHubProcessor.java b/...ure-spring-eventhubs/src/main/java/com/azure/spring/eventhubs/core/EventHubProcessor.java
@@ -13,8 +13,8 @@
 import com.azure.spring.messaging.AzureHeaders;
 import com.azure.spring.messaging.checkpoint.CheckpointConfig;
 import com.azure.spring.messaging.checkpoint.CheckpointMode;
-import com.azure.spring.messaging.checkpoint.reactor.AzureCheckpointer;
-import com.azure.spring.messaging.checkpoint.reactor.Checkpointer;
+import com.azure.spring.messaging.checkpoint.AzureCheckpointer;
+import com.azure.spring.messaging.checkpoint.Checkpointer;
 import com.azure.spring.eventhubs.checkpoint.CheckpointManager;
 import com.azure.spring.eventhubs.support.converter.EventHubMessageConverter;
 import org.slf4j.Logger;

diff --git a/...ing-eventhubs/src/main/java/com/azure/spring/eventhubs/core/EventHubProcessorSupport.java b/...ing-eventhubs/src/main/java/com/azure/spring/eventhubs/core/EventHubProcessorSupport.java
@@ -9,8 +9,8 @@
 import com.azure.spring.messaging.AzureHeaders;
 import com.azure.spring.messaging.checkpoint.CheckpointConfig;
 import com.azure.spring.messaging.checkpoint.CheckpointMode;
-import com.azure.spring.messaging.checkpoint.reactor.AzureCheckpointer;
-import com.azure.spring.messaging.checkpoint.reactor.Checkpointer;
+import com.azure.spring.messaging.checkpoint.AzureCheckpointer;
+import com.azure.spring.messaging.checkpoint.Checkpointer;
 import com.azure.spring.eventhubs.support.converter.EventHubMessageConverter;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHeaders;

diff --git a/...e-spring-eventhubs/src/main/java/com/azure/spring/eventhubs/core/EventHubRxOperation.java b/...e-spring-eventhubs/src/main/java/com/azure/spring/eventhubs/core/EventHubRxOperation.java
diff --git a/...re-spring-eventhubs/src/main/java/com/azure/spring/eventhubs/core/EventHubRxTemplate.java b/...re-spring-eventhubs/src/main/java/com/azure/spring/eventhubs/core/EventHubRxTemplate.java
diff --git a/...g/eventhubs/core/EventHubProvisioner.java → ...ubs/provisioning/EventHubProvisioner.java b/...g/eventhubs/core/EventHubProvisioner.java → ...ubs/provisioning/EventHubProvisioner.java
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.spring.eventhubs.core;
+package com.azure.spring.eventhubs.provisioning;
 
 /**
  * An interface to provision Event Hubs resources.

diff --git a/...cemanager/DefaultEventHubProvisioner.java → ...oning/arm/DefaultEventHubProvisioner.java b/...cemanager/DefaultEventHubProvisioner.java → ...oning/arm/DefaultEventHubProvisioner.java
@@ -1,15 +1,14 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.spring.cloud.autoconfigure.eventhub.resourcemanager;
+package com.azure.spring.eventhubs.provisioning.arm;
 
 import com.azure.resourcemanager.AzureResourceManager;
 import com.azure.spring.cloud.resourcemanager.implementation.crud.EventHubConsumerGroupCrud;
 import com.azure.spring.cloud.resourcemanager.implementation.crud.EventHubCrud;
 import com.azure.spring.cloud.resourcemanager.implementation.crud.EventHubNamespaceCrud;
 import com.azure.spring.core.properties.resource.AzureResourceMetadata;
-import com.azure.spring.eventhubs.core.EventHubProvisioner;
-import reactor.util.function.Tuple2;
+import com.azure.spring.eventhubs.provisioning.EventHubProvisioner;
 import reactor.util.function.Tuples;
 
 /**

diff --git a/...ing-eventhubs/src/main/java/com/azure/spring/eventhubs/provisioning/arm/package-info.java b/...ing-eventhubs/src/main/java/com/azure/spring/eventhubs/provisioning/arm/package-info.java
@@ -0,0 +1,7 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+/**
+ * Package com.azure.spring.eventhubs.provisioning.arm
+ */
+package com.azure.spring.eventhubs.provisioning.arm;
diff --git a/.../messaging/core/reactor/package-info.java → .../eventhubs/provisioning/package-info.java b/.../messaging/core/reactor/package-info.java → .../eventhubs/provisioning/package-info.java
@@ -2,6 +2,6 @@
 // Licensed under the MIT License.
 
 /**
- * Package com.azure.spring.messaging.core.reactor;
+ * Package com.azure.spring.eventhubs.provisioning
  */
-package com.azure.spring.messaging.core.reactor;
+package com.azure.spring.eventhubs.provisioning;
diff --git a/...g-eventhubs/src/main/java/com/azure/spring/eventhubs/support/RxEventHubTestOperation.java b/...g-eventhubs/src/main/java/com/azure/spring/eventhubs/support/RxEventHubTestOperation.java
diff --git a/...ubs/src/test/java/com/azure/spring/eventhubs/core/EventHubOperationSendSubscribeTest.java b/...ubs/src/test/java/com/azure/spring/eventhubs/core/EventHubOperationSendSubscribeTest.java
@@ -10,8 +10,8 @@
 import com.azure.spring.messaging.AzureHeaders;
 import com.azure.spring.messaging.checkpoint.CheckpointConfig;
 import com.azure.spring.messaging.checkpoint.CheckpointMode;
-import com.azure.spring.messaging.checkpoint.reactor.Checkpointer;
-import com.azure.spring.messaging.core.reactor.SendSubscribeByGroupOperationTest;
+import com.azure.spring.messaging.checkpoint.Checkpointer;
+import com.azure.spring.messaging.core.SendSubscribeByGroupOperationTest;
 import com.azure.spring.messaging.support.pojo.User;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;