SpringCloud/spring-cloud-stream
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make AggregateApplication package local

Browse Source 
Fixes #474

- Now the only API for aggregating is AggregateApplicationBuilder
- add namespace tests
This commit is contained in:
Marius Bogoevici
2016-04-08 08:46:38 -04:00
parent af470273bb
commit 0bbabaf705
2 changed files with 43 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-cloud-stream/src/main/java/org/springframework/cloud/stream/aggregate/AggregateApplication.java
View File

@@ -35,7 +35,7 @@ import org.springframework.messaging.SubscribableChannel;
* @author Ilayaperumal Gopinathan
* @author Venil Noronha
*/
public class AggregateApplication {
class AggregateApplication {
private static final String SPRING_CLOUD_STREAM_INTERNAL_PREFIX = "spring.cloud.stream.internal";
@@ -55,14 +55,14 @@ public class AggregateApplication {
*
* @return the resulting parent context for the aggregate
*/
public static ConfigurableApplicationContext run(Class<?>[] apps, String[] parentArgs, String[][] appArgs) {
static ConfigurableApplicationContext run(Class<?>[] apps, String[] parentArgs, String[][] appArgs) {
ConfigurableApplicationContext parentContext = createParentContext(parentArgs != null ? parentArgs
: new String[0]);
runEmbedded(parentContext, apps, appArgs);
return parentContext;
}
public static ConfigurableApplicationContext run(Class<?>... apps) {
static ConfigurableApplicationContext run(Class<?>... apps) {
return run(apps, null, null);
}
@@ -73,7 +73,7 @@ public class AggregateApplication {
* @param apps a list of classes, representing root context definitions for apps
* @param args arguments for the apps
*/
public static void runEmbedded(ConfigurableApplicationContext parentContext,
static void runEmbedded(ConfigurableApplicationContext parentContext,
Class<?>[] apps, String[][] args) {
SharedChannelRegistry bean = parentContext.getBean(SharedChannelRegistry.class);
prepareSharedChannelRegistry(bean, apps);
@@ -81,7 +81,7 @@ public class AggregateApplication {
createChildContexts(parentContext, apps, args);
}
protected static ConfigurableApplicationContext createParentContext(String[] args) {
static ConfigurableApplicationContext createParentContext(String[] args) {
SpringApplicationBuilder aggregatorParentConfiguration = new SpringApplicationBuilder();
aggregatorParentConfiguration
.sources(AggregatorParentConfiguration.class)
@@ -92,7 +92,7 @@ public class AggregateApplication {
return aggregatorParentConfiguration.run(args);
}
private static void createChildContexts(ConfigurableApplicationContext parentContext,
static void createChildContexts(ConfigurableApplicationContext parentContext,
Class<?>[] apps, String args[][]) {
for (int i = apps.length - 1; i >= 0; i--) {
String appClassName = apps[i].getName();
@@ -101,7 +101,7 @@ public class AggregateApplication {
}
}
protected static String getNamespace(String appClassName, int index) {
static String getNamespace(String appClassName, int index) {
return appClassName + "_" + index;
}
@@ -117,7 +117,7 @@ public class AggregateApplication {
.parent(applicationContext);
}
protected static void prepareSharedChannelRegistry(SharedChannelRegistry sharedChannelRegistry, Class<?>[] apps) {
static void prepareSharedChannelRegistry(SharedChannelRegistry sharedChannelRegistry, Class<?>[] apps) {
LinkedHashMap<Class<?>, String> appsToRegister = new LinkedHashMap<>();
for (int i = apps.length - 1; i >= 0; i--) {
String appClassName = apps[i].getName();
@@ -126,7 +126,7 @@ public class AggregateApplication {
prepareSharedChannelRegistry(sharedChannelRegistry, appsToRegister);
}
protected static void prepareSharedChannelRegistry(SharedChannelRegistry sharedChannelRegistry,
static void prepareSharedChannelRegistry(SharedChannelRegistry sharedChannelRegistry,
LinkedHashMap<Class<?>, String> appsWithNamespace) {
int i = 0;
SubscribableChannel sharedChannel = null;

37
spring-cloud-stream/src/test/java/org/springframework/cloud/stream/aggregation/ModuleAggregationTest.java
View File

@@ -16,12 +16,11 @@
package org.springframework.cloud.stream.aggregation;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
import org.junit.Test;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.cloud.stream.aggregate.AggregateApplicationBuilder;
import org.springframework.cloud.stream.aggregate.SharedChannelRegistry;
@@ -31,6 +30,9 @@ import org.springframework.cloud.stream.messaging.Processor;
import org.springframework.cloud.stream.messaging.Source;
import org.springframework.cloud.stream.utils.MockBinderRegistryConfiguration;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.messaging.MessageChannel;
import org.junit.Test;
/**
* @author Marius Bogoevici
@@ -39,11 +41,40 @@ public class ModuleAggregationTest {
@Test
public void testModuleAggregation() {
ConfigurableApplicationContext aggregatedApplicationContext = new AggregateApplicationBuilder(MockBinderRegistryConfiguration.class).from(TestSource.class).to(TestProcessor.class).run();
ConfigurableApplicationContext aggregatedApplicationContext =
new AggregateApplicationBuilder(MockBinderRegistryConfiguration.class)
.from(TestSource.class)
.to(TestProcessor.class)
.run();
SharedChannelRegistry sharedChannelRegistry = aggregatedApplicationContext.getBean(SharedChannelRegistry.class);
BindableChannelFactory channelFactory = aggregatedApplicationContext.getBean(BindableChannelFactory.class);
assertNotNull(channelFactory);
assertThat(sharedChannelRegistry.getAll().keySet(), hasSize(2));
aggregatedApplicationContext.close();
}
@Test
public void testNamespaces() {
ConfigurableApplicationContext aggregatedApplicationContext =
new AggregateApplicationBuilder(MockBinderRegistryConfiguration.class)
.from(TestSource.class)
.namespace("foo")
.to(TestProcessor.class)
.namespace("bar")
.run();
SharedChannelRegistry sharedChannelRegistry
= aggregatedApplicationContext.getBean(SharedChannelRegistry.class);
BindableChannelFactory channelFactory
= aggregatedApplicationContext.getBean(BindableChannelFactory.class);
Object fooOutput = sharedChannelRegistry.get("foo.output");
assertNotNull(fooOutput);
assertThat(fooOutput, instanceOf(MessageChannel.class));
Object barInput = sharedChannelRegistry.get("bar.input");
assertNotNull(barInput);
assertThat(barInput, instanceOf(MessageChannel.class));
assertNotNull(channelFactory);
assertThat(sharedChannelRegistry.getAll().keySet(), hasSize(2));
aggregatedApplicationContext.close();
}