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
Merge "Fix EgressRoute Vulnerabilities"
[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
a460d64
..
3536309
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
@@
-106,7
+106,7
@@
public class Group extends Syncable {
}
\r
db.release(conn);
\r
} catch (SQLException e) {
\r
}
\r
db.release(conn);
\r
} catch (SQLException e) {
\r
-
e.printStackTrace(
);
\r
+
intlogger.error("SQLException " + e.getMessage()
);
\r
}
\r
return list;
\r
}
\r
}
\r
return list;
\r
}
\r
@@
-127,20
+127,21
@@
public class Group extends Syncable {
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
-
e.printStackTrace(
);
\r
+
intlogger.error("SQLException " + e.getMessage()
);
\r
}
\r
return max;
\r
}
\r
\r
public static Collection<String> getGroupsByClassfication(String classfication) {
\r
}
\r
return max;
\r
}
\r
\r
public static Collection<String> getGroupsByClassfication(String classfication) {
\r
- List<String> list = new ArrayList<
String
>();
\r
- String sql = "select * from GROUPS where classification =
'" + classfication + "'
";
\r
+ List<String> list = new ArrayList<>();
\r
+ String sql = "select * from GROUPS where classification =
?
";
\r
try {
\r
DB db = new DB();
\r
@SuppressWarnings("resource")
\r
Connection conn = db.getConnection();
\r
try {
\r
DB db = new DB();
\r
@SuppressWarnings("resource")
\r
Connection conn = db.getConnection();
\r
- try(Statement stmt = conn.createStatement()) {
\r
- try(ResultSet rs = stmt.executeQuery(sql)) {
\r
+ try(PreparedStatement stmt = conn.prepareStatement(sql)) {
\r
+ stmt.setString(1, classfication);
\r
+ try(ResultSet rs = stmt.executeQuery()) {
\r
while (rs.next()) {
\r
int groupid = rs.getInt("groupid");
\r
\r
while (rs.next()) {
\r
int groupid = rs.getInt("groupid");
\r
\r
@@
-149,7
+150,7
@@
public class Group extends Syncable {
}
\r
db.release(conn);
\r
} catch (SQLException e) {
\r
}
\r
db.release(conn);
\r
} catch (SQLException e) {
\r
-
e.printStackTrace(
);
\r
+
intlogger.error("SQLException " + e.getMessage()
);
\r
}
\r
return list;
\r
}
\r
}
\r
return list;
\r
}
\r
@@
-175,7
+176,7
@@
public class Group extends Syncable {
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
-
e.printStackTrace(
);
\r
+
intlogger.error("SQLException " + e.getMessage()
);
\r
}
\r
return count;
\r
}
\r
}
\r
return count;
\r
}
\r
@@
-345,14
+346,14
@@
public class Group extends Syncable {
} catch (SQLException e) {
\r
rv = false;
\r
intlogger.warn("PROV0005 doInsert: " + e.getMessage());
\r
} catch (SQLException e) {
\r
rv = false;
\r
intlogger.warn("PROV0005 doInsert: " + e.getMessage());
\r
-
e.printStackTrace(
);
\r
+
intlogger.error("SQLException " + e.getMessage()
);
\r
} finally {
\r
try {
\r
if(ps!=null) {
\r
ps.close();
\r
}
\r
} catch (SQLException e) {
\r
} finally {
\r
try {
\r
if(ps!=null) {
\r
ps.close();
\r
}
\r
} catch (SQLException e) {
\r
-
e.printStackTrace(
);
\r
+
intlogger.error("SQLException " + e.getMessage()
);
\r
}
\r
}
\r
return rv;
\r
}
\r
}
\r
return rv;
\r
@@
-375,14
+376,14
@@
public class Group extends Syncable {
} catch (SQLException e) {
\r
rv = false;
\r
intlogger.warn("PROV0006 doUpdate: " + e.getMessage());
\r
} catch (SQLException e) {
\r
rv = false;
\r
intlogger.warn("PROV0006 doUpdate: " + e.getMessage());
\r
-
e.printStackTrace(
);
\r
+
intlogger.error("SQLException " + e.getMessage()
);
\r
} finally {
\r
try {
\r
if(ps!=null) {
\r
ps.close();
\r
}
\r
} catch (SQLException e) {
\r
} finally {
\r
try {
\r
if(ps!=null) {
\r
ps.close();
\r
}
\r
} catch (SQLException e) {
\r
-
e.printStackTrace(
);
\r
+
intlogger.error("SQLException " + e.getMessage()
);
\r
}
\r
}
\r
return rv;
\r
}
\r
}
\r
return rv;
\r
@@
-400,14
+401,14
@@
public class Group extends Syncable {
} catch (SQLException e) {
\r
rv = false;
\r
intlogger.warn("PROV0007 doDelete: " + e.getMessage());
\r
} catch (SQLException e) {
\r
rv = false;
\r
intlogger.warn("PROV0007 doDelete: " + e.getMessage());
\r
-
e.printStackTrace(
);
\r
+
intlogger.error("SQLException " + e.getMessage()
);
\r
} finally {
\r
try {
\r
if(ps!=null) {
\r
ps.close();
\r
}
\r
} catch (SQLException e) {
\r
} finally {
\r
try {
\r
if(ps!=null) {
\r
ps.close();
\r
}
\r
} catch (SQLException e) {
\r
-
e.printStackTrace(
);
\r
+
intlogger.error("SQLException " + e.getMessage()
);
\r
}
\r
}
\r
return rv;
\r
}
\r
}
\r
return rv;
\r