X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2Fbeans%2FFeedLinks.java;h=d3ee6436b26a5ca8737b57b101deb23f9dba158f;hb=6c78b3e6a0a67c73f931337356a172cc69cee0e8;hp=14aa1077a5b1e5ab3c77c8205e05c3a9f9f2bd33;hpb=e4b20cc6f7c31f48ddd0de5bcd054b09a35cd510;p=dmaap%2Fdatarouter.git

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 14aa1077..d3ee6436 100644
--- 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");
  * * you may not use this file except in compliance with the License.
  * * You may obtain a copy of the License at
- * * 
+ * *
  *  *      http://www.apache.org/licenses/LICENSE-2.0
- * * 
+ * *
  *  * Unless required by applicable law or agreed to in writing, software
  * * distributed under the License is distributed on an "AS IS" BASIS,
  * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,80 +24,103 @@
 
 package org.onap.dmaap.datarouter.provisioning.beans;
 
-import java.io.InvalidObjectException;
-
+import java.util.Objects;
 import org.json.JSONObject;
 
 /**
  * The URLs associated with a Feed.
+ *
  * @author Robert Eby
  * @version $Id: FeedLinks.java,v 1.3 2013/07/05 13:48:05 eby Exp $
  */
+
 public class FeedLinks implements JSONable {
-	private String self;
-	private String publish;
-	private String subscribe;
-	private String log;
-
-	public FeedLinks() {
-		self = publish = subscribe = log = null;
-	}
-
-	public FeedLinks(JSONObject jo) throws InvalidObjectException {
-		this();
-		self      = jo.getString("self");
-		publish   = jo.getString("publish");
-		subscribe = jo.getString("subscribe");
-		log       = jo.getString("log");
-	}
-
-	public String getSelf() {
-		return self;
-	}
-	public void setSelf(String self) {
-		this.self = self;
-	}
-	public String getPublish() {
-		return publish;
-	}
-	public void setPublish(String publish) {
-		this.publish = publish;
-	}
-	public String getSubscribe() {
-		return subscribe;
-	}
-	public void setSubscribe(String subscribe) {
-		this.subscribe = subscribe;
-	}
-	public String getLog() {
-		return log;
-	}
-	public void setLog(String log) {
-		this.log = log;
-	}
-
-	@Override
-	public JSONObject asJSONObject() {
-		JSONObject jo = new JSONObject();
-		jo.put("self", self);
-		jo.put("publish", publish);
-		jo.put("subscribe", subscribe);
-		jo.put("log", log);
-		return jo;
-	}
-	@Override
-	public boolean equals(Object obj) {
-		if (!(obj instanceof FeedLinks))
-			return false;
-		FeedLinks of = (FeedLinks) obj;
-		if (!self.equals(of.self))
-			return false;
-		if (!publish.equals(of.publish))
-			return false;
-		if (!subscribe.equals(of.subscribe))
-			return false;
-		if (!log.equals(of.log))
-			return false;
-		return true;
-	}
+    private String self;
+    private String publish;
+    private String subscribe;
+    private String log;
+
+    public FeedLinks() {
+        self = publish = subscribe = log = null;
+    }
+
+    /**
+     * FeedLinks constructor.
+     * @param jo JSONObject
+     */
+    public FeedLinks(JSONObject jo) {
+        this();
+        self = jo.getString("self");
+        publish = jo.getString("publish");
+        subscribe = jo.getString("subscribe");
+        log = jo.getString("log");
+    }
+
+    public String getSelf() {
+        return self;
+    }
+
+    public void setSelf(String self) {
+        this.self = self;
+    }
+
+    public String getPublish() {
+        return publish;
+    }
+
+    public void setPublish(String publish) {
+        this.publish = publish;
+    }
+
+    public String getSubscribe() {
+        return subscribe;
+    }
+
+    public void setSubscribe(String subscribe) {
+        this.subscribe = subscribe;
+    }
+
+    public String getLog() {
+        return log;
+    }
+
+    public void setLog(String log) {
+        this.log = log;
+    }
+
+    @Override
+    public JSONObject asJSONObject() {
+        JSONObject jo = new JSONObject();
+        jo.put("self", self);
+        jo.put("publish", publish);
+        jo.put("subscribe", subscribe);
+        jo.put("log", log);
+        return jo;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof FeedLinks)) {
+            return false;
+        }
+        FeedLinks of = (FeedLinks) obj;
+        if (!self.equals(of.self)) {
+            return false;
+        }
+        if (!publish.equals(of.publish)) {
+            return false;
+        }
+        if (!subscribe.equals(of.subscribe)) {
+            return false;
+        }
+        if (!log.equals(of.log)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(self, publish, subscribe, log);
+    }
 }