From 0d84299e61103fea801a0ecdf323d65e0ec457e7 Mon Sep 17 00:00:00 2001 From: Ilayaperumal Gopinathan Date: Thu, 9 May 2019 23:24:01 +0530 Subject: [PATCH] Refactor function composition samples --- ...ip => composed-http-transformer-kafka.zip} | Bin 56522 -> 55154 bytes ...omposed-http-transformer-kotlin-kafka.zip} | Bin 60470 -> 59640 bytes ...osed-http-transformer-kotlin-rabbitmq.zip} | Bin 60482 -> 62204 bytes ...=> composed-http-transformer-rabbitmq.zip} | Bin 56535 -> 57845 bytes .../main/resources/META-INF/spring.factories | 2 -- .../.mvn/wrapper/maven-wrapper.jar | Bin .../.mvn/wrapper/maven-wrapper.properties | 0 .../composed-http-transformer-kafka}/mvnw | 0 .../composed-http-transformer-kafka}/mvnw.cmd | 0 .../composed-http-transformer-kafka}/pom.xml | 26 +++++++++++++++--- .../HttpTransformerKafkaApplication.java} | 6 ++-- ...HttpTransformerKafkaApplicationTests.java} | 4 +-- .../.mvn/wrapper/maven-wrapper.jar | Bin .../.mvn/wrapper/maven-wrapper.properties | 0 .../mvnw | 0 .../mvnw.cmd | 0 .../pom.xml | 26 +++++++++++++++--- ...ttpTransformerKotlinKafkaApplication.java} | 8 +++--- .../KotlinProcessorAutoConfiguration.kt | 2 +- .../main/resources/META-INF/spring.factories | 2 ++ ...ansformerKotlinKafkaApplicationTests.java} | 2 +- .../.mvn/wrapper/maven-wrapper.jar | Bin .../.mvn/wrapper/maven-wrapper.properties | 0 .../mvnw | 0 .../mvnw.cmd | 0 .../pom.xml | 26 +++++++++++++++--- .../rabbit/HttpSourceRabbitApplication.java | 0 .../KotlinProcessorAutoConfiguration.kt | 0 .../main/resources/META-INF/spring.factories | 0 .../HttpSourceRabbitApplicationTests.java | 0 .../.mvn/wrapper/maven-wrapper.jar | Bin .../.mvn/wrapper/maven-wrapper.properties | 0 .../composed-http-transformer-rabbitmq}/mvnw | 0 .../mvnw.cmd | 0 .../pom.xml | 26 +++++++++++++++--- .../rabbit/HttpSourceRabbitApplication.java | 0 .../HttpSourceRabbitApplicationTests.java | 0 37 files changed, 101 insertions(+), 29 deletions(-) rename dataflow-website/stream-developer-guides/feature-guides/streams/dist/{http-transformer-kafka.zip => composed-http-transformer-kafka.zip} (83%) rename dataflow-website/stream-developer-guides/feature-guides/streams/dist/{http-transformer-kotlin-kafka.zip => composed-http-transformer-kotlin-kafka.zip} (78%) rename dataflow-website/stream-developer-guides/feature-guides/streams/dist/{http-transformer-kotlin-rabbitmq.zip => composed-http-transformer-kotlin-rabbitmq.zip} (78%) rename dataflow-website/stream-developer-guides/feature-guides/streams/dist/{http-transformer-rabbitmq.zip => composed-http-transformer-rabbitmq.zip} (83%) delete mode 100644 dataflow-website/stream-developer-guides/feature-guides/streams/function-composition-rabbitmq/http-transformer-kotlin/src/main/resources/META-INF/spring.factories rename dataflow-website/stream-developer-guides/feature-guides/streams/{function-composition-kafka/http-transformer-kotlin => function-composition/composed-http-transformer-kafka}/.mvn/wrapper/maven-wrapper.jar (100%) rename dataflow-website/stream-developer-guides/feature-guides/streams/{function-composition-kafka/http-transformer-kotlin => function-composition/composed-http-transformer-kafka}/.mvn/wrapper/maven-wrapper.properties (100%) rename dataflow-website/stream-developer-guides/feature-guides/streams/{function-composition-kafka/http-transformer-kotlin => function-composition/composed-http-transformer-kafka}/mvnw (100%) rename dataflow-website/stream-developer-guides/feature-guides/streams/{function-composition-kafka/http-transformer-kotlin => function-composition/composed-http-transformer-kafka}/mvnw.cmd (100%) rename dataflow-website/stream-developer-guides/feature-guides/streams/{function-composition-kafka/http-transformer => function-composition/composed-http-transformer-kafka}/pom.xml (85%) rename 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 => function-composition/composed-http-transformer-kafka/src/main/java/io/spring/dataflow/sample/HttpTransformerKafkaApplication.java} (87%) rename 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 => function-composition/composed-http-transformer-kafka/src/test/java/io/spring/dataflow/sample/HttpTransformerKafkaApplicationTests.java} (88%) rename dataflow-website/stream-developer-guides/feature-guides/streams/{function-composition-kafka/http-transformer => function-composition/composed-http-transformer-kotlin-kafka}/.mvn/wrapper/maven-wrapper.jar (100%) rename dataflow-website/stream-developer-guides/feature-guides/streams/{function-composition-kafka/http-transformer => function-composition/composed-http-transformer-kotlin-kafka}/.mvn/wrapper/maven-wrapper.properties (100%) rename dataflow-website/stream-developer-guides/feature-guides/streams/{function-composition-kafka/http-transformer => function-composition/composed-http-transformer-kotlin-kafka}/mvnw (100%) rename dataflow-website/stream-developer-guides/feature-guides/streams/{function-composition-kafka/http-transformer => function-composition/composed-http-transformer-kotlin-kafka}/mvnw.cmd (100%) rename dataflow-website/stream-developer-guides/feature-guides/streams/{function-composition-kafka/http-transformer-kotlin => function-composition/composed-http-transformer-kotlin-kafka}/pom.xml (88%) rename 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 => function-composition/composed-http-transformer-kotlin-kafka/src/main/java/io/spring/dataflow/sample/HttpTransformerKotlinKafkaApplication.java} (84%) rename dataflow-website/stream-developer-guides/feature-guides/streams/{function-composition-rabbitmq/http-transformer-kotlin/src/main/kotlin/org/springframework/cloud/stream/app/processor/function => function-composition/composed-http-transformer-kotlin-kafka/src/main/kotlin/io/spring/dataflow/sample}/KotlinProcessorAutoConfiguration.kt (81%) create mode 100644 dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/src/main/resources/META-INF/spring.factories rename 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 => function-composition/composed-http-transformer-kotlin-kafka/src/test/java/org/springframework/cloud/stream/app/http/source/kafka/HttpTransformerKotlinKafkaApplicationTests.java} (94%) rename dataflow-website/stream-developer-guides/feature-guides/streams/{function-composition-rabbitmq/http-transformer-kotlin => function-composition/composed-http-transformer-kotlin-rabbitmq}/.mvn/wrapper/maven-wrapper.jar (100%) rename dataflow-website/stream-developer-guides/feature-guides/streams/{function-composition-rabbitmq/http-transformer-kotlin => function-composition/composed-http-transformer-kotlin-rabbitmq}/.mvn/wrapper/maven-wrapper.properties (100%) rename dataflow-website/stream-developer-guides/feature-guides/streams/{function-composition-rabbitmq/http-transformer-kotlin => function-composition/composed-http-transformer-kotlin-rabbitmq}/mvnw (100%) rename dataflow-website/stream-developer-guides/feature-guides/streams/{function-composition-rabbitmq/http-transformer-kotlin => function-composition/composed-http-transformer-kotlin-rabbitmq}/mvnw.cmd (100%) rename dataflow-website/stream-developer-guides/feature-guides/streams/{function-composition-rabbitmq/http-transformer-kotlin => function-composition/composed-http-transformer-kotlin-rabbitmq}/pom.xml (88%) rename dataflow-website/stream-developer-guides/feature-guides/streams/{function-composition-rabbitmq/http-transformer-kotlin => function-composition/composed-http-transformer-kotlin-rabbitmq}/src/main/java/org/springframework/cloud/stream/app/http/source/rabbit/HttpSourceRabbitApplication.java (100%) rename dataflow-website/stream-developer-guides/feature-guides/streams/{function-composition-kafka/http-transformer-kotlin => function-composition/composed-http-transformer-kotlin-rabbitmq}/src/main/kotlin/org/springframework/cloud/stream/app/processor/function/KotlinProcessorAutoConfiguration.kt (100%) rename dataflow-website/stream-developer-guides/feature-guides/streams/{function-composition-kafka/http-transformer-kotlin => function-composition/composed-http-transformer-kotlin-rabbitmq}/src/main/resources/META-INF/spring.factories (100%) rename dataflow-website/stream-developer-guides/feature-guides/streams/{function-composition-rabbitmq/http-transformer-kotlin => function-composition/composed-http-transformer-kotlin-rabbitmq}/src/test/java/org/springframework/cloud/stream/app/http/source/rabbit/HttpSourceRabbitApplicationTests.java (100%) rename dataflow-website/stream-developer-guides/feature-guides/streams/{function-composition-rabbitmq/http-transformer => function-composition/composed-http-transformer-rabbitmq}/.mvn/wrapper/maven-wrapper.jar (100%) rename dataflow-website/stream-developer-guides/feature-guides/streams/{function-composition-rabbitmq/http-transformer => function-composition/composed-http-transformer-rabbitmq}/.mvn/wrapper/maven-wrapper.properties (100%) rename dataflow-website/stream-developer-guides/feature-guides/streams/{function-composition-rabbitmq/http-transformer => function-composition/composed-http-transformer-rabbitmq}/mvnw (100%) rename dataflow-website/stream-developer-guides/feature-guides/streams/{function-composition-rabbitmq/http-transformer => function-composition/composed-http-transformer-rabbitmq}/mvnw.cmd (100%) rename dataflow-website/stream-developer-guides/feature-guides/streams/{function-composition-rabbitmq/http-transformer => function-composition/composed-http-transformer-rabbitmq}/pom.xml (85%) rename dataflow-website/stream-developer-guides/feature-guides/streams/{function-composition-rabbitmq/http-transformer => function-composition/composed-http-transformer-rabbitmq}/src/main/java/org/springframework/cloud/stream/app/http/source/rabbit/HttpSourceRabbitApplication.java (100%) rename dataflow-website/stream-developer-guides/feature-guides/streams/{function-composition-rabbitmq/http-transformer => function-composition/composed-http-transformer-rabbitmq}/src/test/java/org/springframework/cloud/stream/app/http/source/rabbit/HttpSourceRabbitApplicationTests.java (100%) 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 dfdf31bf3078a655ace24f76d4f58811798785b3..03ce8c6b761691d7f02a9b467b5dc18c4d15b5df 100644 GIT binary patch delta 6850 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 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 b2585c0504608241eede457e0b0ba1caa4ac0f49..a2bcb83d3596d184bd2bef020d30d6f0a6fcb9bb 100644 GIT binary patch delta 5311 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 delta 4014 zcma);3pm^N8pngEOx;>>Y1~6+l(;LMdkLw!wN2%*P^vOzE)ln)$vC4NXKMYo>{&}Y zWrCxa^}-qhFV5wYyxx|S@3S*bs~t2on%DAc zxN+u2P=54R2U-kGIwb#QH)-jqcqgl~Ok zh*aF4z8Sqc&9#j5^xQS_yb~V2^!(`wnZ+E5|BDpW++LLG`ZYS3J;s*&kOIK95I zY4=fS<#B&+#@(SD&bc1FIfxB?1370j+VqlE{}ctv1370R4_j7_|OCD0pk4MM?MWg44Y2H)?kb8VPxte zd|AI#YTJe~n7VB?MNVh!hH^2^X@4z_L~B!$=*teSrZeMCINaxI>NU*E(gdVg_=%M$ zY2)lrgP+jkj>e=K-eK$H#p3ih&AR8+vWIc(IQ5)9UmvV>H&*eCgN1`ud%!&hAGWb= zFgv@Ys^{tx>*Rm$zV*a19oJQzqCUAId#SX5-dq{YVEQ=SAReSnD){A?J8GUZW^j;x zP<4Lo^Log<1?P42LSNeO94)cSx}diTpZsGI^FJE+n8enGH{~=9GV}7{wQ^~LEGx^| z@zb7DoSMKNGgZJ;S)vlw@S2R^CH!2V_66X(5yd;X3$iG`v)%kv- zPcY3GR!j8QPgr~!+1J6lhM_R=&Dn~jND8hwlX299FO(-Lf1I5d@rM*ANwMV zsYzeZa&`V8azSBWuA(d?Hl#DQdzWn|rKg8lc{f8sZHivRur)SxcB-WpPm-&ct#{u3 z?7pL^(#W-FjM+RWXCTc;Ude58`@E38^f3I@NlPlzDp@k0I=FvZn&Yh) zb-nOuiqnt%jQd>4)WM9%kJVPB{JmvRS0)~0`5+O9bY%oIFR!7i3UVbJ-_C^I2i0>8 zEVMTjr6h#K$BP&x+HKt^(Y62zDpW9*lp#Sa3SXklz`tukbVV7yrtyqoEK^4XATop9 zcGWT)Kfa|b3l`B5!bNH@z<@3UYZ4=9i6TNHoh^k?VaZ`4YP3E;4O#G%p)Wg;k|8Ac z_Mxr78vSjn$BRH?57rooYFxk?b5V^uSYr*vcdzF|0Bh_;uj3EaxFO*KQIK&USm6TI zvt%G$7IHg$aEi`D#^!*zWC^ixk`*kud7EOwPKwUt=4}!P|F1S>a+F0&2DT}aW4P8v zV2h~S54VWQ{cww@+z+>i%5_}J1=t?FeizYtfDO{?_XIX41=Jk9{%E){1^rEujvMzS zxwZAlW!4q`2-u!b!tDtv8q{X&LcAl&Go3-iyEO{MU!zvX$KP8*Qbh`lK=GgOP9@@C z2z9YbN}vEqtZ!H-lyJp@+W)1EQxzd+UCa5IZAf3}f^ZGc_hVRFZ87BOrpP-_6rhGf zSgfrGTApbwzcCu$7(YS68A4Tjy_uMP0j$^jC@L(0ND@E>!&p-l5ok8^;*E_#gvKc# z_!Ws0uG}^NvFf60_rMY(8pBnoeG@|HscYC?9WjiwB_{mquCY+ypaQxAKnPq`cU0hN z{9>?HVlkG$1njwMSH{|l5rG{Wi{ZyGf^^5%W4MSBtzg0&s=v2RxQh`coxm8@kjwpb zf*?kef(h8G*X!^XBUHM8G2CJ6fbUbFm>L4BS6y7`ksvF~11vT}geuQe?*_);Qx9M( zhvU3ADz8}^2{U-OgucF3%zLA$|EqboBwwd-ZJq)abs`H z3F4mvn-5AAnAl=a)Ovw2wiuK=F!AZTD#XVG!2v{AJwev%79SNlnDB&zW1{*9i%k(5 d6REqv7$apUHfm^X`Yg{SUZ4!X*Fz 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