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
Refactor Prov DB handling
[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
98981a3
..
e3a0dc0
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
@@
-37,16
+37,20
@@
import org.json.JSONObject;
* @author Robert Eby
\r
* @version $Id: SubDelivery.java,v 1.2 2013/06/20 14:11:05 eby Exp $
\r
*/
\r
* @author Robert Eby
\r
* @version $Id: SubDelivery.java,v 1.2 2013/06/20 14:11:05 eby Exp $
\r
*/
\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 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
-
\r
+ /**
\r
+ * SubDelivery constructor.
\r
+ * @param url url string
\r
+ * @param user user string
\r
+ * @param password password string
\r
+ * @param use100 use100 string
\r
+ */
\r
public SubDelivery(String url, String user, String password, boolean use100) {
\r
this.url = url;
\r
this.user = user;
\r
public SubDelivery(String url, String user, String password, boolean use100) {
\r
this.url = url;
\r
this.user = user;
\r
@@
-54,6
+58,11
@@
public class SubDelivery implements JSONable {
this.use100 = use100;
\r
}
\r
\r
this.use100 = use100;
\r
}
\r
\r
+ /**
\r
+ * SubDelivery constructor.
\r
+ * @param rs resultset from DB
\r
+ * @throws SQLException in cse of SQL error
\r
+ */
\r
public SubDelivery(ResultSet rs) throws SQLException {
\r
this.url = rs.getString("DELIVERY_URL");
\r
this.user = rs.getString("DELIVERY_USER");
\r
public SubDelivery(ResultSet rs) throws SQLException {
\r
this.url = rs.getString("DELIVERY_URL");
\r
this.user = rs.getString("DELIVERY_USER");
\r
@@
-90,10
+99,6
@@
public class SubDelivery implements JSONable {
return use100;
\r
}
\r
\r
return use100;
\r
}
\r
\r
- public void setUse100(boolean use100) {
\r
- this.use100 = use100;
\r
- }
\r
-
\r
@Override
\r
public JSONObject asJSONObject() {
\r
JSONObject jo = new JSONObject();
\r
@Override
\r
public JSONObject asJSONObject() {
\r
JSONObject jo = new JSONObject();
\r
@@
-106,17
+111,22
@@
public class SubDelivery implements JSONable {
\r
@Override
\r
public boolean equals(Object obj) {
\r
\r
@Override
\r
public boolean equals(Object obj) {
\r
- if (!(obj instanceof SubDelivery))
\r
+ if (!(obj instanceof SubDelivery))
{
\r
return false;
\r
return false;
\r
+ }
\r
SubDelivery os = (SubDelivery) obj;
\r
SubDelivery os = (SubDelivery) obj;
\r
- if (!url.equals(os.url))
\r
+ if (!url.equals(os.url))
{
\r
return false;
\r
return false;
\r
- if (!user.equals(os.user))
\r
+ }
\r
+ if (!user.equals(os.user)) {
\r
return false;
\r
return false;
\r
- if (!password.equals(os.password))
\r
+ }
\r
+ if (!password.equals(os.password)) {
\r
return false;
\r
return false;
\r
- if (use100 != os.use100)
\r
+ }
\r
+ if (use100 != os.use100) {
\r
return false;
\r
return false;
\r
+ }
\r
return true;
\r
}
\r
\r
return true;
\r
}
\r
\r