diff --git a/spring-kafka/src/main/java/com/baeldung/partitioningstrategy/CustomPartitioner.java b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/partitioningstrategy/CustomPartitioner.java similarity index 93% rename from spring-kafka/src/main/java/com/baeldung/partitioningstrategy/CustomPartitioner.java rename to spring-kafka-2/src/main/java/com/baeldung/spring/kafka/partitioningstrategy/CustomPartitioner.java index f4899cf9a364..b63bc248cd3f 100644 --- a/spring-kafka/src/main/java/com/baeldung/partitioningstrategy/CustomPartitioner.java +++ b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/partitioningstrategy/CustomPartitioner.java @@ -1,10 +1,10 @@ -package com.baeldung.partitioningstrategy; +package com.baeldung.spring.kafka.partitioningstrategy; + +import java.util.Map; import org.apache.kafka.clients.producer.Partitioner; import org.apache.kafka.common.Cluster; -import java.util.Map; - public class CustomPartitioner implements Partitioner { private static final int PREMIUM_PARTITION = 0; private static final int NORMAL_PARTITION = 1; diff --git a/spring-kafka/src/main/java/com/baeldung/partitioningstrategy/KafkaApplication.java b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/partitioningstrategy/KafkaApplication.java similarity index 95% rename from spring-kafka/src/main/java/com/baeldung/partitioningstrategy/KafkaApplication.java rename to spring-kafka-2/src/main/java/com/baeldung/spring/kafka/partitioningstrategy/KafkaApplication.java index c2ca1d3a4713..204364ea9387 100644 --- a/spring-kafka/src/main/java/com/baeldung/partitioningstrategy/KafkaApplication.java +++ b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/partitioningstrategy/KafkaApplication.java @@ -1,4 +1,7 @@ -package com.baeldung.partitioningstrategy; +package com.baeldung.spring.kafka.partitioningstrategy; + +import java.util.HashMap; +import java.util.Map; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.KafkaConsumer; @@ -12,9 +15,6 @@ import org.springframework.kafka.core.KafkaTemplate; import org.springframework.kafka.core.ProducerFactory; -import java.util.HashMap; -import java.util.Map; - @SpringBootApplication public class KafkaApplication { @@ -26,7 +26,7 @@ public KafkaTemplate kafkaTemplate() { @Bean public ProducerFactory producerFactory() { Map configProps = new HashMap<>(); - configProps.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:9092"); + configProps.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:9095"); configProps.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class); configProps.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class); return new DefaultKafkaProducerFactory<>(configProps); @@ -35,7 +35,7 @@ public ProducerFactory producerFactory() { @Bean public KafkaConsumer kafkaConsumer() { Map configProps = new HashMap<>(); - configProps.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:9092"); + configProps.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, "localhost:9095"); configProps.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class); configProps.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class); configProps.put(ConsumerConfig.GROUP_ID_CONFIG, "test-group"); // Set a unique group ID diff --git a/spring-kafka/src/main/java/com/baeldung/partitioningstrategy/KafkaMessageConsumer.java b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/partitioningstrategy/KafkaMessageConsumer.java similarity index 95% rename from spring-kafka/src/main/java/com/baeldung/partitioningstrategy/KafkaMessageConsumer.java rename to spring-kafka-2/src/main/java/com/baeldung/spring/kafka/partitioningstrategy/KafkaMessageConsumer.java index 8290b0ab0fa1..58ad40e4ceb1 100644 --- a/spring-kafka/src/main/java/com/baeldung/partitioningstrategy/KafkaMessageConsumer.java +++ b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/partitioningstrategy/KafkaMessageConsumer.java @@ -1,14 +1,16 @@ -package com.baeldung.partitioningstrategy; +package com.baeldung.spring.kafka.partitioningstrategy; + +import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; -import jakarta.annotation.Nullable; import org.springframework.kafka.annotation.KafkaListener; import org.springframework.kafka.support.KafkaHeaders; import org.springframework.messaging.handler.annotation.Header; import org.springframework.messaging.handler.annotation.Payload; import org.springframework.stereotype.Service; -import java.util.List; -import java.util.concurrent.CopyOnWriteArrayList; + +import jakarta.annotation.Nullable; @Service public class KafkaMessageConsumer { diff --git a/spring-kafka/src/main/java/com/baeldung/partitioningstrategy/ReceivedMessage.java b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/partitioningstrategy/ReceivedMessage.java similarity index 91% rename from spring-kafka/src/main/java/com/baeldung/partitioningstrategy/ReceivedMessage.java rename to spring-kafka-2/src/main/java/com/baeldung/spring/kafka/partitioningstrategy/ReceivedMessage.java index a262f62e3930..f3582a2e4b0f 100644 --- a/spring-kafka/src/main/java/com/baeldung/partitioningstrategy/ReceivedMessage.java +++ b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/partitioningstrategy/ReceivedMessage.java @@ -1,4 +1,4 @@ -package com.baeldung.partitioningstrategy; +package com.baeldung.spring.kafka.partitioningstrategy; public class ReceivedMessage { private final String key; diff --git a/spring-kafka/src/main/java/com/baeldung/sasl/KafkaConsumer.java b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/sasl/KafkaConsumer.java similarity index 94% rename from spring-kafka/src/main/java/com/baeldung/sasl/KafkaConsumer.java rename to spring-kafka-2/src/main/java/com/baeldung/spring/kafka/sasl/KafkaConsumer.java index 15f830d51a2f..4cd74105775a 100644 --- a/spring-kafka/src/main/java/com/baeldung/sasl/KafkaConsumer.java +++ b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/sasl/KafkaConsumer.java @@ -1,12 +1,13 @@ -package com.baeldung.sasl; +package com.baeldung.spring.kafka.sasl; + +import java.util.ArrayList; +import java.util.List; -import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.springframework.kafka.annotation.KafkaListener; import org.springframework.stereotype.Component; -import java.util.ArrayList; -import java.util.List; +import lombok.extern.slf4j.Slf4j; @Component @Slf4j diff --git a/spring-kafka/src/main/java/com/baeldung/sasl/KafkaSaslApplication.java b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/sasl/KafkaSaslApplication.java similarity index 90% rename from spring-kafka/src/main/java/com/baeldung/sasl/KafkaSaslApplication.java rename to spring-kafka-2/src/main/java/com/baeldung/spring/kafka/sasl/KafkaSaslApplication.java index 57e2ac605bb7..be2c6c0d2392 100644 --- a/spring-kafka/src/main/java/com/baeldung/sasl/KafkaSaslApplication.java +++ b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/sasl/KafkaSaslApplication.java @@ -1,4 +1,4 @@ -package com.baeldung.sasl; +package com.baeldung.spring.kafka.sasl; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/spring-kafka/src/main/resources/application-sasl.yml b/spring-kafka-2/src/main/resources/application-sasl.yml similarity index 100% rename from spring-kafka/src/main/resources/application-sasl.yml rename to spring-kafka-2/src/main/resources/application-sasl.yml diff --git a/spring-kafka-2/src/main/resources/application.properties b/spring-kafka-2/src/main/resources/application.properties index 76397644400f..fd4cc7a5bf5a 100644 --- a/spring-kafka-2/src/main/resources/application.properties +++ b/spring-kafka-2/src/main/resources/application.properties @@ -1,4 +1,4 @@ -spring.kafka.bootstrap-servers=localhost:9092,localhost:9093,localhost:9094 +spring.kafka.bootstrap-servers=localhost:9092,localhost:9093,localhost:9094, localhost:9095 message.topic.name=baeldung long.message.topic.name=longMessage greeting.topic.name=greeting diff --git a/spring-kafka/src/test/java/com/baeldung/partitioningstrategy/KafkaApplicationIntegrationTest.java b/spring-kafka-2/src/test/java/com/baeldung/spring/kafka/partitioningstrategy/KafkaApplicationIntegrationTest.java similarity index 98% rename from spring-kafka/src/test/java/com/baeldung/partitioningstrategy/KafkaApplicationIntegrationTest.java rename to spring-kafka-2/src/test/java/com/baeldung/spring/kafka/partitioningstrategy/KafkaApplicationIntegrationTest.java index 34e466b4b965..a3ed7993b390 100644 --- a/spring-kafka/src/test/java/com/baeldung/partitioningstrategy/KafkaApplicationIntegrationTest.java +++ b/spring-kafka-2/src/test/java/com/baeldung/spring/kafka/partitioningstrategy/KafkaApplicationIntegrationTest.java @@ -1,4 +1,15 @@ -package com.baeldung.partitioningstrategy; +package com.baeldung.spring.kafka.partitioningstrategy; + +import static java.util.concurrent.TimeUnit.SECONDS; +import static org.awaitility.Awaitility.await; +import static org.junit.Assert.assertEquals; + +import java.time.Duration; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerRecord; @@ -16,19 +27,8 @@ import org.springframework.kafka.test.context.EmbeddedKafka; import org.springframework.kafka.test.utils.KafkaTestUtils; -import java.time.Duration; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - -import static java.util.concurrent.TimeUnit.SECONDS; -import static org.awaitility.Awaitility.await; -import static org.junit.Assert.assertEquals; - @SpringBootTest -@EmbeddedKafka(partitions = 3, brokerProperties = { "listeners=PLAINTEXT://localhost:9092" }, kraft = false) +@EmbeddedKafka(partitions = 3, brokerProperties = { "listeners=PLAINTEXT://localhost:9095" }, kraft = false) public class KafkaApplicationIntegrationTest { @Autowired diff --git a/spring-kafka/src/test/java/com/baeldung/sasl/SprintContextTest.java b/spring-kafka-2/src/test/java/com/baeldung/spring/kafka/sasl/SprintContextTest.java similarity index 85% rename from spring-kafka/src/test/java/com/baeldung/sasl/SprintContextTest.java rename to spring-kafka-2/src/test/java/com/baeldung/spring/kafka/sasl/SprintContextTest.java index 1739ce983b69..77402285b6b2 100644 --- a/spring-kafka/src/test/java/com/baeldung/sasl/SprintContextTest.java +++ b/spring-kafka-2/src/test/java/com/baeldung/spring/kafka/sasl/SprintContextTest.java @@ -1,4 +1,4 @@ -package com.baeldung.sasl; +package com.baeldung.spring.kafka.sasl; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -7,7 +7,7 @@ @ExtendWith(SpringExtension.class) @SpringBootTest(classes = KafkaSaslApplication.class) -class SpringContextTest { +class SprintContextTest { @Test void whenSpringContextIsBootstrapped_thenNoExceptions() { diff --git a/spring-kafka/src/test/resources/sasl/Dockerfile b/spring-kafka-2/src/test/resources/sasl/Dockerfile similarity index 100% rename from spring-kafka/src/test/resources/sasl/Dockerfile rename to spring-kafka-2/src/test/resources/sasl/Dockerfile diff --git a/spring-kafka/src/test/resources/sasl/config/kadm5.acl b/spring-kafka-2/src/test/resources/sasl/config/kadm5.acl similarity index 100% rename from spring-kafka/src/test/resources/sasl/config/kadm5.acl rename to spring-kafka-2/src/test/resources/sasl/config/kadm5.acl diff --git a/spring-kafka/src/test/resources/sasl/config/kafka_server_jaas.conf b/spring-kafka-2/src/test/resources/sasl/config/kafka_server_jaas.conf similarity index 100% rename from spring-kafka/src/test/resources/sasl/config/kafka_server_jaas.conf rename to spring-kafka-2/src/test/resources/sasl/config/kafka_server_jaas.conf diff --git a/spring-kafka/src/test/resources/sasl/config/krb5.conf b/spring-kafka-2/src/test/resources/sasl/config/krb5.conf similarity index 100% rename from spring-kafka/src/test/resources/sasl/config/krb5.conf rename to spring-kafka-2/src/test/resources/sasl/config/krb5.conf diff --git a/spring-kafka/src/test/resources/sasl/config/zookeeper_jaas.conf b/spring-kafka-2/src/test/resources/sasl/config/zookeeper_jaas.conf similarity index 100% rename from spring-kafka/src/test/resources/sasl/config/zookeeper_jaas.conf rename to spring-kafka-2/src/test/resources/sasl/config/zookeeper_jaas.conf diff --git a/spring-kafka/src/test/resources/sasl/docker-compose.yml b/spring-kafka-2/src/test/resources/sasl/docker-compose.yml similarity index 100% rename from spring-kafka/src/test/resources/sasl/docker-compose.yml rename to spring-kafka-2/src/test/resources/sasl/docker-compose.yml diff --git a/spring-kafka/src/test/resources/sasl/setup_kdc.sh b/spring-kafka-2/src/test/resources/sasl/setup_kdc.sh similarity index 100% rename from spring-kafka/src/test/resources/sasl/setup_kdc.sh rename to spring-kafka-2/src/test/resources/sasl/setup_kdc.sh