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 "Remove critical code smells Bean classes"
[dmaap/datarouter.git]
/
datarouter-prov
/
src
/
main
/
java
/
org
/
onap
/
dmaap
/
datarouter
/
provisioning
/
beans
/
IngressRoute.java
diff --git
a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/IngressRoute.java
b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/IngressRoute.java
index
033b390
..
4332d7d
100644
(file)
--- a/
datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/IngressRoute.java
+++ b/
datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/IngressRoute.java
@@
-39,8
+39,9
@@
import java.util.TreeSet;
\r
import javax.servlet.http.HttpServletRequest;
\r
\r
\r
import javax.servlet.http.HttpServletRequest;
\r
\r
+import com.att.eelf.configuration.EELFLogger;
\r
+import com.att.eelf.configuration.EELFManager;
\r
import org.apache.commons.codec.binary.Base64;
\r
import org.apache.commons.codec.binary.Base64;
\r
-import org.apache.log4j.Logger;
\r
import org.json.JSONArray;
\r
import org.json.JSONObject;
\r
import org.onap.dmaap.datarouter.provisioning.utils.DB;
\r
import org.json.JSONArray;
\r
import org.json.JSONObject;
\r
import org.onap.dmaap.datarouter.provisioning.utils.DB;
\r
@@
-53,7
+54,8
@@
import org.onap.dmaap.datarouter.provisioning.utils.DB;
*/
\r
public class IngressRoute extends NodeClass implements Comparable<IngressRoute> {
\r
\r
*/
\r
public class IngressRoute extends NodeClass implements Comparable<IngressRoute> {
\r
\r
- private static Logger intlogger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal");
\r
+ private static EELFLogger intlogger = EELFManager.getInstance().getLogger("InternalLog");
\r
+ private static final String SQLEXCEPTION = "SQLException: ";
\r
private final int seq;
\r
private final int feedid;
\r
private final String userid;
\r
private final int seq;
\r
private final int feedid;
\r
private final String userid;
\r
@@
-101,7
+103,7
@@
public class IngressRoute extends NodeClass implements Comparable<IngressRoute>
}
\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("
PROV0001 getAllIngressRoutesForSQL: " + e.getMessage(), e
);
\r
}
\r
return set;
\r
}
\r
}
\r
return set;
\r
}
\r
@@
-139,7
+141,7
@@
public class IngressRoute extends NodeClass implements Comparable<IngressRoute>
}
\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 getMax: " + e.getMessage(), e
);
\r
}
\r
return rv;
\r
}
\r
}
\r
return rv;
\r
}
\r
@@
-174,14
+176,14
@@
public class IngressRoute extends NodeClass implements Comparable<IngressRoute>
ps.close();
\r
db.release(conn);
\r
} catch (SQLException e) {
\r
ps.close();
\r
db.release(conn);
\r
} catch (SQLException e) {
\r
- intlogger.error("
SQLException " + e.getMessage()
);
\r
+ intlogger.error("
PROV0003 getIngressRoute: " + 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 v;
\r
}
\r
}
\r
return v;
\r
@@
-214,7
+216,7
@@
public class IngressRoute extends NodeClass implements Comparable<IngressRoute>
}
\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("
PROV0004 getIngressRoute: " + e.getMessage(), e
);
\r
}
\r
return rv;
\r
}
\r
}
\r
return rv;
\r
}
\r
@@
-306,6
+308,7
@@
public class IngressRoute extends NodeClass implements Comparable<IngressRoute>
SubnetMatcher sm = new SubnetMatcher(subnet);
\r
return sm.matches(inet.getAddress());
\r
} catch (UnknownHostException e) {
\r
SubnetMatcher sm = new SubnetMatcher(subnet);
\r
return sm.matches(inet.getAddress());
\r
} catch (UnknownHostException e) {
\r
+ intlogger.error("PROV0008 matches: " + e.getMessage(), e);
\r
return false;
\r
}
\r
}
\r
return false;
\r
}
\r
}
\r
@@
-336,6
+339,7
@@
public class IngressRoute extends NodeClass implements Comparable<IngressRoute>
len = sn.length;
\r
valid = true;
\r
} catch (UnknownHostException e) {
\r
len = sn.length;
\r
valid = true;
\r
} catch (UnknownHostException e) {
\r
+ intlogger.error("PROV0008 SubnetMatcher: " + e.getMessage(), e);
\r
len = 0;
\r
valid = false;
\r
}
\r
len = 0;
\r
valid = false;
\r
}
\r
@@
-346,6
+350,7
@@
public class IngressRoute extends NodeClass implements Comparable<IngressRoute>
sn = InetAddress.getByName(subnet.substring(0, i)).getAddress();
\r
valid = true;
\r
} catch (UnknownHostException e) {
\r
sn = InetAddress.getByName(subnet.substring(0, i)).getAddress();
\r
valid = true;
\r
} catch (UnknownHostException e) {
\r
+ intlogger.error("PROV0008 SubnetMatcher: " + e.getMessage(), e);
\r
valid = false;
\r
}
\r
len = n / 8;
\r
valid = false;
\r
}
\r
len = n / 8;
\r
@@
-389,7
+394,7
@@
public class IngressRoute extends NodeClass implements Comparable<IngressRoute>
}
\r
\r
private Collection<String> readNodes() {
\r
}
\r
\r
private Collection<String> readNodes() {
\r
- Collection<String> set = new TreeSet<
String
>();
\r
+ Collection<String> set = new TreeSet<>();
\r
try {
\r
DB db = new DB();
\r
@SuppressWarnings("resource")
\r
try {
\r
DB db = new DB();
\r
@SuppressWarnings("resource")
\r
@@
-406,7
+411,7
@@
public class IngressRoute extends NodeClass implements Comparable<IngressRoute>
}
\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 set;
\r
}
\r
}
\r
return set;
\r
}
\r
@@
-433,14
+438,14
@@
public class IngressRoute extends NodeClass implements Comparable<IngressRoute>
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
@@
-476,14
+481,14
@@
public class IngressRoute extends NodeClass implements Comparable<IngressRoute>
ps.close();
\r
rv = true;
\r
} catch (SQLException e) {
\r
ps.close();
\r
rv = true;
\r
} catch (SQLException e) {
\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
@@
-523,14
+528,10
@@
public class IngressRoute extends NodeClass implements Comparable<IngressRoute>
\r
@Override
\r
public boolean equals(Object obj) {
\r
\r
@Override
\r
public boolean equals(Object obj) {
\r
- try {
\r
- if (!(obj instanceof IngressRoute)) {
\r
- return false;
\r
- }
\r
- return this.compareTo((IngressRoute) obj) == 0;
\r
- } catch (NullPointerException e) {
\r
+ if (!(obj instanceof IngressRoute)) {
\r
return false;
\r
}
\r
return false;
\r
}
\r
+ return this.compareTo((IngressRoute) obj) == 0;
\r
}
\r
\r
@Override
\r
}
\r
\r
@Override
\r