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 for servlet classes
[dmaap/datarouter.git]
/
datarouter-prov
/
src
/
main
/
java
/
org
/
onap
/
dmaap
/
datarouter
/
provisioning
/
SubscriptionServlet.java
diff --git
a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/SubscriptionServlet.java
b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/SubscriptionServlet.java
index
63ff84d
..
ff3ed3c
100644
(file)
--- a/
datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/SubscriptionServlet.java
+++ b/
datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/SubscriptionServlet.java
@@
-233,7
+233,7
@@
public class SubscriptionServlet extends ProxyServlet {
try {
\r
resp.getOutputStream().print(sub.asJSONObject(true).toString());
\r
} catch (IOException ioe) {
\r
try {
\r
resp.getOutputStream().print(sub.asJSONObject(true).toString());
\r
} catch (IOException ioe) {
\r
- eventlogger.error("
IOException: " + ioe.getMessage()
);
\r
+ eventlogger.error("
PROV0191 SubscriptionServlet.doGet: " + ioe.getMessage(), ioe
);
\r
}
\r
} finally {
\r
eelfLogger.info(EelfMsgs.EXIT);
\r
}
\r
} finally {
\r
eelfLogger.info(EelfMsgs.EXIT);
\r
@@
-320,7
+320,7
@@
public class SubscriptionServlet extends ProxyServlet {
message = e.getMessage();
\r
elr.setMessage(message);
\r
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);
\r
message = e.getMessage();
\r
elr.setMessage(message);
\r
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);
\r
- eventlogger.error(elr.toString());
\r
+ eventlogger.error(elr.toString()
, e
);
\r
sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);
\r
return;
\r
}
\r
sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);
\r
return;
\r
}
\r
@@
-380,7
+380,7
@@
public class SubscriptionServlet extends ProxyServlet {
try {
\r
resp.getOutputStream().print(sub.asLimitedJSONObject().toString());
\r
} catch (IOException ioe) {
\r
try {
\r
resp.getOutputStream().print(sub.asLimitedJSONObject().toString());
\r
} catch (IOException ioe) {
\r
- eventlogger.error("
IOException: " + ioe.getMessage()
);
\r
+ eventlogger.error("
PROV0192 SubscriptionServlet.doPut: " + ioe.getMessage(), ioe
);
\r
}
\r
\r
/**Change Owner ship of Subscriber Adding for group feature:Rally US708115*/
\r
}
\r
\r
/**Change Owner ship of Subscriber Adding for group feature:Rally US708115*/
\r
@@
-392,7
+392,7
@@
public class SubscriptionServlet extends ProxyServlet {
sub.changeOwnerShip();
\r
}
\r
} catch (JSONException je) {
\r
sub.changeOwnerShip();
\r
}
\r
} catch (JSONException je) {
\r
- eventlogger.error("
JSONException: " + je.getMessage()
);
\r
+ eventlogger.error("
PROV0193 SubscriptionServlet.doPut: " + je.getMessage(), je
);
\r
}
\r
}
\r
/***End of change ownership*/
\r
}
\r
}
\r
/***End of change ownership*/
\r
@@
-499,7
+499,7
@@
public class SubscriptionServlet extends ProxyServlet {
message = "Badly formed JSON";
\r
elr.setMessage(message);
\r
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);
\r
message = "Badly formed JSON";
\r
elr.setMessage(message);
\r
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);
\r
- eventlogger.error(elr.toString());
\r
+ eventlogger.error(elr.toString()
, e
);
\r
sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);
\r
}
\r
} finally {
\r
sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);
\r
}
\r
} finally {
\r
@@
-538,11
+538,11
@@
public class SubscriptionServlet extends ProxyServlet {
conn.getContentLength(); // Force the GET through
\r
conn.disconnect();
\r
} catch (IOException e) {
\r
conn.getContentLength(); // Force the GET through
\r
conn.disconnect();
\r
} catch (IOException e) {
\r
- intlogger.info("
IOException Error accessing URL: " + u + ": " + e.getMessage()
);
\r
+ intlogger.info("
PROV0194 Error accessing URL: " + u + ": " + e.getMessage(), e
);
\r
}
\r
}
\r
} catch (Exception e) {
\r
}
\r
}
\r
} catch (Exception e) {
\r
- intlogger.warn("
Caught exception in SubscriberNotifyThread: " + e.getMessage()
);
\r
+ intlogger.warn("
PROV0195 Caught exception in SubscriberNotifyThread: " + e.getMessage(), e
);
\r
}
\r
}
\r
}
\r
}
\r
}
\r
}
\r