Removing unused code

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

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/SubDelivery.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/SubDelivery.java
index 2341f2b..5a3457b 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/SubDelivery.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/SubDelivery.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
@@ -26,84 +26,94 @@ package org.onap.dmaap.datarouter.provisioning.beans;
 \r
 import java.sql.ResultSet;\r
 import java.sql.SQLException;\r
+import java.util.Objects;\r
 \r
 import org.json.JSONObject;\r
 \r
 /**\r
  * The representation of Subscription delivery information.  This includes the URL to deliver to,\r
  * login and password, and whether to use the "HTTP 100-continue" feature for this subscription.\r
+ *\r
  * @author Robert Eby\r
  * @version $Id: SubDelivery.java,v 1.2 2013/06/20 14:11:05 eby Exp $\r
  */\r
 public class SubDelivery implements JSONable {\r
-       private String url;\r
-       private String user;\r
-       private String password;\r
-       private boolean use100;\r
-\r
-       public SubDelivery() {\r
-               this("", "", "", false);\r
-       }\r
-       public SubDelivery(String url, String user, String password, boolean use100) {\r
-               this.url      = url;\r
-               this.user     = user;\r
-               this.password = password;\r
-               this.use100   = use100;\r
-       }\r
-       public SubDelivery(ResultSet rs) throws SQLException {\r
-               this.url      = rs.getString("DELIVERY_URL");\r
-               this.user     = rs.getString("DELIVERY_USER");\r
-               this.password = rs.getString("DELIVERY_PASSWORD");\r
-               this.use100   = rs.getBoolean("DELIVERY_USE100");\r
-\r
-       }\r
-       public String getUrl() {\r
-               return url;\r
-       }\r
-       public void setUrl(String url) {\r
-               this.url = url;\r
-       }\r
-       public String getUser() {\r
-               return user;\r
-       }\r
-       public void setUser(String user) {\r
-               this.user = user;\r
-       }\r
-       public String getPassword() {\r
-               return password;\r
-       }\r
-       public void setPassword(String password) {\r
-               this.password = password;\r
-       }\r
-\r
-       public boolean isUse100() {\r
-               return use100;\r
-       }\r
-       public void setUse100(boolean use100) {\r
-               this.use100 = use100;\r
-       }\r
-       @Override\r
-       public JSONObject asJSONObject() {\r
-               JSONObject jo = new JSONObject();\r
-               jo.put("url", url);\r
-               jo.put("user", user);\r
-               jo.put("password", password);\r
-               jo.put("use100", use100);\r
-               return jo;\r
-       }\r
-       @Override\r
-       public boolean equals(Object obj) {\r
-               if (!(obj instanceof SubDelivery))\r
-                       return false;\r
-               SubDelivery os = (SubDelivery) obj;\r
-               if (!url.equals(os.url))\r
-                       return false;\r
-               if (!user.equals(os.user))\r
-                       return false;\r
-               if (!password.equals(os.password))\r
-                       return false;\r
-               if (use100 != os.use100)\r
-                       return false;\r
-               return true;\r
-       }\r
+    private String url;\r
+    private String user;\r
+    private String password;\r
+    private boolean use100;\r
+\r
+    public SubDelivery(String url, String user, String password, boolean use100) {\r
+        this.url = url;\r
+        this.user = user;\r
+        this.password = password;\r
+        this.use100 = use100;\r
+    }\r
+\r
+    public SubDelivery(ResultSet rs) throws SQLException {\r
+        this.url = rs.getString("DELIVERY_URL");\r
+        this.user = rs.getString("DELIVERY_USER");\r
+        this.password = rs.getString("DELIVERY_PASSWORD");\r
+        this.use100 = rs.getBoolean("DELIVERY_USE100");\r
+\r
+    }\r
+\r
+    public String getUrl() {\r
+        return url;\r
+    }\r
+\r
+    public void setUrl(String url) {\r
+        this.url = url;\r
+    }\r
+\r
+    public String getUser() {\r
+        return user;\r
+    }\r
+\r
+    public void setUser(String user) {\r
+        this.user = user;\r
+    }\r
+\r
+    public String getPassword() {\r
+        return password;\r
+    }\r
+\r
+    public void setPassword(String password) {\r
+        this.password = password;\r
+    }\r
+\r
+    public boolean isUse100() {\r
+        return use100;\r
+    }\r
+\r
+    @Override\r
+    public JSONObject asJSONObject() {\r
+        JSONObject jo = new JSONObject();\r
+        jo.put("url", url);\r
+        jo.put("user", user);\r
+        jo.put("password", password);\r
+        jo.put("use100", use100);\r
+        return jo;\r
+    }\r
+\r
+    @Override\r
+    public boolean equals(Object obj) {\r
+        if (!(obj instanceof SubDelivery))\r
+            return false;\r
+        SubDelivery os = (SubDelivery) obj;\r
+        if (!url.equals(os.url))\r
+            return false;\r
+        if (!user.equals(os.user))\r
+            return false;\r
+        if (!password.equals(os.password))\r
+            return false;\r
+        if (use100 != os.use100)\r
+            return false;\r
+        return true;\r
+    }\r
+\r
+    @Override\r
+    public int hashCode() {\r
+        return Objects.hash(url, user, password, use100);\r
+    }\r
 }\r