Release version 1.1.0 of sli/northbound

[ccsdk/sli/northbound.git] / dmaap-listener / src / main / java / org / onap / ccsdk / sli / northbound / dmaapclient / SdncFlatJsonDmaapConsumer.java

diff --git a/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncFlatJsonDmaapConsumer.java b/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncFlatJsonDmaapConsumer.java
index 1d499a1..6c90c71 100644 (file)
--- a/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncFlatJsonDmaapConsumer.java
+++ b/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncFlatJsonDmaapConsumer.java
@@ -21,9 +21,6 @@
 
 package org.onap.ccsdk.sli.northbound.dmaapclient;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
@@ -32,9 +29,12 @@ import java.util.Iterator;
 import java.util.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 
 
-public class SdncFlatJsonDmaapConsumer extends SdncDmaapConsumer {
+public class SdncFlatJsonDmaapConsumer extends SdncDmaapConsumerImpl {
 
     private static final Logger LOG = LoggerFactory.getLogger(SdncFlatJsonDmaapConsumer.class);
 
@@ -124,6 +124,8 @@ public class SdncFlatJsonDmaapConsumer extends SdncDmaapConsumer {
     private Map<String, String> loadMap(String msgType, String mapDirName) {
         Map<String, String> results = new HashMap<>();
 
+        String dirName = mapDirName;
+
         if (mapDirName == null) {
             String rootdir = System.getenv(DMAAPLISTENERROOT);
 
@@ -131,16 +133,16 @@ public class SdncFlatJsonDmaapConsumer extends SdncDmaapConsumer {
                 rootdir = "/opt/app/dmaap-listener";
             }
 
-            mapDirName = rootdir + "/lib";
+            dirName = rootdir + "/lib";
         }
 
-        String mapFilename = mapDirName + "/" + msgType + ".map";
+        String mapFilename = dirName + "/" + msgType + ".map";
 
         File mapFile = new File(mapFilename);
 
         if (!mapFile.canRead()) {
             LOG.error(String.format("Cannot read map file (%s)", mapFilename));
-            return (null);
+            return null;
         }
 
         try (BufferedReader mapReader = new BufferedReader(new FileReader(mapFile))) {
@@ -160,9 +162,9 @@ public class SdncFlatJsonDmaapConsumer extends SdncDmaapConsumer {
             mapReader.close();
         } catch (Exception e) {
             LOG.error("Caught exception reading map " + mapFilename, e);
-            return (null);
+            return null;
         }
 
-        return (results);
+        return results;
     }
 }