Sync the root package name change of Spring modules (#210)

Azure-Samples · Mar 4, 2022 · e70c96f · e70c96f
1 parent 48a77ca
commit e70c96f
Show file tree

Hide file tree

Showing 18 changed files with 45 additions and 48 deletions.
diff --git a/...ion/src/main/java/com/azure/spring/sample/eventhubs/EventHubIntegrationConfiguration.java b/...ion/src/main/java/com/azure/spring/sample/eventhubs/EventHubIntegrationConfiguration.java
@@ -3,9 +3,9 @@
 
 package com.azure.spring.sample.eventhubs;
 
-import com.azure.spring.eventhubs.core.EventHubsProcessorFactory;
-import com.azure.spring.eventhubs.core.listener.EventHubsMessageListenerContainer;
-import com.azure.spring.eventhubs.core.properties.EventHubsContainerProperties;
+import com.azure.spring.messaging.eventhubs.core.EventHubsProcessorFactory;
+import com.azure.spring.messaging.eventhubs.core.listener.EventHubsMessageListenerContainer;
+import com.azure.spring.messaging.eventhubs.core.properties.EventHubsContainerProperties;
 import com.azure.spring.integration.eventhubs.inbound.EventHubsInboundChannelAdapter;
 import com.azure.spring.messaging.checkpoint.CheckpointConfig;
 import com.azure.spring.messaging.checkpoint.CheckpointMode;

diff --git a/...eventhubs-integration/src/main/java/com/azure/spring/sample/eventhubs/SendController.java b/...eventhubs-integration/src/main/java/com/azure/spring/sample/eventhubs/SendController.java
@@ -3,8 +3,8 @@
 
 package com.azure.spring.sample.eventhubs;
 
-import com.azure.spring.eventhubs.core.EventHubsTemplate;
-import com.azure.spring.integration.handler.DefaultMessageHandler;
+import com.azure.spring.messaging.eventhubs.core.EventHubsTemplate;
+import com.azure.spring.integration.core.handler.DefaultMessageHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/.../java/com/azure/spring/sample/eventhubs/binder/BatchProducerAndConsumerConfiguration.java b/.../java/com/azure/spring/sample/eventhubs/binder/BatchProducerAndConsumerConfiguration.java
@@ -3,8 +3,7 @@
 
 package com.azure.spring.sample.eventhubs.binder;
 
-import com.azure.spring.eventhubs.support.EventHubsHeaders;
-import com.azure.spring.messaging.checkpoint.Checkpointer;
+import com.azure.spring.messaging.eventhubs.support.EventHubsHeaders;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Bean;
@@ -17,8 +16,6 @@
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
-import static com.azure.spring.messaging.AzureHeaders.CHECKPOINTER;
-
 @Configuration
 @Profile("batch")
 public class BatchProducerAndConsumerConfiguration {

diff --git a/...ava/com/azure/spring/sample/eventhubs/binder/DefaultProducerAndConsumerConfiguration.java b/...ava/com/azure/spring/sample/eventhubs/binder/DefaultProducerAndConsumerConfiguration.java
@@ -4,7 +4,7 @@
 package com.azure.spring.sample.eventhubs.binder;
 
 
-import com.azure.spring.eventhubs.support.EventHubsHeaders;
+import com.azure.spring.messaging.eventhubs.support.EventHubsHeaders;
 import com.azure.spring.messaging.checkpoint.Checkpointer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...java/com/azure/spring/sample/eventhubs/binder/ManualProducerAndConsumerConfiguration.java b/...java/com/azure/spring/sample/eventhubs/binder/ManualProducerAndConsumerConfiguration.java
@@ -4,7 +4,7 @@
 package com.azure.spring.sample.eventhubs.binder;
 
 
-import com.azure.spring.eventhubs.support.EventHubsHeaders;
+import com.azure.spring.messaging.eventhubs.support.EventHubsHeaders;
 import com.azure.spring.messaging.AzureHeaders;
 import com.azure.spring.messaging.checkpoint.Checkpointer;
 import org.slf4j.Logger;

diff --git a/...aces/src/main/java/com/azure/spring/sample/servicebus/CustomizedServiceBusProperties.java b/...aces/src/main/java/com/azure/spring/sample/servicebus/CustomizedServiceBusProperties.java
@@ -5,9 +5,9 @@
 
 import com.azure.spring.messaging.ConsumerIdentifier;
 import com.azure.spring.messaging.PropertiesSupplier;
-import com.azure.spring.servicebus.core.properties.CommonProperties;
-import com.azure.spring.servicebus.core.properties.ProcessorProperties;
-import com.azure.spring.servicebus.core.properties.ProducerProperties;
+import com.azure.spring.messaging.servicebus.core.properties.CommonProperties;
+import com.azure.spring.messaging.servicebus.core.properties.ProcessorProperties;
+import com.azure.spring.messaging.servicebus.core.properties.ProducerProperties;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
 

diff --git a/...spring/sample/servicebus/MultipleNamespacesAzureServiceBusMessagingAutoConfiguration.java b/...spring/sample/servicebus/MultipleNamespacesAzureServiceBusMessagingAutoConfiguration.java
@@ -6,16 +6,16 @@
 import com.azure.spring.messaging.PropertiesSupplier;
 import com.azure.spring.messaging.checkpoint.CheckpointConfig;
 import com.azure.spring.messaging.checkpoint.CheckpointMode;
-import com.azure.spring.servicebus.core.ServiceBusProcessorFactory;
-import com.azure.spring.servicebus.core.ServiceBusProducerFactory;
-import com.azure.spring.servicebus.core.ServiceBusTemplate;
-import com.azure.spring.servicebus.core.listener.ServiceBusMessageListenerContainer;
-import com.azure.spring.servicebus.core.properties.ProcessorProperties;
-import com.azure.spring.servicebus.core.properties.ProducerProperties;
-import com.azure.spring.servicebus.core.properties.ServiceBusContainerProperties;
-import com.azure.spring.servicebus.implementation.core.DefaultServiceBusNamespaceProcessorFactory;
-import com.azure.spring.servicebus.implementation.core.DefaultServiceBusNamespaceProducerFactory;
-import com.azure.spring.servicebus.support.converter.ServiceBusMessageConverter;
+import com.azure.spring.messaging.servicebus.core.ServiceBusProcessorFactory;
+import com.azure.spring.messaging.servicebus.core.ServiceBusProducerFactory;
+import com.azure.spring.messaging.servicebus.core.ServiceBusTemplate;
+import com.azure.spring.messaging.servicebus.core.listener.ServiceBusMessageListenerContainer;
+import com.azure.spring.messaging.servicebus.core.properties.ProcessorProperties;
+import com.azure.spring.messaging.servicebus.core.properties.ProducerProperties;
+import com.azure.spring.messaging.servicebus.core.properties.ServiceBusContainerProperties;
+import com.azure.spring.messaging.servicebus.implementation.core.DefaultServiceBusNamespaceProcessorFactory;
+import com.azure.spring.messaging.servicebus.implementation.core.DefaultServiceBusNamespaceProducerFactory;
+import com.azure.spring.messaging.servicebus.support.converter.ServiceBusMessageConverter;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;

diff --git a/...iple-namespaces/src/main/java/com/azure/spring/sample/servicebus/QueueReceiveService.java b/...iple-namespaces/src/main/java/com/azure/spring/sample/servicebus/QueueReceiveService.java
@@ -3,12 +3,12 @@
 
 package com.azure.spring.sample.servicebus;
 
-import com.azure.spring.integration.handler.DefaultMessageHandler;
+import com.azure.spring.integration.core.handler.DefaultMessageHandler;
 import com.azure.spring.integration.servicebus.inbound.ServiceBusInboundChannelAdapter;
 import com.azure.spring.messaging.AzureHeaders;
 import com.azure.spring.messaging.checkpoint.Checkpointer;
-import com.azure.spring.service.servicebus.properties.ServiceBusEntityType;
-import com.azure.spring.servicebus.core.ServiceBusTemplate;
+import com.azure.spring.cloud.service.servicebus.properties.ServiceBusEntityType;
+import com.azure.spring.messaging.servicebus.core.ServiceBusTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/...ultiple-namespaces/src/main/java/com/azure/spring/sample/servicebus/QueueSendService.java b/...ultiple-namespaces/src/main/java/com/azure/spring/sample/servicebus/QueueSendService.java
@@ -3,9 +3,9 @@
 
 package com.azure.spring.sample.servicebus;
 
-import com.azure.spring.integration.handler.DefaultMessageHandler;
-import com.azure.spring.service.servicebus.properties.ServiceBusEntityType;
-import com.azure.spring.servicebus.core.ServiceBusTemplate;
+import com.azure.spring.integration.core.handler.DefaultMessageHandler;
+import com.azure.spring.cloud.service.servicebus.properties.ServiceBusEntityType;
+import com.azure.spring.messaging.servicebus.core.ServiceBusTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Bean;

diff --git a/...le-namespace/src/main/java/com/azure/spring/sample/servicebus/QueueReceiveController.java b/...le-namespace/src/main/java/com/azure/spring/sample/servicebus/QueueReceiveController.java
@@ -8,9 +8,9 @@
 import com.azure.spring.messaging.checkpoint.CheckpointConfig;
 import com.azure.spring.messaging.checkpoint.CheckpointMode;
 import com.azure.spring.messaging.checkpoint.Checkpointer;
-import com.azure.spring.servicebus.core.ServiceBusProcessorFactory;
-import com.azure.spring.servicebus.core.listener.ServiceBusMessageListenerContainer;
-import com.azure.spring.servicebus.core.properties.ServiceBusContainerProperties;
+import com.azure.spring.messaging.servicebus.core.ServiceBusProcessorFactory;
+import com.azure.spring.messaging.servicebus.core.listener.ServiceBusMessageListenerContainer;
+import com.azure.spring.messaging.servicebus.core.properties.ServiceBusContainerProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Qualifier;

diff --git a/...ingle-namespace/src/main/java/com/azure/spring/sample/servicebus/QueueSendController.java b/...ingle-namespace/src/main/java/com/azure/spring/sample/servicebus/QueueSendController.java
@@ -3,9 +3,9 @@
 
 package com.azure.spring.sample.servicebus;
 
-import com.azure.spring.integration.handler.DefaultMessageHandler;
-import com.azure.spring.service.servicebus.properties.ServiceBusEntityType;
-import com.azure.spring.servicebus.core.ServiceBusTemplate;
+import com.azure.spring.integration.core.handler.DefaultMessageHandler;
+import com.azure.spring.cloud.service.servicebus.properties.ServiceBusEntityType;
+import com.azure.spring.messaging.servicebus.core.ServiceBusTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/...le-namespace/src/main/java/com/azure/spring/sample/servicebus/TopicReceiveController.java b/...le-namespace/src/main/java/com/azure/spring/sample/servicebus/TopicReceiveController.java
@@ -8,9 +8,9 @@
 import com.azure.spring.messaging.checkpoint.CheckpointConfig;
 import com.azure.spring.messaging.checkpoint.CheckpointMode;
 import com.azure.spring.messaging.checkpoint.Checkpointer;
-import com.azure.spring.servicebus.core.ServiceBusProcessorFactory;
-import com.azure.spring.servicebus.core.listener.ServiceBusMessageListenerContainer;
-import com.azure.spring.servicebus.core.properties.ServiceBusContainerProperties;
+import com.azure.spring.messaging.servicebus.core.ServiceBusProcessorFactory;
+import com.azure.spring.messaging.servicebus.core.listener.ServiceBusMessageListenerContainer;
+import com.azure.spring.messaging.servicebus.core.properties.ServiceBusContainerProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Qualifier;

diff --git a/...ingle-namespace/src/main/java/com/azure/spring/sample/servicebus/TopicSendController.java b/...ingle-namespace/src/main/java/com/azure/spring/sample/servicebus/TopicSendController.java
@@ -3,9 +3,9 @@
 
 package com.azure.spring.sample.servicebus;
 
-import com.azure.spring.integration.handler.DefaultMessageHandler;
-import com.azure.spring.service.servicebus.properties.ServiceBusEntityType;
-import com.azure.spring.servicebus.core.ServiceBusTemplate;
+import com.azure.spring.integration.core.handler.DefaultMessageHandler;
+import com.azure.spring.cloud.service.servicebus.properties.ServiceBusEntityType;
+import com.azure.spring.messaging.servicebus.core.ServiceBusTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/...queue-integration/src/main/java/com/azure/spring/sample/storage/queue/ReceiveService.java b/...queue-integration/src/main/java/com/azure/spring/sample/storage/queue/ReceiveService.java
@@ -6,7 +6,7 @@
 import com.azure.spring.integration.storage.queue.inbound.StorageQueueMessageSource;
 import com.azure.spring.messaging.AzureHeaders;
 import com.azure.spring.messaging.checkpoint.Checkpointer;
-import com.azure.spring.storage.queue.core.StorageQueueTemplate;
+import com.azure.spring.messaging.storage.queue.core.StorageQueueTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Bean;

diff --git a/...queue-integration/src/main/java/com/azure/spring/sample/storage/queue/SendController.java b/...queue-integration/src/main/java/com/azure/spring/sample/storage/queue/SendController.java
@@ -3,8 +3,8 @@
 
 package com.azure.spring.sample.storage.queue;
 
-import com.azure.spring.integration.handler.DefaultMessageHandler;
-import com.azure.spring.storage.queue.core.StorageQueueTemplate;
+import com.azure.spring.integration.core.handler.DefaultMessageHandler;
+import com.azure.spring.messaging.storage.queue.core.StorageQueueTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/...ava/com/azure/spring/sample/storage/queue/operation/StorageQueueOperationApplication.java b/...ava/com/azure/spring/sample/storage/queue/operation/StorageQueueOperationApplication.java
@@ -3,7 +3,7 @@
 
 package com.azure.spring.sample.storage.queue.operation;
 
-import com.azure.spring.storage.queue.core.StorageQueueTemplate;
+import com.azure.spring.messaging.storage.queue.core.StorageQueueTemplate;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 

diff --git a/...peration/src/main/java/com/azure/spring/sample/storage/queue/operation/WebController.java b/...peration/src/main/java/com/azure/spring/sample/storage/queue/operation/WebController.java
@@ -5,7 +5,7 @@
 
 import com.azure.spring.messaging.AzureHeaders;
 import com.azure.spring.messaging.checkpoint.Checkpointer;
-import com.azure.spring.storage.queue.core.StorageQueueTemplate;
+import com.azure.spring.messaging.storage.queue.core.StorageQueueTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/...ge-blob-sample/src/main/java/com/azure/spring/sample/storage/resource/BlobController.java b/...ge-blob-sample/src/main/java/com/azure/spring/sample/storage/resource/BlobController.java
@@ -3,7 +3,7 @@
 
 package com.azure.spring.sample.storage.resource;
 
-import com.azure.spring.core.resource.AzureStorageBlobProtocolResolver;
+import com.azure.spring.cloud.core.resource.AzureStorageBlobProtocolResolver;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;