diff --git a/multi-binder-samples/kafka-multibinder-jaas/.mvn/wrapper/maven-wrapper.jar b/multi-binder-samples/kafka-multi-binder-jaas/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from multi-binder-samples/kafka-multibinder-jaas/.mvn/wrapper/maven-wrapper.jar rename to multi-binder-samples/kafka-multi-binder-jaas/.mvn/wrapper/maven-wrapper.jar diff --git a/multi-binder-samples/kafka-multibinder-jaas/.mvn/wrapper/maven-wrapper.properties b/multi-binder-samples/kafka-multi-binder-jaas/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from multi-binder-samples/kafka-multibinder-jaas/.mvn/wrapper/maven-wrapper.properties rename to multi-binder-samples/kafka-multi-binder-jaas/.mvn/wrapper/maven-wrapper.properties diff --git a/multi-binder-samples/kafka-multibinder-jaas/README.adoc b/multi-binder-samples/kafka-multi-binder-jaas/README.adoc similarity index 99% rename from multi-binder-samples/kafka-multibinder-jaas/README.adoc rename to multi-binder-samples/kafka-multi-binder-jaas/README.adoc index 7a251ae..d73a05e 100644 --- a/multi-binder-samples/kafka-multibinder-jaas/README.adoc +++ b/multi-binder-samples/kafka-multi-binder-jaas/README.adoc @@ -3,7 +3,6 @@ This is a sample application that demonstrates how to connect to multi kafka clusters with security enabled using multiple binders. This application uses two Kafka clusters both of them are enabled with security (JAAS - SASL/PLAINTEXT). - ## Here are the detailed instructions for setting up your cluster. If you already have two clusters with security (sasl/plaintext) enabled, you can skip this section. However, it may still benefit to go over these instructions in order to avoid any inconsistencies with your environment. @@ -20,7 +19,7 @@ If you already have two clusters with security (sasl/plaintext) enabled, you can KafkaServer { org.apache.kafka.common.security.plain.PlainLoginModule required username="admin" - password="admin-secret"; + password="admin-secret" user_admin="admin-secret"; }; @@ -99,7 +98,7 @@ $ .//bin/kafka-server-start.sh config/server.properties KafkaServer { org.apache.kafka.common.security.plain.PlainLoginModule required username="admin" - password="admin-secret"; + password="admin-secret" user_admin="admin-secret"; }; diff --git a/multi-binder-samples/kafka-multibinder-jaas/mvnw b/multi-binder-samples/kafka-multi-binder-jaas/mvnw similarity index 100% rename from multi-binder-samples/kafka-multibinder-jaas/mvnw rename to multi-binder-samples/kafka-multi-binder-jaas/mvnw diff --git a/multi-binder-samples/kafka-multibinder-jaas/mvnw.cmd b/multi-binder-samples/kafka-multi-binder-jaas/mvnw.cmd similarity index 100% rename from multi-binder-samples/kafka-multibinder-jaas/mvnw.cmd rename to multi-binder-samples/kafka-multi-binder-jaas/mvnw.cmd diff --git a/multi-binder-samples/kafka-multi-binder-jaas/pom.xml b/multi-binder-samples/kafka-multi-binder-jaas/pom.xml new file mode 100644 index 0000000..78c39ec --- /dev/null +++ b/multi-binder-samples/kafka-multi-binder-jaas/pom.xml @@ -0,0 +1,125 @@ + + + 4.0.0 + + kafka-multi-binder-jaas + 0.0.1-SNAPSHOT + jar + + kafka-multi-binder-jaas + Demo project with multi kafka cluster/binder with JAAS + + + org.springframework.boot + spring-boot-starter-parent + 2.2.0.RELEASE + + + + + Hoxton.BUILD-SNAPSHOT + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + + + + org.springframework.cloud + spring-cloud-stream-binder-kafka + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.kafka + spring-kafka-test + test + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-starter + + + org.springframework.boot + spring-boot-starter-web + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/libs-snapshot-local + + true + + + false + + + + spring-milestones + Spring Milestones + https://repo.spring.io/libs-milestone-local + + false + + + + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/libs-snapshot-local + + true + + + false + + + + spring-milestones + Spring Milestones + https://repo.spring.io/libs-milestone-local + + false + + + + spring-releases + Spring Releases + https://repo.spring.io/libs-release-local + + false + + + + + diff --git a/multi-binder-samples/kafka-multibinder-jaas/src/main/java/multibinder/kafka/jaas/MultiBinderKafkaJaasSample.java b/multi-binder-samples/kafka-multi-binder-jaas/src/main/java/multibinder/kafka/jaas/MultiBinderKafkaJaasSample.java similarity index 51% rename from multi-binder-samples/kafka-multibinder-jaas/src/main/java/multibinder/kafka/jaas/MultiBinderKafkaJaasSample.java rename to multi-binder-samples/kafka-multi-binder-jaas/src/main/java/multibinder/kafka/jaas/MultiBinderKafkaJaasSample.java index 094dc81..4decbe8 100644 --- a/multi-binder-samples/kafka-multibinder-jaas/src/main/java/multibinder/kafka/jaas/MultiBinderKafkaJaasSample.java +++ b/multi-binder-samples/kafka-multi-binder-jaas/src/main/java/multibinder/kafka/jaas/MultiBinderKafkaJaasSample.java @@ -16,15 +16,11 @@ package multibinder.kafka.jaas; +import java.util.function.Function; + import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.stream.annotation.EnableBinding; -import org.springframework.cloud.stream.annotation.Input; -import org.springframework.cloud.stream.annotation.Output; -import org.springframework.cloud.stream.annotation.StreamListener; -import org.springframework.messaging.MessageChannel; -import org.springframework.messaging.SubscribableChannel; -import org.springframework.messaging.handler.annotation.SendTo; +import org.springframework.context.annotation.Bean; @SpringBootApplication public class MultiBinderKafkaJaasSample { @@ -33,35 +29,17 @@ public class MultiBinderKafkaJaasSample { SpringApplication.run(MultiBinderKafkaJaasSample.class, args); } - @EnableBinding(CustomProcessor.class) - static class Foo { + static class Foo { - @StreamListener("input") - @SendTo("output") - public String receive(String foo) { - return foo; + @Bean + public Function receive() { + return foo -> foo; } - @StreamListener("input1") - @SendTo("output1") - public String receive1(String foo) { - return foo; + @Bean + public Function receive1() { + return foo -> foo; } } - interface CustomProcessor { - - @Input("input") - SubscribableChannel input(); - - @Output("output") - MessageChannel output(); - - @Input("input1") - SubscribableChannel input1(); - - @Output("output1") - MessageChannel output1(); - - } -} +} \ No newline at end of file diff --git a/multi-binder-samples/kafka-multibinder-jaas/src/main/resources/application.yml b/multi-binder-samples/kafka-multi-binder-jaas/src/main/resources/application.yml similarity index 90% rename from multi-binder-samples/kafka-multibinder-jaas/src/main/resources/application.yml rename to multi-binder-samples/kafka-multi-binder-jaas/src/main/resources/application.yml index 8bfecf5..4b0294a 100644 --- a/multi-binder-samples/kafka-multibinder-jaas/src/main/resources/application.yml +++ b/multi-binder-samples/kafka-multi-binder-jaas/src/main/resources/application.yml @@ -1,15 +1,16 @@ spring.cloud.stream: + function.definition: receive;receive1 bindings: - input: + receive-in-0: destination: kafka1-in binder: kafka1 - output: + receive-out-0: destination: kafka2-out binder: kafka2 - input1: + receive1-in-0: destination: kafka2-in binder: kafka2 - output1: + receive1-out-0: destination: kafka1-out binder: kafka1 binders: diff --git a/multi-binder-samples/kafka-multibinder-jaas/src/test/java/multibinder/kafka/jaas/MultiBinderKafkaJaasSampleTests.java b/multi-binder-samples/kafka-multi-binder-jaas/src/test/java/multibinder/kafka/jaas/MultiBinderKafkaJaasSampleTests.java similarity index 100% rename from multi-binder-samples/kafka-multibinder-jaas/src/test/java/multibinder/kafka/jaas/MultiBinderKafkaJaasSampleTests.java rename to multi-binder-samples/kafka-multi-binder-jaas/src/test/java/multibinder/kafka/jaas/MultiBinderKafkaJaasSampleTests.java diff --git a/multi-binder-samples/kafka-multibinder-jaas/pom.xml b/multi-binder-samples/kafka-multibinder-jaas/pom.xml deleted file mode 100644 index 71578d5..0000000 --- a/multi-binder-samples/kafka-multibinder-jaas/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - 4.0.0 - - kafka-multibinder-jaas - 0.0.1-SNAPSHOT - jar - - kafka-multibinder-jaas - Demo project with multi kafka cluster/binder with JAAS - - - io.spring.cloud.stream.sample - spring-cloud-stream-samples-parent - 0.0.1-SNAPSHOT - ../.. - - - - - org.springframework.cloud - spring-cloud-stream-binder-kafka - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.cloud - spring-cloud-stream-test-support - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - diff --git a/multi-binder-samples/multi-binder-kafka-streams/README.adoc b/multi-binder-samples/multi-binder-kafka-streams/README.adoc index 7bdae3d..f67cc23 100644 --- a/multi-binder-samples/multi-binder-kafka-streams/README.adoc +++ b/multi-binder-samples/multi-binder-kafka-streams/README.adoc @@ -28,7 +28,7 @@ Assuming you are running two dockerized Kafka clusters as above. Issue the following commands: -`docker exec -it kafka-multib-inder-1 /opt/kafka/bin/kafka-console-producer.sh --broker-list 127.0.0.1:9092 --topic dataIn` +`docker exec -it kafka-multi-binder-1 /opt/kafka/bin/kafka-console-producer.sh --broker-list 127.0.0.1:9092 --topic dataIn` On another terminal: diff --git a/multi-binder-samples/multi-binder-kafka-streams/docker-compose.yml b/multi-binder-samples/multi-binder-kafka-streams/docker-compose.yml index 0fa14da..a3dfa74 100644 --- a/multi-binder-samples/multi-binder-kafka-streams/docker-compose.yml +++ b/multi-binder-samples/multi-binder-kafka-streams/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: kafka1: image: wurstmeister/kafka - container_name: kafka-multib-inder-1 + container_name: kafka-multi-binder-1 ports: - "9092:9092" environment: diff --git a/multi-binder-samples/pom.xml b/multi-binder-samples/pom.xml index 6241382..2033793 100644 --- a/multi-binder-samples/pom.xml +++ b/multi-binder-samples/pom.xml @@ -11,7 +11,7 @@ multi-binder-kafka-rabbit multi-binder-two-kafka-clusters - kafka-multibinder-jaas + kafka-multi-binder-jaas multi-binder-kafka-streams