From 5939f96016377293a2f3c2d382d99ec6f3b32b1e Mon Sep 17 00:00:00 2001 From: markfisher Date: Mon, 13 Feb 2017 09:16:07 -0500 Subject: [PATCH] renaming stream function property --- scripts/stream.sh | 2 +- .../function/stream/StreamConfiguration.java | 20 +++++++++---------- ...ava => StreamConfigurationProperties.java} | 16 +++++++-------- 3 files changed, 19 insertions(+), 19 deletions(-) rename spring-cloud-function-stream/src/main/java/org/springframework/cloud/function/stream/{FunctionConfigurationProperties.java => StreamConfigurationProperties.java} (70%) diff --git a/scripts/stream.sh b/scripts/stream.sh index 9a7e9fd19..c022e98de 100755 --- a/scripts/stream.sh +++ b/scripts/stream.sh @@ -43,7 +43,7 @@ done java -jar ../spring-cloud-function-samples/spring-cloud-function-sample-compiler/target/function-sample-compiler-1.0.0.BUILD-SNAPSHOT.jar\ --management.security.enabled=false\ --server.port=$PORT\ - --function.name=$FUNC\ + --spring.cloud.function.stream.endpoint=$FUNC\ $IN\ $OUT\ $RESOURCE\ 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 a3c380156..2dc666e4c 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 @@ -1,5 +1,5 @@ /* - * Copyright 2016 the original author or authors. + * Copyright 2016-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -50,7 +50,7 @@ import reactor.core.publisher.Flux; /** * @author Mark Fisher */ -@EnableConfigurationProperties(FunctionConfigurationProperties.class) +@EnableConfigurationProperties(StreamConfigurationProperties.class) @ConditionalOnClass({ Binder.class, AbstractFunctionInvoker.class }) @ConditionalOnProperty(name = "spring.cloud.stream.enabled", havingValue = "true", matchIfMissing = true) public class StreamConfiguration { @@ -60,12 +60,12 @@ public class StreamConfiguration { protected static class SupplierConfiguration { @Autowired - private FunctionConfigurationProperties properties; + private StreamConfigurationProperties properties; @Bean @ConditionalOnProperty("spring.cloud.stream.bindings.output.destination") public SupplierInvokingMessageProducer invoker(FunctionCatalog registry) { - String name = properties.getName(); + String name = properties.getEndpoint(); Supplier> supplier = registry.lookupSupplier(name); return new SupplierInvokingMessageProducer(supplier); } @@ -76,12 +76,12 @@ public class StreamConfiguration { protected static class FunctionConfiguration { @Autowired - private FunctionConfigurationProperties properties; + private StreamConfigurationProperties properties; @Bean @ConditionalOnProperty("spring.cloud.stream.bindings.input.destination") public AbstractFunctionInvoker invoker(FunctionCatalog registry) { - String name = properties.getName(); + String name = properties.getEndpoint(); Function, Flux> function = registry.lookupFunction(name); return new StreamListeningFunctionInvoker(function); } @@ -92,12 +92,12 @@ public class StreamConfiguration { protected static class ConsumerConfiguration { @Autowired - private FunctionConfigurationProperties properties; + private StreamConfigurationProperties properties; @Bean @ConditionalOnProperty("spring.cloud.stream.bindings.input.destination") public StreamListeningConsumerInvoker invoker(FunctionCatalog registry) { - String name = properties.getName(); + String name = properties.getEndpoint(); Consumer consumer = registry.lookupConsumer(name); return new StreamListeningConsumerInvoker(consumer); } @@ -134,9 +134,9 @@ public class StreamConfiguration { @Override public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) { - String functionName = context.getEnvironment().getProperty("function.name"); + String functionName = context.getEnvironment().getProperty("spring.cloud.function.stream.endpoint"); if (!StringUtils.hasText(functionName)) { - return ConditionOutcome.noMatch("no function name available"); + return ConditionOutcome.noMatch("no endpoint function name available"); } if (functionName.indexOf(',') != -1) { // for now we will just check the first, but later may support: diff --git a/spring-cloud-function-stream/src/main/java/org/springframework/cloud/function/stream/FunctionConfigurationProperties.java b/spring-cloud-function-stream/src/main/java/org/springframework/cloud/function/stream/StreamConfigurationProperties.java similarity index 70% rename from spring-cloud-function-stream/src/main/java/org/springframework/cloud/function/stream/FunctionConfigurationProperties.java rename to spring-cloud-function-stream/src/main/java/org/springframework/cloud/function/stream/StreamConfigurationProperties.java index c5349262d..bdabb4705 100644 --- a/spring-cloud-function-stream/src/main/java/org/springframework/cloud/function/stream/FunctionConfigurationProperties.java +++ b/spring-cloud-function-stream/src/main/java/org/springframework/cloud/function/stream/StreamConfigurationProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 the original author or authors. + * Copyright 2016-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,16 +21,16 @@ import org.springframework.boot.context.properties.ConfigurationProperties; /** * @author Mark Fisher */ -@ConfigurationProperties(prefix = "function") -public class FunctionConfigurationProperties { +@ConfigurationProperties(prefix = "spring.cloud.function.stream") +public class StreamConfigurationProperties { - private String name; + private String endpoint; - public String getName() { - return name; + public String getEndpoint() { + return endpoint; } - public void setName(String name) { - this.name = name; + public void setEndpoint(String endpoint) { + this.endpoint = endpoint; } }