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
Remove critical code smells Bean classes
[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
8904765
..
be4c640
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
@@
-46,6
+46,7
@@
public class Group extends Syncable {
\r
private static EELFLogger intlogger = EELFManager.getInstance().getLogger("InternalLog");
\r
private static int next_groupid = getMaxGroupID() + 1;
\r
\r
private static EELFLogger intlogger = EELFManager.getInstance().getLogger("InternalLog");
\r
private static int next_groupid = getMaxGroupID() + 1;
\r
+ private static final String SQLEXCEPTION = "SQLException: ";
\r
\r
private int groupid;
\r
private String authid;
\r
\r
private int groupid;
\r
private String authid;
\r
@@
-107,7
+108,7
@@
public class Group extends Syncable {
}
\r
db.release(conn);
\r
} catch (SQLException e) {
\r
}
\r
db.release(conn);
\r
} catch (SQLException e) {
\r
- intlogger.error("
SQLException " + e.getMessage()
);
\r
+ intlogger.error("
PROV0009 getGroupsForSQL: " + e.getMessage(), e
);
\r
}
\r
return list;
\r
}
\r
}
\r
return list;
\r
}
\r
@@
-127,7
+128,7
@@
public class Group extends Syncable {
}
\r
db.release(conn);
\r
} catch (SQLException e) {
\r
}
\r
db.release(conn);
\r
} catch (SQLException e) {
\r
- intlogger.info("
getMaxSubID: " + e.getMessage()
);
\r
+ intlogger.info("
PROV0001 getMaxSubID: " + e.getMessage(), e
);
\r
}
\r
return max;
\r
}
\r
}
\r
return max;
\r
}
\r
@@
-150,7
+151,7
@@
public class Group extends Syncable {
}
\r
db.release(conn);
\r
} catch (SQLException e) {
\r
}
\r
db.release(conn);
\r
} catch (SQLException e) {
\r
- intlogger.error("
SQLException " + e.getMessage()
);
\r
+ intlogger.error("
PROV0002 getGroupsByClassfication: " + e.getMessage(), e
);
\r
}
\r
return list;
\r
}
\r
}
\r
return list;
\r
}
\r
@@
-175,7
+176,7
@@
public class Group extends Syncable {
}
\r
db.release(conn);
\r
} catch (SQLException e) {
\r
}
\r
db.release(conn);
\r
} catch (SQLException e) {
\r
- intlogger.warn("PROV0008 countActiveSubscriptions: " + e.getMessage());
\r
+ intlogger.warn("PROV0008 countActiveSubscriptions: " + e.getMessage()
, e
);
\r
}
\r
return count;
\r
}
\r
}
\r
return count;
\r
}
\r
@@
-229,7
+230,8
@@
public class Group extends Syncable {
} catch (InvalidObjectException e) {
\r
throw e;
\r
} catch (Exception e) {
\r
} catch (InvalidObjectException e) {
\r
throw e;
\r
} catch (Exception e) {
\r
- throw new InvalidObjectException("invalid JSON: " + e.getMessage());
\r
+ intlogger.warn("Invalid JSON: " + e.getMessage(), e);
\r
+ throw new InvalidObjectException("Invalid JSON: " + e.getMessage());
\r
}
\r
}
\r
\r
}
\r
}
\r
\r
@@
-346,14
+348,14
@@
public class Group extends Syncable {
ps.close();
\r
} catch (SQLException e) {
\r
rv = false;
\r
ps.close();
\r
} catch (SQLException e) {
\r
rv = false;
\r
- intlogger.warn("PROV0005 doInsert: " + e.getMessage());
\r
+ intlogger.warn("PROV0005 doInsert: " + e.getMessage()
, e
);
\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
- intlogger.error(
"SQLException " + e.getMessage()
);
\r
+ intlogger.error(
SQLEXCEPTION + e.getMessage(), e
);
\r
}
\r
}
\r
return rv;
\r
}
\r
}
\r
return rv;
\r
@@
-375,14
+377,14
@@
public class Group extends Syncable {
ps.executeUpdate();
\r
} catch (SQLException e) {
\r
rv = false;
\r
ps.executeUpdate();
\r
} catch (SQLException e) {
\r
rv = false;
\r
- intlogger.warn("PROV0006 doUpdate: " + e.getMessage());
\r
+ intlogger.warn("PROV0006 doUpdate: " + e.getMessage()
, e
);
\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
- intlogger.error(
"SQLException " + e.getMessage()
);
\r
+ intlogger.error(
SQLEXCEPTION + e.getMessage(), e
);
\r
}
\r
}
\r
return rv;
\r
}
\r
}
\r
return rv;
\r
@@
-399,14
+401,14
@@
public class Group extends Syncable {
ps.execute();
\r
} catch (SQLException e) {
\r
rv = false;
\r
ps.execute();
\r
} catch (SQLException e) {
\r
rv = false;
\r
- intlogger.warn("PROV0007 doDelete: " + e.getMessage());
\r
+ intlogger.warn("PROV0007 doDelete: " + e.getMessage()
, e
);
\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
- intlogger.error(
"SQLException " + e.getMessage()
);
\r
+ intlogger.error(
SQLEXCEPTION + e.getMessage(), e
);
\r
}
\r
}
\r
return rv;
\r
}
\r
}
\r
return rv;
\r