From e1bce8c2929ec1df887db755c4c9dfd8c3669e3a Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Fri, 24 Nov 2017 13:28:31 +0900 Subject: [PATCH] Change name of property endpoint -> defaultRoute --- .../src/main/resources/application.properties | 2 +- .../src/main/resources/application.properties | 2 +- .../cloud/function/stream/StreamConfiguration.java | 2 +- .../stream/StreamConfigurationProperties.java | 14 +++++++++----- .../stream/StreamListeningFunctionInvoker.java | 10 +++++----- .../mixed/PojoStreamingExplicitEndpointTests.java | 2 +- 6 files changed, 18 insertions(+), 14 deletions(-) diff --git a/spring-cloud-function-samples/function-sample-pojo/src/main/resources/application.properties b/spring-cloud-function-samples/function-sample-pojo/src/main/resources/application.properties index ce79fe047..1751e8a8a 100644 --- a/spring-cloud-function-samples/function-sample-pojo/src/main/resources/application.properties +++ b/spring-cloud-function-samples/function-sample-pojo/src/main/resources/application.properties @@ -1,4 +1,4 @@ spring.cloud.stream.bindings.input.destination: foos spring.cloud.stream.bindings.output.destination: bars -spring.cloud.function.stream.endpoint: uppercase +spring.cloud.function.stream.default-route: uppercase management.security.enabled: false \ No newline at end of file diff --git a/spring-cloud-function-samples/function-sample/src/main/resources/application.properties b/spring-cloud-function-samples/function-sample/src/main/resources/application.properties index 7cadfc1fb..9093ab614 100644 --- a/spring-cloud-function-samples/function-sample/src/main/resources/application.properties +++ b/spring-cloud-function-samples/function-sample/src/main/resources/application.properties @@ -1,2 +1,2 @@ -spring.cloud.function.stream.endpoint: uppercase +spring.cloud.function.stream.default-route: uppercase spring.cloud.function.scan.packages: com.example.functions \ No newline at end of file diff --git a/spring-cloud-function-stream/src/main/java/org/springframework/cloud/function/stream/StreamConfiguration.java b/spring-cloud-function-stream/src/main/java/org/springframework/cloud/function/stream/StreamConfiguration.java index 75643842b..2f2b1cf2f 100644 --- a/spring-cloud-function-stream/src/main/java/org/springframework/cloud/function/stream/StreamConfiguration.java +++ b/spring-cloud-function-stream/src/main/java/org/springframework/cloud/function/stream/StreamConfiguration.java @@ -60,7 +60,7 @@ public class StreamConfiguration { FunctionInspector functionInspector, @Lazy CompositeMessageConverterFactory compositeMessageConverterFactory) { return new StreamListeningFunctionInvoker(registry, functionInspector, - compositeMessageConverterFactory, properties.getEndpoint()); + compositeMessageConverterFactory, properties.getDefaultRoute()); } } diff --git a/spring-cloud-function-stream/src/main/java/org/springframework/cloud/function/stream/StreamConfigurationProperties.java b/spring-cloud-function-stream/src/main/java/org/springframework/cloud/function/stream/StreamConfigurationProperties.java index 1d3d821d9..ad4c2f07b 100644 --- a/spring-cloud-function-stream/src/main/java/org/springframework/cloud/function/stream/StreamConfigurationProperties.java +++ b/spring-cloud-function-stream/src/main/java/org/springframework/cloud/function/stream/StreamConfigurationProperties.java @@ -24,7 +24,11 @@ import org.springframework.boot.context.properties.ConfigurationProperties; @ConfigurationProperties(prefix = "spring.cloud.function.stream") public class StreamConfigurationProperties { - private String endpoint; + /** + * The default route for a message if more than one is available and no explicit route + * key is provided. + */ + private String defaultRoute; /** * Interval to be used for the Duration (in milliseconds) of a non-Flux producing @@ -34,12 +38,12 @@ public class StreamConfigurationProperties { public static final String ROUTE_KEY = "stream_routekey"; - public String getEndpoint() { - return endpoint; + public String getDefaultRoute() { + return defaultRoute; } - public void setEndpoint(String endpoint) { - this.endpoint = endpoint; + public void setDefaultRoute(String defaultRoute) { + this.defaultRoute = defaultRoute; } public long getInterval() { diff --git a/spring-cloud-function-stream/src/main/java/org/springframework/cloud/function/stream/StreamListeningFunctionInvoker.java b/spring-cloud-function-stream/src/main/java/org/springframework/cloud/function/stream/StreamListeningFunctionInvoker.java index b9b7dafa2..2c960ce2f 100644 --- a/spring-cloud-function-stream/src/main/java/org/springframework/cloud/function/stream/StreamListeningFunctionInvoker.java +++ b/spring-cloud-function-stream/src/main/java/org/springframework/cloud/function/stream/StreamListeningFunctionInvoker.java @@ -55,7 +55,7 @@ public class StreamListeningFunctionInvoker implements SmartInitializingSingleto private MessageConverter converter; - private final String defaultEndpoint; + private final String defaultRoute; private final Map processors = new HashMap<>(); @@ -67,11 +67,11 @@ public class StreamListeningFunctionInvoker implements SmartInitializingSingleto public StreamListeningFunctionInvoker(FunctionCatalog functionCatalog, FunctionInspector functionInspector, - CompositeMessageConverterFactory converterFactory, String defaultEndpoint) { + CompositeMessageConverterFactory converterFactory, String defaultRoute) { this.functionCatalog = functionCatalog; this.functionInspector = functionInspector; this.converterFactory = converterFactory; - this.defaultEndpoint = defaultEndpoint; + this.defaultRoute = defaultRoute; } @Override @@ -137,8 +137,8 @@ public class StreamListeningFunctionInvoker implements SmartInitializingSingleto .get(StreamConfigurationProperties.ROUTE_KEY); name = stash(key); } - if (name==null && defaultEndpoint != null) { - name = stash(defaultEndpoint); + if (name==null && defaultRoute != null) { + name = stash(defaultRoute); } if (name == null) { Set names = new LinkedHashSet<>(functionCatalog.getFunctionNames()); diff --git a/spring-cloud-function-stream/src/test/java/org/springframework/cloud/function/stream/mixed/PojoStreamingExplicitEndpointTests.java b/spring-cloud-function-stream/src/test/java/org/springframework/cloud/function/stream/mixed/PojoStreamingExplicitEndpointTests.java index cd21d175d..3057d7899 100644 --- a/spring-cloud-function-stream/src/test/java/org/springframework/cloud/function/stream/mixed/PojoStreamingExplicitEndpointTests.java +++ b/spring-cloud-function-stream/src/test/java/org/springframework/cloud/function/stream/mixed/PojoStreamingExplicitEndpointTests.java @@ -44,7 +44,7 @@ import static org.assertj.core.api.Assertions.assertThat; */ @RunWith(SpringRunner.class) @SpringBootTest(classes = PojoStreamingExplicitEndpointTests.StreamingFunctionApplication.class, properties = { - "spring.cloud.function.stream.endpoint=uppercase", + "spring.cloud.function.stream.default-route=uppercase", "logging.level.org.springframework.integration=DEBUG", "debug=TRUE" }) public class PojoStreamingExplicitEndpointTests {