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
/
EgressRoute.java
diff --git
a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/EgressRoute.java
b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/EgressRoute.java
index
a78a9c1
..
54d5b39
100644
(file)
--- a/
datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/EgressRoute.java
+++ b/
datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/EgressRoute.java
@@
-49,6
+49,11
@@
public class EgressRoute extends NodeClass implements Comparable<EgressRoute> {
private final int subid;
\r
private final int nodeid;
\r
\r
private final int subid;
\r
private final int nodeid;
\r
\r
+ /**
\r
+ * EgressRoute constructor.
\r
+ * @param subid subscription id
\r
+ * @param nodeid node id
\r
+ */
\r
public EgressRoute(int subid, int nodeid) {
\r
this.subid = subid;
\r
this.nodeid = nodeid;
\r
public EgressRoute(int subid, int nodeid) {
\r
this.subid = subid;
\r
this.nodeid = nodeid;
\r
@@
-101,7
+106,7
@@
public class EgressRoute extends NodeClass implements Comparable<EgressRoute> {
* @return an EgressRoute, or null if there is no route for this subscription
\r
*/
\r
public static EgressRoute getEgressRoute(int sub) {
\r
* @return an EgressRoute, or null if there is no route for this subscription
\r
*/
\r
public static EgressRoute getEgressRoute(int sub) {
\r
- EgressRoute
v
= null;
\r
+ EgressRoute
er
= null;
\r
DB db = new DB();
\r
String sql = "select NODEID from EGRESS_ROUTES where SUBID = ?";
\r
try (Connection conn = db.getConnection();
\r
DB db = new DB();
\r
String sql = "select NODEID from EGRESS_ROUTES where SUBID = ?";
\r
try (Connection conn = db.getConnection();
\r
@@
-110,7
+115,7
@@
public class EgressRoute extends NodeClass implements Comparable<EgressRoute> {
try (ResultSet rs = ps.executeQuery()) {
\r
if (rs.next()) {
\r
int node = rs.getInt("NODEID");
\r
try (ResultSet rs = ps.executeQuery()) {
\r
if (rs.next()) {
\r
int node = rs.getInt("NODEID");
\r
-
v
= new EgressRoute(sub, node);
\r
+
er
= new EgressRoute(sub, node);
\r
}
\r
} finally {
\r
db.release(conn);
\r
}
\r
} finally {
\r
db.release(conn);
\r
@@
-118,14
+123,14
@@
public class EgressRoute extends NodeClass implements Comparable<EgressRoute> {
} catch (SQLException e) {
\r
intlogger.error("PROV0009 EgressRoute.getEgressRoute: " + e.getMessage(), e);
\r
}
\r
} catch (SQLException e) {
\r
intlogger.error("PROV0009 EgressRoute.getEgressRoute: " + e.getMessage(), e);
\r
}
\r
- return
v
;
\r
+ return
er
;
\r
}
\r
\r
@Override
\r
}
\r
\r
@Override
\r
- public boolean doDelete(Connection c) {
\r
+ public boolean doDelete(Connection c
onn
) {
\r
boolean rv = true;
\r
String sql = "delete from EGRESS_ROUTES where SUBID = ?";
\r
boolean rv = true;
\r
String sql = "delete from EGRESS_ROUTES where SUBID = ?";
\r
- try (PreparedStatement ps = c.prepareStatement(sql)) {
\r
+ try (PreparedStatement ps = c
onn
.prepareStatement(sql)) {
\r
ps.setInt(1, subid);
\r
ps.execute();
\r
} catch (SQLException e) {
\r
ps.setInt(1, subid);
\r
ps.execute();
\r
} catch (SQLException e) {
\r
@@
-136,10
+141,10
@@
public class EgressRoute extends NodeClass implements Comparable<EgressRoute> {
}
\r
\r
@Override
\r
}
\r
\r
@Override
\r
- public boolean doInsert(Connection c) {
\r
+ public boolean doInsert(Connection c
onn
) {
\r
boolean rv = false;
\r
String sql = "insert into EGRESS_ROUTES (SUBID, NODEID) values (?, ?)";
\r
boolean rv = false;
\r
String sql = "insert into EGRESS_ROUTES (SUBID, NODEID) values (?, ?)";
\r
- try (PreparedStatement ps = c.prepareStatement(sql)) {
\r
+ try (PreparedStatement ps = c
onn
.prepareStatement(sql)) {
\r
// Create the NETWORK_ROUTES row
\r
ps.setInt(1, this.subid);
\r
ps.setInt(2, this.nodeid);
\r
// Create the NETWORK_ROUTES row
\r
ps.setInt(1, this.subid);
\r
ps.setInt(2, this.nodeid);
\r
@@
-153,10
+158,10
@@
public class EgressRoute extends NodeClass implements Comparable<EgressRoute> {
}
\r
\r
@Override
\r
}
\r
\r
@Override
\r
- public boolean doUpdate(Connection c) {
\r
+ public boolean doUpdate(Connection c
onn
) {
\r
boolean rv = true;
\r
String sql = "update EGRESS_ROUTES set NODEID = ? where SUBID = ?";
\r
boolean rv = true;
\r
String sql = "update EGRESS_ROUTES set NODEID = ? where SUBID = ?";
\r
- try (PreparedStatement ps = c.prepareStatement(sql)) {
\r
+ try (PreparedStatement ps = c
onn
.prepareStatement(sql)) {
\r
ps.setInt(1, nodeid);
\r
ps.setInt(2, subid);
\r
ps.executeUpdate();
\r
ps.setInt(1, nodeid);
\r
ps.setInt(2, subid);
\r
ps.executeUpdate();
\r
@@
-189,8
+194,8
@@
public class EgressRoute extends NodeClass implements Comparable<EgressRoute> {
}
\r
\r
@Override
\r
}
\r
\r
@Override
\r
- public int compareTo(EgressRoute
o
) {
\r
- return this.subid -
o
.subid;
\r
+ public int compareTo(EgressRoute
er
) {
\r
+ return this.subid -
er
.subid;
\r
}
\r
\r
@Override
\r
}
\r
\r
@Override
\r