1 files changed, 6 insertions, 2 deletions
diff --git a/src/main/java/org/onap/dcae/commonFunction/DmaapPropertyReader.java b/src/main/java/org/onap/dcae/commonFunction/DmaapPropertyReader.java
index c0659aa6..0ee1e434 100644
--- a/src/main/java/org/onap/dcae/commonFunction/DmaapPropertyReader.java
+++ b/src/main/java/org/onap/dcae/commonFunction/DmaapPropertyReader.java
@@ -68,9 +68,9 @@ public class DmaapPropertyReader {
         Map<String, String> transformedDmaapProperties = new HashMap<>();
         try {
             AnyNode root = AnyNode.parse(configFilePath);
-            if (root.hasKey("channels")) { // Check if dmaap config is handled by legacy controller/service/manager
+            if (isInLegacyFormat(root)) {
                 transformedDmaapProperties = getLegacyDmaapPropertiesWithChannels(root.get("channels"));
-            } else {//Handing new format from controllergen2/config_binding_service
+            } else {
                 transformedDmaapProperties = getDmaapPropertiesWithInfoData(root);
             }
         } catch (IOException e) {
@@ -79,6 +79,10 @@ public class DmaapPropertyReader {
         return transformedDmaapProperties;
     }
 
+    private static boolean isInLegacyFormat(AnyNode root) {
+        return root.hasKey("channels");
+    }
+
     private static Map<String, String> getLegacyDmaapPropertiesWithChannels(AnyNode channelsNode) {
         return channelsNode.asList().stream()
                 .map(DmaapPropertyReader::getTransformedMandatoryChannelProperties)