diff --git a/pom.xml b/pom.xml
index 187ff60dd2..5c85e94546 100644
--- a/pom.xml
+++ b/pom.xml
@@ -144,6 +144,7 @@
         <module>spring-jms</module>
         <module>spring-jooq</module>
         <module>spring-jpa</module>
+        <module>spring-kafka</module>
         <module>spring-katharsis</module>
         <module>spring-ldap</module>
         <module>spring-mockito</module>
diff --git a/spring-kafka/src/main/java/com/baeldung/spring/kafka/KafkaProducerConfig.java b/spring-kafka/src/main/java/com/baeldung/spring/kafka/KafkaProducerConfig.java
index 84d57c9e92..7e2527b36e 100644
--- a/spring-kafka/src/main/java/com/baeldung/spring/kafka/KafkaProducerConfig.java
+++ b/spring-kafka/src/main/java/com/baeldung/spring/kafka/KafkaProducerConfig.java
@@ -1,8 +1,5 @@
 package com.baeldung.spring.kafka;
 
-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;
@@ -13,6 +10,9 @@ import org.springframework.kafka.core.KafkaTemplate;
 import org.springframework.kafka.core.ProducerFactory;
 import org.springframework.kafka.support.serializer.JsonSerializer;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @Configuration
 public class KafkaProducerConfig {
 
@@ -21,30 +21,30 @@ public class KafkaProducerConfig {
 
     @Bean
     public ProducerFactory<String, String> producerFactory() {
-        Map<String, Object> configProps = new HashMap<String, Object>();
+        Map<String, Object> configProps = new HashMap<>();
         configProps.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapAddress);
         configProps.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class);
         configProps.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class);
-        return new DefaultKafkaProducerFactory<String, String>(configProps);
+        return new DefaultKafkaProducerFactory<>(configProps);
     }
 
     @Bean
     public KafkaTemplate<String, String> kafkaTemplate() {
-        return new KafkaTemplate<String, String>(producerFactory());
+        return new KafkaTemplate<>(producerFactory());
     }
     
     @Bean
     public ProducerFactory<String, Greeting> greetingProducerFactory() {
-        Map<String, Object> configProps = new HashMap<String, Object>();
+        Map<String, Object> configProps = new HashMap<>();
         configProps.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapAddress);
         configProps.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class);
         configProps.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, JsonSerializer.class);
-        return new DefaultKafkaProducerFactory<String, Greeting>(configProps);
+        return new DefaultKafkaProducerFactory<>(configProps);
     }
     
     @Bean
     public KafkaTemplate<String, Greeting> greetingKafkaTemplate() {
-        return new KafkaTemplate<String, Greeting>(greetingProducerFactory());
+        return new KafkaTemplate<>(greetingProducerFactory());
     }
     
 }