X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdmf%2Fmr%2Futils%2FConfigurationReader.java;h=5688dccbde9a51ab3a51a97db115c5715e8e0019;hb=refs%2Fchanges%2F40%2F104840%2F1;hp=800bb0f51caacc0e82ddafc62ef1cc581b756e99;hpb=b3354b73e2de1579adb346ff1f10966585f3aeab;p=dmaap%2Fmessagerouter%2Fmsgrtr.git diff --git a/src/main/java/org/onap/dmaap/dmf/mr/utils/ConfigurationReader.java b/src/main/java/org/onap/dmaap/dmf/mr/utils/ConfigurationReader.java index 800bb0f..5688dcc 100644 --- a/src/main/java/org/onap/dmaap/dmf/mr/utils/ConfigurationReader.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/utils/ConfigurationReader.java @@ -38,7 +38,6 @@ import org.onap.dmaap.dmf.mr.backends.memory.MemoryMetaBroker; import org.onap.dmaap.dmf.mr.backends.memory.MemoryQueue; import org.onap.dmaap.dmf.mr.backends.memory.MemoryQueuePublisher; import org.onap.dmaap.dmf.mr.beans.DMaaPCambriaLimiter; -import org.onap.dmaap.dmf.mr.beans.DMaaPKafkaMetaBroker; import org.onap.dmaap.dmf.mr.beans.DMaaPZkConfigDb; import org.onap.dmaap.dmf.mr.constants.CambriaConstants; import org.onap.dmaap.dmf.mr.metabroker.Broker; @@ -147,8 +146,10 @@ public class ConfigurationReader { long allowedtimeSkewMs=600000L; String strallowedTimeSkewM= com.att.ajsc.filemonitor.AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop,"authentication.allowedTimeSkewMs"); - if(null!=strallowedTimeSkewM)allowedtimeSkewMs= Long.parseLong(strallowedTimeSkewM); - + if(null!=strallowedTimeSkewM) + { + allowedtimeSkewMs= Long.parseLong(strallowedTimeSkewM); + } //String strrequireSecureChannel= com.att.ajsc.filemonitor.AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop,"aauthentication.requireSecureChannel"); //if(strrequireSecureChannel!=null)requireSecureChannel=Boolean.parseBoolean(strrequireSecureChannel); @@ -181,7 +182,9 @@ public class ConfigurationReader { // setup a backend String type = com.att.ajsc.filemonitor.AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop,CambriaConstants.kBrokerType); - if (type==null) type = CambriaConstants.kBrokerType_Kafka; + if (type==null){ + type = CambriaConstants.kBrokerType_Kafka; + } if (CambriaConstants.kBrokerType_Kafka.equalsIgnoreCase(type)) { log.info("Broker Type is:" + CambriaConstants.kBrokerType_Kafka); } else if (CambriaConstants.kBrokerType_Memory.equalsIgnoreCase(type)) { @@ -454,7 +457,9 @@ public class ConfigurationReader { String zkServername = com.att.ajsc.filemonitor.AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop,CambriaConstants.kSetting_ZkConfigDbServers); - if (zkServername==null) zkServername=CambriaConstants.kDefault_ZkConfigDbServers; + if (zkServername==null){ + zkServername=CambriaConstants.kDefault_ZkConfigDbServers; + } return zkServername; }