Code style cleanup for prov authz and beans

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

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/FeedLinks.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/FeedLinks.java
index 14aa107..779bffa 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/FeedLinks.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/FeedLinks.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,79 +25,104 @@
 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 Feed.\r
+ *\r
  * @author Robert Eby\r
  * @version $Id: FeedLinks.java,v 1.3 2013/07/05 13:48:05 eby Exp $\r
  */\r
+\r
 public class FeedLinks implements JSONable {\r
-       private String self;\r
-       private String publish;\r
-       private String subscribe;\r
-       private String log;\r
-\r
-       public FeedLinks() {\r
-               self = publish = subscribe = log = null;\r
-       }\r
-\r
-       public FeedLinks(JSONObject jo) throws InvalidObjectException {\r
-               this();\r
-               self      = jo.getString("self");\r
-               publish   = jo.getString("publish");\r
-               subscribe = jo.getString("subscribe");\r
-               log       = jo.getString("log");\r
-       }\r
-\r
-       public String getSelf() {\r
-               return self;\r
-       }\r
-       public void setSelf(String self) {\r
-               this.self = self;\r
-       }\r
-       public String getPublish() {\r
-               return publish;\r
-       }\r
-       public void setPublish(String publish) {\r
-               this.publish = publish;\r
-       }\r
-       public String getSubscribe() {\r
-               return subscribe;\r
-       }\r
-       public void setSubscribe(String subscribe) {\r
-               this.subscribe = subscribe;\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("publish", publish);\r
-               jo.put("subscribe", subscribe);\r
-               jo.put("log", log);\r
-               return jo;\r
-       }\r
-       @Override\r
-       public boolean equals(Object obj) {\r
-               if (!(obj instanceof FeedLinks))\r
-                       return false;\r
-               FeedLinks of = (FeedLinks) obj;\r
-               if (!self.equals(of.self))\r
-                       return false;\r
-               if (!publish.equals(of.publish))\r
-                       return false;\r
-               if (!subscribe.equals(of.subscribe))\r
-                       return false;\r
-               if (!log.equals(of.log))\r
-                       return false;\r
-               return true;\r
-       }\r
+    private String self;\r
+    private String publish;\r
+    private String subscribe;\r
+    private String log;\r
+\r
+    public FeedLinks() {\r
+        self = publish = subscribe = log = null;\r
+    }\r
+\r
+    /**\r
+     * FeedLinks constructor.\r
+     * @param jo JSONObject\r
+     */\r
+    public FeedLinks(JSONObject jo) {\r
+        this();\r
+        self = jo.getString("self");\r
+        publish = jo.getString("publish");\r
+        subscribe = jo.getString("subscribe");\r
+        log = jo.getString("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 getPublish() {\r
+        return publish;\r
+    }\r
+\r
+    public void setPublish(String publish) {\r
+        this.publish = publish;\r
+    }\r
+\r
+    public String getSubscribe() {\r
+        return subscribe;\r
+    }\r
+\r
+    public void setSubscribe(String subscribe) {\r
+        this.subscribe = subscribe;\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("publish", publish);\r
+        jo.put("subscribe", subscribe);\r
+        jo.put("log", log);\r
+        return jo;\r
+    }\r
+\r
+    @Override\r
+    public boolean equals(Object obj) {\r
+        if (!(obj instanceof FeedLinks)) {\r
+            return false;\r
+        }\r
+        FeedLinks of = (FeedLinks) obj;\r
+        if (!self.equals(of.self)) {\r
+            return false;\r
+        }\r
+        if (!publish.equals(of.publish)) {\r
+            return false;\r
+        }\r
+        if (!subscribe.equals(of.subscribe)) {\r
+            return false;\r
+        }\r
+        if (!log.equals(of.log)) {\r
+            return false;\r
+        }\r
+        return true;\r
+    }\r
+\r
+    @Override\r
+    public int hashCode() {\r
+        return Objects.hash(self, publish, subscribe, log);\r
+    }\r
 }\r