diff --git a/apache-kafka-3/.gitignore b/apache-kafka-3/.gitignore deleted file mode 100644 index 549e00a2a9..0000000000 --- a/apache-kafka-3/.gitignore +++ /dev/null @@ -1,33 +0,0 @@ -HELP.md -target/ -!.mvn/wrapper/maven-wrapper.jar -!**/src/main/**/target/ -!**/src/test/**/target/ - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ -build/ -!**/src/main/**/build/ -!**/src/test/**/build/ - -### VS Code ### -.vscode/ diff --git a/apache-kafka-3/pom.xml b/apache-kafka-3/pom.xml deleted file mode 100644 index 9466068482..0000000000 --- a/apache-kafka-3/pom.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - 4.0.0 - - - com.baeldung - parent-boot-2 - 0.0.1-SNAPSHOT - ../parent-boot-2 - - - apache-kafka-3 - Apache Kafka 3 - Third module for Apache Kafka related articles - - 17 - - - - org.springframework.boot - spring-boot-starter - - - org.springframework.kafka - spring-kafka - - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.kafka - spring-kafka-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - diff --git a/apache-kafka-3/src/main/resources/application.properties b/apache-kafka-3/src/main/resources/application.properties deleted file mode 100644 index 0fce641151..0000000000 --- a/apache-kafka-3/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -kafka.topic.name=test-topic diff --git a/pom.xml b/pom.xml index 3a3ba46d48..330035020f 100644 --- a/pom.xml +++ b/pom.xml @@ -672,7 +672,6 @@ apache-httpclient apache-kafka apache-kafka-2 - apache-kafka-3 apache-libraries-2 apache-libraries apache-olingo diff --git a/apache-kafka-3/src/main/java/com/baeldung/apachekafka3/groupId/KafkaConfig.java b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/groupId/KafkaConfig.java similarity index 97% rename from apache-kafka-3/src/main/java/com/baeldung/apachekafka3/groupId/KafkaConfig.java rename to spring-kafka-2/src/main/java/com/baeldung/spring/kafka/groupId/KafkaConfig.java index da9a41f425..6514816424 100644 --- a/apache-kafka-3/src/main/java/com/baeldung/apachekafka3/groupId/KafkaConfig.java +++ b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/groupId/KafkaConfig.java @@ -1,4 +1,4 @@ -package com.baeldung.apachekafka3.groupId; +package com.baeldung.spring.kafka.groupId; import java.util.HashMap; import java.util.Map; diff --git a/apache-kafka-3/src/main/java/com/baeldung/apachekafka3/groupId/KafkaErrorHandler.java b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/groupId/KafkaErrorHandler.java similarity index 96% rename from apache-kafka-3/src/main/java/com/baeldung/apachekafka3/groupId/KafkaErrorHandler.java rename to spring-kafka-2/src/main/java/com/baeldung/spring/kafka/groupId/KafkaErrorHandler.java index 3acd18a452..c334925141 100644 --- a/apache-kafka-3/src/main/java/com/baeldung/apachekafka3/groupId/KafkaErrorHandler.java +++ b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/groupId/KafkaErrorHandler.java @@ -1,4 +1,4 @@ -package com.baeldung.apachekafka3.groupId; +package com.baeldung.spring.kafka.groupId; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.common.errors.RecordDeserializationException; diff --git a/apache-kafka-3/src/main/java/com/baeldung/apachekafka3/groupId/Main.java b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/groupId/Main.java similarity index 75% rename from apache-kafka-3/src/main/java/com/baeldung/apachekafka3/groupId/Main.java rename to spring-kafka-2/src/main/java/com/baeldung/spring/kafka/groupId/Main.java index e38699270f..589b20c68f 100644 --- a/apache-kafka-3/src/main/java/com/baeldung/apachekafka3/groupId/Main.java +++ b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/groupId/Main.java @@ -1,11 +1,11 @@ -package com.baeldung.apachekafka3.groupId; +package com.baeldung.spring.kafka.groupId; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.ComponentScan; @SpringBootApplication -@ComponentScan(basePackages = "com.baeldung.apachekafka3.groupId") +@ComponentScan(basePackages = "com.baeldung.spring.kafka.groupId") public class Main { public static void main(String[] args) { diff --git a/apache-kafka-3/src/main/java/com/baeldung/apachekafka3/groupId/MyKafkaConsumer.java b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/groupId/MyKafkaConsumer.java similarity index 96% rename from apache-kafka-3/src/main/java/com/baeldung/apachekafka3/groupId/MyKafkaConsumer.java rename to spring-kafka-2/src/main/java/com/baeldung/spring/kafka/groupId/MyKafkaConsumer.java index e3c7220479..f26b605a7b 100644 --- a/apache-kafka-3/src/main/java/com/baeldung/apachekafka3/groupId/MyKafkaConsumer.java +++ b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/groupId/MyKafkaConsumer.java @@ -1,4 +1,4 @@ -package com.baeldung.apachekafka3.groupId; +package com.baeldung.spring.kafka.groupId; import java.util.concurrent.CountDownLatch; diff --git a/apache-kafka-3/src/main/java/com/baeldung/apachekafka3/groupId/MyKafkaProducer.java b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/groupId/MyKafkaProducer.java similarity index 94% rename from apache-kafka-3/src/main/java/com/baeldung/apachekafka3/groupId/MyKafkaProducer.java rename to spring-kafka-2/src/main/java/com/baeldung/spring/kafka/groupId/MyKafkaProducer.java index 8707ce800d..f8642a99a5 100644 --- a/apache-kafka-3/src/main/java/com/baeldung/apachekafka3/groupId/MyKafkaProducer.java +++ b/spring-kafka-2/src/main/java/com/baeldung/spring/kafka/groupId/MyKafkaProducer.java @@ -1,4 +1,4 @@ -package com.baeldung.apachekafka3.groupId; +package com.baeldung.spring.kafka.groupId; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apache-kafka-3/src/test/java/com/baeldung/apachekafka3/groupId/MainLiveTest.java b/spring-kafka-2/src/test/java/com/baeldung/spring/kafka/groupId/MainLiveTest.java similarity index 92% rename from apache-kafka-3/src/test/java/com/baeldung/apachekafka3/groupId/MainLiveTest.java rename to spring-kafka-2/src/test/java/com/baeldung/spring/kafka/groupId/MainLiveTest.java index e10e41838a..fb767f1f10 100644 --- a/apache-kafka-3/src/test/java/com/baeldung/apachekafka3/groupId/MainLiveTest.java +++ b/spring-kafka-2/src/test/java/com/baeldung/spring/kafka/groupId/MainLiveTest.java @@ -1,4 +1,4 @@ -package com.baeldung.apachekafka3.groupId; +package com.baeldung.spring.kafka.groupId; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; @@ -15,7 +15,7 @@ import org.springframework.kafka.test.context.EmbeddedKafka; import org.springframework.test.annotation.DirtiesContext; @SpringBootTest(classes = Main.class) -@ComponentScan(basePackages = "com.baeldung.apachekafka3.groupId") +@ComponentScan(basePackages = "com.baeldung.spring.kafka.groupId") @DirtiesContext @EmbeddedKafka(partitions = 4, topics = { "${kafka.topic.name:test-topic}" }, brokerProperties = { "listeners=PLAINTEXT://localhost:9092", "port=9092" }) public class MainLiveTest {