Code style cleanup for prov authz and beans

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

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/SubLinks.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/SubLinks.java
index f07a76e..9c10fb3 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/SubLinks.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/SubLinks.java
@@ -25,6 +25,7 @@
 package org.onap.dmaap.datarouter.provisioning.beans;\r
 \r
 import java.io.InvalidObjectException;\r
+import java.util.Objects;\r
 \r
 import org.json.JSONObject;\r
 \r
@@ -34,6 +35,7 @@ import org.json.JSONObject;
  * @author Robert Eby\r
  * @version $Id: SubLinks.java,v 1.3 2013/07/05 13:48:05 eby Exp $\r
  */\r
+\r
 public class SubLinks implements JSONable {\r
     private String self;\r
     private String feed;\r
@@ -43,13 +45,23 @@ public class SubLinks implements JSONable {
         self = feed = log = null;\r
     }\r
 \r
-    public SubLinks(JSONObject jo) throws InvalidObjectException {\r
+    /**\r
+     * Sublinks constructor.\r
+     * @param jo JSONObject\r
+     */\r
+    public SubLinks(JSONObject jo) {\r
         this();\r
         self = jo.getString("self");\r
         feed = jo.getString("feed");\r
         log = jo.getString("log");\r
     }\r
 \r
+    /**\r
+     * Sublinks constructor.\r
+     * @param self string for self\r
+     * @param feed string for feed\r
+     * @param log string for log\r
+     */\r
     public SubLinks(String self, String feed, String log) {\r
         this.self = self;\r
         this.feed = feed;\r
@@ -91,15 +103,24 @@ public class SubLinks implements JSONable {
 \r
     @Override\r
     public boolean equals(Object obj) {\r
-        if (!(obj instanceof SubLinks))\r
+        if (!(obj instanceof SubLinks)) {\r
             return false;\r
+        }\r
         SubLinks os = (SubLinks) obj;\r
-        if (!self.equals(os.self))\r
+        if (!self.equals(os.self)) {\r
             return false;\r
-        if (!feed.equals(os.feed))\r
+        }\r
+        if (!feed.equals(os.feed)) {\r
             return false;\r
-        if (!log.equals(os.log))\r
+        }\r
+        if (!log.equals(os.log)) {\r
             return false;\r
+        }\r
         return true;\r
     }\r
+\r
+    @Override\r
+    public int hashCode() {\r
+        return Objects.hash(self, feed, log);\r
+    }\r
 }\r