From 39d7e244b9641ee236ecd1937f966800edb16c0f Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Wed, 8 Jul 2015 17:05:33 +0100 Subject: [PATCH] Change package names --- .../streams}/EnableMessageBus.java | 10 +++++----- .../streams}/adapter/ChannelBinding.java | 2 +- .../streams}/adapter/ChannelLocator.java | 2 +- .../streams}/adapter/ChannelsMetadata.java | 4 ++-- .../streams}/adapter/DefaultChannelLocator.java | 4 ++-- .../runner => cloud/streams}/adapter/Input.java | 2 +- .../streams}/adapter/InputChannelBinding.java | 2 +- .../streams}/adapter/MessageBusAdapter.java | 4 ++-- .../runner => cloud/streams}/adapter/Output.java | 2 +- .../streams}/adapter/OutputChannelBinding.java | 2 +- .../DiscoveryClientAutoConfiguration.java | 10 +++++----- .../discovery/DiscoveryClientChannelLocator.java | 8 ++++---- .../streams}/config/LifecycleConfiguration.java | 4 ++-- .../config/MessageBusAdapterConfiguration.java | 16 ++++++++-------- .../streams}/config/MessageBusProperties.java | 2 +- .../config/RabbitServiceConfiguration.java | 2 +- .../config/RedisServiceConfiguration.java | 2 +- .../streams}/endpoint/ChannelsEndpoint.java | 8 ++++---- .../src/main/resources/META-INF/spring.factories | 2 +- .../adapter/DefaultChannelLocatorTests.java | 5 +++-- .../DiscoveryClientChannelLocatorTests.java | 9 ++++++--- .../MessageBusAdapterConfigurationTests.java | 12 +++++++----- .../ModuleOptionsPropertySourceInitializer.java | 4 ++-- .../src/main/resources/META-INF/spring.factories | 2 +- .../sink/src/main/java/demo/SinkApplication.java | 2 +- .../src/main/java/demo/ModuleApplication.java | 2 +- .../src/main/java/demo/SourceApplication.java | 2 +- .../tap/src/main/java/demo/TapApplication.java | 2 +- 28 files changed, 67 insertions(+), 61 deletions(-) rename spring-cloud-streams/src/main/java/org/springframework/{bus/runner => cloud/streams}/EnableMessageBus.java (79%) rename spring-cloud-streams/src/main/java/org/springframework/{bus/runner => cloud/streams}/adapter/ChannelBinding.java (95%) rename spring-cloud-streams/src/main/java/org/springframework/{bus/runner => cloud/streams}/adapter/ChannelLocator.java (93%) rename spring-cloud-streams/src/main/java/org/springframework/{bus/runner => cloud/streams}/adapter/ChannelsMetadata.java (92%) rename spring-cloud-streams/src/main/java/org/springframework/{bus/runner => cloud/streams}/adapter/DefaultChannelLocator.java (94%) rename spring-cloud-streams/src/main/java/org/springframework/{bus/runner => cloud/streams}/adapter/Input.java (96%) rename spring-cloud-streams/src/main/java/org/springframework/{bus/runner => cloud/streams}/adapter/InputChannelBinding.java (94%) rename spring-cloud-streams/src/main/java/org/springframework/{bus/runner => cloud/streams}/adapter/MessageBusAdapter.java (99%) rename spring-cloud-streams/src/main/java/org/springframework/{bus/runner => cloud/streams}/adapter/Output.java (96%) rename spring-cloud-streams/src/main/java/org/springframework/{bus/runner => cloud/streams}/adapter/OutputChannelBinding.java (96%) rename spring-cloud-streams/src/main/java/org/springframework/{bus/runner => cloud/streams}/adapter/discovery/DiscoveryClientAutoConfiguration.java (87%) rename spring-cloud-streams/src/main/java/org/springframework/{bus/runner => cloud/streams}/adapter/discovery/DiscoveryClientChannelLocator.java (92%) rename spring-cloud-streams/src/main/java/org/springframework/{bus/runner => cloud/streams}/config/LifecycleConfiguration.java (90%) rename spring-cloud-streams/src/main/java/org/springframework/{bus/runner => cloud/streams}/config/MessageBusAdapterConfiguration.java (91%) rename spring-cloud-streams/src/main/java/org/springframework/{bus/runner => cloud/streams}/config/MessageBusProperties.java (99%) rename spring-cloud-streams/src/main/java/org/springframework/{bus/runner => cloud/streams}/config/RabbitServiceConfiguration.java (97%) rename spring-cloud-streams/src/main/java/org/springframework/{bus/runner => cloud/streams}/config/RedisServiceConfiguration.java (97%) rename spring-cloud-streams/src/main/java/org/springframework/{bus/runner => cloud/streams}/endpoint/ChannelsEndpoint.java (90%) rename spring-cloud-streams/src/test/java/org/springframework/{bus/runner => cloud/streams}/adapter/DefaultChannelLocatorTests.java (92%) rename spring-cloud-streams/src/test/java/org/springframework/{bus/runner => cloud/streams}/adapter/DiscoveryClientChannelLocatorTests.java (86%) rename spring-cloud-streams/src/test/java/org/springframework/{bus/runner => cloud/streams}/config/MessageBusAdapterConfigurationTests.java (91%) rename spring-xd-runner/src/main/java/org/springframework/{bus/xd/bootstrap => cloud/streams/xd}/ModuleOptionsPropertySourceInitializer.java (97%) diff --git a/spring-cloud-streams/src/main/java/org/springframework/bus/runner/EnableMessageBus.java b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/EnableMessageBus.java similarity index 79% rename from spring-cloud-streams/src/main/java/org/springframework/bus/runner/EnableMessageBus.java rename to spring-cloud-streams/src/main/java/org/springframework/cloud/streams/EnableMessageBus.java index ffdbc3137..aa669eec7 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/bus/runner/EnableMessageBus.java +++ b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/EnableMessageBus.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bus.runner; +package org.springframework.cloud.streams; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -23,10 +23,10 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.springframework.bus.runner.config.LifecycleConfiguration; -import org.springframework.bus.runner.config.MessageBusAdapterConfiguration; -import org.springframework.bus.runner.config.RabbitServiceConfiguration; -import org.springframework.bus.runner.config.RedisServiceConfiguration; +import org.springframework.cloud.streams.config.LifecycleConfiguration; +import org.springframework.cloud.streams.config.MessageBusAdapterConfiguration; +import org.springframework.cloud.streams.config.RabbitServiceConfiguration; +import org.springframework.cloud.streams.config.RedisServiceConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/ChannelBinding.java b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/ChannelBinding.java similarity index 95% rename from spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/ChannelBinding.java rename to spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/ChannelBinding.java index 2c9cc4600..e0332152d 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/ChannelBinding.java +++ b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/ChannelBinding.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bus.runner.adapter; +package org.springframework.cloud.streams.adapter; /** * Represents a binding between a local and remote message channel. diff --git a/spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/ChannelLocator.java b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/ChannelLocator.java similarity index 93% rename from spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/ChannelLocator.java rename to spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/ChannelLocator.java index b235c1ef5..085de8b2e 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/ChannelLocator.java +++ b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/ChannelLocator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bus.runner.adapter; +package org.springframework.cloud.streams.adapter; /** * @author Dave Syer diff --git a/spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/ChannelsMetadata.java b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/ChannelsMetadata.java similarity index 92% rename from spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/ChannelsMetadata.java rename to spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/ChannelsMetadata.java index a37b5fc99..0053a3c04 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/ChannelsMetadata.java +++ b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/ChannelsMetadata.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.bus.runner.adapter; +package org.springframework.cloud.streams.adapter; import java.util.Collection; import java.util.Collections; -import org.springframework.bus.runner.config.MessageBusProperties; +import org.springframework.cloud.streams.config.MessageBusProperties; /** * @author Dave Syer diff --git a/spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/DefaultChannelLocator.java b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/DefaultChannelLocator.java similarity index 94% rename from spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/DefaultChannelLocator.java rename to spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/DefaultChannelLocator.java index b17c90374..90c3eda93 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/DefaultChannelLocator.java +++ b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/DefaultChannelLocator.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.bus.runner.adapter; +package org.springframework.cloud.streams.adapter; -import org.springframework.bus.runner.config.MessageBusProperties; +import org.springframework.cloud.streams.config.MessageBusProperties; import org.springframework.util.StringUtils; /** diff --git a/spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/Input.java b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/Input.java similarity index 96% rename from spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/Input.java rename to spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/Input.java index eb94465af..22c4c43fb 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/Input.java +++ b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/Input.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bus.runner.adapter; +package org.springframework.cloud.streams.adapter; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/InputChannelBinding.java b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/InputChannelBinding.java similarity index 94% rename from spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/InputChannelBinding.java rename to spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/InputChannelBinding.java index 3871293bc..d2fc37224 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/InputChannelBinding.java +++ b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/InputChannelBinding.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bus.runner.adapter; +package org.springframework.cloud.streams.adapter; /** * @author Dave Syer diff --git a/spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/MessageBusAdapter.java b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/MessageBusAdapter.java similarity index 99% rename from spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/MessageBusAdapter.java rename to spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/MessageBusAdapter.java index 64d21ad59..b57a9b3e6 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/MessageBusAdapter.java +++ b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/MessageBusAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bus.runner.adapter; +package org.springframework.cloud.streams.adapter; import java.util.ArrayList; import java.util.Collection; @@ -29,7 +29,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeansException; -import org.springframework.bus.runner.config.MessageBusProperties; +import org.springframework.cloud.streams.config.MessageBusProperties; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.ConfigurableApplicationContext; diff --git a/spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/Output.java b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/Output.java similarity index 96% rename from spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/Output.java rename to spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/Output.java index f10736b7a..9d5b8b8a7 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/Output.java +++ b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/Output.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bus.runner.adapter; +package org.springframework.cloud.streams.adapter; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/OutputChannelBinding.java b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/OutputChannelBinding.java similarity index 96% rename from spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/OutputChannelBinding.java rename to spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/OutputChannelBinding.java index a43075653..8ba652742 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/OutputChannelBinding.java +++ b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/OutputChannelBinding.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bus.runner.adapter; +package org.springframework.cloud.streams.adapter; /** diff --git a/spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/discovery/DiscoveryClientAutoConfiguration.java b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/discovery/DiscoveryClientAutoConfiguration.java similarity index 87% rename from spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/discovery/DiscoveryClientAutoConfiguration.java rename to spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/discovery/DiscoveryClientAutoConfiguration.java index 7623ea3e1..c606960cb 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/discovery/DiscoveryClientAutoConfiguration.java +++ b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/discovery/DiscoveryClientAutoConfiguration.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.springframework.bus.runner.adapter.discovery; +package org.springframework.cloud.streams.adapter.discovery; import javax.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import org.springframework.bus.runner.adapter.ChannelLocator; -import org.springframework.bus.runner.adapter.Output; -import org.springframework.bus.runner.adapter.MessageBusAdapter; -import org.springframework.bus.runner.adapter.Input; import org.springframework.cloud.client.discovery.DiscoveryClient; import org.springframework.cloud.client.discovery.event.HeartbeatEvent; import org.springframework.cloud.client.discovery.event.HeartbeatMonitor; +import org.springframework.cloud.streams.adapter.ChannelLocator; +import org.springframework.cloud.streams.adapter.Input; +import org.springframework.cloud.streams.adapter.MessageBusAdapter; +import org.springframework.cloud.streams.adapter.Output; import org.springframework.context.annotation.Configuration; import org.springframework.context.event.EventListener; diff --git a/spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/discovery/DiscoveryClientChannelLocator.java b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/discovery/DiscoveryClientChannelLocator.java similarity index 92% rename from spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/discovery/DiscoveryClientChannelLocator.java rename to spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/discovery/DiscoveryClientChannelLocator.java index b81588f6d..56bfb2ebe 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/bus/runner/adapter/discovery/DiscoveryClientChannelLocator.java +++ b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/adapter/discovery/DiscoveryClientChannelLocator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bus.runner.adapter.discovery; +package org.springframework.cloud.streams.adapter.discovery; import java.net.URI; import java.util.Collection; @@ -24,11 +24,11 @@ import java.util.Random; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.bus.runner.adapter.ChannelBinding; -import org.springframework.bus.runner.adapter.ChannelLocator; -import org.springframework.bus.runner.adapter.ChannelsMetadata; import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.discovery.DiscoveryClient; +import org.springframework.cloud.streams.adapter.ChannelBinding; +import org.springframework.cloud.streams.adapter.ChannelLocator; +import org.springframework.cloud.streams.adapter.ChannelsMetadata; import org.springframework.web.client.RestOperations; import org.springframework.web.client.RestTemplate; import org.springframework.web.util.UriComponentsBuilder; diff --git a/spring-cloud-streams/src/main/java/org/springframework/bus/runner/config/LifecycleConfiguration.java b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/LifecycleConfiguration.java similarity index 90% rename from spring-cloud-streams/src/main/java/org/springframework/bus/runner/config/LifecycleConfiguration.java rename to spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/LifecycleConfiguration.java index 3248febeb..b4ac9966a 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/bus/runner/config/LifecycleConfiguration.java +++ b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/LifecycleConfiguration.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.bus.runner.config; +package org.springframework.cloud.streams.config; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; -import org.springframework.bus.runner.adapter.MessageBusAdapter; +import org.springframework.cloud.streams.adapter.MessageBusAdapter; import org.springframework.context.annotation.Configuration; /** diff --git a/spring-cloud-streams/src/main/java/org/springframework/bus/runner/config/MessageBusAdapterConfiguration.java b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/MessageBusAdapterConfiguration.java similarity index 91% rename from spring-cloud-streams/src/main/java/org/springframework/bus/runner/config/MessageBusAdapterConfiguration.java rename to spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/MessageBusAdapterConfiguration.java index feb15ad1f..2f347f34a 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/bus/runner/config/MessageBusAdapterConfiguration.java +++ b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/MessageBusAdapterConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bus.runner.config; +package org.springframework.cloud.streams.config; import java.util.Arrays; import java.util.Collection; @@ -29,13 +29,13 @@ import org.springframework.beans.factory.BeanFactoryUtils; import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.bus.runner.adapter.ChannelLocator; -import org.springframework.bus.runner.adapter.Input; -import org.springframework.bus.runner.adapter.InputChannelBinding; -import org.springframework.bus.runner.adapter.MessageBusAdapter; -import org.springframework.bus.runner.adapter.Output; -import org.springframework.bus.runner.adapter.OutputChannelBinding; -import org.springframework.bus.runner.endpoint.ChannelsEndpoint; +import org.springframework.cloud.streams.adapter.ChannelLocator; +import org.springframework.cloud.streams.adapter.Input; +import org.springframework.cloud.streams.adapter.InputChannelBinding; +import org.springframework.cloud.streams.adapter.MessageBusAdapter; +import org.springframework.cloud.streams.adapter.Output; +import org.springframework.cloud.streams.adapter.OutputChannelBinding; +import org.springframework.cloud.streams.endpoint.ChannelsEndpoint; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.ImportResource; diff --git a/spring-cloud-streams/src/main/java/org/springframework/bus/runner/config/MessageBusProperties.java b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/MessageBusProperties.java similarity index 99% rename from spring-cloud-streams/src/main/java/org/springframework/bus/runner/config/MessageBusProperties.java rename to spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/MessageBusProperties.java index f846acea4..b85714426 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/bus/runner/config/MessageBusProperties.java +++ b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/MessageBusProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bus.runner.config; +package org.springframework.cloud.streams.config; import java.util.Properties; diff --git a/spring-cloud-streams/src/main/java/org/springframework/bus/runner/config/RabbitServiceConfiguration.java b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/RabbitServiceConfiguration.java similarity index 97% rename from spring-cloud-streams/src/main/java/org/springframework/bus/runner/config/RabbitServiceConfiguration.java rename to spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/RabbitServiceConfiguration.java index 990c9c9e8..b0903f021 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/bus/runner/config/RabbitServiceConfiguration.java +++ b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/RabbitServiceConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bus.runner.config; +package org.springframework.cloud.streams.config; import org.springframework.amqp.rabbit.connection.ConnectionFactory; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/spring-cloud-streams/src/main/java/org/springframework/bus/runner/config/RedisServiceConfiguration.java b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/RedisServiceConfiguration.java similarity index 97% rename from spring-cloud-streams/src/main/java/org/springframework/bus/runner/config/RedisServiceConfiguration.java rename to spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/RedisServiceConfiguration.java index 569d89494..72ad24b47 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/bus/runner/config/RedisServiceConfiguration.java +++ b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/config/RedisServiceConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bus.runner.config; +package org.springframework.cloud.streams.config; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.cloud.Cloud; diff --git a/spring-cloud-streams/src/main/java/org/springframework/bus/runner/endpoint/ChannelsEndpoint.java b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/endpoint/ChannelsEndpoint.java similarity index 90% rename from spring-cloud-streams/src/main/java/org/springframework/bus/runner/endpoint/ChannelsEndpoint.java rename to spring-cloud-streams/src/main/java/org/springframework/cloud/streams/endpoint/ChannelsEndpoint.java index df3e832bf..c217e4c88 100644 --- a/spring-cloud-streams/src/main/java/org/springframework/bus/runner/endpoint/ChannelsEndpoint.java +++ b/spring-cloud-streams/src/main/java/org/springframework/cloud/streams/endpoint/ChannelsEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bus.runner.endpoint; +package org.springframework.cloud.streams.endpoint; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -22,9 +22,9 @@ import java.util.List; import java.util.Map; import org.springframework.boot.actuate.endpoint.AbstractEndpoint; -import org.springframework.bus.runner.adapter.ChannelsMetadata; -import org.springframework.bus.runner.adapter.MessageBusAdapter; -import org.springframework.bus.runner.adapter.OutputChannelBinding; +import org.springframework.cloud.streams.adapter.ChannelsMetadata; +import org.springframework.cloud.streams.adapter.MessageBusAdapter; +import org.springframework.cloud.streams.adapter.OutputChannelBinding; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; diff --git a/spring-cloud-streams/src/main/resources/META-INF/spring.factories b/spring-cloud-streams/src/main/resources/META-INF/spring.factories index f30e7d9e3..072c4fa18 100644 --- a/spring-cloud-streams/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-streams/src/main/resources/META-INF/spring.factories @@ -1,3 +1,3 @@ # AutoConfiguration org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.bus.runner.adapter.discovery.DiscoveryClientAutoConfiguration \ No newline at end of file +org.springframework.cloud.streams.adapter.discovery.DiscoveryClientAutoConfiguration \ No newline at end of file diff --git a/spring-cloud-streams/src/test/java/org/springframework/bus/runner/adapter/DefaultChannelLocatorTests.java b/spring-cloud-streams/src/test/java/org/springframework/cloud/streams/adapter/DefaultChannelLocatorTests.java similarity index 92% rename from spring-cloud-streams/src/test/java/org/springframework/bus/runner/adapter/DefaultChannelLocatorTests.java rename to spring-cloud-streams/src/test/java/org/springframework/cloud/streams/adapter/DefaultChannelLocatorTests.java index 38f9b8f21..544bb5736 100644 --- a/spring-cloud-streams/src/test/java/org/springframework/bus/runner/adapter/DefaultChannelLocatorTests.java +++ b/spring-cloud-streams/src/test/java/org/springframework/cloud/streams/adapter/DefaultChannelLocatorTests.java @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bus.runner.adapter; +package org.springframework.cloud.streams.adapter; import static org.junit.Assert.assertEquals; import org.junit.Test; -import org.springframework.bus.runner.config.MessageBusProperties; +import org.springframework.cloud.streams.adapter.DefaultChannelLocator; +import org.springframework.cloud.streams.config.MessageBusProperties; /** * @author Dave Syer diff --git a/spring-cloud-streams/src/test/java/org/springframework/bus/runner/adapter/DiscoveryClientChannelLocatorTests.java b/spring-cloud-streams/src/test/java/org/springframework/cloud/streams/adapter/DiscoveryClientChannelLocatorTests.java similarity index 86% rename from spring-cloud-streams/src/test/java/org/springframework/bus/runner/adapter/DiscoveryClientChannelLocatorTests.java rename to spring-cloud-streams/src/test/java/org/springframework/cloud/streams/adapter/DiscoveryClientChannelLocatorTests.java index a0f983f05..857ee21ac 100644 --- a/spring-cloud-streams/src/test/java/org/springframework/bus/runner/adapter/DiscoveryClientChannelLocatorTests.java +++ b/spring-cloud-streams/src/test/java/org/springframework/cloud/streams/adapter/DiscoveryClientChannelLocatorTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bus.runner.adapter; +package org.springframework.cloud.streams.adapter; import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.any; @@ -26,10 +26,13 @@ import java.util.HashSet; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import org.springframework.bus.runner.adapter.discovery.DiscoveryClientChannelLocator; -import org.springframework.bus.runner.config.MessageBusProperties; import org.springframework.cloud.client.DefaultServiceInstance; import org.springframework.cloud.client.discovery.DiscoveryClient; +import org.springframework.cloud.streams.adapter.ChannelsMetadata; +import org.springframework.cloud.streams.adapter.InputChannelBinding; +import org.springframework.cloud.streams.adapter.OutputChannelBinding; +import org.springframework.cloud.streams.adapter.discovery.DiscoveryClientChannelLocator; +import org.springframework.cloud.streams.config.MessageBusProperties; import org.springframework.web.client.RestOperations; /** diff --git a/spring-cloud-streams/src/test/java/org/springframework/bus/runner/config/MessageBusAdapterConfigurationTests.java b/spring-cloud-streams/src/test/java/org/springframework/cloud/streams/config/MessageBusAdapterConfigurationTests.java similarity index 91% rename from spring-cloud-streams/src/test/java/org/springframework/bus/runner/config/MessageBusAdapterConfigurationTests.java rename to spring-cloud-streams/src/test/java/org/springframework/cloud/streams/config/MessageBusAdapterConfigurationTests.java index 834e33239..ec479c136 100644 --- a/spring-cloud-streams/src/test/java/org/springframework/bus/runner/config/MessageBusAdapterConfigurationTests.java +++ b/spring-cloud-streams/src/test/java/org/springframework/cloud/streams/config/MessageBusAdapterConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bus.runner.config; +package org.springframework.cloud.streams.config; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -29,10 +29,12 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.boot.test.SpringApplicationConfiguration; -import org.springframework.bus.runner.adapter.ChannelBinding; -import org.springframework.bus.runner.adapter.MessageBusAdapter; -import org.springframework.bus.runner.adapter.OutputChannelBinding; -import org.springframework.bus.runner.config.MessageBusAdapterConfigurationTests.Empty; +import org.springframework.cloud.streams.adapter.ChannelBinding; +import org.springframework.cloud.streams.adapter.MessageBusAdapter; +import org.springframework.cloud.streams.adapter.OutputChannelBinding; +import org.springframework.cloud.streams.config.MessageBusAdapterConfiguration; +import org.springframework.cloud.streams.config.MessageBusProperties; +import org.springframework.cloud.streams.config.MessageBusAdapterConfigurationTests.Empty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/spring-xd-runner/src/main/java/org/springframework/bus/xd/bootstrap/ModuleOptionsPropertySourceInitializer.java b/spring-xd-runner/src/main/java/org/springframework/cloud/streams/xd/ModuleOptionsPropertySourceInitializer.java similarity index 97% rename from spring-xd-runner/src/main/java/org/springframework/bus/xd/bootstrap/ModuleOptionsPropertySourceInitializer.java rename to spring-xd-runner/src/main/java/org/springframework/cloud/streams/xd/ModuleOptionsPropertySourceInitializer.java index f918276c4..84531b3d0 100644 --- a/spring-xd-runner/src/main/java/org/springframework/bus/xd/bootstrap/ModuleOptionsPropertySourceInitializer.java +++ b/spring-xd-runner/src/main/java/org/springframework/cloud/streams/xd/ModuleOptionsPropertySourceInitializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bus.xd.bootstrap; +package org.springframework.cloud.streams.xd; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -24,7 +24,7 @@ import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.bus.runner.config.MessageBusProperties; +import org.springframework.cloud.streams.config.MessageBusProperties; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; diff --git a/spring-xd-runner/src/main/resources/META-INF/spring.factories b/spring-xd-runner/src/main/resources/META-INF/spring.factories index b4c8230a6..2606d14dd 100644 --- a/spring-xd-runner/src/main/resources/META-INF/spring.factories +++ b/spring-xd-runner/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.cloud.bootstrap.BootstrapConfiguration:\ -org.springframework.bus.xd.bootstrap.ModuleOptionsPropertySourceInitializer \ No newline at end of file +org.springframework.cloud.streams.xd.ModuleOptionsPropertySourceInitializer \ No newline at end of file diff --git a/spring-xd-samples/sink/src/main/java/demo/SinkApplication.java b/spring-xd-samples/sink/src/main/java/demo/SinkApplication.java index c15d582e7..400e67299 100644 --- a/spring-xd-samples/sink/src/main/java/demo/SinkApplication.java +++ b/spring-xd-samples/sink/src/main/java/demo/SinkApplication.java @@ -2,7 +2,7 @@ package demo; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.bus.runner.EnableMessageBus; +import org.springframework.cloud.streams.EnableMessageBus; import org.springframework.context.annotation.ComponentScan; import config.ModuleDefinition; diff --git a/spring-xd-samples/source-xml/src/main/java/demo/ModuleApplication.java b/spring-xd-samples/source-xml/src/main/java/demo/ModuleApplication.java index 03007d978..61cbb5cf5 100644 --- a/spring-xd-samples/source-xml/src/main/java/demo/ModuleApplication.java +++ b/spring-xd-samples/source-xml/src/main/java/demo/ModuleApplication.java @@ -2,7 +2,7 @@ package demo; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.bus.runner.EnableMessageBus; +import org.springframework.cloud.streams.EnableMessageBus; import org.springframework.context.annotation.ImportResource; import org.springframework.context.annotation.PropertySource; diff --git a/spring-xd-samples/source/src/main/java/demo/SourceApplication.java b/spring-xd-samples/source/src/main/java/demo/SourceApplication.java index f4011f4bd..5b74ec926 100644 --- a/spring-xd-samples/source/src/main/java/demo/SourceApplication.java +++ b/spring-xd-samples/source/src/main/java/demo/SourceApplication.java @@ -2,7 +2,7 @@ package demo; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.bus.runner.EnableMessageBus; +import org.springframework.cloud.streams.EnableMessageBus; import org.springframework.context.annotation.ComponentScan; import config.ModuleDefinition; diff --git a/spring-xd-samples/tap/src/main/java/demo/TapApplication.java b/spring-xd-samples/tap/src/main/java/demo/TapApplication.java index 1c6f957db..08843af09 100644 --- a/spring-xd-samples/tap/src/main/java/demo/TapApplication.java +++ b/spring-xd-samples/tap/src/main/java/demo/TapApplication.java @@ -2,7 +2,7 @@ package demo; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.bus.runner.EnableMessageBus; +import org.springframework.cloud.streams.EnableMessageBus; import org.springframework.context.annotation.ComponentScan; import config.ModuleDefinition;