System.out is replace by a logger

Issue-ID: DCAEGEN2-1468

Signed-off-by: Rama-Huawei <rama.subba.reddy.s@huawei.com>
Change-Id: Iefdbfd3480f831ce734e748ac0680ed53c60f0fb

diff --git a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/service/db/MongodbService.java b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/service/db/MongodbService.java
index 8677c6f..eb8a3a1 100644 (file)
--- a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/service/db/MongodbService.java
+++ b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/service/db/MongodbService.java
@@ -109,14 +109,14 @@ public class MongodbService implements DbStoreService {
                        builder.sslEnabled(Boolean.TRUE.equals(mongodb.getEncrypt()));// getEncrypt() can be null
                }
                MongoClientOptions options = builder.build();
-               List<ServerAddress> addrs = new ArrayList<ServerAddress>();
+               List<ServerAddress> addrs = new ArrayList<>();
 
                addrs.add(new ServerAddress(host, port)); // FIXME should be a list of address
 
                try {
                        if (StringUtils.isNoneBlank(userName) && StringUtils.isNoneBlank(password)) {
                                credential = MongoCredential.createCredential(userName, databaseName, password.toCharArray());
-                               List<MongoCredential> credentialList = new ArrayList<MongoCredential>();
+                               List<MongoCredential> credentialList = new ArrayList<>();
                                credentialList.add(credential);
                                mongoClient = new MongoClient(addrs, credentialList, options);
                        } else {
@@ -148,7 +148,7 @@ public class MongodbService implements DbStoreService {
        }
 
        public void saveJsons(EffectiveTopic effectiveTopic, List<JSONObject> jsons) {
-               if (dbReady == false)//TOD throw exception
+               if (!dbReady)//TOD throw exception
                        return;
                List<Document> documents = new ArrayList<>(jsons.size());
                for (JSONObject json : jsons) {

diff --git a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/util/DruidSupervisorGenerator.java b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/util/DruidSupervisorGenerator.java
index 8a177cc..51d3168 100644 (file)
--- a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/util/DruidSupervisorGenerator.java
+++ b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/util/DruidSupervisorGenerator.java
@@ -28,6 +28,8 @@ import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;\r
 import org.apache.velocity.runtime.RuntimeConstants;\r
 import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;\r
+import org.slf4j.Logger;\r
+import org.slf4j.LoggerFactory;\r
 \r
 import java.io.BufferedWriter;\r
 import java.io.FileWriter;\r
@@ -59,6 +61,8 @@ import java.util.Map.Entry;
 @Getter\r
 public class DruidSupervisorGenerator {\r
 \r
+    private final Logger log = LoggerFactory.getLogger(this.getClass());\r
+\r
     Template template = null;\r
     VelocityContext context;\r
 \r
@@ -90,7 +94,6 @@ public class DruidSupervisorGenerator {
 \r
             while (fields.hasNext()) {\r
                 Entry<String, JsonNode> field = fields.next();\r
-                //                             System.out.println("--------"+field.getKey()+"--------");\r
                 printNode(prefix + "." + field.getKey(), field.getValue());\r
             }\r
 \r
@@ -113,25 +116,13 @@ public class DruidSupervisorGenerator {
     private void printFlattenSpec(JsonNodeType type, String path) {\r
         String name = path.substring(2).replace('.', ':');\r
         // lets see what type the node is\r
-        System.out.println("{");\r
-        System.out.println("\"type\": \"path\",");\r
-        System.out.println("\"name\": \"" + name + "\",");\r
-        System.out.println("\"expr\": \"" + path + "\"");\r
-        System.out.println("},");\r
+        log.info("{");\r
+        log.info("\"type\": \"path\",");\r
+        log.info("\"name\": \"" + name + "\",");\r
+        log.info("\"expr\": \"" + path + "\"");\r
+        log.info("},");\r
 \r
         dimensions.add(new String[]{name, path});\r
-               /*\r
-                //for  dimensionsSpec\r
-                               if (JsonNodeType.NUMBER.equals(type)) {\r
-                                       System.out.println("{");\r
-                                       System.out.println("\"type\": \"long\",");\r
-                                       System.out.println("\"name\": \"" + name + "\","); \r
-                                       System.out.println("},");\r
-                               } else {\r
-                                       System.out.println("\"" + name + "\",");\r
-               \r
-                               }\r
-               */\r
     }\r
 \r
     public void doTopic(String topic) throws IOException {\r