enable/disable AAF using a flag

[dmaap/messagerouter/msgrtr.git] / src / main / java / com / att / dmf / mr / beans / DMaaPKafkaMetaBroker.java

diff --git a/src/main/java/com/att/dmf/mr/beans/DMaaPKafkaMetaBroker.java b/src/main/java/com/att/dmf/mr/beans/DMaaPKafkaMetaBroker.java
index cbb58e4..acf4824 100644 (file)
--- a/src/main/java/com/att/dmf/mr/beans/DMaaPKafkaMetaBroker.java
+++ b/src/main/java/com/att/dmf/mr/beans/DMaaPKafkaMetaBroker.java
@@ -84,9 +84,11 @@ public class DMaaPKafkaMetaBroker implements Broker1 {
                }
                
             props.put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, fkafkaBrokers );
+            if(Utils.isCadiEnabled()){
             props.put("sasl.jaas.config", "org.apache.kafka.common.security.plain.PlainLoginModule required username='admin' password='"+Utils.getKafkaproperty()+"';");
                 props.put(AdminClientConfig.SECURITY_PROTOCOL_CONFIG, "SASL_PLAINTEXT");            
             props.put("sasl.mechanism", "PLAIN");
+            }
           
             fKafkaAdminClient=AdminClient.create ( props );
            
@@ -119,10 +121,11 @@ public class DMaaPKafkaMetaBroker implements Broker1 {
                        fkafkaBrokers = "localhost:9092";
                }
                
-               
+                if(Utils.isCadiEnabled()){
                 props.put("sasl.jaas.config", "org.apache.kafka.common.security.plain.PlainLoginModule required username='admin' password='"+Utils.getKafkaproperty()+"';");
                 props.put(AdminClientConfig.SECURITY_PROTOCOL_CONFIG, "SASL_PLAINTEXT");            
             props.put("sasl.mechanism", "PLAIN");
+                }
             props.put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, fkafkaBrokers );
             
             fKafkaAdminClient=AdminClient.create ( props );