diff --git a/applications/processor/twitter-trend-processor/src/test/java/org/springframework/cloud/stream/app/processor/twitter/trend/TwitterTrendLocationProcessorIntegrationTests.java b/applications/processor/twitter-trend-processor/src/test/java/org/springframework/cloud/stream/app/processor/twitter/trend/TwitterTrendLocationProcessorIntegrationTests.java index 5741a4b7..a58f1b50 100644 --- a/applications/processor/twitter-trend-processor/src/test/java/org/springframework/cloud/stream/app/processor/twitter/trend/TwitterTrendLocationProcessorIntegrationTests.java +++ b/applications/processor/twitter-trend-processor/src/test/java/org/springframework/cloud/stream/app/processor/twitter/trend/TwitterTrendLocationProcessorIntegrationTests.java @@ -95,7 +95,7 @@ public class TwitterTrendLocationProcessorIntegrationTests { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(TestTwitterTrendLocationProcessorApplication.class)) .web(WebApplicationType.NONE) - .run("--spring.cloud.stream.function.definition=twitterTrendFunction", + .run("--spring.cloud.function.definition=twitterTrendFunction", "--twitter.trend.trendQueryType=trendLocation", "--twitter.connection.rawJson=false", @@ -130,7 +130,7 @@ public class TwitterTrendLocationProcessorIntegrationTests { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(TestTwitterTrendLocationProcessorApplication.class)) .web(WebApplicationType.NONE) - .run("--spring.cloud.stream.function.definition=twitterTrendFunction", + .run("--spring.cloud.function.definition=twitterTrendFunction", "--twitter.trend.trendQueryType=trendLocation", "--twitter.connection.rawJson=true", @@ -166,7 +166,7 @@ public class TwitterTrendLocationProcessorIntegrationTests { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(TestTwitterTrendLocationProcessorApplication.class)) .web(WebApplicationType.NONE) - .run("--spring.cloud.stream.function.definition=twitterTrendFunction", + .run("--spring.cloud.function.definition=twitterTrendFunction", "--twitter.trend.trendQueryType=trendLocation", "--twitter.connection.rawJson=true", diff --git a/applications/processor/twitter-trend-processor/src/test/java/org/springframework/cloud/stream/app/processor/twitter/trend/TwitterTrendProcessorIntegrationTests.java b/applications/processor/twitter-trend-processor/src/test/java/org/springframework/cloud/stream/app/processor/twitter/trend/TwitterTrendProcessorIntegrationTests.java index 515e6443..bcfc780e 100644 --- a/applications/processor/twitter-trend-processor/src/test/java/org/springframework/cloud/stream/app/processor/twitter/trend/TwitterTrendProcessorIntegrationTests.java +++ b/applications/processor/twitter-trend-processor/src/test/java/org/springframework/cloud/stream/app/processor/twitter/trend/TwitterTrendProcessorIntegrationTests.java @@ -89,7 +89,7 @@ public class TwitterTrendProcessorIntegrationTests { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(TestTwitterTrendProcessorApplication.class)) .web(WebApplicationType.NONE) - .run("--spring.cloud.stream.function.definition=twitterTrendFunction", + .run("--spring.cloud.function.definition=twitterTrendFunction", "--twitter.trend.locationId='2972'", "--twitter.connection.rawJson=true", diff --git a/applications/sink/geode-sink/src/test/java/org/springframework/cloud/stream/app/sink/geode/GeodeSinkTests.java b/applications/sink/geode-sink/src/test/java/org/springframework/cloud/stream/app/sink/geode/GeodeSinkTests.java index 4b41cb30..db978678 100644 --- a/applications/sink/geode-sink/src/test/java/org/springframework/cloud/stream/app/sink/geode/GeodeSinkTests.java +++ b/applications/sink/geode-sink/src/test/java/org/springframework/cloud/stream/app/sink/geode/GeodeSinkTests.java @@ -63,7 +63,7 @@ public class GeodeSinkTests { void consumeWithJsonEnabled() { applicationContextRunner .withPropertyValues( - "spring.cloud.stream.function.definition=geodeConsumer", + "spring.cloud.function.definition=geodeConsumer", "geode.region.regionName=Stocks", "geode.consumer.json=true", "geode.consumer.key-expression=payload.getField('symbol')", @@ -85,7 +85,7 @@ public class GeodeSinkTests { void consumeWithoutJsonEnabled() { applicationContextRunner .withPropertyValues( - "spring.cloud.stream.function.definition=geodeConsumer", + "spring.cloud.function.definition=geodeConsumer", "geode.region.regionName=Stocks", "geode.consumer.key-expression='key'", "geode.pool.hostAddresses=" + "localhost:" + geode.getLocatorPort()) diff --git a/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/sink/rabbit/RabbitSinkIntegrationTests.java b/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/sink/rabbit/RabbitSinkIntegrationTests.java index 398935eb..084a9973 100644 --- a/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/sink/rabbit/RabbitSinkIntegrationTests.java +++ b/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/sink/rabbit/RabbitSinkIntegrationTests.java @@ -38,7 +38,7 @@ import org.springframework.messaging.SubscribableChannel; import org.springframework.test.annotation.DirtiesContext; @SpringBootTest( - properties = {"spring.cloud.stream.function.definition=rabbitConsumer", "spring.rabbitmq.port = ${spring.rabbitmq.test.port}"}, + properties = {"spring.cloud.function.definition=rabbitConsumer", "spring.rabbitmq.port = ${spring.rabbitmq.test.port}"}, webEnvironment = SpringBootTest.WebEnvironment.NONE) @DirtiesContext @Import(RabbitSinkIntegrationTests.FooConfiguration.class) diff --git a/applications/sink/s3-sink/README.adoc b/applications/sink/s3-sink/README.adoc index 95010fd6..449e42ee 100644 --- a/applications/sink/s3-sink/README.adoc +++ b/applications/sink/s3-sink/README.adoc @@ -20,7 +20,6 @@ $$s3.consumer.acl-expression$$:: $$Expression to evaluate S3 Object access contr $$s3.consumer.bucket$$:: $$AWS bucket for target file(s) to store.$$ *($$String$$, default: `$$$$`)* $$s3.consumer.bucket-expression$$:: $$Expression to evaluate AWS bucket name.$$ *($$Expression$$, default: `$$$$`)* $$s3.consumer.key-expression$$:: $$Expression to evaluate S3 Object key.$$ *($$Expression$$, default: `$$$$`)* -$$s3.common.endpoint-url$$:: $$Optional endpoint url to connect to s3 compatible storage.$$ *($$String$$, default: `$$$$`)* //end::configuration-properties[] The target generated application based on the `AmazonS3SinkConfiguration` can be enhanced with the `S3MessageHandler.UploadMetadataProvider` and/or `S3ProgressListener`, which are injected into `S3MessageHandler` bean. diff --git a/applications/sink/twitter-message-sink/src/test/java/org/springframework/cloud/stream/app/sink/twitter/message/TwitterMessageSinkIntegrationTests.java b/applications/sink/twitter-message-sink/src/test/java/org/springframework/cloud/stream/app/sink/twitter/message/TwitterMessageSinkIntegrationTests.java index 4fc332d4..116a17d4 100644 --- a/applications/sink/twitter-message-sink/src/test/java/org/springframework/cloud/stream/app/sink/twitter/message/TwitterMessageSinkIntegrationTests.java +++ b/applications/sink/twitter-message-sink/src/test/java/org/springframework/cloud/stream/app/sink/twitter/message/TwitterMessageSinkIntegrationTests.java @@ -111,7 +111,7 @@ public class TwitterMessageSinkIntegrationTests { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(TestTwitterMessageSinkApplication.class)) .web(WebApplicationType.NONE) - .run("--spring.cloud.stream.function.definition=byteArrayTextToString|sendDirectMessageConsumer", + .run("--spring.cloud.function.definition=byteArrayTextToString|sendDirectMessageConsumer", "--twitter.message.update.screenName='user666'", @@ -149,7 +149,7 @@ public class TwitterMessageSinkIntegrationTests { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(TestTwitterMessageSinkApplication.class)) .web(WebApplicationType.NONE) - .run("--spring.cloud.stream.function.definition=byteArrayTextToString|sendDirectMessageConsumer", + .run("--spring.cloud.function.definition=byteArrayTextToString|sendDirectMessageConsumer", "--twitter.message.update.userId='1075751718749659136'", @@ -178,7 +178,7 @@ public class TwitterMessageSinkIntegrationTests { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(TestTwitterMessageSinkApplication.class)) .web(WebApplicationType.NONE) - .run("--spring.cloud.stream.function.definition=byteArrayTextToString|sendDirectMessageConsumer", + .run("--spring.cloud.function.definition=byteArrayTextToString|sendDirectMessageConsumer", "--twitter.message.update.userId=headers['user']", "--twitter.message.update.text=payload.concat(\" with suffix \")", diff --git a/applications/sink/twitter-update-sink/README.adoc b/applications/sink/twitter-update-sink/README.adoc index 533b9546..4a16e1dd 100644 --- a/applications/sink/twitter-update-sink/README.adoc +++ b/applications/sink/twitter-update-sink/README.adoc @@ -38,6 +38,6 @@ $$twitter.update.text$$:: $$(SpEL expression) The text of the text update. URL e Use `@Import(TwitterUpdateConsumerConfiguration.class)` to compose those functions. By default the `twitter-update` implements the following composite function chain: -`spring.cloud.stream.function.definition=byteArrayTextToString|messageToStatusUpdateFunction|updateStatus` or (`byteArrayTextToString|twitterStatusUpdateConsumer`) +`spring.cloud.function.definition=byteArrayTextToString|messageToStatusUpdateFunction|updateStatus` or (`byteArrayTextToString|twitterStatusUpdateConsumer`) diff --git a/applications/sink/twitter-update-sink/src/test/java/org/springframework/cloud/stream/app/sink/twitter/update/TwitterUpdateSinkIntegrationTests.java b/applications/sink/twitter-update-sink/src/test/java/org/springframework/cloud/stream/app/sink/twitter/update/TwitterUpdateSinkIntegrationTests.java index 0d7a9306..c76f170f 100644 --- a/applications/sink/twitter-update-sink/src/test/java/org/springframework/cloud/stream/app/sink/twitter/update/TwitterUpdateSinkIntegrationTests.java +++ b/applications/sink/twitter-update-sink/src/test/java/org/springframework/cloud/stream/app/sink/twitter/update/TwitterUpdateSinkIntegrationTests.java @@ -89,7 +89,7 @@ public class TwitterUpdateSinkIntegrationTests { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(TestTwitterUpdateSinkApplication.class)) .web(WebApplicationType.NONE) - .run("--spring.cloud.stream.function.definition=byteArrayTextToString|twitterStatusUpdateConsumer", + .run("--spring.cloud.function.definition=byteArrayTextToString|twitterStatusUpdateConsumer", "--twitter.connection.consumerKey=myConsumerKey", "--twitter.connection.consumerSecret=myConsumerSecret", "--twitter.connection.accessToken=myAccessToken", @@ -117,7 +117,7 @@ public class TwitterUpdateSinkIntegrationTests { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(TestTwitterUpdateSinkApplication.class)) .web(WebApplicationType.NONE) - .run("--spring.cloud.stream.function.definition=byteArrayTextToString|twitterStatusUpdateConsumer", + .run("--spring.cloud.function.definition=byteArrayTextToString|twitterStatusUpdateConsumer", "--twitter.update.text=payload.toUpperCase().concat(\" With Suffix\")", "--twitter.connection.consumerKey=myConsumerKey", @@ -157,7 +157,7 @@ public class TwitterUpdateSinkIntegrationTests { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(TestTwitterUpdateSinkApplication.class)) .web(WebApplicationType.NONE) - .run("--spring.cloud.stream.function.definition=byteArrayTextToString|twitterStatusUpdateConsumer", + .run("--spring.cloud.function.definition=byteArrayTextToString|twitterStatusUpdateConsumer", "--twitter.update.attachmentUrl='http://attachementUrl'", "--twitter.update.placeId='myPlaceId'", diff --git a/applications/source/ftp-source/src/test/java/org/springframework/cloud/stream/app/source/ftp/FtpSourceTests.java b/applications/source/ftp-source/src/test/java/org/springframework/cloud/stream/app/source/ftp/FtpSourceTests.java index 65a23dda..00067dff 100644 --- a/applications/source/ftp-source/src/test/java/org/springframework/cloud/stream/app/source/ftp/FtpSourceTests.java +++ b/applications/source/ftp-source/src/test/java/org/springframework/cloud/stream/app/source/ftp/FtpSourceTests.java @@ -42,7 +42,7 @@ import static org.assertj.core.api.Assertions.assertThat; "ftp.factory.password = foo", "file.consumer.mode = ref", "ftp.factory.cacheSessions = true", - "spring.cloud.stream.function.definition=ftpSupplier" + "spring.cloud.function.definition=ftpSupplier" }) @DirtiesContext public class FtpSourceTests extends FtpTestSupport { diff --git a/applications/source/geode-source/src/test/java/org/springframework/cloud/stream/app/source/geode/GeodeSourceTests.java b/applications/source/geode-source/src/test/java/org/springframework/cloud/stream/app/source/geode/GeodeSourceTests.java index 1fa8a324..396249ae 100644 --- a/applications/source/geode-source/src/test/java/org/springframework/cloud/stream/app/source/geode/GeodeSourceTests.java +++ b/applications/source/geode-source/src/test/java/org/springframework/cloud/stream/app/source/geode/GeodeSourceTests.java @@ -97,7 +97,7 @@ public class GeodeSourceTests { void pdxReadSerialized() { applicationContextRunner .withPropertyValues( - "spring.cloud.stream.function.definition=geodeSupplier", + "spring.cloud.function.definition=geodeSupplier", "geode.region.regionName=myRegion", "geode.client.pdx-read-serialized=true", "geode.supplier.query=Select * from /myRegion where symbol='XXX' and price > 140", diff --git a/applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/source/jdbc/JdbcSourceIntegrationTests.java b/applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/source/jdbc/JdbcSourceIntegrationTests.java index 0cbbbe3a..4160d269 100644 --- a/applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/source/jdbc/JdbcSourceIntegrationTests.java +++ b/applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/source/jdbc/JdbcSourceIntegrationTests.java @@ -33,7 +33,7 @@ import org.springframework.test.annotation.DirtiesContext; * @author Soby Chacko * @author Artem Bilan */ -@SpringBootTest(properties = "spring.cloud.stream.function.definition=jdbcSupplier") +@SpringBootTest(properties = "spring.cloud.function.definition=jdbcSupplier") @DirtiesContext public class JdbcSourceIntegrationTests { diff --git a/applications/source/s3-source/README.adoc b/applications/source/s3-source/README.adoc index 73fca7e3..dca73d61 100644 --- a/applications/source/s3-source/README.adoc +++ b/applications/source/s3-source/README.adoc @@ -62,7 +62,6 @@ $$s3.supplier.preserve-timestamp$$:: $$To transfer or not the timestamp of the r $$s3.supplier.remote-dir$$:: $$AWS S3 bucket resource.$$ *($$String$$, default: `$$bucket$$`)* $$s3.supplier.remote-file-separator$$:: $$Remote File separator.$$ *($$String$$, default: `$$/$$`)* $$s3.supplier.tmp-file-suffix$$:: $$Temporary file suffix.$$ *($$String$$, default: `$$.tmp$$`)* -$$s3.common.endpoint-url$$:: $$Optional endpoint url to connect to s3 compatible storage.$$ *($$String$$, default: `$$$$`)* //end::configuration-properties[] == Amazon AWS common options diff --git a/applications/source/sftp-source/src/test/java/org/springframework/cloud/stream/app/source/sftp/SftpSourceTests.java b/applications/source/sftp-source/src/test/java/org/springframework/cloud/stream/app/source/sftp/SftpSourceTests.java index 9c17a8ca..33401148 100644 --- a/applications/source/sftp-source/src/test/java/org/springframework/cloud/stream/app/source/sftp/SftpSourceTests.java +++ b/applications/source/sftp-source/src/test/java/org/springframework/cloud/stream/app/source/sftp/SftpSourceTests.java @@ -47,7 +47,7 @@ public class SftpSourceTests extends SftpTestSupport { "sftp.supplier.factory.port =${sftp.factory.port}", "sftp.supplier.factory.allowUnknownKeys=true", "sftp.supplier.remoteDir=sftpSource", - "spring.cloud.stream.function.definition=sftpSupplier") + "spring.cloud.function.definition=sftpSupplier") .run(context -> { OutputDestination output = context.getBean(OutputDestination.class); SftpSupplierProperties config = context.getBean(SftpSupplierProperties.class); @@ -73,7 +73,7 @@ public class SftpSourceTests extends SftpTestSupport { "sftp.supplier.localDir=" + this.targetLocalDirectory.toString(), "--task.launch.request.arg-expressions=fileName=payload", "--task.launch.request.task-name=myTask", - "spring.cloud.stream.function.definition=sftpSupplier|taskLaunchRequestFunction") + "spring.cloud.function.definition=sftpSupplier|taskLaunchRequestFunction") .run(context -> { OutputDestination output = context.getBean(OutputDestination.class); SftpSupplierProperties config = context.getBean(SftpSupplierProperties.class); diff --git a/applications/source/time-source/src/test/java/org/springframework/cloud/stream/app/source/time/TimeSourceTests.java b/applications/source/time-source/src/test/java/org/springframework/cloud/stream/app/source/time/TimeSourceTests.java index 5b1b507f..120fec97 100644 --- a/applications/source/time-source/src/test/java/org/springframework/cloud/stream/app/source/time/TimeSourceTests.java +++ b/applications/source/time-source/src/test/java/org/springframework/cloud/stream/app/source/time/TimeSourceTests.java @@ -71,7 +71,7 @@ public class TimeSourceTests { TestChannelBinderConfiguration .getCompleteConfiguration(TimeSourceTestApplication.class)) .web(WebApplicationType.NONE) - .run("--spring.cloud.stream.function.definition=timeSupplier|spelFunction", + .run("--spring.cloud.function.definition=timeSupplier|spelFunction", "--spel.function.expression=payload.length()")) { OutputDestination target = context.getBean(OutputDestination.class); @@ -88,7 +88,7 @@ public class TimeSourceTests { TestChannelBinderConfiguration .getCompleteConfiguration(TimeSourceTestApplication.class)) .web(WebApplicationType.NONE) - .run("--spring.cloud.stream.function.definition=timeSupplier|spelFunction|headerEnricherFunction|taskLaunchRequestFunction", + .run("--spring.cloud.function.definition=timeSupplier|spelFunction|headerEnricherFunction|taskLaunchRequestFunction", "--spel.function.expression=payload.length()", "--header.enricher.headers=task-id=payload*2", "--spring.cloud.stream.bindings.output.destination=foo", diff --git a/applications/source/twitter-message-source/src/test/java/org/springframework/cloud/stream/app/source/twitter/message/TwitterMessageSourceIntegrationTests.java b/applications/source/twitter-message-source/src/test/java/org/springframework/cloud/stream/app/source/twitter/message/TwitterMessageSourceIntegrationTests.java index f58a79b2..1f803ea6 100644 --- a/applications/source/twitter-message-source/src/test/java/org/springframework/cloud/stream/app/source/twitter/message/TwitterMessageSourceIntegrationTests.java +++ b/applications/source/twitter-message-source/src/test/java/org/springframework/cloud/stream/app/source/twitter/message/TwitterMessageSourceIntegrationTests.java @@ -94,7 +94,7 @@ public class TwitterMessageSourceIntegrationTests { .getCompleteConfiguration(TestTwitterMessageSourceApplication.class)) .web(WebApplicationType.NONE) - .run("--spring.cloud.stream.function.definition=twitterMessageSupplier", + .run("--spring.cloud.function.definition=twitterMessageSupplier", "--twitter.connection.consumerKey=consumerKey666", "--twitter.connection.consumerSecret=consumerSecret666", diff --git a/applications/source/twitter-search-source/src/test/java/org/springframework/cloud/stream/app/source/twitter/search/TwitterSearchSourceIntegrationTests.java b/applications/source/twitter-search-source/src/test/java/org/springframework/cloud/stream/app/source/twitter/search/TwitterSearchSourceIntegrationTests.java index e7b4fca3..c1e79113 100644 --- a/applications/source/twitter-search-source/src/test/java/org/springframework/cloud/stream/app/source/twitter/search/TwitterSearchSourceIntegrationTests.java +++ b/applications/source/twitter-search-source/src/test/java/org/springframework/cloud/stream/app/source/twitter/search/TwitterSearchSourceIntegrationTests.java @@ -108,7 +108,7 @@ public class TwitterSearchSourceIntegrationTests { .getCompleteConfiguration(TestTwitterSearchSourceApplication.class)) .web(WebApplicationType.NONE) - .run("--spring.cloud.stream.function.definition=twitterSearchSupplier", + .run("--spring.cloud.function.definition=twitterSearchSupplier", "--twitter.connection.consumerKey=consumerKey666", "--twitter.connection.consumerSecret=consumerSecret666", "--twitter.connection.accessToken=accessToken666", @@ -136,7 +136,7 @@ public class TwitterSearchSourceIntegrationTests { TestChannelBinderConfiguration .getCompleteConfiguration(TestTwitterSearchSourceApplication.class)) .web(WebApplicationType.NONE) - .run("--spring.cloud.stream.function.definition=twitterSearchSupplier", + .run("--spring.cloud.function.definition=twitterSearchSupplier", "--twitter.connection.consumerKey=consumerKey666", "--twitter.connection.consumerSecret=consumerSecret666", "--twitter.connection.accessToken=accessToken666", diff --git a/applications/source/twitter-stream-source/src/test/java/org/springframework/cloud/stream/app/source/twitter/stream/TwitterStreamSourceTests.java b/applications/source/twitter-stream-source/src/test/java/org/springframework/cloud/stream/app/source/twitter/stream/TwitterStreamSourceTests.java index d5e5b1a3..43e1fb1b 100644 --- a/applications/source/twitter-stream-source/src/test/java/org/springframework/cloud/stream/app/source/twitter/stream/TwitterStreamSourceTests.java +++ b/applications/source/twitter-stream-source/src/test/java/org/springframework/cloud/stream/app/source/twitter/stream/TwitterStreamSourceTests.java @@ -103,7 +103,7 @@ public class TwitterStreamSourceTests { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(TestTwitterStreamSourceApplication.class)) .web(WebApplicationType.NONE) - .run("--spring.cloud.stream.function.definition=twitterStreamSupplier", + .run("--spring.cloud.function.definition=twitterStreamSupplier", "--twitter.connection.consumerKey=consumerKey666", "--twitter.connection.consumerSecret=consumerSecret666", diff --git a/applications/stream-applications-core/common/stream-applications-composite-function-support/src/main/java/org/springframework/cloud/stream/app/composite/function/common/FunctionBindingEnvironmentPostProcessor.java b/applications/stream-applications-core/common/stream-applications-composite-function-support/src/main/java/org/springframework/cloud/stream/app/composite/function/common/FunctionBindingEnvironmentPostProcessor.java index 7e945404..69d38fcd 100644 --- a/applications/stream-applications-core/common/stream-applications-composite-function-support/src/main/java/org/springframework/cloud/stream/app/composite/function/common/FunctionBindingEnvironmentPostProcessor.java +++ b/applications/stream-applications-core/common/stream-applications-composite-function-support/src/main/java/org/springframework/cloud/stream/app/composite/function/common/FunctionBindingEnvironmentPostProcessor.java @@ -100,6 +100,8 @@ public class FunctionBindingEnvironmentPostProcessor implements EnvironmentPostP private String functionDefinition(Environment environment) { if (environment.containsProperty(SPRING_CLOUD_STREAM_FUNCTION_DEFINITION)) { + log.warn("The property '" + SPRING_CLOUD_STREAM_FUNCTION_DEFINITION + "' is deprecated. Please use '" + + SPRING_CLOUD_FUNCTION_DEFINITION + "'"); return environment.getProperty(SPRING_CLOUD_STREAM_FUNCTION_DEFINITION); } else if (environment.containsProperty(SPRING_CLOUD_FUNCTION_DEFINITION)) { diff --git a/applications/stream-applications-core/common/stream-applications-composite-function-support/src/test/java/org/springframework/cloud/stream/app/composite/function/common/FunctionBindingsEnvironmentPostProcessorTests.java b/applications/stream-applications-core/common/stream-applications-composite-function-support/src/test/java/org/springframework/cloud/stream/app/composite/function/common/FunctionBindingsEnvironmentPostProcessorTests.java index 89645b17..9445e6f6 100644 --- a/applications/stream-applications-core/common/stream-applications-composite-function-support/src/test/java/org/springframework/cloud/stream/app/composite/function/common/FunctionBindingsEnvironmentPostProcessorTests.java +++ b/applications/stream-applications-core/common/stream-applications-composite-function-support/src/test/java/org/springframework/cloud/stream/app/composite/function/common/FunctionBindingsEnvironmentPostProcessorTests.java @@ -31,7 +31,7 @@ public class FunctionBindingsEnvironmentPostProcessorTests { ApplicationContext context = new SpringApplication(TestApp.class).run( "--spring.cloud.stream.bindings.output.destination=foo", "--spring.cloud.stream.bindings.input.destination=bar", - "--spring.cloud.stream.function.definition=firstFunction|secondFunction"); + "--spring.cloud.function.definition=firstFunction|secondFunction"); assertThat(context.getEnvironment().getProperty("spring.cloud.stream.function.bindings.firstFunctionsecondFunction-out-0")) .isEqualTo("output"); assertThat(context.getEnvironment().getProperty("spring.cloud.stream.function.bindings.firstFunctionsecondFunction-in-0")) diff --git a/functions/common/twitter-common/src/main/java/org/springframework/cloud/fn/common/twitter/OnMissingStreamFunctionDefinitionCondition.java b/functions/common/twitter-common/src/main/java/org/springframework/cloud/fn/common/twitter/OnMissingStreamFunctionDefinitionCondition.java deleted file mode 100644 index 55565bdd..00000000 --- a/functions/common/twitter-common/src/main/java/org/springframework/cloud/fn/common/twitter/OnMissingStreamFunctionDefinitionCondition.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2015-2020 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. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.cloud.fn.common.twitter; - -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.autoconfigure.condition.NoneNestedConditions; - -/** - * @author Christian Tzolov - */ -public class OnMissingStreamFunctionDefinitionCondition extends NoneNestedConditions { - - public OnMissingStreamFunctionDefinitionCondition() { - super(ConfigurationPhase.REGISTER_BEAN); - } - - @ConditionalOnProperty(name = "spring.cloud.stream.function.definition") - static class OnFunctionDslProperty { - } -} diff --git a/functions/consumer/websocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/websocket/WebsocketConsumerServer.java b/functions/consumer/websocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/websocket/WebsocketConsumerServer.java index 4986ed74..1447ab40 100644 --- a/functions/consumer/websocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/websocket/WebsocketConsumerServer.java +++ b/functions/consumer/websocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/websocket/WebsocketConsumerServer.java @@ -37,7 +37,7 @@ import org.springframework.beans.factory.annotation.Autowired; /** * Bootstraps a Netty server using the {@link WebsocketConsumerServerInitializer}. Also adds - * a {@link LoggingHandler} and uses the logLevel + * a {@link LoggingHandler} and uses the logLevel * from {@link WebsocketConsumerProperties#logLevel}. * * @author Oliver Moser diff --git a/functions/function/task-launch-request-function/src/test/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestFunctionApplicationTests.java b/functions/function/task-launch-request-function/src/test/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestFunctionApplicationTests.java index e1098b5e..f23399ae 100644 --- a/functions/function/task-launch-request-function/src/test/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestFunctionApplicationTests.java +++ b/functions/function/task-launch-request-function/src/test/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestFunctionApplicationTests.java @@ -54,7 +54,7 @@ public class TaskLaunchRequestFunctionApplicationTests { ApplicationContext context = springApplicationBuilder.properties( "spring.jmx.enabled=false", - "spring.cloud.stream.function.definition=taskLaunchRequestFunction", + "spring.cloud.function.definition=taskLaunchRequestFunction", "task.launch.request.task-name=foo") .run(); @@ -70,7 +70,7 @@ public class TaskLaunchRequestFunctionApplicationTests { public void dataflowTaskLaunchRequestWithArgsAndDeploymentProperties() throws IOException { ApplicationContext context = springApplicationBuilder.properties( - "spring.jmx.enabled=false", "spring.cloud.stream.function.definition=taskLaunchRequestFunction", + "spring.jmx.enabled=false", "spring.cloud.function.definition=taskLaunchRequestFunction", "task.launch.request.task-name=foo", "task.launch.request.args=foo=bar,baz=boo", "task.launch.request.deploymentProperties=count=3") .run(); @@ -87,7 +87,7 @@ public class TaskLaunchRequestFunctionApplicationTests { public void taskLaunchRequestWithCommandLineArgsMessageMapper() throws IOException { ApplicationContext context = springApplicationBuilder.properties( - "spring.jmx.enabled=false", "spring.cloud.stream.function.definition=taskLaunchRequestFunction", + "spring.jmx.enabled=false", "spring.cloud.function.definition=taskLaunchRequestFunction", "task.launch.request.task-name=foo", "enhanceTLRArgs=true") .run(); @@ -104,7 +104,7 @@ public class TaskLaunchRequestFunctionApplicationTests { public void taskLaunchRequestWithArgExpressions() throws IOException { ApplicationContext context = springApplicationBuilder.properties( "spring.jmx.enabled=false", - "spring.cloud.stream.function.definition=taskLaunchRequestFunction", + "spring.cloud.function.definition=taskLaunchRequestFunction", "task.launch.request.task-name=foo", "task.launch.request.arg-expressions=foo=payload.toUpperCase(),bar=payload.substring(0,2)") .run(); @@ -124,7 +124,7 @@ public class TaskLaunchRequestFunctionApplicationTests { @DirtiesContext public void taskLaunchRequestWithIntPayload() throws IOException { ApplicationContext context = springApplicationBuilder.properties( - "spring.jmx.enabled=false", "spring.cloud.stream.function.definition=taskLaunchRequestFunction", + "spring.jmx.enabled=false", "spring.cloud.function.definition=taskLaunchRequestFunction", "task.launch.request.task-name=foo", "task.launch.request.arg-expressions=i=payload") .run(); @@ -145,7 +145,7 @@ public class TaskLaunchRequestFunctionApplicationTests { @DirtiesContext public void taskNameExpression() throws IOException { ApplicationContext context = springApplicationBuilder.properties( - "spring.jmx.enabled=false", "spring.cloud.stream.function.definition=taskLaunchRequestFunction", + "spring.jmx.enabled=false", "spring.cloud.function.definition=taskLaunchRequestFunction", "task.launch.request.task-name-expression=payload+'_task'") .run(); @@ -164,7 +164,7 @@ public class TaskLaunchRequestFunctionApplicationTests { @DirtiesContext public void customTaskNameExtractor() throws IOException { ApplicationContext context = springApplicationBuilder.properties( - "spring.jmx.enabled=false", "spring.cloud.stream.function.definition=taskLaunchRequestFunction", + "spring.jmx.enabled=false", "spring.cloud.function.definition=taskLaunchRequestFunction", "customTaskNameExtractor=true") .run(); TaskLaunchRequestFunction taskLaunchRequestFunction = context.getBean(TaskLaunchRequestFunction.class); diff --git a/functions/function/twitter-function/README.adoc b/functions/function/twitter-function/README.adoc index 7a957afd..1427a796 100644 --- a/functions/function/twitter-function/README.adoc +++ b/functions/function/twitter-function/README.adoc @@ -55,7 +55,7 @@ public class MyTwitterTrendBootApp { public static void main(String[] args) { SpringApplication.run(MyTwitterTrendBootApp.class, - "--spring.cloud.stream.function.definition=trend|twitterTrendFunction|managedJson"); + "--spring.cloud.function.definition=trend|twitterTrendFunction|managedJson"); } } ---- @@ -110,7 +110,7 @@ public class MyTwitterGeoProcessorBootApp { public static void main(String[] args) { SpringApplication.run(MyTwitterGeoProcessorBootApp.class, - "--spring.cloud.stream.function.definition=messageToGeoQueryFunction|twitterSearchPlacesFunction|managedJson"); + "--spring.cloud.function.definition=messageToGeoQueryFunction|twitterSearchPlacesFunction|managedJson"); } } ----