简柏林 / thingskit · Commits

Commit 23063b16009a105a0eda1642779f7a372d6622fc

Authored by YevhenBondarenko
1 parent b82525ae

refactoring

Inline Side-by-side
Showing 6 changed files with 2 additions and 18 deletions
... ... @@ -743,7 +743,7 @@ queue:
743 743 sasl.mechanism: "${TB_QUEUE_KAFKA_CONFLUENT_SASL_MECHANISM:PLAIN}"
744 744 sasl.config: "${TB_QUEUE_KAFKA_CONFLUENT_SASL_JAAS_CONFIG:org.apache.kafka.common.security.plain.PlainLoginModule required username=\"CLUSTER_API_KEY\" password=\"CLUSTER_API_SECRET\";}"
745 745 security.protocol: "${TB_QUEUE_KAFKA_CONFLUENT_SECURITY_PROTOCOL:SASL_SSL}"
746   - consumerPropertiesPerTopic:
  746 + consumer-properties-per-topic:
747 747 tb_firmware:
748 748 - key: max.poll.records
749 749 value: 10
... ...
... ... @@ -98,7 +98,7 @@ public class TbKafkaSettings {
98 98 private List<TbKafkaProperty> other;
99 99
100 100 @Setter
101   - private Map<String, List<TbKafkaProperty>> consumerPropertiesPerTopic;
  101 + private Map<String, List<TbKafkaProperty>> consumerPropertiesPerTopic = Collections.emptyMap();
102 102
103 103 public Properties toAdminProps() {
104 104 Properties props = toProps();
... ...
... ... @@ -136,10 +136,6 @@ queue:
136 136 sasl.mechanism: "${TB_QUEUE_KAFKA_CONFLUENT_SASL_MECHANISM:PLAIN}"
137 137 sasl.config: "${TB_QUEUE_KAFKA_CONFLUENT_SASL_JAAS_CONFIG:org.apache.kafka.common.security.plain.PlainLoginModule required username=\"CLUSTER_API_KEY\" password=\"CLUSTER_API_SECRET\";}"
138 138 security.protocol: "${TB_QUEUE_KAFKA_CONFLUENT_SECURITY_PROTOCOL:SASL_SSL}"
139   - consumerPropertiesPerTopic:
140   - tb_firmware:
141   - - key: max.poll.records
142   - value: 10
143 139 other:
144 140 topic-properties:
145 141 rule-engine: "${TB_QUEUE_KAFKA_RE_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:1;min.insync.replicas:1}"
... ...
... ... @@ -108,10 +108,6 @@ queue:
108 108 sasl.mechanism: "${TB_QUEUE_KAFKA_CONFLUENT_SASL_MECHANISM:PLAIN}"
109 109 sasl.config: "${TB_QUEUE_KAFKA_CONFLUENT_SASL_JAAS_CONFIG:org.apache.kafka.common.security.plain.PlainLoginModule required username=\"CLUSTER_API_KEY\" password=\"CLUSTER_API_SECRET\";}"
110 110 security.protocol: "${TB_QUEUE_KAFKA_CONFLUENT_SECURITY_PROTOCOL:SASL_SSL}"
111   - consumerPropertiesPerTopic:
112   - tb_firmware:
113   - - key: max.poll.records
114   - value: 10
115 111 other:
116 112 topic-properties:
117 113 rule-engine: "${TB_QUEUE_KAFKA_RE_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:1;min.insync.replicas:1}"
... ...
... ... @@ -174,10 +174,6 @@ queue:
174 174 sasl.mechanism: "${TB_QUEUE_KAFKA_CONFLUENT_SASL_MECHANISM:PLAIN}"
175 175 sasl.config: "${TB_QUEUE_KAFKA_CONFLUENT_SASL_JAAS_CONFIG:org.apache.kafka.common.security.plain.PlainLoginModule required username=\"CLUSTER_API_KEY\" password=\"CLUSTER_API_SECRET\";}"
176 176 security.protocol: "${TB_QUEUE_KAFKA_CONFLUENT_SECURITY_PROTOCOL:SASL_SSL}"
177   - consumerPropertiesPerTopic:
178   - tb_firmware:
179   - - key: max.poll.records
180   - value: 10
181 177 other:
182 178 topic-properties:
183 179 rule-engine: "${TB_QUEUE_KAFKA_RE_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:1}"
... ...
... ... @@ -136,10 +136,6 @@ queue:
136 136 sasl.mechanism: "${TB_QUEUE_KAFKA_CONFLUENT_SASL_MECHANISM:PLAIN}"
137 137 sasl.config: "${TB_QUEUE_KAFKA_CONFLUENT_SASL_JAAS_CONFIG:org.apache.kafka.common.security.plain.PlainLoginModule required username=\"CLUSTER_API_KEY\" password=\"CLUSTER_API_SECRET\";}"
138 138 security.protocol: "${TB_QUEUE_KAFKA_CONFLUENT_SECURITY_PROTOCOL:SASL_SSL}"
139   - consumerPropertiesPerTopic:
140   - tb_firmware:
141   - - key: max.poll.records
142   - value: 10
143 139 other:
144 140 topic-properties:
145 141 rule-engine: "${TB_QUEUE_KAFKA_RE_TOPIC_PROPERTIES:retention.ms:604800000;segment.bytes:26214400;retention.bytes:1048576000;partitions:1;min.insync.replicas:1}"
... ...