From b1e4071b594e5a9bc42f24cf8119fb0d52f03e6e Mon Sep 17 00:00:00 2001 From: Steve Hu Date: Thu, 1 Feb 2024 21:16:54 -0500 Subject: [PATCH] fixes #197 Use NoneDecryptedInstance to load the config for registerModule (#198) --- .../java/com/networknt/kafka/consumer/KafkaConsumerManager.java | 2 +- .../main/java/com/networknt/kafka/consumer/LightConsumer.java | 2 +- .../main/java/com/networknt/kafka/producer/LightProducer.java | 2 +- .../src/main/java/com/networknt/kafka/streams/LightStreams.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kafka-consumer/src/main/java/com/networknt/kafka/consumer/KafkaConsumerManager.java b/kafka-consumer/src/main/java/com/networknt/kafka/consumer/KafkaConsumerManager.java index b77dd44..be31bd4 100644 --- a/kafka-consumer/src/main/java/com/networknt/kafka/consumer/KafkaConsumerManager.java +++ b/kafka-consumer/src/main/java/com/networknt/kafka/consumer/KafkaConsumerManager.java @@ -99,7 +99,7 @@ public KafkaConsumerManager(final KafkaConsumerConfig config) { masks.add("basic.auth.user.info"); masks.add("sasl.jaas.config"); masks.add("schema.registry.ssl.truststore.password"); - ModuleRegistry.registerModule(KafkaConsumerConfig.CONFIG_NAME, KafkaConsumerManager.class.getName(), Config.getInstance().getJsonMapConfigNoCache(KafkaConsumerConfig.CONFIG_NAME), masks); + ModuleRegistry.registerModule(KafkaConsumerConfig.CONFIG_NAME, KafkaConsumerManager.class.getName(), Config.getNoneDecryptedInstance().getJsonMapConfigNoCache(KafkaConsumerConfig.CONFIG_NAME), masks); // Cached thread pool int maxThreadCount = config.getMaxConsumerThreads(); diff --git a/kafka-consumer/src/main/java/com/networknt/kafka/consumer/LightConsumer.java b/kafka-consumer/src/main/java/com/networknt/kafka/consumer/LightConsumer.java index 9d72540..5b58c1f 100644 --- a/kafka-consumer/src/main/java/com/networknt/kafka/consumer/LightConsumer.java +++ b/kafka-consumer/src/main/java/com/networknt/kafka/consumer/LightConsumer.java @@ -21,6 +21,6 @@ default void registerModule() { masks.add("basic.auth.user.info"); masks.add("sasl.jaas.config"); masks.add("schema.registry.ssl.truststore.password"); - ModuleRegistry.registerModule(KafkaConsumerConfig.CONFIG_NAME, LightConsumer.class.getName(), Config.getInstance().getJsonMapConfigNoCache(KafkaConsumerConfig.CONFIG_NAME), masks); + ModuleRegistry.registerModule(KafkaConsumerConfig.CONFIG_NAME, LightConsumer.class.getName(), Config.getNoneDecryptedInstance().getJsonMapConfigNoCache(KafkaConsumerConfig.CONFIG_NAME), masks); } } diff --git a/kafka-producer/src/main/java/com/networknt/kafka/producer/LightProducer.java b/kafka-producer/src/main/java/com/networknt/kafka/producer/LightProducer.java index 557a2da..b173438 100644 --- a/kafka-producer/src/main/java/com/networknt/kafka/producer/LightProducer.java +++ b/kafka-producer/src/main/java/com/networknt/kafka/producer/LightProducer.java @@ -43,6 +43,6 @@ default void registerModule() { masks.add("basic.auth.user.info"); masks.add("sasl.jaas.config"); masks.add("schema.registry.ssl.truststore.password"); - ModuleRegistry.registerModule(KafkaProducerConfig.CONFIG_NAME, LightProducer.class.getName(), Config.getInstance().getJsonMapConfigNoCache(KafkaProducerConfig.CONFIG_NAME), masks); + ModuleRegistry.registerModule(KafkaProducerConfig.CONFIG_NAME, LightProducer.class.getName(), Config.getNoneDecryptedInstance().getJsonMapConfigNoCache(KafkaProducerConfig.CONFIG_NAME), masks); } } diff --git a/kafka-streams/src/main/java/com/networknt/kafka/streams/LightStreams.java b/kafka-streams/src/main/java/com/networknt/kafka/streams/LightStreams.java index b05b98b..871b3ee 100644 --- a/kafka-streams/src/main/java/com/networknt/kafka/streams/LightStreams.java +++ b/kafka-streams/src/main/java/com/networknt/kafka/streams/LightStreams.java @@ -40,7 +40,7 @@ default void registerModule() { masks.add("basic.auth.user.info"); masks.add("sasl.jaas.config"); masks.add("schema.registry.ssl.truststore.password"); - ModuleRegistry.registerModule(KafkaStreamsConfig.CONFIG_NAME, LightStreams.class.getName(), Config.getInstance().getJsonMapConfigNoCache(KafkaStreamsConfig.CONFIG_NAME), masks); + ModuleRegistry.registerModule(KafkaStreamsConfig.CONFIG_NAME, LightStreams.class.getName(), Config.getNoneDecryptedInstance().getJsonMapConfigNoCache(KafkaStreamsConfig.CONFIG_NAME), masks); } /**