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 2f66a49..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
@@ -7,9 +7,9 @@
  * * Licensed under the Apache License, Version 2.0 (the "License");\r
  * * you may not use this file except in compliance with the License.\r
  * * You may obtain a copy of the License at\r
- * * \r
+ * *\r
  *  *      http://www.apache.org/licenses/LICENSE-2.0\r
- * * \r
+ * *\r
  *  * Unless required by applicable law or agreed to in writing, software\r
  * * distributed under the License is distributed on an "AS IS" BASIS,\r
  * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
@@ -25,71 +25,102 @@
 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
 /**\r
  * The URLs associated with a Subscription.\r
+ *\r
  * @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
-       private String log;\r
-\r
-       public SubLinks() {\r
-               self = feed = log = null;\r
-       }\r
-       public SubLinks(JSONObject jo) throws InvalidObjectException {\r
-               this();\r
-               self = jo.getString("self");\r
-               feed = jo.getString("feed");\r
-               log  = jo.getString("log");\r
-       }\r
-       public SubLinks(String self, String feed, String log) {\r
-               this.self = self;\r
-               this.feed = feed;\r
-               this.log  = log;\r
-       }\r
-       public String getSelf() {\r
-               return self;\r
-       }\r
-       public void setSelf(String self) {\r
-               this.self = self;\r
-       }\r
-       public String getFeed() {\r
-               return feed;\r
-       }\r
-       public void setFeed(String feed) {\r
-               this.feed = feed;\r
-       }\r
-       public String getLog() {\r
-               return log;\r
-       }\r
-       public void setLog(String log) {\r
-               this.log = log;\r
-       }\r
-\r
-       @Override\r
-       public JSONObject asJSONObject() {\r
-               JSONObject jo = new JSONObject();\r
-               jo.put("self", self);\r
-               jo.put("feed", feed);\r
-               jo.put("log", log);\r
-               return jo;\r
-       }\r
-       @Override\r
-       public boolean equals(Object obj) {\r
-               if (!(obj instanceof SubLinks))\r
-                       return false;\r
-               SubLinks os = (SubLinks) obj;\r
-               if (!self.equals(os.self))\r
-                       return false;\r
-               if (!feed.equals(os.feed))\r
-                       return false;\r
-               if (!log.equals(os.log))\r
-                       return false;\r
-               return true;\r
-       }\r
+    private String self;\r
+    private String feed;\r
+    private String log;\r
+\r
+    public SubLinks() {\r
+        self = feed = log = null;\r
+    }\r
+\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
+        this.log = log;\r
+    }\r
+\r
+    public String getSelf() {\r
+        return self;\r
+    }\r
+\r
+    public void setSelf(String self) {\r
+        this.self = self;\r
+    }\r
+\r
+    public String getFeed() {\r
+        return feed;\r
+    }\r
+\r
+    public void setFeed(String feed) {\r
+        this.feed = feed;\r
+    }\r
+\r
+    public String getLog() {\r
+        return log;\r
+    }\r
+\r
+    public void setLog(String log) {\r
+        this.log = log;\r
+    }\r
+\r
+    @Override\r
+    public JSONObject asJSONObject() {\r
+        JSONObject jo = new JSONObject();\r
+        jo.put("self", self);\r
+        jo.put("feed", feed);\r
+        jo.put("log", log);\r
+        return jo;\r
+    }\r
+\r
+    @Override\r
+    public boolean equals(Object obj) {\r
+        if (!(obj instanceof SubLinks)) {\r
+            return false;\r
+        }\r
+        SubLinks os = (SubLinks) obj;\r
+        if (!self.equals(os.self)) {\r
+            return false;\r
+        }\r
+        if (!feed.equals(os.feed)) {\r
+            return false;\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