diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/dist/http-transformer-kafka.zip b/dataflow-website/stream-developer-guides/feature-guides/streams/dist/composed-http-transformer-kafka.zip similarity index 83% rename from dataflow-website/stream-developer-guides/feature-guides/streams/dist/http-transformer-kafka.zip rename to dataflow-website/stream-developer-guides/feature-guides/streams/dist/composed-http-transformer-kafka.zip index dfdf31b..03ce8c6 100644 Binary files a/dataflow-website/stream-developer-guides/feature-guides/streams/dist/http-transformer-kafka.zip and b/dataflow-website/stream-developer-guides/feature-guides/streams/dist/composed-http-transformer-kafka.zip differ diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/dist/http-transformer-kotlin-kafka.zip b/dataflow-website/stream-developer-guides/feature-guides/streams/dist/composed-http-transformer-kotlin-kafka.zip similarity index 78% rename from dataflow-website/stream-developer-guides/feature-guides/streams/dist/http-transformer-kotlin-kafka.zip rename to dataflow-website/stream-developer-guides/feature-guides/streams/dist/composed-http-transformer-kotlin-kafka.zip index c7deb7f..c709608 100644 Binary files a/dataflow-website/stream-developer-guides/feature-guides/streams/dist/http-transformer-kotlin-kafka.zip and b/dataflow-website/stream-developer-guides/feature-guides/streams/dist/composed-http-transformer-kotlin-kafka.zip differ diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/dist/http-transformer-kotlin-rabbitmq.zip b/dataflow-website/stream-developer-guides/feature-guides/streams/dist/composed-http-transformer-kotlin-rabbitmq.zip similarity index 78% rename from dataflow-website/stream-developer-guides/feature-guides/streams/dist/http-transformer-kotlin-rabbitmq.zip rename to dataflow-website/stream-developer-guides/feature-guides/streams/dist/composed-http-transformer-kotlin-rabbitmq.zip index fa7bb0e..88b53ff 100644 Binary files a/dataflow-website/stream-developer-guides/feature-guides/streams/dist/http-transformer-kotlin-rabbitmq.zip and b/dataflow-website/stream-developer-guides/feature-guides/streams/dist/composed-http-transformer-kotlin-rabbitmq.zip differ diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/dist/http-transformer-rabbitmq.zip b/dataflow-website/stream-developer-guides/feature-guides/streams/dist/composed-http-transformer-rabbitmq.zip similarity index 83% rename from dataflow-website/stream-developer-guides/feature-guides/streams/dist/http-transformer-rabbitmq.zip rename to dataflow-website/stream-developer-guides/feature-guides/streams/dist/composed-http-transformer-rabbitmq.zip index b2585c0..a2bcb83 100644 Binary files a/dataflow-website/stream-developer-guides/feature-guides/streams/dist/http-transformer-rabbitmq.zip and b/dataflow-website/stream-developer-guides/feature-guides/streams/dist/composed-http-transformer-rabbitmq.zip differ diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-rabbitmq/http-transformer-kotlin/src/main/resources/META-INF/spring.factories b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-rabbitmq/http-transformer-kotlin/src/main/resources/META-INF/spring.factories deleted file mode 100644 index e20d073..0000000 --- a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-rabbitmq/http-transformer-kotlin/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration:\ - org.springframework.cloud.stream.app.processor.function.KotlinProcessorAutoConfiguration diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-kafka/http-transformer-kotlin/.mvn/wrapper/maven-wrapper.jar b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-kafka/http-transformer-kotlin/.mvn/wrapper/maven-wrapper.jar rename to dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/.mvn/wrapper/maven-wrapper.jar diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-kafka/http-transformer-kotlin/.mvn/wrapper/maven-wrapper.properties b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-kafka/http-transformer-kotlin/.mvn/wrapper/maven-wrapper.properties rename to dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/.mvn/wrapper/maven-wrapper.properties diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-kafka/http-transformer-kotlin/mvnw b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/mvnw similarity index 100% rename from dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-kafka/http-transformer-kotlin/mvnw rename to dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/mvnw diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-kafka/http-transformer-kotlin/mvnw.cmd b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/mvnw.cmd similarity index 100% rename from dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-kafka/http-transformer-kotlin/mvnw.cmd rename to dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/mvnw.cmd diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-kafka/http-transformer/pom.xml b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/pom.xml similarity index 85% rename from dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-kafka/http-transformer/pom.xml rename to dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/pom.xml index 4e2f0fe..37c860f 100644 --- a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-kafka/http-transformer/pom.xml +++ b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/pom.xml @@ -8,10 +8,10 @@ 2.1.0.RELEASE - org.springframework.cloud.stream.app - http-transformer - 2.1.0.BUILD-SNAPSHOT - http-source-kafka + io.spring.dataflow.sample + composed-http-transformer-kafka + 0.0.1-SNAPSHOT + composed-http-transformer-kafka Spring Cloud Stream Http Transformer Kafka Binder Application @@ -26,6 +26,8 @@ + springcloudstream + ${project.version} true 1.8 UTF-8 @@ -105,6 +107,22 @@ org.springframework.boot spring-boot-maven-plugin + + com.google.cloud.tools + jib-maven-plugin + 0.10.1 + + + springcloud/openjdk + + + ${docker.org}/${project.artifactId}:${docker.version} + + + true + + + diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-kafka/http-transformer/src/main/java/org/springframework/cloud/stream/app/http/source/kafka/HttpSourceKafkaApplication.java b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/src/main/java/io/spring/dataflow/sample/HttpTransformerKafkaApplication.java similarity index 87% rename from dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-kafka/http-transformer/src/main/java/org/springframework/cloud/stream/app/http/source/kafka/HttpSourceKafkaApplication.java rename to dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/src/main/java/io/spring/dataflow/sample/HttpTransformerKafkaApplication.java index 277f5bf..a396d5a 100644 --- a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-kafka/http-transformer/src/main/java/org/springframework/cloud/stream/app/http/source/kafka/HttpSourceKafkaApplication.java +++ b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/src/main/java/io/spring/dataflow/sample/HttpTransformerKafkaApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.stream.app.http.source.kafka; +package io.spring.dataflow.sample; import java.util.function.Function; @@ -26,7 +26,7 @@ import org.springframework.context.annotation.Import; @SpringBootApplication @Import(org.springframework.cloud.stream.app.http.source.HttpSourceConfiguration.class) -public class HttpSourceKafkaApplication { +public class HttpTransformerKafkaApplication { @Bean public Function upper() { @@ -40,6 +40,6 @@ public class HttpSourceKafkaApplication { public static void main(String[] args) { - SpringApplication.run(HttpSourceKafkaApplication.class, args); + SpringApplication.run(HttpTransformerKafkaApplication.class, args); } } diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-kafka/http-transformer/src/test/java/org/springframework/cloud/stream/app/http/source/kafka/HttpSourceKafkaApplicationTests.java b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/src/test/java/io/spring/dataflow/sample/HttpTransformerKafkaApplicationTests.java similarity index 88% rename from dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-kafka/http-transformer/src/test/java/org/springframework/cloud/stream/app/http/source/kafka/HttpSourceKafkaApplicationTests.java rename to dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/src/test/java/io/spring/dataflow/sample/HttpTransformerKafkaApplicationTests.java index 00b4e0b..776fedf 100644 --- a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-kafka/http-transformer/src/test/java/org/springframework/cloud/stream/app/http/source/kafka/HttpSourceKafkaApplicationTests.java +++ b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/src/test/java/io/spring/dataflow/sample/HttpTransformerKafkaApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.stream.app.http.source.kafka; +package io.spring.dataflow.sample; import org.junit.Test; import org.junit.runner.RunWith; @@ -23,7 +23,7 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) @SpringBootTest -public class HttpSourceKafkaApplicationTests { +public class HttpTransformerKafkaApplicationTests { @Test public void contextLoads() { diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-kafka/http-transformer/.mvn/wrapper/maven-wrapper.jar b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-kafka/http-transformer/.mvn/wrapper/maven-wrapper.jar rename to dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/.mvn/wrapper/maven-wrapper.jar diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-kafka/http-transformer/.mvn/wrapper/maven-wrapper.properties b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-kafka/http-transformer/.mvn/wrapper/maven-wrapper.properties rename to dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/.mvn/wrapper/maven-wrapper.properties diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-kafka/http-transformer/mvnw b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/mvnw similarity index 100% rename from dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-kafka/http-transformer/mvnw rename to dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/mvnw diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-kafka/http-transformer/mvnw.cmd b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/mvnw.cmd similarity index 100% rename from dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-kafka/http-transformer/mvnw.cmd rename to dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/mvnw.cmd diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-kafka/http-transformer-kotlin/pom.xml b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/pom.xml similarity index 88% rename from dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-kafka/http-transformer-kotlin/pom.xml rename to dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/pom.xml index 5d90f5b..e19c84b 100644 --- a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-kafka/http-transformer-kotlin/pom.xml +++ b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/pom.xml @@ -8,10 +8,10 @@ 2.1.0.RELEASE - org.springframework.cloud.stream.app - http-transformer-kotlin - 2.1.0.BUILD-SNAPSHOT - http-source-kafka + io.spring.dataflow.sample + composed-http-transformer-kotlin-kafka + 0.0.1-SNAPSHOT + composed-http-transformer-kotlin-kafka Spring Cloud Stream Http Transformer Kotlin Processor with Kafka Binder Application @@ -26,6 +26,8 @@ + springcloudstream + ${project.version} true 1.8 UTF-8 @@ -115,6 +117,22 @@ org.springframework.boot spring-boot-maven-plugin + + com.google.cloud.tools + jib-maven-plugin + 0.10.1 + + + springcloud/openjdk + + + ${docker.org}/${project.artifactId}:${docker.version} + + + true + + + kotlin-maven-plugin org.jetbrains.kotlin diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-kafka/http-transformer-kotlin/src/main/java/org/springframework/cloud/stream/app/http/source/kafka/HttpSourceKafkaApplication.java b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/src/main/java/io/spring/dataflow/sample/HttpTransformerKotlinKafkaApplication.java similarity index 84% rename from dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-kafka/http-transformer-kotlin/src/main/java/org/springframework/cloud/stream/app/http/source/kafka/HttpSourceKafkaApplication.java rename to dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/src/main/java/io/spring/dataflow/sample/HttpTransformerKotlinKafkaApplication.java index 190b227..f0700d7 100644 --- a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-kafka/http-transformer-kotlin/src/main/java/org/springframework/cloud/stream/app/http/source/kafka/HttpSourceKafkaApplication.java +++ b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/src/main/java/io/spring/dataflow/sample/HttpTransformerKotlinKafkaApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.stream.app.http.source.kafka; +package io.spring.dataflow.sample; import java.util.function.Function; @@ -27,8 +27,8 @@ import org.springframework.context.annotation.Import; @SpringBootApplication @Import({org.springframework.cloud.stream.app.http.source.HttpSourceConfiguration.class, - HttpSourceKafkaApplication.FunctionProcessorConfiguration.class}) -public class HttpSourceKafkaApplication { + HttpTransformerKotlinKafkaApplication.FunctionProcessorConfiguration.class}) +public class HttpTransformerKotlinKafkaApplication { @Configuration public static class FunctionProcessorConfiguration { @@ -45,6 +45,6 @@ public class HttpSourceKafkaApplication { } public static void main(String[] args) { - SpringApplication.run(HttpSourceKafkaApplication.class, args); + SpringApplication.run(HttpTransformerKotlinKafkaApplication.class, args); } } diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-rabbitmq/http-transformer-kotlin/src/main/kotlin/org/springframework/cloud/stream/app/processor/function/KotlinProcessorAutoConfiguration.kt b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/src/main/kotlin/io/spring/dataflow/sample/KotlinProcessorAutoConfiguration.kt similarity index 81% rename from dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-rabbitmq/http-transformer-kotlin/src/main/kotlin/org/springframework/cloud/stream/app/processor/function/KotlinProcessorAutoConfiguration.kt rename to dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/src/main/kotlin/io/spring/dataflow/sample/KotlinProcessorAutoConfiguration.kt index b727fa8..63b3d14 100644 --- a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-rabbitmq/http-transformer-kotlin/src/main/kotlin/org/springframework/cloud/stream/app/processor/function/KotlinProcessorAutoConfiguration.kt +++ b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/src/main/kotlin/io/spring/dataflow/sample/KotlinProcessorAutoConfiguration.kt @@ -1,4 +1,4 @@ -package org.springframework.cloud.stream.app.processor.function +package io.spring.dataflow.sample import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/src/main/resources/META-INF/spring.factories b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000..cd4440c --- /dev/null +++ b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration:\ + io.spring.dataflow.sample.KotlinProcessorAutoConfiguration diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-kafka/http-transformer-kotlin/src/test/java/org/springframework/cloud/stream/app/http/source/kafka/HttpSourceKafkaApplicationTests.java b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/src/test/java/org/springframework/cloud/stream/app/http/source/kafka/HttpTransformerKotlinKafkaApplicationTests.java similarity index 94% rename from dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-kafka/http-transformer-kotlin/src/test/java/org/springframework/cloud/stream/app/http/source/kafka/HttpSourceKafkaApplicationTests.java rename to dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/src/test/java/org/springframework/cloud/stream/app/http/source/kafka/HttpTransformerKotlinKafkaApplicationTests.java index 00b4e0b..0f292dc 100644 --- a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-kafka/http-transformer-kotlin/src/test/java/org/springframework/cloud/stream/app/http/source/kafka/HttpSourceKafkaApplicationTests.java +++ b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/src/test/java/org/springframework/cloud/stream/app/http/source/kafka/HttpTransformerKotlinKafkaApplicationTests.java @@ -23,7 +23,7 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) @SpringBootTest -public class HttpSourceKafkaApplicationTests { +public class HttpTransformerKotlinKafkaApplicationTests { @Test public void contextLoads() { diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-rabbitmq/http-transformer-kotlin/.mvn/wrapper/maven-wrapper.jar b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-rabbitmq/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-rabbitmq/http-transformer-kotlin/.mvn/wrapper/maven-wrapper.jar rename to dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-rabbitmq/.mvn/wrapper/maven-wrapper.jar diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-rabbitmq/http-transformer-kotlin/.mvn/wrapper/maven-wrapper.properties b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-rabbitmq/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-rabbitmq/http-transformer-kotlin/.mvn/wrapper/maven-wrapper.properties rename to dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-rabbitmq/.mvn/wrapper/maven-wrapper.properties diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-rabbitmq/http-transformer-kotlin/mvnw b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-rabbitmq/mvnw similarity index 100% rename from dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-rabbitmq/http-transformer-kotlin/mvnw rename to dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-rabbitmq/mvnw diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-rabbitmq/http-transformer-kotlin/mvnw.cmd b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-rabbitmq/mvnw.cmd similarity index 100% rename from dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-rabbitmq/http-transformer-kotlin/mvnw.cmd rename to dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-rabbitmq/mvnw.cmd diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-rabbitmq/http-transformer-kotlin/pom.xml b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-rabbitmq/pom.xml similarity index 88% rename from dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-rabbitmq/http-transformer-kotlin/pom.xml rename to dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-rabbitmq/pom.xml index 591d8f6..4364ee4 100644 --- a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-rabbitmq/http-transformer-kotlin/pom.xml +++ b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-rabbitmq/pom.xml @@ -8,10 +8,10 @@ 2.1.0.RELEASE - org.springframework.cloud.stream.app - http-transformer-kotlin - 2.1.0.BUILD-SNAPSHOT - http-source-rabbit + io.spring.dataflow.sample + composed-http-transformer-kotlin-rabbitmq + 0.0.1-SNAPSHOT + http-transformer-kotlin-rabbitmq Spring Cloud Stream Http Transformer Kotlin Processor with Rabbit Binder Application @@ -26,6 +26,8 @@ + springcloudstream + ${project.version} true 1.8 UTF-8 @@ -115,6 +117,22 @@ org.springframework.boot spring-boot-maven-plugin + + com.google.cloud.tools + jib-maven-plugin + 0.10.1 + + + springcloud/openjdk + + + ${docker.org}/${project.artifactId}:${docker.version} + + + true + + + kotlin-maven-plugin org.jetbrains.kotlin diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-rabbitmq/http-transformer-kotlin/src/main/java/org/springframework/cloud/stream/app/http/source/rabbit/HttpSourceRabbitApplication.java b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-rabbitmq/src/main/java/org/springframework/cloud/stream/app/http/source/rabbit/HttpSourceRabbitApplication.java similarity index 100% rename from dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-rabbitmq/http-transformer-kotlin/src/main/java/org/springframework/cloud/stream/app/http/source/rabbit/HttpSourceRabbitApplication.java rename to dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-rabbitmq/src/main/java/org/springframework/cloud/stream/app/http/source/rabbit/HttpSourceRabbitApplication.java diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-kafka/http-transformer-kotlin/src/main/kotlin/org/springframework/cloud/stream/app/processor/function/KotlinProcessorAutoConfiguration.kt b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-rabbitmq/src/main/kotlin/org/springframework/cloud/stream/app/processor/function/KotlinProcessorAutoConfiguration.kt similarity index 100% rename from dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-kafka/http-transformer-kotlin/src/main/kotlin/org/springframework/cloud/stream/app/processor/function/KotlinProcessorAutoConfiguration.kt rename to dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-rabbitmq/src/main/kotlin/org/springframework/cloud/stream/app/processor/function/KotlinProcessorAutoConfiguration.kt diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-kafka/http-transformer-kotlin/src/main/resources/META-INF/spring.factories b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-rabbitmq/src/main/resources/META-INF/spring.factories similarity index 100% rename from dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-kafka/http-transformer-kotlin/src/main/resources/META-INF/spring.factories rename to dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-rabbitmq/src/main/resources/META-INF/spring.factories diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-rabbitmq/http-transformer-kotlin/src/test/java/org/springframework/cloud/stream/app/http/source/rabbit/HttpSourceRabbitApplicationTests.java b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-rabbitmq/src/test/java/org/springframework/cloud/stream/app/http/source/rabbit/HttpSourceRabbitApplicationTests.java similarity index 100% rename from dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-rabbitmq/http-transformer-kotlin/src/test/java/org/springframework/cloud/stream/app/http/source/rabbit/HttpSourceRabbitApplicationTests.java rename to dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-rabbitmq/src/test/java/org/springframework/cloud/stream/app/http/source/rabbit/HttpSourceRabbitApplicationTests.java diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-rabbitmq/http-transformer/.mvn/wrapper/maven-wrapper.jar b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-rabbitmq/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-rabbitmq/http-transformer/.mvn/wrapper/maven-wrapper.jar rename to dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-rabbitmq/.mvn/wrapper/maven-wrapper.jar diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-rabbitmq/http-transformer/.mvn/wrapper/maven-wrapper.properties b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-rabbitmq/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-rabbitmq/http-transformer/.mvn/wrapper/maven-wrapper.properties rename to dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-rabbitmq/.mvn/wrapper/maven-wrapper.properties diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-rabbitmq/http-transformer/mvnw b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-rabbitmq/mvnw similarity index 100% rename from dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-rabbitmq/http-transformer/mvnw rename to dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-rabbitmq/mvnw diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-rabbitmq/http-transformer/mvnw.cmd b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-rabbitmq/mvnw.cmd similarity index 100% rename from dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-rabbitmq/http-transformer/mvnw.cmd rename to dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-rabbitmq/mvnw.cmd diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-rabbitmq/http-transformer/pom.xml b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-rabbitmq/pom.xml similarity index 85% rename from dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-rabbitmq/http-transformer/pom.xml rename to dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-rabbitmq/pom.xml index 818a234..41d6ccd 100644 --- a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-rabbitmq/http-transformer/pom.xml +++ b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-rabbitmq/pom.xml @@ -8,10 +8,10 @@ 2.1.0.RELEASE - org.springframework.cloud.stream.app - http-transformer - 2.1.0.BUILD-SNAPSHOT - http-source-rabbit + io.spring.dataflow.sample + composed-http-transformer-rabbitmq + 0.0.1-SNAPSHOT + composed-http-transformer-rabbitmq Spring Cloud Stream Http Transformer Rabbit Binder Application @@ -26,6 +26,8 @@ + springcloudstream + ${project.version} true 1.8 UTF-8 @@ -105,6 +107,22 @@ org.springframework.boot spring-boot-maven-plugin + + com.google.cloud.tools + jib-maven-plugin + 0.10.1 + + + springcloud/openjdk + + + ${docker.org}/${project.artifactId}:${docker.version} + + + true + + + diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-rabbitmq/http-transformer/src/main/java/org/springframework/cloud/stream/app/http/source/rabbit/HttpSourceRabbitApplication.java b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-rabbitmq/src/main/java/org/springframework/cloud/stream/app/http/source/rabbit/HttpSourceRabbitApplication.java similarity index 100% rename from dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-rabbitmq/http-transformer/src/main/java/org/springframework/cloud/stream/app/http/source/rabbit/HttpSourceRabbitApplication.java rename to dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-rabbitmq/src/main/java/org/springframework/cloud/stream/app/http/source/rabbit/HttpSourceRabbitApplication.java diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-rabbitmq/http-transformer/src/test/java/org/springframework/cloud/stream/app/http/source/rabbit/HttpSourceRabbitApplicationTests.java b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-rabbitmq/src/test/java/org/springframework/cloud/stream/app/http/source/rabbit/HttpSourceRabbitApplicationTests.java similarity index 100% rename from dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-rabbitmq/http-transformer/src/test/java/org/springframework/cloud/stream/app/http/source/rabbit/HttpSourceRabbitApplicationTests.java rename to dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-rabbitmq/src/test/java/org/springframework/cloud/stream/app/http/source/rabbit/HttpSourceRabbitApplicationTests.java