[SDCISA-16147, swisspost#583] Fix the fix.

Related: SDCISA-15633, SDCISA-15833, SDCISA-16147, swisspost/vertx-redisques#170, swisspost/vertx-redisques#177, swisspost/vertx-rest-storage#186, swisspost#577, swisspost/vertx-redisques#181, swisspost#493, swisspost/vertx-rest-storage#188, swisspost#583
hiddenalpha · Jun 4, 2024 · 2bc60b9 · 2bc60b9
1 parent 721a69a
commit 2bc60b9
Showing 1 changed file with 38 additions and 35 deletions.
diff --git a/gateleen-kafka/src/main/java/org/swisspush/gateleen/kafka/KafkaHandler.java b/gateleen-kafka/src/main/java/org/swisspush/gateleen/kafka/KafkaHandler.java
@@ -21,11 +21,14 @@
 import org.swisspush.gateleen.core.validation.ValidationStatus;
 import org.swisspush.gateleen.validation.ValidationException;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.regex.Pattern;
 
+import static org.swisspush.gateleen.core.exception.GateleenExceptionFactory.newGateleenThriftyExceptionFactory;
+
 /**
  * Handler class for all Kafka related requests.
  *
@@ -53,41 +56,41 @@ public class KafkaHandler extends ConfigurationResourceConsumer {
 
     private boolean initialized = false;
 
-//    /** @deprecated Use {@link #builder()} */
-//    @Deprecated
-//    public KafkaHandler(ConfigurationResourceManager configurationResourceManager, KafkaProducerRepository repository,
-//                        KafkaMessageSender kafkaMessageSender, String configResourceUri, String streamingPath) {
-//        this(configurationResourceManager, null, repository, kafkaMessageSender,
-//                configResourceUri, streamingPath);
-//    }
-//
-//    /** @deprecated Use {@link #builder()} */
-//    @Deprecated
-//    public KafkaHandler(ConfigurationResourceManager configurationResourceManager, KafkaMessageValidator kafkaMessageValidator,
-//                        KafkaProducerRepository repository, KafkaMessageSender kafkaMessageSender, String configResourceUri,
-//                        String streamingPath) {
-//        this(configurationResourceManager, kafkaMessageValidator, repository, kafkaMessageSender,
-//                configResourceUri, streamingPath, new HashMap<>());
-//    }
-//
-//    /** @deprecated Use {@link #builder()} */
-//    @Deprecated
-//    public KafkaHandler(ConfigurationResourceManager configurationResourceManager, KafkaProducerRepository repository,
-//    KafkaMessageSender kafkaMessageSender, String configResourceUri, String streamingPath, Map<String, Object> properties) {
-//
-//        this(configurationResourceManager, null, repository, kafkaMessageSender,
-//                configResourceUri, streamingPath, properties);
-//    }
-//
-//    /** @deprecated Use {@link #builder()} */
-//    @Deprecated
-//    public KafkaHandler(ConfigurationResourceManager configurationResourceManager, KafkaMessageValidator kafkaMessageValidator, KafkaProducerRepository repository,
-//                        KafkaMessageSender kafkaMessageSender, String configResourceUri, String streamingPath, Map<String, Object> properties) {
-//        this(Vertx.vertx(), newGateleenThriftyExceptionFactory(), configurationResourceManager,
-//            kafkaMessageValidator, repository, kafkaMessageSender, configResourceUri, streamingPath,
-//            properties);
-//        log.warn("TODO: Do NOT use this DEPRECATED constructor! It creates instances that it should not create!");
-//    }
+    /** @deprecated Use {@link #builder()} */
+    @Deprecated
+    public KafkaHandler(ConfigurationResourceManager configurationResourceManager, KafkaProducerRepository repository,
+                        KafkaMessageSender kafkaMessageSender, String configResourceUri, String streamingPath) {
+        this(configurationResourceManager, null, repository, kafkaMessageSender,
+                configResourceUri, streamingPath);
+    }
+
+    /** @deprecated Use {@link #builder()} */
+    @Deprecated
+    public KafkaHandler(ConfigurationResourceManager configurationResourceManager, KafkaMessageValidator kafkaMessageValidator,
+                        KafkaProducerRepository repository, KafkaMessageSender kafkaMessageSender, String configResourceUri,
+                        String streamingPath) {
+        this(configurationResourceManager, kafkaMessageValidator, repository, kafkaMessageSender,
+                configResourceUri, streamingPath, new HashMap<>());
+    }
+
+    /** @deprecated Use {@link #builder()} */
+    @Deprecated
+    public KafkaHandler(ConfigurationResourceManager configurationResourceManager, KafkaProducerRepository repository,
+    KafkaMessageSender kafkaMessageSender, String configResourceUri, String streamingPath, Map<String, Object> properties) {
+
+        this(configurationResourceManager, null, repository, kafkaMessageSender,
+                configResourceUri, streamingPath, properties);
+    }
+
+    /** @deprecated Use {@link #builder()} */
+    @Deprecated
+    public KafkaHandler(ConfigurationResourceManager configurationResourceManager, KafkaMessageValidator kafkaMessageValidator, KafkaProducerRepository repository,
+                        KafkaMessageSender kafkaMessageSender, String configResourceUri, String streamingPath, Map<String, Object> properties) {
+        this(Vertx.vertx(), newGateleenThriftyExceptionFactory(), configurationResourceManager,
+            kafkaMessageValidator, repository, kafkaMessageSender, configResourceUri, streamingPath,
+            properties);
+        log.warn("TODO: Do NOT use this DEPRECATED constructor! It creates instances that it should not create!");
+    }
 
     /** Use {@link #builder()} to get an instance. */
     KafkaHandler(