change typo for properties (use of nested class configuration)

fdelbrayelle · May 18, 2020 · b1d6d2e · b1d6d2e
1 parent 16435b2
commit b1d6d2e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 14 deletions.
diff --git a/generators/app/index.js b/generators/app/index.js
@@ -214,7 +214,7 @@ module.exports = class extends BaseGenerator {
   '[bootstrap.servers]': localhost:9092
   `;
         if (this.components.includes('consumer') && this.pollingTimeout) {
-            kafkaProperties += `pollingTimeout: ${this.pollingTimeout}
+            kafkaProperties += `polling.timeout: ${this.pollingTimeout}
   `;
         }
         let consumersCpt = 0;

diff --git a/generators/app/templates/src/main/java/package/config/KafkaProperties.java.ejs b/generators/app/templates/src/main/java/package/config/KafkaProperties.java.ejs
@@ -30,22 +30,17 @@ import java.util.Map;
 @Configuration
 @ConfigurationProperties(prefix = "kafka")
 public class KafkaProperties {
-    public static final int DEFAULT_POLL_TIMEOUT = 10_000;
     public static final String BOOTSTRAP_SERVER = "localhost:9092";
 
     private Map<String, Map<String, Object>> consumer = new HashMap<>();
 
     private Map<String, Map<String, Object>> producer = new HashMap<>();
 
-    private Integer pollingTimeout;
+    private Polling polling = new Polling();
 
     @PostConstruct
     public void init() {
 
-        if (pollingTimeout == null) {
-            pollingTimeout = DEFAULT_POLL_TIMEOUT;
-        }
-
         for (String consumerKey: consumer.keySet()) {
             final Map<String, Object> properties = consumer.get(consumerKey);
             if (! properties.containsKey(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG)) {
@@ -61,12 +56,8 @@ public class KafkaProperties {
         }
     }
 
-    public Integer getPollingTimeout() {
-        return pollingTimeout;
-    }
-
-    public void setPollingTimeout(Integer pollingTimeout) {
-        this.pollingTimeout = pollingTimeout;
+    public Polling getPolling() {
+        return polling;
     }
 
     public Map<String, Map<String, Object>> getConsumer() {
@@ -84,4 +75,17 @@ public class KafkaProperties {
     public void setProducer(Map<String, Map<String, Object>> producer) {
         this.producer = producer;
     }
+
+    public static class Polling {
+        protected static final int DEFAULT_POLL_TIMEOUT = 10_000;
+        private Integer timeout = DEFAULT_POLL_TIMEOUT;
+
+        public Integer getTimeout() {
+            return timeout;
+        }
+
+        public void setTimeout(Integer timeout) {
+            this.timeout = timeout;
+        }
+    }
 }
diff --git a/...rators/app/templates/src/main/java/package/service/kafka/consumer/EntityConsumer.java.ejs b/...rators/app/templates/src/main/java/package/service/kafka/consumer/EntityConsumer.java.ejs
@@ -35,7 +35,7 @@ public class <%= entityClass %>Consumer extends GenericConsumer<<%= entityClass
     private final Logger log = LoggerFactory.getLogger(<%= entityClass %>.class);
 
     public <%= entityClass %>Consumer(@Value("${kafka.consumer.<%= camelCaseEntityClass %>.name}") final String topic, final KafkaProperties kafkaProperties) {
-        super(topic, kafkaProperties.getConsumer().get("<%= camelCaseEntityClass %>"), kafkaProperties.getPollingTimeout());
+        super(topic, kafkaProperties.getConsumer().get("<%= camelCaseEntityClass %>"), kafkaProperties.getPolling().getTimeout());
     }
 
     @Override