X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2Fbeans%2FGroup.java;h=4d6b0ee2fdb82025197818fef92200848c35dd3a;hb=f20778ffa99aa9c6f30a0f84112a5392b259ea63;hp=da682d7411ef35dde60ec20d11f17cb95cf89fb9;hpb=d6302cb0b3db8043598e8b6bc3dc5ed436f848cb;p=dmaap%2Fdatarouter.git

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 da682d74..4d6b0ee2 100644
--- 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
@@ -23,16 +23,19 @@
 
 package org.onap.dmaap.datarouter.provisioning.beans;
 
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
 import java.io.InvalidObjectException;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.util.*;
-
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
 import org.json.JSONObject;
 import org.onap.dmaap.datarouter.provisioning.utils.DB;
 
@@ -44,8 +47,9 @@ import org.onap.dmaap.datarouter.provisioning.utils.DB;
  */
 public class Group extends Syncable {
 
+    private static final String GROUP_ID_CONST = "groupid";
     private static EELFLogger intlogger = EELFManager.getInstance().getLogger("InternalLog");
-    private static int next_groupid = getMaxGroupID() + 1;
+    private static int nextGroupid = getMaxGroupID() + 1;
     private static final String SQLEXCEPTION = "SQLException: ";
 
     private int groupid;
@@ -56,6 +60,60 @@ public class Group extends Syncable {
     private String members;
     private Date last_mod;
 
+    public Group() {
+        this("", "", "");
+    }
+
+    public Group(String name, String desc, String members) {
+        this.groupid = -1;
+        this.authid = "";
+        this.name = name;
+        this.description = desc;
+        this.members = members;
+        this.classification = "";
+        this.last_mod = new Date();
+    }
+
+
+    public Group(ResultSet rs) throws SQLException {
+        this.groupid = rs.getInt("GROUPID");
+        this.authid = rs.getString("AUTHID");
+        this.name = rs.getString("NAME");
+        this.description = rs.getString("DESCRIPTION");
+        this.classification = rs.getString("CLASSIFICATION");
+        this.members = rs.getString("MEMBERS");
+        this.last_mod = rs.getDate("LAST_MOD");
+    }
+
+
+    public Group(JSONObject jo) throws InvalidObjectException {
+        this("", "", "");
+        try {
+            // The JSONObject is assumed to contain a vnd.dmaap-dr.group representation
+            this.groupid = jo.optInt(GROUP_ID_CONST, -1);
+            String gname = jo.getString("name");
+            String gdescription = jo.getString("description");
+
+            this.authid = jo.getString("authid");
+            this.name = gname;
+            this.description = gdescription;
+            this.classification = jo.getString("classification");
+            this.members = jo.getString("members");
+
+            if (gname.length() > 50) {
+                throw new InvalidObjectException("Group name is too long");
+            }
+            if (gdescription.length() > 256) {
+                throw new InvalidObjectException("Group Description is too long");
+            }
+        } catch (InvalidObjectException e) {
+            throw e;
+        } catch (Exception e) {
+            intlogger.warn("Invalid JSON: " + e.getMessage(), e);
+            throw new InvalidObjectException("Invalid JSON: " + e.getMessage());
+        }
+    }
+
 
     public static Group getGroupMatching(Group gup) {
         String sql = String.format(
@@ -82,7 +140,7 @@ public class Group extends Syncable {
         return list.size() > 0 ? list.get(0) : null;
     }
 
-    public static Group getGroupByAuthId(String id) {
+    static Group getGroupByAuthId(String id) {
         String sql = "select * from GROUPS where AUTHID = '" + id + "'";
         List<Group> list = getGroupsForSQL(sql);
         return list.size() > 0 ? list.get(0) : null;
@@ -93,7 +151,7 @@ public class Group extends Syncable {
     }
 
     private static List<Group> getGroupsForSQL(String sql) {
-        List<Group> list = new ArrayList<Group>();
+        List<Group> list = new ArrayList<>();
         try {
             DB db = new DB();
             @SuppressWarnings("resource")
@@ -113,7 +171,7 @@ public class Group extends Syncable {
         return list;
     }
 
-    public static int getMaxGroupID() {
+    private static int getMaxGroupID() {
         int max = 0;
         try {
             DB db = new DB();
@@ -133,60 +191,6 @@ public class Group extends Syncable {
         return max;
     }
 
-    public Group() {
-        this("", "", "");
-    }
-
-    public Group(String name, String desc, String members) {
-        this.groupid = -1;
-        this.authid = "";
-        this.name = name;
-        this.description = desc;
-        this.members = members;
-        this.classification = "";
-        this.last_mod = new Date();
-    }
-
-
-    public Group(ResultSet rs) throws SQLException {
-        this.groupid = rs.getInt("GROUPID");
-        this.authid = rs.getString("AUTHID");
-        this.name = rs.getString("NAME");
-        this.description = rs.getString("DESCRIPTION");
-        this.classification = rs.getString("CLASSIFICATION");
-        this.members = rs.getString("MEMBERS");
-        this.last_mod = rs.getDate("LAST_MOD");
-    }
-
-
-    public Group(JSONObject jo) throws InvalidObjectException {
-        this("", "", "");
-        try {
-            // The JSONObject is assumed to contain a vnd.dmaap-dr.group representation
-            this.groupid = jo.optInt("groupid", -1);
-            String gname = jo.getString("name");
-            String gdescription = jo.getString("description");
-
-            this.authid = jo.getString("authid");
-            this.name = gname;
-            this.description = gdescription;
-            this.classification = jo.getString("classification");
-            this.members = jo.getString("members");
-
-            if (gname.length() > 50) {
-                throw new InvalidObjectException("Group name is too long");
-            }
-            if (gdescription.length() > 256) {
-                throw new InvalidObjectException("Group Description is too long");
-            }
-        } catch (InvalidObjectException e) {
-            throw e;
-        } catch (Exception e) {
-            intlogger.warn("Invalid JSON: " + e.getMessage(), e);
-            throw new InvalidObjectException("Invalid JSON: " + e.getMessage());
-        }
-    }
-
     public int getGroupid() {
         return groupid;
     }
@@ -242,7 +246,7 @@ public class Group extends Syncable {
     @Override
     public JSONObject asJSONObject() {
         JSONObject jo = new JSONObject();
-        jo.put("groupid", groupid);
+        jo.put(GROUP_ID_CONST, groupid);
         jo.put("authid", authid);
         jo.put("name", name);
         jo.put("description", description);
@@ -259,11 +263,11 @@ public class Group extends Syncable {
         try {
             if (groupid == -1) {
                 // No feed ID assigned yet, so assign the next available one
-                setGroupid(next_groupid++);
+                setGroupid(nextGroupid++);
             }
             // In case we insert a gropup from synchronization
-            if (groupid > next_groupid) {
-                next_groupid = groupid + 1;
+            if (groupid > nextGroupid) {
+                nextGroupid = groupid + 1;
             }
 
             // Create the GROUPS row