private static final int DEFAULT_MAX_SUBS = 100000;
private static final int DEFAULT_POKETIMER1 = 5;
private static final int DEFAULT_POKETIMER2 = 30;
- private static final String DEFAULT_DOMAIN = "onap";
private static final String DEFAULT_PROVSRVR_NAME = "dmaap-dr-prov";
//Common Errors
*/
static int activeSubs = 0;
- /**
- * The domain used to generate a FQDN from the "bare" node names.
- */
- private static String provDomain = "web.att.com";
-
/**
* The standard FQDN of the provisioning server in this Data Router ecosystem.
*/
pokeTimer2 = getInt(map, Parameters.PROV_POKETIMER2, DEFAULT_POKETIMER2);
// The domain used to generate a FQDN from the "bare" node names
- provDomain = getString(map, Parameters.PROV_DOMAIN, DEFAULT_DOMAIN);
provName = getString(map, Parameters.PROV_NAME, DEFAULT_PROVSRVR_NAME);
activeProvName = getString(map, Parameters.PROV_ACTIVE_NAME, provName);
initialActivePod = getString(map, Parameters.ACTIVE_POD, "");
// check content type is SUB_CONTENT_TYPE, version 1.0
ContentHeader ch = getContentHeader(req);
String ver = ch.getAttribute("version");
- if (!ch.getType().equals(GROUP_BASECONTENT_TYPE) || !(ver.equals("1.0") || ver.equals("2.0"))) {
+ if (!ch.getType().equals(GROUP_BASECONTENT_TYPE) || !("1.0".equals(ver) || "2.0".equals(ver))) {
intlogger.debug("Content-type is: " + req.getHeader("Content-Type"));
message = "Incorrect content-type";
elr.setMessage(message);
try {
// Set up keystore
Properties props = (new DB()).getProperties();
- String store = props.getProperty(Main.KEYSTORE_PATH_PROPERTY);
- String pass = props.getProperty(Main.KEYSTORE_PASS_PROPERTY);
- store = props.getProperty(Main.TRUSTSTORE_PATH_PROPERTY);
- pass = props.getProperty(Main.TRUSTSTORE_PASS_PROPERTY);
+ String store = props.getProperty(Main.TRUSTSTORE_PATH_PROPERTY);
+ String pass = props.getProperty(Main.TRUSTSTORE_PASS_PROPERTY);
if (store == null || store.length() == 0) {
store = Main.DEFAULT_TRUSTSTORE;
pass = "changeit";
private String queryGeneretor(Map<String, String> map) throws ParseException {\r
\r
String sql;\r
- String eventType = null;\r
String feedids = null;\r
String startTime = null;\r
String endTime = null;\r
String subid = " ";\r
- if (map.get(EVENT_TYPE) != null) {\r
- eventType = map.get(EVENT_TYPE);\r
- }\r
+\r
if (map.get(FEEDIDS) != null) {\r
feedids = map.get(FEEDIDS);\r
}\r
if (map.get(END_TIME) != null) {\r
endTime = map.get(END_TIME);\r
}\r
- if ("all".equalsIgnoreCase(eventType)) {\r
- eventType = "PUB','DEL, EXP, PBF";\r
- }\r
if (map.get(SUBID) != null) {\r
subid = map.get(SUBID);\r
}\r
this.eventTime = dt.getTime();\r
this.publishId = pp[2];\r
this.feedid = Integer.parseInt(pp[3]);\r
- if (pp[1].equals("DLX")) {\r
+ if ("DLX".equals(pp[1])) {\r
this.requestUri = "";\r
this.method = "GET"; // Note: we need a valid value in this field, even though unused\r
this.contentType = "";\r
this.contentLength = Long.parseLong(pp[5]);\r
- } else if (pp[1].equals("PUB") || pp[1].equals("LOG") || pp[1].equals("PBF")) {\r
+ } else if ("PUB".equals(pp[1]) || "LOG".equals(pp[1]) || "PBF".equals(pp[1])) {\r
this.requestUri = pp[4];\r
this.method = pp[5];\r
this.contentType = pp[6];\r
this.fileid = thisFileid;\r
this.deliveryAttempts = Integer.parseInt(pp[10]);\r
this.reason = pp[9];\r
- if (!reason.equals("notRetryable") && !reason.equals("retriesExhausted") && !reason.equals("diskFull")) {\r
+ if (!"notRetryable".equals(reason) && !"retriesExhausted".equals(reason) && !"diskFull".equals(reason)) {\r
this.reason = "other";\r
}\r
}\r
this.groupid = jo.optInt("groupid");\r
this.name = jo.getString("name");\r
this.aafInstance = jo.optString("aaf_instance", "legacy");\r
- if (!(aafInstance.equalsIgnoreCase("legacy")) && aafInstance.length() > 255) {\r
+ if (!("legacy".equalsIgnoreCase(aafInstance)) && aafInstance.length() > 255) {\r
throw new InvalidObjectException("aaf_instance field is too long");\r
}\r
if (name.length() > 255) {\r
|| pathUrl.contains("group"))) {
String method = httpRequest.getMethod().toUpperCase();
- if (!(method.equals("POST"))) {
+ if (!("POST".equals(method))) {
// if request method is PUT method (publish or Feed update) Needs to check for DELETE
- if (method.equals("PUT") || method.equals("DELETE")) {
+ if ("PUT".equals(method) || "DELETE".equals(method)) {
if ((pathUrl.contains("subs"))) { //edit subscriber
int subId = BaseServlet.getIdFromPath(httpRequest);
if (subId <= 0) {
try {
Feed feed = Feed.getFeedById(feedId);
if (feed != null) {
- if (!((feed.getAafInstance().equalsIgnoreCase("legacy")) || feed.getAafInstance() == null
+ if (!(("legacy".equalsIgnoreCase(feed.getAafInstance())) || feed.getAafInstance() == null
|| feed.getAafInstance().equals(""))) { //also apply null check and empty check too
aafInstance = feed.getAafInstance();
String message = "DRProvCadiFilter.isAAFFeed: aafInstance-:" + aafInstance + "; feedId:- " + feedId;
try {
Subscription subscriber = Subscription.getSubscriptionById(subId);
if (subscriber != null) {
- if (!((subscriber.getAafInstance().equalsIgnoreCase("legacy"))
+ if (!(("legacy".equalsIgnoreCase(subscriber.getAafInstance()))
|| subscriber.getAafInstance() == null
- || subscriber.getAafInstance().equals(""))) { //also apply null check and empty check too
+ || "".equals(subscriber.getAafInstance()))) { //also apply null check and empty check too
aafInstance = subscriber.getAafInstance();
String message = "DRProvCadiFilter.isAAFSubscriber: aafInstance-:" + aafInstance + "; subId:- "
+ subId;