Code Review
/
dmaap
/
datarouter.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Removing code smells
[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
d3f82e6
..
c076ffb
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
@@
-24,9
+24,7
@@
\r
package org.onap.dmaap.datarouter.provisioning.beans;
\r
\r
\r
package org.onap.dmaap.datarouter.provisioning.beans;
\r
\r
-import java.io.InvalidObjectException;
\r
import java.util.Objects;
\r
import java.util.Objects;
\r
-
\r
import org.json.JSONObject;
\r
\r
/**
\r
import org.json.JSONObject;
\r
\r
/**
\r
@@
-35,6
+33,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
* @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
public class SubLinks implements JSONable {
\r
private String self;
\r
private String feed;
\r
@@
-44,13
+43,23
@@
public class SubLinks implements JSONable {
self = feed = log = null;
\r
}
\r
\r
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
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
public SubLinks(String self, String feed, String log) {
\r
this.self = self;
\r
this.feed = feed;
\r
@@
-92,15
+101,19
@@
public class SubLinks implements JSONable {
\r
@Override
\r
public boolean equals(Object obj) {
\r
\r
@Override
\r
public boolean equals(Object obj) {
\r
- if (!(obj instanceof SubLinks))
\r
+ if (!(obj instanceof SubLinks))
{
\r
return false;
\r
return false;
\r
+ }
\r
SubLinks os = (SubLinks) obj;
\r
SubLinks os = (SubLinks) obj;
\r
- if (!self.equals(os.self))
\r
+ if (!self.equals(os.self))
{
\r
return false;
\r
return false;
\r
- if (!feed.equals(os.feed))
\r
+ }
\r
+ if (!feed.equals(os.feed)) {
\r
return false;
\r
return false;
\r
- if (!log.equals(os.log))
\r
+ }
\r
+ if (!log.equals(os.log)) {
\r
return false;
\r
return false;
\r
+ }
\r
return true;
\r
}
\r
\r
return true;
\r
}
\r
\r