From 770047871b2ecbdbae140b242b3e8d9d266aec35 Mon Sep 17 00:00:00 2001 From: Marius Bogoevici Date: Thu, 19 Nov 2015 17:15:02 -0500 Subject: [PATCH] Moved Rabbit management outside with the Rabbit bus --- .../stream/binder/rabbit/LocalizedQueueConnectionFactory.java | 1 - .../cloud/stream/binder/rabbit}/RabbitAdminException.java | 2 +- .../cloud/stream/binder/rabbit/RabbitBindingCleaner.java | 2 -- .../cloud/stream/binder/rabbit}/RabbitManagementUtils.java | 2 +- .../cloud/stream/binder/rabbit/RabbitBinderCleanerTests.java | 2 -- 5 files changed, 2 insertions(+), 7 deletions(-) rename spring-cloud-stream-binders/{spring-cloud-stream-binder-spi/src/main/java/org/springframework/cloud/stream/binder => spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit}/RabbitAdminException.java (94%) rename spring-cloud-stream-binders/{spring-cloud-stream-binder-spi/src/main/java/org/springframework/cloud/stream/binder => spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit}/RabbitManagementUtils.java (98%) diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/LocalizedQueueConnectionFactory.java b/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/LocalizedQueueConnectionFactory.java index 6f342f417..7815bba3c 100644 --- a/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/LocalizedQueueConnectionFactory.java +++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/LocalizedQueueConnectionFactory.java @@ -35,7 +35,6 @@ import org.springframework.core.io.Resource; import org.springframework.util.Assert; import org.springframework.web.client.RestTemplate; import org.springframework.web.util.UriComponentsBuilder; -import org.springframework.cloud.stream.binder.RabbitManagementUtils; /** diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-spi/src/main/java/org/springframework/cloud/stream/binder/RabbitAdminException.java b/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitAdminException.java similarity index 94% rename from spring-cloud-stream-binders/spring-cloud-stream-binder-spi/src/main/java/org/springframework/cloud/stream/binder/RabbitAdminException.java rename to spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitAdminException.java index 1a4e7b8d6..191b2e2e1 100644 --- a/spring-cloud-stream-binders/spring-cloud-stream-binder-spi/src/main/java/org/springframework/cloud/stream/binder/RabbitAdminException.java +++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitAdminException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.stream.binder; +package org.springframework.cloud.stream.binder.rabbit; /** diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitBindingCleaner.java b/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitBindingCleaner.java index 7a8022c59..21e0a03f0 100644 --- a/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitBindingCleaner.java +++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitBindingCleaner.java @@ -28,8 +28,6 @@ import org.slf4j.LoggerFactory; import org.springframework.cloud.stream.binder.BinderUtils; import org.springframework.cloud.stream.binder.BindingCleaner; import org.springframework.cloud.stream.binder.MessageChannelBinderSupport; -import org.springframework.cloud.stream.binder.RabbitAdminException; -import org.springframework.cloud.stream.binder.RabbitManagementUtils; import org.springframework.web.client.RestTemplate; import org.springframework.web.util.UriComponentsBuilder; diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-spi/src/main/java/org/springframework/cloud/stream/binder/RabbitManagementUtils.java b/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitManagementUtils.java similarity index 98% rename from spring-cloud-stream-binders/spring-cloud-stream-binder-spi/src/main/java/org/springframework/cloud/stream/binder/RabbitManagementUtils.java rename to spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitManagementUtils.java index cc2bc97d4..58f7cad5b 100644 --- a/spring-cloud-stream-binders/spring-cloud-stream-binder-spi/src/main/java/org/springframework/cloud/stream/binder/RabbitManagementUtils.java +++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitManagementUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.stream.binder; +package org.springframework.cloud.stream.binder.rabbit; import java.net.URI; import java.net.URISyntaxException; diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/test/java/org/springframework/cloud/stream/binder/rabbit/RabbitBinderCleanerTests.java b/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/test/java/org/springframework/cloud/stream/binder/rabbit/RabbitBinderCleanerTests.java index fb1f75178..a772e7774 100644 --- a/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/test/java/org/springframework/cloud/stream/binder/rabbit/RabbitBinderCleanerTests.java +++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/test/java/org/springframework/cloud/stream/binder/rabbit/RabbitBinderCleanerTests.java @@ -39,8 +39,6 @@ import org.springframework.amqp.rabbit.core.ChannelCallback; import org.springframework.amqp.rabbit.core.RabbitAdmin; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.cloud.stream.binder.MessageChannelBinderSupport; -import org.springframework.cloud.stream.binder.RabbitAdminException; -import org.springframework.cloud.stream.binder.RabbitManagementUtils; import org.springframework.cloud.stream.test.junit.rabbit.RabbitTestSupport; import org.springframework.web.client.RestTemplate; import org.springframework.web.util.UriComponentsBuilder;