1 files changed, 41 insertions, 18 deletions

diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusTopicParams.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusTopicParams.java
index 9df7221f..53a6ab66 100644
--- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusTopicParams.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/BusTopicParams.java
@@ -3,8 +3,8 @@
  * ONAP
  * ================================================================================
  * Copyright (C) 2018 Samsung Electronics Co., Ltd. All rights reserved.
- * Modifications Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2018-2019, 2021 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019, 2023-2024 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,21 +24,23 @@ package org.onap.policy.common.endpoints.event.comm.bus.internal;
 
 import java.util.List;
 import java.util.Map;
+import lombok.AccessLevel;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.apache.commons.lang3.StringUtils;
 
 /**
  * Member variables of this Params class are as follows.
  *
- * <p>servers DMaaP servers
- * topic DMaaP Topic to be monitored
- * apiKey DMaaP API Key (optional)
- * apiSecret DMaaP API Secret (optional)
- * consumerGroup DMaaP Reader Consumer Group
- * consumerInstance DMaaP Reader Instance
- * fetchTimeout DMaaP fetch timeout
- * fetchLimit DMaaP fetch limit
+ * <p>servers Kafka servers
+ * topic Kafka Topic to be monitored
+ * apiKey Kafka API Key (optional)
+ * apiSecret Kafka API Secret (optional)
+ * consumerGroup kafka Reader Consumer Group
+ * consumerInstance Kafka Reader Instance
+ * fetchTimeout kafka fetch timeout
+ * fetchLimit Kafka fetch limit
  * environment DME2 Environment
  * aftEnvironment DME2 AFT Environment
  * partner DME2 Partner
@@ -46,6 +48,7 @@ import org.apache.commons.lang3.StringUtils;
  * longitude DME2 Longitude
  * additionalProps Additional properties to pass to DME2
  * useHttps does connection use HTTPS?
+ * allowTracing is message tracing allowed?
  * allowSelfSignedCerts are self-signed certificates allow
  */
 @Getter
@@ -64,6 +67,7 @@ public class BusTopicParams {
     private int fetchTimeout;
     private int fetchLimit;
     private boolean useHttps;
+    private boolean allowTracing;
     private boolean allowSelfSignedCerts;
     private boolean managed;
 
@@ -78,6 +82,7 @@ public class BusTopicParams {
     private String clientName;
     private String hostname;
     private String basePath;
+    @Getter
     private String serializationProvider;
 
     public static TopicParamsBuilder builder() {
@@ -165,29 +170,43 @@ public class BusTopicParams {
         return additionalProps != null;
     }
 
-    public String getSerializationProvider() {
-        return serializationProvider;
+    public void setEffectiveTopic(String effectiveTopic) {
+        this.effectiveTopic = topicToLowerCase(effectiveTopic);
     }
 
+    public void setTopic(String topic) {
+        this.topic = topicToLowerCase(topic);
+    }
+
+    public String getEffectiveTopic() {
+        return topicToLowerCase(effectiveTopic);
+    }
+
+    public String getTopic() {
+        return topicToLowerCase(topic);
+    }
+
+    private String topicToLowerCase(String topic) {
+        return (topic == null || topic.isEmpty()) ? topic : topic.toLowerCase();
+    }
+
+    @NoArgsConstructor(access = AccessLevel.PRIVATE)
     public static class TopicParamsBuilder {
 
         final BusTopicParams params = new BusTopicParams();
 
-        private TopicParamsBuilder() {
-        }
-
         public TopicParamsBuilder servers(List<String> servers) {
             this.params.servers = servers;
             return this;
         }
 
         public TopicParamsBuilder topic(String topic) {
-            this.params.topic = topic;
+            this.params.setTopic(topic);
             return this;
         }
 
         public TopicParamsBuilder effectiveTopic(String effectiveTopic) {
-            this.params.effectiveTopic = effectiveTopic;
+            this.params.setEffectiveTopic(effectiveTopic);
             return this;
         }
 
@@ -226,6 +245,11 @@ public class BusTopicParams {
             return this;
         }
 
+        public TopicParamsBuilder allowTracing(boolean allowTracing) {
+            this.params.allowTracing = allowTracing;
+            return this;
+        }
+
         public TopicParamsBuilder allowSelfSignedCerts(boolean allowSelfSignedCerts) {
             this.params.allowSelfSignedCerts = allowSelfSignedCerts;
             return this;
@@ -309,7 +333,6 @@ public class BusTopicParams {
             this.params.serializationProvider = serializationProvider;
             return this;
         }
-
     }
 }