diff --git a/sdk/spring/azure-spring-cloud-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/eventhub/resourcemanager/DefaultEventHubProvisioner.java b/sdk/spring/azure-spring-cloud-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/eventhub/resourcemanager/DefaultEventHubProvisioner.java
index e1ec79bc031de..284786cf70622 100644
--- a/sdk/spring/azure-spring-cloud-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/eventhub/resourcemanager/DefaultEventHubProvisioner.java
+++ b/sdk/spring/azure-spring-cloud-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/eventhub/resourcemanager/DefaultEventHubProvisioner.java
@@ -8,9 +8,9 @@
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.core.util.Triple;
-import com.azure.spring.core.util.Tuple;
import com.azure.spring.eventhubs.core.EventHubProvisioner;
+import reactor.util.function.Tuple2;
+import reactor.util.function.Tuples;
/**
* Default implementation to provision an Event Hub.
@@ -35,12 +35,12 @@ public void provisionNamespace(String namespace) {
@Override
public void provisionEventHub(String namespace, String eventHub) {
- this.eventHubCrud.getOrCreate(Tuple.of(namespace, eventHub));
+ this.eventHubCrud.getOrCreate(Tuples.of(namespace, eventHub));
}
@Override
public void provisionConsumerGroup(String namespace, String eventHub, String consumerGroup) {
- this.consumerGroupCrud.getOrCreate(Triple.of(namespace, eventHub, consumerGroup));
+ this.consumerGroupCrud.getOrCreate(Tuples.of(namespace, eventHub, consumerGroup));
}
}
diff --git a/sdk/spring/azure-spring-cloud-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/servicebus/resourcemanager/DefaultServiceBusQueueProvisioner.java b/sdk/spring/azure-spring-cloud-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/servicebus/resourcemanager/DefaultServiceBusQueueProvisioner.java
index 4ae0e24518d6b..d90f888ed96e9 100644
--- a/sdk/spring/azure-spring-cloud-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/servicebus/resourcemanager/DefaultServiceBusQueueProvisioner.java
+++ b/sdk/spring/azure-spring-cloud-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/servicebus/resourcemanager/DefaultServiceBusQueueProvisioner.java
@@ -6,8 +6,8 @@
import com.azure.resourcemanager.AzureResourceManager;
import com.azure.spring.cloud.resourcemanager.implementation.crud.ServiceBusQueueCrud;
import com.azure.spring.core.properties.resource.AzureResourceMetadata;
-import com.azure.spring.core.util.Tuple;
import com.azure.spring.servicebus.core.ServiceBusQueueProvisioner;
+import reactor.util.function.Tuples;
/**
* A default implementation to provision Service Bus Queue.
@@ -23,7 +23,7 @@ public DefaultServiceBusQueueProvisioner(AzureResourceManager azureResourceManag
@Override
public void provisionQueue(String namespace, String queue) {
- this.serviceBusQueueCrud.getOrCreate(Tuple.of(namespace, queue));
+ this.serviceBusQueueCrud.getOrCreate(Tuples.of(namespace, queue));
}
}
diff --git a/sdk/spring/azure-spring-cloud-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/servicebus/resourcemanager/DefaultServiceBusTopicProvisioner.java b/sdk/spring/azure-spring-cloud-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/servicebus/resourcemanager/DefaultServiceBusTopicProvisioner.java
index 2363e7b409b20..dce1e972209c0 100644
--- a/sdk/spring/azure-spring-cloud-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/servicebus/resourcemanager/DefaultServiceBusTopicProvisioner.java
+++ b/sdk/spring/azure-spring-cloud-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/servicebus/resourcemanager/DefaultServiceBusTopicProvisioner.java
@@ -7,9 +7,8 @@
import com.azure.spring.cloud.resourcemanager.implementation.crud.ServiceBusTopicCrud;
import com.azure.spring.cloud.resourcemanager.implementation.crud.ServiceBusTopicSubscriptionCrud;
import com.azure.spring.core.properties.resource.AzureResourceMetadata;
-import com.azure.spring.core.util.Triple;
-import com.azure.spring.core.util.Tuple;
import com.azure.spring.servicebus.core.ServiceBusTopicProvisioner;
+import reactor.util.function.Tuples;
/**
* A default implementation to provision Service Bus Topic.
@@ -27,11 +26,11 @@ public DefaultServiceBusTopicProvisioner(AzureResourceManager azureResourceManag
@Override
public void provisionTopic(String namespace, String topic) {
- this.topicCrud.getOrCreate(Tuple.of(namespace, topic));
+ this.topicCrud.getOrCreate(Tuples.of(namespace, topic));
}
@Override
public void provisionSubscription(String namespace, String topic, String subscription) {
- this.subscriptionCrud.getOrCreate(Triple.of(namespace, topic, subscription));
+ this.subscriptionCrud.getOrCreate(Tuples.of(namespace, topic, subscription));
}
}
diff --git a/sdk/spring/azure-spring-cloud-core/pom.xml b/sdk/spring/azure-spring-cloud-core/pom.xml
index 955b33ed0220b..fdcf5dc9a1ddf 100644
--- a/sdk/spring/azure-spring-cloud-core/pom.xml
+++ b/sdk/spring/azure-spring-cloud-core/pom.xml
@@ -64,6 +64,12 @@
5.7.2
test
+
+ org.springframework
+ spring-test
+ 5.3.9
+ test
+