Code style cleanup for prov authz and beans

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

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/FeedAuthorization.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/FeedAuthorization.java
index 4d90163..ff08f59 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/FeedAuthorization.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/FeedAuthorization.java
@@ -38,14 +38,18 @@ import org.json.JSONObject;
  * @version $Id: FeedAuthorization.java,v 1.2 2013/06/20 14:11:05 eby Exp $\r
  */\r
 public class FeedAuthorization implements JSONable {\r
+\r
     private String classification;\r
-    private Set<FeedEndpointID> endpoint_ids;\r
-    private Set<String> endpoint_addrs;\r
+    private Set<FeedEndpointID> endpointIds;\r
+    private Set<String> endpointAddrs;\r
 \r
+    /**\r
+     * FeedAuthoization constructor.\r
+     */\r
     public FeedAuthorization() {\r
         this.classification = "";\r
-        this.endpoint_ids = new HashSet<>();\r
-        this.endpoint_addrs = new HashSet<>();\r
+        this.endpointIds = new HashSet<>();\r
+        this.endpointAddrs = new HashSet<>();\r
     }\r
 \r
     public String getClassification() {\r
@@ -57,19 +61,19 @@ public class FeedAuthorization implements JSONable {
     }\r
 \r
     public Set<FeedEndpointID> getEndpoint_ids() {\r
-        return endpoint_ids;\r
+        return endpointIds;\r
     }\r
 \r
-    public void setEndpoint_ids(Set<FeedEndpointID> endpoint_ids) {\r
-        this.endpoint_ids = endpoint_ids;\r
+    public void setEndpoint_ids(Set<FeedEndpointID> endpointIds) {\r
+        this.endpointIds = endpointIds;\r
     }\r
 \r
     public Set<String> getEndpoint_addrs() {\r
-        return endpoint_addrs;\r
+        return endpointAddrs;\r
     }\r
 \r
-    public void setEndpoint_addrs(Set<String> endpoint_addrs) {\r
-        this.endpoint_addrs = endpoint_addrs;\r
+    public void setEndpoint_addrs(Set<String> endpointAddrs) {\r
+        this.endpointAddrs = endpointAddrs;\r
     }\r
 \r
     @Override\r
@@ -77,12 +81,12 @@ public class FeedAuthorization implements JSONable {
         JSONObject jo = new JSONObject();\r
         jo.put("classification", classification);\r
         JSONArray ja = new JSONArray();\r
-        for (FeedEndpointID eid : endpoint_ids) {\r
+        for (FeedEndpointID eid : endpointIds) {\r
             ja.put(eid.asJSONObject());\r
         }\r
         jo.put("endpoint_ids", ja);\r
         ja = new JSONArray();\r
-        for (String t : endpoint_addrs) {\r
+        for (String t : endpointAddrs) {\r
             ja.put(t);\r
         }\r
         jo.put("endpoint_addrs", ja);\r
@@ -91,20 +95,24 @@ public class FeedAuthorization implements JSONable {
 \r
     @Override\r
     public boolean equals(Object obj) {\r
-        if (!(obj instanceof FeedAuthorization))\r
+        if (!(obj instanceof FeedAuthorization)) {\r
             return false;\r
+        }\r
         FeedAuthorization of = (FeedAuthorization) obj;\r
-        if (!classification.equals(of.classification))\r
+        if (!classification.equals(of.classification)) {\r
             return false;\r
-        if (!endpoint_ids.equals(of.endpoint_ids))\r
+        }\r
+        if (!endpointIds.equals(of.endpointIds)) {\r
             return false;\r
-        if (!endpoint_addrs.equals(of.endpoint_addrs))\r
+        }\r
+        if (!endpointAddrs.equals(of.endpointAddrs)) {\r
             return false;\r
+        }\r
         return true;\r
     }\r
 \r
     @Override\r
     public int hashCode() {\r
-        return Objects.hash(classification, endpoint_ids, endpoint_addrs);\r
+        return Objects.hash(classification, endpointIds, endpointAddrs);\r
     }\r
 }\r