update project name + spring versions

Author: code-not-found

.travis.yml

@@ -20,7 +20,7 @@ env:
 - PROJECT_DIR=spring-kafka-json
 - PROJECT_DIR=spring-kafka-multiple-topics
 - PROJECT_DIR=spring-kafka-spring-integration-helloworld
-- PROJECT_DIR=spring-kafka-test-embedded
+- PROJECT_DIR=spring-kafka-unit-test-classrule
 
 script:
 - cd $PROJECT_DIR

spring-kafka-test-embedded/README.md

@@ -0,0 +1,7 @@
+# spring-kafka-unit-test-classrule
+
+[![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=com.codenotfound%3Aspring-kafka-unit-test-classrule&metric=alert_status)](https://sonarcloud.io/dashboard?id=com.codenotfound%3Aspring-kafka-unit-test-classrule)
+
+A detailed step-by-step tutorial on how to unit test your Spring Kafka application using an embedded broker.
+
+[https://codenotfound.com/spring-kafka-embedded-unit-test-example.html](https://codenotfound.com/spring-kafka-embedded-unit-test-example.html)

spring-kafka-unit-test-classrule/README.md

@@ -4,57 +4,55 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>com.codenotfound</groupId>
-  <artifactId>spring-kafka-test-embedded</artifactId>
+  <artifactId>spring-kafka-unit-test-classrule</artifactId>
   <version>0.0.1-SNAPSHOT</version>
 
-  <name>spring-kafka-test-embedded</name>
-  <description>Spring Kafka - Embedded Unit Test Example</description>
-  <url>https://www.codenotfound.com/spring-kafka-embedded-unit-test-example.html</url>
+  <name>spring-kafka-unit-test-classrule</name>
+  <description>Spring Kafka Embedded Unit Test Example</description>
+  <url>https://codenotfound.com/spring-kafka-embedded-unit-test-example.html</url>
 
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>1.5.4.RELEASE</version>
+    <version>2.1.0.RELEASE</version>
+    <relativePath /> <!-- lookup parent from repository -->
   </parent>
 
   <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <java.version>1.8</java.version>
-
-    <spring-kafka.version>1.2.2.RELEASE</spring-kafka.version>
   </properties>
 
   <dependencies>
-    <!-- spring-boot -->
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.kafka</groupId>
+      <artifactId>spring-kafka</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-test</artifactId>
       <scope>test</scope>
     </dependency>
-    <!-- spring-kafka -->
-    <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>
-      <version>${spring-kafka.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
 
   <build>
     <plugins>
-      <!-- spring-boot-maven-plugin -->
       <plugin>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
       </plugin>
     </plugins>
   </build>
+
 </project>

spring-kafka-test-embedded/pom.xml renamed to spring-kafka-unit-test-classrule/pom.xml

@@ -1,22 +1,22 @@
 package com.codenotfound.kafka.consumer;
 
 import java.util.concurrent.CountDownLatch;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.kafka.annotation.KafkaListener;
 
 public class Receiver {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(Receiver.class);
+  private static final Logger LOGGER =
+      LoggerFactory.getLogger(Receiver.class);
 
   private CountDownLatch latch = new CountDownLatch(1);
 
   public CountDownLatch getLatch() {
     return latch;
   }
 
-  @KafkaListener(topics = "${kafka.topic.receiver}")
+  @KafkaListener(topics = "receiver.t")
   public void receive(String payload) {
     LOGGER.info("received payload='{}'", payload);
     latch.countDown();

spring-kafka-test-embedded/src/main/java/com/codenotfound/kafka/SpringKafkaApplication.java renamed to spring-kafka-unit-test-classrule/src/main/java/com/codenotfound/kafka/SpringKafkaApplication.java

@@ -2,16 +2,17 @@
 
 import java.util.HashMap;
 import java.util.Map;
-
 import org.apache.kafka.clients.consumer.ConsumerConfig;
 import org.apache.kafka.common.serialization.StringDeserializer;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.kafka.annotation.EnableKafka;
 import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory;
+import org.springframework.kafka.config.KafkaListenerContainerFactory;
 import org.springframework.kafka.core.ConsumerFactory;
 import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
+import org.springframework.kafka.listener.ConcurrentMessageListenerContainer;
 
 @Configuration
 @EnableKafka
@@ -23,9 +24,12 @@ public class ReceiverConfig {
   @Bean
   public Map<String, Object> consumerConfigs() {
     Map<String, Object> props = new HashMap<>();
-    props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers);
-    props.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class);
-    props.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class);
+    props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG,
+        bootstrapServers);
+    props.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG,
+        StringDeserializer.class);
+    props.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG,
+        StringDeserializer.class);
     props.put(ConsumerConfig.GROUP_ID_CONFIG, "reveiver");
 
     return props;
@@ -37,7 +41,7 @@ public ConsumerFactory<String, String> consumerFactory() {
   }
 
   @Bean
-  public ConcurrentKafkaListenerContainerFactory<String, String> kafkaListenerContainerFactory() {
+  public KafkaListenerContainerFactory<ConcurrentMessageListenerContainer<String, String>> kafkaListenerContainerFactory() {
     ConcurrentKafkaListenerContainerFactory<String, String> factory =
         new ConcurrentKafkaListenerContainerFactory<>();
     factory.setConsumerFactory(consumerFactory());

spring-kafka-test-embedded/src/main/java/com/codenotfound/kafka/consumer/Receiver.java renamed to spring-kafka-unit-test-classrule/src/main/java/com/codenotfound/kafka/consumer/Receiver.java

@@ -7,13 +7,14 @@
 
 public class Sender {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(Sender.class);
+  private static final Logger LOGGER =
+      LoggerFactory.getLogger(Sender.class);
 
   @Autowired
   private KafkaTemplate<String, String> kafkaTemplate;
 
-  public void send(String topic, String payload) {
-    LOGGER.info("sending payload='{}' to topic='{}'", payload, topic);
-    kafkaTemplate.send(topic, payload);
+  public void send(String payload) {
+    LOGGER.info("sending payload='{}'", payload);
+    kafkaTemplate.send("sender.t", payload);
   }
 }

spring-kafka-test-embedded/src/main/java/com/codenotfound/kafka/consumer/ReceiverConfig.java renamed to spring-kafka-unit-test-classrule/src/main/java/com/codenotfound/kafka/consumer/ReceiverConfig.java

@@ -2,7 +2,6 @@
 
 import java.util.HashMap;
 import java.util.Map;
-
 import org.apache.kafka.clients.producer.ProducerConfig;
 import org.apache.kafka.common.serialization.StringSerializer;
 import org.springframework.beans.factory.annotation.Value;
@@ -21,9 +20,12 @@ public class SenderConfig {
   @Bean
   public Map<String, Object> producerConfigs() {
     Map<String, Object> props = new HashMap<>();
-    props.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers);
-    props.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class);
-    props.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class);
+    props.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG,
+        bootstrapServers);
+    props.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG,
+        StringSerializer.class);
+    props.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG,
+        StringSerializer.class);
 
     return props;
   }

