Return an empty collection instead of null

Issue-ID: DCAEGEN2-1468

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

diff --git a/components/datalake-handler/feeder/src/main/java/com/mongodb/internal/validator/CollectibleDocumentFieldNameValidator.java b/components/datalake-handler/feeder/src/main/java/com/mongodb/internal/validator/CollectibleDocumentFieldNameValidator.java
index e7a8e1b..cde4d43 100644 (file)
--- a/components/datalake-handler/feeder/src/main/java/com/mongodb/internal/validator/CollectibleDocumentFieldNameValidator.java
+++ b/components/datalake-handler/feeder/src/main/java/com/mongodb/internal/validator/CollectibleDocumentFieldNameValidator.java
@@ -42,15 +42,7 @@ public class CollectibleDocumentFieldNameValidator implements FieldNameValidator
             throw new IllegalArgumentException("Field name can not be null");\r
         }\r
 \r
-        /* dl change\r
-        if (fieldName.contains(".")) {\r
-            return false;\r
-        }*/\r
-\r
-        if (fieldName.startsWith("$") && !EXCEPTIONS.contains(fieldName)) {\r
-            return false;\r
-        }\r
-        return true;\r
+        return !fieldName.startsWith("$") || EXCEPTIONS.contains(fieldName);\r
     }\r
 \r
     @Override\r

diff --git a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/DbController.java b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/DbController.java
index f177a9a..9fa8f49 100644 (file)
--- a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/DbController.java
+++ b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/DbController.java
@@ -61,7 +61,6 @@ public class DbController {
        @GetMapping("")
        @ResponseBody
        @ApiOperation(value="Gat all databases name")
-       //public Iterable<Db> list() throws IOException {
        public List<String> list() throws IOException {
                Iterable<Db> ret = dbRepository.findAll();
                List<String> retString = new ArrayList<>();
@@ -112,7 +111,7 @@ public class DbController {
                        newdb.setPass(dbConfig.getPassword());
                        newdb.setEncrypt(dbConfig.isEncrypt());
 
-                       if(!dbConfig.getName().equals("Elecsticsearch") || !dbConfig.getName().equals("Druid"))
+                       if(!dbConfig.getName().equals("Elecsticsearch") || dbConfig.getName().equals("Druid"))
                        {
                                newdb.setDatabase(new String(dbConfig.getDatabase()));
                        }
@@ -134,10 +133,6 @@ public class DbController {
        @ResponseBody
        @ApiOperation(value="Get a database's details.")
        public Db getDb(@PathVariable("dbName") String dbName, HttpServletResponse response) throws IOException {
-               /*Db db = dbService.getDb(dbName);
-               if (db == null) {
-                       sendError(response, 404, "Db not found: " + dbName);
-               }*/
                Db db = dbRepository.findByName(dbName);
                if (db == null) {
                        sendError(response, 404, "Db not found: " + dbName);
@@ -171,21 +166,18 @@ public class DbController {
        @ResponseBody
        @ApiOperation(value="Get a database's all topics.")
        public Set<Topic> getDbTopics(@PathVariable("dbName") String dbName, HttpServletResponse response) throws IOException {
-               //Db db = dbService.getDb(dbName);
                Set<Topic> topics;
                try {
                        Db db = dbRepository.findByName(dbName);
                        topics = db.getTopics();
-               }catch(Exception ex)
-               {
+               } catch(Exception ex) {
                        sendError(response, 404, "DB: " + dbName + " or Topics not found");
-                       return null;
+                       return Collections.emptySet();
 
                }
                return topics;
        }
 
-
        //Update Db
        @PutMapping("")
        @ResponseBody

diff --git a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/FeederController.java b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/FeederController.java
index 0a64ddb..d9080ec 100644 (file)
--- a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/FeederController.java
+++ b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/FeederController.java
@@ -92,7 +92,7 @@ public class FeederController {
        @ApiOperation(value="Retrieve feeder status.")
     public String status() {           
        String status = "Feeder is running: "+pullService.isRunning();
-       log.info("sending feeder status ...");//TODO we can send what topics are monitored, how many messages are sent, etc.
+        log.info("sending feeder status ..." + status);//TODO we can send what topics are monitored, how many messages are sent, etc.
 
         return "{\"version\": \""+config.getDatalakeVersion()+"\", \"running\": "+pullService.isRunning()+"}";
     }

diff --git a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/TopicController.java b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/TopicController.java
index bb0de4b..b59b2a7 100644 (file)
--- a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/TopicController.java
+++ b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/TopicController.java
@@ -72,9 +72,6 @@ public class TopicController {
 
        private final Logger log = LoggerFactory.getLogger(this.getClass());
 
-       //@Autowired
-       //private DmaapService dmaapService;
-
        @Autowired
        private ApplicationContext context;
 

diff --git a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/domain/Kafka.java b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/domain/Kafka.java
index 7f7b59e..de80db7 100644 (file)
--- a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/domain/Kafka.java
+++ b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/domain/Kafka.java
@@ -95,10 +95,6 @@ public class Kafka {
        @Column(name="`timeout_sec`", columnDefinition = "integer default 10")
        private Integer timeout;
 
-       //don't show this field in admin UI 
-       //@Column(name="`check_topic_interval_sec`", columnDefinition = "integer default 10")
-//     private Integer checkTopicInterval;
-       
        @JsonBackReference
        @ManyToMany(fetch = FetchType.EAGER)
        @JoinTable(     name                            = "map_kafka_topic",

diff --git a/components/datalake-handler/feeder/src/test/java/org/onap/datalake/feeder/controller/DbControllerTest.java b/components/datalake-handler/feeder/src/test/java/org/onap/datalake/feeder/controller/DbControllerTest.java
index 8c18c40..54f5387 100644 (file)
--- a/components/datalake-handler/feeder/src/test/java/org/onap/datalake/feeder/controller/DbControllerTest.java
+++ b/components/datalake-handler/feeder/src/test/java/org/onap/datalake/feeder/controller/DbControllerTest.java
@@ -45,6 +45,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
+import java.util.Collections;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
@@ -159,7 +160,7 @@ public class DbControllerTest {
         db1.setTopics(topics);
         setAccessPrivateFields(dbController);
         Set<Topic> elecsticsearch = dbController.getDbTopics(dbName, httpServletResponse);
-        assertEquals(null, elecsticsearch);
+        assertEquals(Collections.emptySet(), elecsticsearch);
         when(dbRepository.findByName(dbName)).thenReturn(db1);
         elecsticsearch = dbController.getDbTopics(dbName, httpServletResponse);
         for (Topic anElecsticsearch : elecsticsearch) {