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
/
Subscription.java
diff --git
a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Subscription.java
b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Subscription.java
index
442a764
..
c12d83d
100644
(file)
--- a/
datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Subscription.java
+++ b/
datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Subscription.java
@@
-117,7
+117,7
@@
public class Subscription extends Syncable {
}
\r
db.release(conn);
\r
} catch (SQLException e) {
\r
}
\r
db.release(conn);
\r
} catch (SQLException e) {
\r
- intlogger.error(
e.toString()
);
\r
+ intlogger.error(
"PROV0001 getSubscriptionsForSQL: " + e.toString(), e
);
\r
}
\r
return list;
\r
}
\r
}
\r
return list;
\r
}
\r
@@
-137,7
+137,7
@@
public class Subscription 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("getMaxSubID: " + e.getMessage()
, e
);
\r
}
\r
return max;
\r
}
\r
}
\r
return max;
\r
}
\r
@@
-161,7
+161,7
@@
public class Subscription 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(SQLEXCEPTION + e.getMessage()
, e
);
\r
}
\r
return list;
\r
}
\r
}
\r
return list;
\r
}
\r
@@
-186,7
+186,7
@@
public class Subscription 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
@@
-274,7
+274,8
@@
public class Subscription 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
@@
-474,14
+475,14
@@
public class Subscription 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
@@
-508,14
+509,14
@@
public class Subscription 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
@@
-541,14
+542,14
@@
public class Subscription extends Syncable {
ps.close();
\r
} catch (SQLException e) {
\r
rv = false;
\r
ps.close();
\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
@@
-566,14
+567,14
@@
public class Subscription 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