Removing clumsy code smells and adding missing JettyFilter test

[dmaap/datarouter.git] / datarouter-prov / src / main / java / org / onap / dmaap / datarouter / provisioning / beans / Group.java

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Group.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Group.java
index 4d6b0ee..d05e3e6 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Group.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Group.java
@@ -121,7 +121,7 @@ public class Group extends Syncable {
                 gup.getName()\r
         );\r
         List<Group> list = getGroupsForSQL(sql);\r
-        return list.size() > 0 ? list.get(0) : null;\r
+        return !list.isEmpty() ? list.get(0) : null;\r
     }\r
 \r
     public static Group getGroupMatching(Group gup, int groupid) {\r
@@ -131,19 +131,19 @@ public class Group extends Syncable {
                 gup.getGroupid()\r
         );\r
         List<Group> list = getGroupsForSQL(sql);\r
-        return list.size() > 0 ? list.get(0) : null;\r
+        return !list.isEmpty() ? list.get(0) : null;\r
     }\r
 \r
     public static Group getGroupById(int id) {\r
         String sql = "select * from GROUPS where GROUPID = " + id;\r
         List<Group> list = getGroupsForSQL(sql);\r
-        return list.size() > 0 ? list.get(0) : null;\r
+        return !list.isEmpty() ? list.get(0) : null;\r
     }\r
 \r
     static Group getGroupByAuthId(String id) {\r
         String sql = "select * from GROUPS where AUTHID = '" + id + "'";\r
         List<Group> list = getGroupsForSQL(sql);\r
-        return list.size() > 0 ? list.get(0) : null;\r
+        return !list.isEmpty() ? list.get(0) : null;\r
     }\r
 \r
     public static Collection<Group> getAllgroups() {\r