From: Rama-Huawei Date: Mon, 5 Aug 2019 04:10:46 +0000 (+0530) Subject: Used isEmpty to check collection is empty or not X-Git-Tag: 2.0.0~61^2 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=2c4763545f1e0089d68815c735fc6255adc2aa56;p=dcaegen2%2Fservices.git Used isEmpty to check collection is empty or not Issue-ID: DCAEGEN2-1468 Signed-off-by: Rama-Huawei Change-Id: Ice0fe7a0119442f7cf7f6171ea1e2a2c8a0c8cab --- diff --git a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/service/DesignService.java b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/service/DesignService.java index d0940baa..d4924972 100755 --- a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/service/DesignService.java +++ b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/service/DesignService.java @@ -114,7 +114,7 @@ public class DesignService { dbs.add(db.get()); } } - if (dbs.size() > 0) + if (!dbs.isEmpty()) design.setDbs(dbs); else { design.getDbs().clear(); diff --git a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/service/DesignTypeService.java b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/service/DesignTypeService.java index 86baebf8..58bc35e4 100755 --- a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/service/DesignTypeService.java +++ b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/service/DesignTypeService.java @@ -49,7 +49,7 @@ public class DesignTypeService { List designTypeList = null; List designTypeConfigList = new ArrayList<>(); designTypeList = (List)designTypeRepository.findAll(); - if (designTypeList != null && designTypeList.size() > 0) { + if (designTypeList != null && !designTypeList.isEmpty()) { log.info("DesignTypeList is not null"); for(DesignType designType : designTypeList) { designTypeConfigList.add(designType.getDesignTypeConfig()); diff --git a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/service/TopicService.java b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/service/TopicService.java index ed9b5c20..043cc653 100644 --- a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/service/TopicService.java +++ b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/service/TopicService.java @@ -162,9 +162,9 @@ public class TopicService { relateDb.add(sinkdb); } } - if (relateDb.size() > 0) + if (!relateDb.isEmpty()) topic.setDbs(relateDb); - else if (relateDb.size() == 0) { + else { topic.getDbs().clear(); } } else { @@ -179,9 +179,9 @@ public class TopicService { relateKafka.add(sinkKafka.get()); } } - if (relateKafka.size() > 0) { + if (!relateKafka.isEmpty()) { topic.setKafkas(relateKafka); - } else if (relateKafka.size() == 0) { + } else { topic.getKafkas().clear(); } } else {