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

Cleanup spring.cloud.stream.function.definition usage.

Browse Source
This commit is contained in:
Corneil du Plessis
2023-04-11 16:06:46 +02:00
parent 4b11ab6b1e
commit b600ec0b49
7 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/source/cdc-debezium-source/src/test/java/org/springframework/cloud/stream/app/source/cdc/CdcFlatteningIntegrationTest.java
View File

@@ -51,7 +51,7 @@ public class CdcFlatteningIntegrationTest extends CdcMySqlTestSupport {
.withUserConfiguration( .withUserConfiguration(
TestChannelBinderConfiguration.getCompleteConfiguration(TestCdcSourceApplication.class)) TestChannelBinderConfiguration.getCompleteConfiguration(TestCdcSourceApplication.class))
.withPropertyValues( .withPropertyValues(
"spring.cloud.stream.function.definition=cdcSupplier", "spring.cloud.function.definition=cdcSupplier",
"cdc.name=my-sql-connector", "cdc.name=my-sql-connector",
"cdc.schema=false", "cdc.schema=false",
"cdc.stream.header.offset=false", "cdc.stream.header.offset=false",

2
applications/source/cdc-debezium-source/src/test/java/org/springframework/cloud/stream/app/source/cdc/CdcSourceDatabasesIntegrationTest.java
View File

@@ -62,7 +62,7 @@ public class CdcSourceDatabasesIntegrationTest {
private final SpringApplicationBuilder applicationBuilder = new SpringApplicationBuilder( private final SpringApplicationBuilder applicationBuilder = new SpringApplicationBuilder(
TestChannelBinderConfiguration.getCompleteConfiguration(TestCdcSourceApplication.class)) TestChannelBinderConfiguration.getCompleteConfiguration(TestCdcSourceApplication.class))
.web(WebApplicationType.NONE) .web(WebApplicationType.NONE)
.properties("spring.cloud.stream.function.definition=cdcSupplier", .properties("spring.cloud.function.definition=cdcSupplier",
"cdc.name=my-connector", "cdc.name=my-connector",
"cdc.flattening.dropTombstones=false", "cdc.flattening.dropTombstones=false",
"cdc.schema=false", "cdc.schema=false",

2
applications/source/cdc-debezium-source/src/test/java/org/springframework/cloud/stream/app/source/cdc/CdcTestUtils.java
View File

@@ -35,7 +35,7 @@ import org.springframework.util.StreamUtils;
public final class CdcTestUtils { public final class CdcTestUtils {
/** /**
* derived from the spring.cloud.stream.function.definition value * derived from the spring.cloud.function.definition value
*/ */
public static final String CDC_SUPPLIER_OUT_0 = "cdcSupplier-out-0"; public static final String CDC_SUPPLIER_OUT_0 = "cdcSupplier-out-0";

2
applications/stream-applications-core/stream-applications-composite-function-support/src/main/java/org/springframework/cloud/stream/app/composite/function/common/FunctionBindingEnvironmentPostProcessor.java
View File

@@ -105,7 +105,7 @@ public class FunctionBindingEnvironmentPostProcessor implements EnvironmentPostP
environment.getProperty(SPRING_CLOUD_FUNCTION_DEFINITION)); environment.getProperty(SPRING_CLOUD_FUNCTION_DEFINITION));
} }
if (environment.containsProperty(SPRING_CLOUD_STREAM_FUNCTION_DEFINITION)) { if (environment.containsProperty(SPRING_CLOUD_STREAM_FUNCTION_DEFINITION)) {
log.warn("The property '" + SPRING_CLOUD_STREAM_FUNCTION_DEFINITION + "' is deprecated. Please use '" log.error("The property '" + SPRING_CLOUD_STREAM_FUNCTION_DEFINITION + "' is deprecated. Please use '"
+ SPRING_CLOUD_FUNCTION_DEFINITION + "'"); + SPRING_CLOUD_FUNCTION_DEFINITION + "'");
functionDefinition = sanitizeActualFunctionDefinition( functionDefinition = sanitizeActualFunctionDefinition(
environment.getProperty(SPRING_CLOUD_STREAM_FUNCTION_DEFINITION)); environment.getProperty(SPRING_CLOUD_STREAM_FUNCTION_DEFINITION));

2
docs/FunctionComposition.adoc
View File

@@ -26,7 +26,7 @@ finally publish a task launch request every second to the rabbit exchange with t
---- ----
java -jar target/time-source-rabbit-3.0.0-SNAPSHOT.jar \ java -jar target/time-source-rabbit-3.0.0-SNAPSHOT.jar \
--spring.cloud.stream.bindings.output.destination=time-test \ --spring.cloud.stream.bindings.output.destination=time-test \
--spring.cloud.stream.function.definition="timeSupplier|spelFunction|headerEnricherFunction|taskLaunchRequestFunction" \ --spring.cloud.function.definition="timeSupplier|spelFunction|headerEnricherFunction|taskLaunchRequestFunction" \
--spel.function.expression="payload.length()" \ --spel.function.expression="payload.length()" \
--header.enricher.headers=task-id=payload*2 \ --header.enricher.headers=task-id=payload*2 \
--task.launch.request.task-name-expression="'task-'+headers['task-id']" --task.launch.request.task-name-expression="'task-'+headers['task-id']"

7
stream-applications-build/pom.xml
View File

@@ -42,10 +42,9 @@
<spring-integration.version>6.0.4</spring-integration.version> <spring-integration.version>6.0.4</spring-integration.version>
<spring-cloud.version>2022.0.2</spring-cloud.version> <spring-cloud.version>2022.0.2</spring-cloud.version>
<spring-cloud-starters.version>4.0.1</spring-cloud-starters.version> <spring-cloud-starters.version>4.0.2</spring-cloud-starters.version>
<spring-cloud-function.version>4.0.1</spring-cloud-function.version> <spring-cloud-function.version>4.0.2</spring-cloud-function.version>
<spring-cloud-stream-dependencies.version>4.0.1</spring-cloud-stream-dependencies.version> <spring-cloud-stream-dependencies.version>4.0.2</spring-cloud-stream-dependencies.version>
<spring-cloud-stream.version>4.0.1</spring-cloud-stream.version>
<test-containers.version>1.17.6</test-containers.version> <test-containers.version>1.17.6</test-containers.version>
<mockserver.version>5.13.2</mockserver.version> <mockserver.version>5.13.2</mockserver.version>

2
version/RELEASE_VERSION
View File

@@ -1 +1 @@
4.0.0-M1 4.0.0-SNAPSHOT