From a392325fe13ec633dacc60bed951b37186582f5e Mon Sep 17 00:00:00 2001 From: Ilayaperumal Gopinathan Date: Fri, 21 Aug 2020 15:31:37 +0530 Subject: [PATCH] Update multi IO samples based on the maven plugin update --- .../http-click-ingest/pom.xml | 7 +++- .../http-region-ingest/pom.xml | 7 +++- .../user-clicks-per-region-processor/pom.xml | 40 +++++++++++++++++-- ...onfiguration-metadata-whitelist.properties | 2 - .../src/main/resources/application.yml | 19 +++++++-- .../ticktock/multi-input-log-kafka/pom.xml | 2 +- ...ataflow-configuration-metadata.properties} | 1 - .../src/main/resources/application.properties | 2 +- .../ticktock/multi-input-log-rabbit/pom.xml | 2 +- ...onfiguration-metadata-whitelist.properties | 1 - 10 files changed, 65 insertions(+), 18 deletions(-) delete mode 100644 multi-io-samples/kafka-streams/user-clicks-per-region/user-clicks-per-region-processor/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties rename multi-io-samples/ticktock/multi-input-log-kafka/src/main/resources/META-INF/{dataflow-configuration-metadata-whitelist.properties => dataflow-configuration-metadata.properties} (61%) diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region/http-click-ingest/pom.xml b/multi-io-samples/kafka-streams/user-clicks-per-region/http-click-ingest/pom.xml index 6d9ce02..4932870 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region/http-click-ingest/pom.xml +++ b/multi-io-samples/kafka-streams/user-clicks-per-region/http-click-ingest/pom.xml @@ -162,7 +162,7 @@ ${org.springframework.cloud.dataflow.spring.configuration.metadata.json} - user-clicks + ${configuration-properties.outbound-ports} @@ -182,6 +182,9 @@ ${project.build.outputDirectory}/META-INF/spring-configuration-metadata-encoded.properties + + ${project.build.outputDirectory}/META-INF/dataflow-configuration-port-mapping.properties + @@ -190,7 +193,7 @@ org.springframework.cloud spring-cloud-app-starter-metadata-maven-plugin - 2.0.1.M1 + 2.0.2.BUILD-SNAPSHOT true diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region/http-region-ingest/pom.xml b/multi-io-samples/kafka-streams/user-clicks-per-region/http-region-ingest/pom.xml index e3f2d59..4674436 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region/http-region-ingest/pom.xml +++ b/multi-io-samples/kafka-streams/user-clicks-per-region/http-region-ingest/pom.xml @@ -160,7 +160,7 @@ ${org.springframework.cloud.dataflow.spring.configuration.metadata.json} - user-regions + ${configuration-properties.outbound-ports} @@ -180,6 +180,9 @@ ${project.build.outputDirectory}/META-INF/spring-configuration-metadata-encoded.properties + + ${project.build.outputDirectory}/META-INF/dataflow-configuration-port-mapping.properties + @@ -188,7 +191,7 @@ org.springframework.cloud spring-cloud-app-starter-metadata-maven-plugin - 2.0.1.M1 + 2.0.2.BUILD-SNAPSHOT true diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region/user-clicks-per-region-processor/pom.xml b/multi-io-samples/kafka-streams/user-clicks-per-region/user-clicks-per-region-processor/pom.xml index dd95d72..7af0cba 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region/user-clicks-per-region-processor/pom.xml +++ b/multi-io-samples/kafka-streams/user-clicks-per-region/user-clicks-per-region-processor/pom.xml @@ -141,7 +141,7 @@ springcloud/openjdk - springcloudstream/multi-io-sample-${project.artifactId} + ilayaperumalg/multi-io-sample-${project.artifactId} 1.0.0-SNAPSHOT @@ -150,12 +150,46 @@ USE_CURRENT_TIMESTAMP Docker - userClicks,userRegions - clicksPerRegion + ${configuration-properties.inbound-ports} + ${configuration-properties.outbound-ports} + + org.springframework.cloud + spring-cloud-app-starter-metadata-maven-plugin + 2.0.2.BUILD-SNAPSHOT + + + aggregate-metadata + compile + + aggregate-metadata + + + + + + org.codehaus.mojo + properties-maven-plugin + 1.0.0 + + + process-classes + + read-project-properties + + + + + ${project.build.outputDirectory}/META-INF/dataflow-configuration-port-mapping.properties + + + + + + diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region/user-clicks-per-region-processor/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties b/multi-io-samples/kafka-streams/user-clicks-per-region/user-clicks-per-region-processor/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties deleted file mode 100644 index f30fe1d..0000000 --- a/multi-io-samples/kafka-streams/user-clicks-per-region/user-clicks-per-region-processor/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties +++ /dev/null @@ -1,2 +0,0 @@ -configuration-properties.inbound-ports=userClicks,userRegions -configuration-properties.outbound-ports=clicksPerRegion diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region/user-clicks-per-region-processor/src/main/resources/application.yml b/multi-io-samples/kafka-streams/user-clicks-per-region/user-clicks-per-region-processor/src/main/resources/application.yml index 0dc8e79..73ca9aa 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region/user-clicks-per-region-processor/src/main/resources/application.yml +++ b/multi-io-samples/kafka-streams/user-clicks-per-region/user-clicks-per-region-processor/src/main/resources/application.yml @@ -1,7 +1,18 @@ -spring.cloud.function.definition: processUserClickStream -spring.cloud.stream.function.bindings.processUserClickStream-in-0: userClicks -spring.cloud.stream.function.bindings.processUserClickStream-in-1: userRegions -spring.cloud.stream.function.bindings.processUserClickStream-out-0: clicksPerRegion +#spring.cloud.function.definition: processUserClickStream +#spring.cloud.stream.function.bindings.processUserClickStream-in-0: userClicks +#spring.cloud.stream.function.bindings.processUserClickStream-in-1: userRegions +#spring.cloud.stream.function.bindings.processUserClickStream-out-0: clicksPerRegion + +spring: + cloud: + function: + definition: processUserClickStream + stream: + function: + bindings: + processUserClickStream-in-0: userClicks + processUserClickStream-in-1: userRegions + processUserClickStream-out-0: clicksPerRegion spring.cloud.stream.bindings.userClicks.consumer.useNativeDecoding: true spring.cloud.stream.bindings.userRegions.consumer.useNativeDecoding: true diff --git a/multi-io-samples/ticktock/multi-input-log-kafka/pom.xml b/multi-io-samples/ticktock/multi-input-log-kafka/pom.xml index 53bd82a..bd667b5 100644 --- a/multi-io-samples/ticktock/multi-input-log-kafka/pom.xml +++ b/multi-io-samples/ticktock/multi-input-log-kafka/pom.xml @@ -247,7 +247,7 @@ org.springframework.cloud spring-cloud-app-starter-metadata-maven-plugin - 2.0.1.M1 + 2.0.2.BUILD-SNAPSHOT true diff --git a/multi-io-samples/ticktock/multi-input-log-kafka/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties b/multi-io-samples/ticktock/multi-input-log-kafka/src/main/resources/META-INF/dataflow-configuration-metadata.properties similarity index 61% rename from multi-io-samples/ticktock/multi-input-log-kafka/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties rename to multi-io-samples/ticktock/multi-input-log-kafka/src/main/resources/META-INF/dataflow-configuration-metadata.properties index 51233a2..ab4592d 100644 --- a/multi-io-samples/ticktock/multi-input-log-kafka/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties +++ b/multi-io-samples/ticktock/multi-input-log-kafka/src/main/resources/META-INF/dataflow-configuration-metadata.properties @@ -1,2 +1 @@ configuration-properties.classes=org.springframework.cloud.fn.consumer.log.LogConsumerProperties -configuration-properties.inbound-ports=input1,input2,input3 diff --git a/multi-io-samples/ticktock/multi-input-log-kafka/src/main/resources/application.properties b/multi-io-samples/ticktock/multi-input-log-kafka/src/main/resources/application.properties index dad608a..015701a 100644 --- a/multi-io-samples/ticktock/multi-input-log-kafka/src/main/resources/application.properties +++ b/multi-io-samples/ticktock/multi-input-log-kafka/src/main/resources/application.properties @@ -4,7 +4,7 @@ info.app.description=@project.description@ info.app.version=@project.version@ management.endpoints.web.exposure.include=health,info,bindings -spring.cloud.stream.function.definition=byteArrayTextToString|logConsumer;byteArrayTextToString|logConsumer2;byteArrayTextToString|logConsumer3 +spring.cloud.stream.function.definition=byteArrayTextToString|logConsumer spring.cloud.stream.function.bindings.byteArrayTextToString|logConsumer-in-0=input1 spring.cloud.stream.function.bindings.byteArrayTextToString|logConsumer2-in-0=input2 diff --git a/multi-io-samples/ticktock/multi-input-log-rabbit/pom.xml b/multi-io-samples/ticktock/multi-input-log-rabbit/pom.xml index 7c89aac..5ae587f 100644 --- a/multi-io-samples/ticktock/multi-input-log-rabbit/pom.xml +++ b/multi-io-samples/ticktock/multi-input-log-rabbit/pom.xml @@ -247,7 +247,7 @@ org.springframework.cloud spring-cloud-app-starter-metadata-maven-plugin - 2.0.1.M1 + 2.0.2.BUILD-SNAPSHOT true diff --git a/multi-io-samples/ticktock/multi-input-log-rabbit/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties b/multi-io-samples/ticktock/multi-input-log-rabbit/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties index 51233a2..ab4592d 100644 --- a/multi-io-samples/ticktock/multi-input-log-rabbit/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties +++ b/multi-io-samples/ticktock/multi-input-log-rabbit/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties @@ -1,2 +1 @@ configuration-properties.classes=org.springframework.cloud.fn.consumer.log.LogConsumerProperties -configuration-properties.inbound-ports=input1,input2,input3