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
fixed 12 blocker issues in group.java
[dmaap/datarouter.git]
/
datarouter-prov
/
src
/
main
/
java
/
org
/
onap
/
dmaap
/
datarouter
/
provisioning
/
beans
/
Group.java
diff --git
a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Group.java
b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Group.java
index
a021a60
..
a460d64
100644
(file)
--- a/
datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Group.java
+++ b/
datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Group.java
@@
-29,10
+29,7
@@
import java.sql.PreparedStatement;
import java.sql.ResultSet;
\r
import java.sql.SQLException;
\r
import java.sql.Statement;
\r
import java.sql.ResultSet;
\r
import java.sql.SQLException;
\r
import java.sql.Statement;
\r
-import java.util.ArrayList;
\r
-import java.util.Collection;
\r
-import java.util.Date;
\r
-import java.util.List;
\r
+import java.util.*;
\r
\r
import org.apache.log4j.Logger;
\r
import org.json.JSONObject;
\r
\r
import org.apache.log4j.Logger;
\r
import org.json.JSONObject;
\r
@@
-99,14
+96,14
@@
public class Group extends Syncable {
DB db = new DB();
\r
@SuppressWarnings("resource")
\r
Connection conn = db.getConnection();
\r
DB db = new DB();
\r
@SuppressWarnings("resource")
\r
Connection conn = db.getConnection();
\r
- Statement stmt = conn.createStatement();
\r
- ResultSet rs = stmt.executeQuery(sql);
\r
- while (rs.next()) {
\r
- Group group = new Group(rs);
\r
- list.add(group);
\r
+ try(Statement stmt = conn.createStatement()) {
\r
+ try(ResultSet rs = stmt.executeQuery(sql)) {
\r
+ while (rs.next()) {
\r
+ Group group = new Group(rs);
\r
+ list.add(group);
\r
+ }
\r
+ }
\r
}
\r
}
\r
- rs.close();
\r
- stmt.close();
\r
db.release(conn);
\r
} catch (SQLException e) {
\r
e.printStackTrace();
\r
db.release(conn);
\r
} catch (SQLException e) {
\r
e.printStackTrace();
\r
@@
-120,13
+117,13
@@
public class Group extends Syncable {
DB db = new DB();
\r
@SuppressWarnings("resource")
\r
Connection conn = db.getConnection();
\r
DB db = new DB();
\r
@SuppressWarnings("resource")
\r
Connection conn = db.getConnection();
\r
- Statement stmt = conn.createStatement();
\r
- ResultSet rs = stmt.executeQuery("select MAX(groupid) from GROUPS");
\r
- if (rs.next()) {
\r
- max = rs.getInt(1);
\r
+ try(Statement stmt = conn.createStatement()) {
\r
+ try(ResultSet rs = stmt.executeQuery("select MAX(groupid) from GROUPS")) {
\r
+ if (rs.next()) {
\r
+ max = rs.getInt(1);
\r
+ }
\r
+ }
\r
}
\r
}
\r
- rs.close();
\r
- stmt.close();
\r
db.release(conn);
\r
} catch (SQLException e) {
\r
intlogger.info("getMaxSubID: " + e.getMessage());
\r
db.release(conn);
\r
} catch (SQLException e) {
\r
intlogger.info("getMaxSubID: " + e.getMessage());
\r
@@
-142,14
+139,14
@@
public class Group extends Syncable {
DB db = new DB();
\r
@SuppressWarnings("resource")
\r
Connection conn = db.getConnection();
\r
DB db = new DB();
\r
@SuppressWarnings("resource")
\r
Connection conn = db.getConnection();
\r
- Statement stmt = conn.createStatement();
\r
- ResultSet rs = stmt.executeQuery(sql);
\r
- while (rs.next()) {
\r
- int groupid = rs.getInt("groupid");
\r
- //list.add(URLUtilities.generateSubscriptionURL(groupid));
\r
+ try(Statement stmt = conn.createStatement()) {
\r
+ try(ResultSet rs = stmt.executeQuery(sql)) {
\r
+ while (rs.next()) {
\r
+ int groupid = rs.getInt("groupid");
\r
+
\r
+ }
\r
+ }
\r
}
\r
}
\r
- rs.close();
\r
- stmt.close();
\r
db.release(conn);
\r
} catch (SQLException e) {
\r
e.printStackTrace();
\r
db.release(conn);
\r
} catch (SQLException e) {
\r
e.printStackTrace();
\r
@@
-168,13
+165,13
@@
public class Group extends Syncable {
DB db = new DB();
\r
@SuppressWarnings("resource")
\r
Connection conn = db.getConnection();
\r
DB db = new DB();
\r
@SuppressWarnings("resource")
\r
Connection conn = db.getConnection();
\r
- Statement stmt = conn.createStatement();
\r
- ResultSet rs = stmt.executeQuery("select count(*) from SUBSCRIPTIONS");
\r
- if (rs.next()) {
\r
- count = rs.getInt(1);
\r
+ try(Statement stmt = conn.createStatement()) {
\r
+ try(ResultSet rs = stmt.executeQuery("select count(*) from SUBSCRIPTIONS")) {
\r
+ if (rs.next()) {
\r
+ count = rs.getInt(1);
\r
+ }
\r
+ }
\r
}
\r
}
\r
- rs.close();
\r
- stmt.close();
\r
db.release(conn);
\r
} catch (SQLException e) {
\r
intlogger.warn("PROV0008 countActiveSubscriptions: " + e.getMessage());
\r
db.release(conn);
\r
} catch (SQLException e) {
\r
intlogger.warn("PROV0008 countActiveSubscriptions: " + e.getMessage());
\r
@@
-351,7
+348,9
@@
public class Group extends Syncable {
e.printStackTrace();
\r
} finally {
\r
try {
\r
e.printStackTrace();
\r
} finally {
\r
try {
\r
- ps.close();
\r
+ if(ps!=null) {
\r
+ ps.close();
\r
+ }
\r
} catch (SQLException e) {
\r
e.printStackTrace();
\r
}
\r
} catch (SQLException e) {
\r
e.printStackTrace();
\r
}
\r
@@
-379,7
+378,9
@@
public class Group extends Syncable {
e.printStackTrace();
\r
} finally {
\r
try {
\r
e.printStackTrace();
\r
} finally {
\r
try {
\r
- ps.close();
\r
+ if(ps!=null) {
\r
+ ps.close();
\r
+ }
\r
} catch (SQLException e) {
\r
e.printStackTrace();
\r
}
\r
} catch (SQLException e) {
\r
e.printStackTrace();
\r
}
\r
@@
-402,7
+403,9
@@
public class Group extends Syncable {
e.printStackTrace();
\r
} finally {
\r
try {
\r
e.printStackTrace();
\r
} finally {
\r
try {
\r
- ps.close();
\r
+ if(ps!=null) {
\r
+ ps.close();
\r
+ }
\r
} catch (SQLException e) {
\r
e.printStackTrace();
\r
}
\r
} catch (SQLException e) {
\r
e.printStackTrace();
\r
}
\r
@@
-440,4
+443,9
@@
public class Group extends Syncable {
public String toString() {
\r
return "GROUP: groupid=" + groupid;
\r
}
\r
public String toString() {
\r
return "GROUP: groupid=" + groupid;
\r
}
\r
+
\r
+ @Override
\r
+ public int hashCode() {
\r
+ return Objects.hash(groupid, authid, name, description, classification, members, last_mod);
\r
+ }
\r
}
\r
}
\r