From 88e3dee91a0381f150733f2da4e2b4ca42384ece Mon Sep 17 00:00:00 2001
From: vunamtien <vunamtien16@gmail.com>
Date: Fri, 19 Apr 2024 15:07:36 +0700
Subject: [PATCH] [JAVA-33623] Split-or-move-spring-kafka-module (#16419)

---
 pom.xml                                       |  2 +
 spring-kafka-4/README.md                      | 11 ++++
 spring-kafka-4/pom.xml                        | 62 +++++++++++++++++++
 .../countingmessages/Application.java         |  0
 .../KafkaCountingMessagesComponent.java       |  0
 .../CustomPartitioner.java                    |  0
 .../KafkaApplication.java                     |  0
 .../KafkaMessageConsumer.java                 |  0
 .../partitioningstrategy/ReceivedMessage.java |  0
 .../src/main/resources/application.properties |  2 +
 spring-kafka-4/src/main/resources/logback.xml | 13 ++++
 .../KafkaApplicationIntegrationTest.java      |  0
 .../src/test/resources/application.yml        |  7 +++
 .../src/test/resources/logback-test.xml       | 19 ++++++
 spring-kafka/README.md                        |  2 -
 15 files changed, 116 insertions(+), 2 deletions(-)
 create mode 100644 spring-kafka-4/README.md
 create mode 100644 spring-kafka-4/pom.xml
 rename {spring-kafka => spring-kafka-4}/src/main/java/com/baeldung/countingmessages/Application.java (100%)
 rename {spring-kafka => spring-kafka-4}/src/main/java/com/baeldung/countingmessages/KafkaCountingMessagesComponent.java (100%)
 rename {spring-kafka => spring-kafka-4}/src/main/java/com/baeldung/partitioningstrategy/CustomPartitioner.java (100%)
 rename {spring-kafka => spring-kafka-4}/src/main/java/com/baeldung/partitioningstrategy/KafkaApplication.java (100%)
 rename {spring-kafka => spring-kafka-4}/src/main/java/com/baeldung/partitioningstrategy/KafkaMessageConsumer.java (100%)
 rename {spring-kafka => spring-kafka-4}/src/main/java/com/baeldung/partitioningstrategy/ReceivedMessage.java (100%)
 create mode 100644 spring-kafka-4/src/main/resources/application.properties
 create mode 100644 spring-kafka-4/src/main/resources/logback.xml
 rename {spring-kafka => spring-kafka-4}/src/test/java/com/baeldung/partitioningstrategy/KafkaApplicationIntegrationTest.java (100%)
 create mode 100644 spring-kafka-4/src/test/resources/application.yml
 create mode 100644 spring-kafka-4/src/test/resources/logback-test.xml

diff --git a/pom.xml b/pom.xml
index 002ea294ef..a30c9ef69a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -812,6 +812,7 @@
                 <!--<module>spring-jinq</module>-->
                 <module>spring-kafka-2</module>
                 <module>spring-kafka-3</module>
+                <module>spring-kafka-4</module>
                 <module>spring-kafka</module>
                 <module>spring-katharsis</module> <!-- Upgrade to Boot 3 not possible as the project has not been upgraded to Support Jakarta dependencies-->
                 <module>spring-mobile</module>
@@ -1059,6 +1060,7 @@
                 <!--<module>spring-jinq</module>-->
                 <module>spring-kafka-2</module>
                 <module>spring-kafka-3</module>                     
+                <module>spring-kafka-4</module>
                 <module>spring-kafka</module>
                 <module>spring-katharsis</module> <!-- Upgrade to Boot 3 not possible as the project has not been upgraded to Support Jakarta dependencies-->
                 <module>spring-mobile</module>
diff --git a/spring-kafka-4/README.md b/spring-kafka-4/README.md
new file mode 100644
index 0000000000..83dd249e09
--- /dev/null
+++ b/spring-kafka-4/README.md
@@ -0,0 +1,11 @@
+## Spring Kafka
+
+This module contains articles about Spring with Kafka
+
+### Relevant articles
+
+- [Get the Number of Messages in an Apache Kafka Topic](https://www.baeldung.com/java-kafka-count-topic-messages)
+- [Sending Data to a Specific Partition in Kafka](https://www.baeldung.com/kafka-send-data-partition)
+
+- More articles: [[<-- prev]](../spring-kafka-3)
+
diff --git a/spring-kafka-4/pom.xml b/spring-kafka-4/pom.xml
new file mode 100644
index 0000000000..224203b5c2
--- /dev/null
+++ b/spring-kafka-4/pom.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>spring-kafka-4</artifactId>
+    <name>spring-kafka-4</name>
+    <description>Intro to Kafka with Spring</description>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-boot-3</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-boot-3</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.kafka</groupId>
+            <artifactId>spring-kafka</artifactId>
+            <version>${spring-kafka.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.kafka</groupId>
+            <artifactId>spring-kafka-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>kafka</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>com.baeldung.spring.kafka.KafkaApplication</mainClass>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <spring-kafka.version>3.1.2</spring-kafka.version>
+        <spring-boot.version>3.2.2</spring-boot.version>
+        <junit-jupiter.version>5.10.2</junit-jupiter.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/spring-kafka/src/main/java/com/baeldung/countingmessages/Application.java b/spring-kafka-4/src/main/java/com/baeldung/countingmessages/Application.java
similarity index 100%
rename from spring-kafka/src/main/java/com/baeldung/countingmessages/Application.java
rename to spring-kafka-4/src/main/java/com/baeldung/countingmessages/Application.java
diff --git a/spring-kafka/src/main/java/com/baeldung/countingmessages/KafkaCountingMessagesComponent.java b/spring-kafka-4/src/main/java/com/baeldung/countingmessages/KafkaCountingMessagesComponent.java
similarity index 100%
rename from spring-kafka/src/main/java/com/baeldung/countingmessages/KafkaCountingMessagesComponent.java
rename to spring-kafka-4/src/main/java/com/baeldung/countingmessages/KafkaCountingMessagesComponent.java
diff --git a/spring-kafka/src/main/java/com/baeldung/partitioningstrategy/CustomPartitioner.java b/spring-kafka-4/src/main/java/com/baeldung/partitioningstrategy/CustomPartitioner.java
similarity index 100%
rename from spring-kafka/src/main/java/com/baeldung/partitioningstrategy/CustomPartitioner.java
rename to spring-kafka-4/src/main/java/com/baeldung/partitioningstrategy/CustomPartitioner.java
diff --git a/spring-kafka/src/main/java/com/baeldung/partitioningstrategy/KafkaApplication.java b/spring-kafka-4/src/main/java/com/baeldung/partitioningstrategy/KafkaApplication.java
similarity index 100%
rename from spring-kafka/src/main/java/com/baeldung/partitioningstrategy/KafkaApplication.java
rename to spring-kafka-4/src/main/java/com/baeldung/partitioningstrategy/KafkaApplication.java
diff --git a/spring-kafka/src/main/java/com/baeldung/partitioningstrategy/KafkaMessageConsumer.java b/spring-kafka-4/src/main/java/com/baeldung/partitioningstrategy/KafkaMessageConsumer.java
similarity index 100%
rename from spring-kafka/src/main/java/com/baeldung/partitioningstrategy/KafkaMessageConsumer.java
rename to spring-kafka-4/src/main/java/com/baeldung/partitioningstrategy/KafkaMessageConsumer.java
diff --git a/spring-kafka/src/main/java/com/baeldung/partitioningstrategy/ReceivedMessage.java b/spring-kafka-4/src/main/java/com/baeldung/partitioningstrategy/ReceivedMessage.java
similarity index 100%
rename from spring-kafka/src/main/java/com/baeldung/partitioningstrategy/ReceivedMessage.java
rename to spring-kafka-4/src/main/java/com/baeldung/partitioningstrategy/ReceivedMessage.java
diff --git a/spring-kafka-4/src/main/resources/application.properties b/spring-kafka-4/src/main/resources/application.properties
new file mode 100644
index 0000000000..23e281f4e2
--- /dev/null
+++ b/spring-kafka-4/src/main/resources/application.properties
@@ -0,0 +1,2 @@
+server.port=8081
+spring.kafka.bootstrap-servers=localhost:9092
diff --git a/spring-kafka-4/src/main/resources/logback.xml b/spring-kafka-4/src/main/resources/logback.xml
new file mode 100644
index 0000000000..7d900d8ea8
--- /dev/null
+++ b/spring-kafka-4/src/main/resources/logback.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/spring-kafka/src/test/java/com/baeldung/partitioningstrategy/KafkaApplicationIntegrationTest.java b/spring-kafka-4/src/test/java/com/baeldung/partitioningstrategy/KafkaApplicationIntegrationTest.java
similarity index 100%
rename from spring-kafka/src/test/java/com/baeldung/partitioningstrategy/KafkaApplicationIntegrationTest.java
rename to spring-kafka-4/src/test/java/com/baeldung/partitioningstrategy/KafkaApplicationIntegrationTest.java
diff --git a/spring-kafka-4/src/test/resources/application.yml b/spring-kafka-4/src/test/resources/application.yml
new file mode 100644
index 0000000000..e160e06f80
--- /dev/null
+++ b/spring-kafka-4/src/test/resources/application.yml
@@ -0,0 +1,7 @@
+spring:
+  kafka:
+    consumer:
+      auto-offset-reset: earliest
+      group-id: baeldung
+test:
+  topic: embedded-test-topic
diff --git a/spring-kafka-4/src/test/resources/logback-test.xml b/spring-kafka-4/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000..74f126ebc1
--- /dev/null
+++ b/spring-kafka-4/src/test/resources/logback-test.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+
+    <!-- Reduce the noise as the consumer keeps trying to connect until the Kafka instance is available -->
+    <springProfile name="ssl">
+        <logger name="org.apache.kafka.clients.NetworkClient" level="ERROR" additivity="false"/>
+    </springProfile>
+
+</configuration>
\ No newline at end of file
diff --git a/spring-kafka/README.md b/spring-kafka/README.md
index ed6c3bf8d7..a6d646c131 100644
--- a/spring-kafka/README.md
+++ b/spring-kafka/README.md
@@ -9,8 +9,6 @@ This module contains articles about Spring with Kafka
 - [Monitor the Consumer Lag in Apache Kafka](https://www.baeldung.com/java-kafka-consumer-lag)
 - [Send Large Messages With Kafka](https://www.baeldung.com/java-kafka-send-large-message)
 - [Kafka Streams With Spring Boot](https://www.baeldung.com/spring-boot-kafka-streams)
-- [Get the Number of Messages in an Apache Kafka Topic](https://www.baeldung.com/java-kafka-count-topic-messages)
-- [Sending Data to a Specific Partition in Kafka](https://www.baeldung.com/kafka-send-data-partition)
 - [Implementing Retry in Kafka Consumer](https://www.baeldung.com/spring-retry-kafka-consumer)
 ### Intro