spring-kafka-test-embedded/src/main/java/com/codenotfound/kafka/producer/Sender.java renamed to spring-kafka-unit-test-classrule/src/main/java/com/codenotfound/kafka/producer/Sender.java

@@ -1,4 +1,2 @@
 kafka:
   bootstrap-servers: localhost:9092
-  topic:
-    receiver: receiver.t

spring-kafka-test-embedded/src/main/java/com/codenotfound/kafka/producer/SenderConfig.java renamed to spring-kafka-unit-test-classrule/src/main/java/com/codenotfound/kafka/producer/SenderConfig.java

@@ -2,13 +2,13 @@
 
   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
     <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
-      </pattern>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
     </encoder>
   </appender>
 
   <logger name="com.codenotfound" level="DEBUG" />
   <logger name="org.springframework" level="WARN" />
+  <logger name="org.apache.kafka.test.TestUtils" level="OFF" />
 
   <root level="WARN">
     <appender-ref ref="STDOUT" />

spring-kafka-test-embedded/src/main/resources/application.yml renamed to spring-kafka-unit-test-classrule/src/main/resources/application.yml

@@ -1,10 +1,8 @@
 package com.codenotfound.kafka.consumer;
 
 import static org.assertj.core.api.Assertions.assertThat;
-
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
-
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -18,7 +16,7 @@
 import org.springframework.kafka.core.KafkaTemplate;
 import org.springframework.kafka.core.ProducerFactory;
 import org.springframework.kafka.listener.MessageListenerContainer;
-import org.springframework.kafka.test.rule.KafkaEmbedded;
+import org.springframework.kafka.test.rule.EmbeddedKafkaRule;
 import org.springframework.kafka.test.utils.ContainerTestUtils;
 import org.springframework.kafka.test.utils.KafkaTestUtils;
 import org.springframework.test.annotation.DirtiesContext;
@@ -29,7 +27,8 @@
 @DirtiesContext
 public class SpringKafkaReceiverTest {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(SpringKafkaReceiverTest.class);
+  private static final Logger LOGGER =
+      LoggerFactory.getLogger(SpringKafkaReceiverTest.class);
 
   private static String RECEIVER_TOPIC = "receiver.t";
 
@@ -42,17 +41,20 @@ public class SpringKafkaReceiverTest {
   private KafkaListenerEndpointRegistry kafkaListenerEndpointRegistry;
 
   @ClassRule
-  public static KafkaEmbedded embeddedKafka = new KafkaEmbedded(1, true, RECEIVER_TOPIC);
+  public static EmbeddedKafkaRule embeddedKafka =
+      new EmbeddedKafkaRule(1, true, RECEIVER_TOPIC);
 
   @Before
   public void setUp() throws Exception {
     // set up the Kafka producer properties
     Map<String, Object> senderProperties =
-        KafkaTestUtils.senderProps(embeddedKafka.getBrokersAsString());
+        KafkaTestUtils.senderProps(
+            embeddedKafka.getEmbeddedKafka().getBrokersAsString());
 
     // create a Kafka producer factory
     ProducerFactory<String, String> producerFactory =
-        new DefaultKafkaProducerFactory<String, String>(senderProperties);
+        new DefaultKafkaProducerFactory<String, String>(
+            senderProperties);
 
     // create a Kafka template
     template = new KafkaTemplate<>(producerFactory);
@@ -63,7 +65,7 @@ public void setUp() throws Exception {
     for (MessageListenerContainer messageListenerContainer : kafkaListenerEndpointRegistry
         .getListenerContainers()) {
       ContainerTestUtils.waitForAssignment(messageListenerContainer,
-          embeddedKafka.getPartitionsPerTopic());
+          embeddedKafka.getEmbeddedKafka().getPartitionsPerTopic());
     }
   }