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
Code style cleanup for prov authz and beans
[dmaap/datarouter.git]
/
datarouter-prov
/
src
/
main
/
java
/
org
/
onap
/
dmaap
/
datarouter
/
provisioning
/
beans
/
FeedAuthorization.java
diff --git
a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/FeedAuthorization.java
b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/FeedAuthorization.java
index
4d90163
..
ff08f59
100644
(file)
--- a/
datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/FeedAuthorization.java
+++ b/
datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/FeedAuthorization.java
@@
-38,14
+38,18
@@
import org.json.JSONObject;
* @version $Id: FeedAuthorization.java,v 1.2 2013/06/20 14:11:05 eby Exp $
\r
*/
\r
public class FeedAuthorization implements JSONable {
\r
* @version $Id: FeedAuthorization.java,v 1.2 2013/06/20 14:11:05 eby Exp $
\r
*/
\r
public class FeedAuthorization implements JSONable {
\r
+
\r
private String classification;
\r
private String classification;
\r
- private Set<FeedEndpointID> endpoint
_i
ds;
\r
- private Set<String> endpoint
_a
ddrs;
\r
+ private Set<FeedEndpointID> endpoint
I
ds;
\r
+ private Set<String> endpoint
A
ddrs;
\r
\r
\r
+ /**
\r
+ * FeedAuthoization constructor.
\r
+ */
\r
public FeedAuthorization() {
\r
this.classification = "";
\r
public FeedAuthorization() {
\r
this.classification = "";
\r
- this.endpoint
_i
ds = new HashSet<>();
\r
- this.endpoint
_a
ddrs = new HashSet<>();
\r
+ this.endpoint
I
ds = new HashSet<>();
\r
+ this.endpoint
A
ddrs = new HashSet<>();
\r
}
\r
\r
public String getClassification() {
\r
}
\r
\r
public String getClassification() {
\r
@@
-57,19
+61,19
@@
public class FeedAuthorization implements JSONable {
}
\r
\r
public Set<FeedEndpointID> getEndpoint_ids() {
\r
}
\r
\r
public Set<FeedEndpointID> getEndpoint_ids() {
\r
- return endpoint
_i
ds;
\r
+ return endpoint
I
ds;
\r
}
\r
\r
}
\r
\r
- public void setEndpoint_ids(Set<FeedEndpointID> endpoint
_i
ds) {
\r
- this.endpoint
_ids = endpoint_i
ds;
\r
+ public void setEndpoint_ids(Set<FeedEndpointID> endpoint
I
ds) {
\r
+ this.endpoint
Ids = endpointI
ds;
\r
}
\r
\r
public Set<String> getEndpoint_addrs() {
\r
}
\r
\r
public Set<String> getEndpoint_addrs() {
\r
- return endpoint
_a
ddrs;
\r
+ return endpoint
A
ddrs;
\r
}
\r
\r
}
\r
\r
- public void setEndpoint_addrs(Set<String> endpoint
_a
ddrs) {
\r
- this.endpoint
_addrs = endpoint_a
ddrs;
\r
+ public void setEndpoint_addrs(Set<String> endpoint
A
ddrs) {
\r
+ this.endpoint
Addrs = endpointA
ddrs;
\r
}
\r
\r
@Override
\r
}
\r
\r
@Override
\r
@@
-77,12
+81,12
@@
public class FeedAuthorization implements JSONable {
JSONObject jo = new JSONObject();
\r
jo.put("classification", classification);
\r
JSONArray ja = new JSONArray();
\r
JSONObject jo = new JSONObject();
\r
jo.put("classification", classification);
\r
JSONArray ja = new JSONArray();
\r
- for (FeedEndpointID eid : endpoint
_i
ds) {
\r
+ for (FeedEndpointID eid : endpoint
I
ds) {
\r
ja.put(eid.asJSONObject());
\r
}
\r
jo.put("endpoint_ids", ja);
\r
ja = new JSONArray();
\r
ja.put(eid.asJSONObject());
\r
}
\r
jo.put("endpoint_ids", ja);
\r
ja = new JSONArray();
\r
- for (String t : endpoint
_a
ddrs) {
\r
+ for (String t : endpoint
A
ddrs) {
\r
ja.put(t);
\r
}
\r
jo.put("endpoint_addrs", ja);
\r
ja.put(t);
\r
}
\r
jo.put("endpoint_addrs", ja);
\r
@@
-91,20
+95,24
@@
public class FeedAuthorization implements JSONable {
\r
@Override
\r
public boolean equals(Object obj) {
\r
\r
@Override
\r
public boolean equals(Object obj) {
\r
- if (!(obj instanceof FeedAuthorization))
\r
+ if (!(obj instanceof FeedAuthorization))
{
\r
return false;
\r
return false;
\r
+ }
\r
FeedAuthorization of = (FeedAuthorization) obj;
\r
FeedAuthorization of = (FeedAuthorization) obj;
\r
- if (!classification.equals(of.classification))
\r
+ if (!classification.equals(of.classification))
{
\r
return false;
\r
return false;
\r
- if (!endpoint_ids.equals(of.endpoint_ids))
\r
+ }
\r
+ if (!endpointIds.equals(of.endpointIds)) {
\r
return false;
\r
return false;
\r
- if (!endpoint_addrs.equals(of.endpoint_addrs))
\r
+ }
\r
+ if (!endpointAddrs.equals(of.endpointAddrs)) {
\r
return false;
\r
return false;
\r
+ }
\r
return true;
\r
}
\r
\r
@Override
\r
public int hashCode() {
\r
return true;
\r
}
\r
\r
@Override
\r
public int hashCode() {
\r
- return Objects.hash(classification, endpoint
_ids, endpoint_a
ddrs);
\r
+ return Objects.hash(classification, endpoint
Ids, endpointA
ddrs);
\r
}
\r
}
\r
}
\r
}
\r