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
update DR logging to log under one system
[dmaap/datarouter.git]
/
datarouter-prov
/
src
/
main
/
java
/
org
/
onap
/
dmaap
/
datarouter
/
provisioning
/
GroupServlet.java
diff --git
a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/GroupServlet.java
b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/GroupServlet.java
index
96a9924
..
188dce6
100644
(file)
--- a/
datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/GroupServlet.java
+++ b/
datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/GroupServlet.java
@@
-55,7
+55,7
@@
public class GroupServlet extends ProxyServlet {
EventLogRecord elr = new EventLogRecord(req);
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_METHOD_NOT_ALLOWED);
EventLogRecord elr = new EventLogRecord(req);
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_METHOD_NOT_ALLOWED);
- eventlogger.
info(elr
);
+ eventlogger.
error(elr.toString()
);
sendResponseError(resp, HttpServletResponse.SC_METHOD_NOT_ALLOWED, message, eventlogger);
}
/**
sendResponseError(resp, HttpServletResponse.SC_METHOD_NOT_ALLOWED, message, eventlogger);
}
/**
@@
-70,16
+70,12
@@
public class GroupServlet extends ProxyServlet {
if (message != null) {
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_FORBIDDEN);
if (message != null) {
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_FORBIDDEN);
- eventlogger.
info(elr
);
+ eventlogger.
error(elr.toString()
);
sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);
return;
}
if (isProxyServer()) {
sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);
return;
}
if (isProxyServer()) {
- try {
- super.doGet(req, resp);
- } catch (IOException ioe) {
- eventlogger.error("IOException" + ioe.getMessage());
- }
+ super.doGet(req, resp);
return;
}
String bhdr = req.getHeader(BEHALF_HEADER);
return;
}
String bhdr = req.getHeader(BEHALF_HEADER);
@@
-87,7
+83,7
@@
public class GroupServlet extends ProxyServlet {
message = "Missing "+BEHALF_HEADER+" header.";
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);
message = "Missing "+BEHALF_HEADER+" header.";
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);
- eventlogger.
info(elr
);
+ eventlogger.
error(elr.toString()
);
sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);
return;
}
sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);
return;
}
@@
-98,7
+94,7
@@
public class GroupServlet extends ProxyServlet {
message = "Policy Engine disallows access.";
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_FORBIDDEN);
message = "Policy Engine disallows access.";
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_FORBIDDEN);
- eventlogger.
info(elr
);
+ eventlogger.
error(elr.toString()
);
resp.sendError(HttpServletResponse.SC_FORBIDDEN, message);
return;
}*/
resp.sendError(HttpServletResponse.SC_FORBIDDEN, message);
return;
}*/
@@
-111,7
+107,7
@@
public class GroupServlet extends ProxyServlet {
message = "Incorrect content-type";
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE);
message = "Incorrect content-type";
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE);
- eventlogger.
info(elr
);
+ eventlogger.
error(elr.toString()
);
resp.sendError(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE, message);
return;
}*/
resp.sendError(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE, message);
return;
}*/
@@
-122,7
+118,7
@@
public class GroupServlet extends ProxyServlet {
message = "Missing or bad group number.";
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);
message = "Missing or bad group number.";
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);
- eventlogger.
info(elr
);
+ eventlogger.
error(elr.toString()
);
sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);
return;
}
sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);
return;
}
@@
-130,7
+126,7
@@
public class GroupServlet extends ProxyServlet {
Group gup = Group.getGroupById(groupid);
// send response
elr.setResult(HttpServletResponse.SC_OK);
Group gup = Group.getGroupById(groupid);
// send response
elr.setResult(HttpServletResponse.SC_OK);
- eventlogger.info(elr);
+ eventlogger.info(elr
.toString()
);
resp.setStatus(HttpServletResponse.SC_OK);
resp.setContentType(GROUPFULL_CONTENT_TYPE);
try {
resp.setStatus(HttpServletResponse.SC_OK);
resp.setContentType(GROUPFULL_CONTENT_TYPE);
try {
@@
-145,7
+141,7
@@
public class GroupServlet extends ProxyServlet {
// send response
elr.setResult(HttpServletResponse.SC_OK);
// send response
elr.setResult(HttpServletResponse.SC_OK);
- eventlogger.info(elr);
+ eventlogger.info(elr
.toString()
);
resp.setStatus(HttpServletResponse.SC_OK);
resp.setContentType(GROUPLIST_CONTENT_TYPE);
resp.getOutputStream().print(t);*/
resp.setStatus(HttpServletResponse.SC_OK);
resp.setContentType(GROUPLIST_CONTENT_TYPE);
resp.getOutputStream().print(t);*/
@@
-160,16
+156,12
@@
public class GroupServlet extends ProxyServlet {
if (message != null) {
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_FORBIDDEN);
if (message != null) {
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_FORBIDDEN);
- eventlogger.
info(elr
);
+ eventlogger.
error(elr.toString()
);
sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);
return;
}
if (isProxyServer()) {
sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);
return;
}
if (isProxyServer()) {
- try {
- super.doPut(req, resp);
- } catch (IOException ioe) {
- eventlogger.error("IOException" + ioe.getMessage());
- }
+ super.doPut(req, resp);
return;
}
String bhdr = req.getHeader(BEHALF_HEADER);
return;
}
String bhdr = req.getHeader(BEHALF_HEADER);
@@
-177,7
+169,7
@@
public class GroupServlet extends ProxyServlet {
message = "Missing "+BEHALF_HEADER+" header.";
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);
message = "Missing "+BEHALF_HEADER+" header.";
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);
- eventlogger.
info(elr
);
+ eventlogger.
error(elr.toString()
);
sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);
return;
}
sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);
return;
}
@@
-186,7
+178,7
@@
public class GroupServlet extends ProxyServlet {
message = "Missing or bad groupid.";
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);
message = "Missing or bad groupid.";
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);
- eventlogger.
info(elr
);
+ eventlogger.
error(elr.toString()
);
sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);
return;
}
sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);
return;
}
@@
-195,7
+187,7
@@
public class GroupServlet extends ProxyServlet {
message = "Missing or bad group number.";
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_NOT_FOUND);
message = "Missing or bad group number.";
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_NOT_FOUND);
- eventlogger.
info(elr
);
+ eventlogger.
error(elr.toString()
);
sendResponseError(resp, HttpServletResponse.SC_NOT_FOUND, message, eventlogger);
return;
}
sendResponseError(resp, HttpServletResponse.SC_NOT_FOUND, message, eventlogger);
return;
}
@@
-205,7
+197,7
@@
public class GroupServlet extends ProxyServlet {
message = "Policy Engine disallows access.";
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_FORBIDDEN);
message = "Policy Engine disallows access.";
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_FORBIDDEN);
- eventlogger.
info(elr
);
+ eventlogger.
error(elr.toString()
);
resp.sendError(HttpServletResponse.SC_FORBIDDEN, message);
return;
}*/
resp.sendError(HttpServletResponse.SC_FORBIDDEN, message);
return;
}*/
@@
-216,7
+208,7
@@
public class GroupServlet extends ProxyServlet {
message = "Incorrect content-type";
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE);
message = "Incorrect content-type";
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE);
- eventlogger.
info(elr
);
+ eventlogger.
error(elr.toString()
);
sendResponseError(resp, HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE, message, eventlogger);
return;
}
sendResponseError(resp, HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE, message, eventlogger);
return;
}
@@
-225,7
+217,7
@@
public class GroupServlet extends ProxyServlet {
message = "Badly formed JSON";
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);
message = "Badly formed JSON";
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);
- eventlogger.
info(elr
);
+ eventlogger.
error(elr.toString()
);
sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);
return;
}
sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);
return;
}
@@
-238,7
+230,7
@@
public class GroupServlet extends ProxyServlet {
message = e.getMessage();
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);
message = e.getMessage();
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);
- eventlogger.
info(elr
);
+ eventlogger.
error(elr.toString()
);
sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);
return;
}
sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);
return;
}
@@
-255,7
+247,7
@@
public class GroupServlet extends ProxyServlet {
if (doUpdate(gup)) {
// send response
elr.setResult(HttpServletResponse.SC_OK);
if (doUpdate(gup)) {
// send response
elr.setResult(HttpServletResponse.SC_OK);
- eventlogger.info(elr);
+ eventlogger.info(elr
.toString()
);
resp.setStatus(HttpServletResponse.SC_OK);
resp.setContentType(GROUPFULL_CONTENT_TYPE);
try {
resp.setStatus(HttpServletResponse.SC_OK);
resp.setContentType(GROUPFULL_CONTENT_TYPE);
try {
@@
-267,7
+259,7
@@
public class GroupServlet extends ProxyServlet {
} else {
// Something went wrong with the UPDATE
elr.setResult(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
} else {
// Something went wrong with the UPDATE
elr.setResult(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
- eventlogger.
info(elr
);
+ eventlogger.
error(elr.toString()
);
sendResponseError(resp, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, DB_PROBLEM_MSG, eventlogger);
}
}
sendResponseError(resp, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, DB_PROBLEM_MSG, eventlogger);
}
}
@@
-283,16
+275,12
@@
public class GroupServlet extends ProxyServlet {
if (message != null) {
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_FORBIDDEN);
if (message != null) {
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_FORBIDDEN);
- eventlogger.
info(elr
);
+ eventlogger.
error(elr.toString()
);
sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);
return;
}
if (isProxyServer()) {
sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);
return;
}
if (isProxyServer()) {
- try {
- super.doPost(req, resp);
- } catch (IOException ioe) {
- eventlogger.error("IOException" + ioe.getMessage());
- }
+ super.doPost(req, resp);
return;
}
String bhdr = req.getHeader(BEHALF_HEADER);
return;
}
String bhdr = req.getHeader(BEHALF_HEADER);
@@
-300,7
+288,7
@@
public class GroupServlet extends ProxyServlet {
message = "Missing "+BEHALF_HEADER+" header.";
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);
message = "Missing "+BEHALF_HEADER+" header.";
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);
- eventlogger.
info(elr
);
+ eventlogger.
error(elr.toString()
);
sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);
return;
}
sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);
return;
}
@@
-309,7
+297,7
@@
public class GroupServlet extends ProxyServlet {
message = "Missing or bad feed number.";
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);
message = "Missing or bad feed number.";
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);
- eventlogger.info(elr);
+ eventlogger.info(elr
.toString()
);
resp.sendError(HttpServletResponse.SC_BAD_REQUEST, message);
return;
}
resp.sendError(HttpServletResponse.SC_BAD_REQUEST, message);
return;
}
@@
-318,7
+306,7
@@
public class GroupServlet extends ProxyServlet {
message = "Missing or bad feed number.";
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_NOT_FOUND);
message = "Missing or bad feed number.";
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_NOT_FOUND);
- eventlogger.info(elr);
+ eventlogger.info(elr
.toString()
);
resp.sendError(HttpServletResponse.SC_NOT_FOUND, message);
return;
}*/
resp.sendError(HttpServletResponse.SC_NOT_FOUND, message);
return;
}*/
@@
-328,7
+316,7
@@
public class GroupServlet extends ProxyServlet {
message = "Policy Engine disallows access.";
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_FORBIDDEN);
message = "Policy Engine disallows access.";
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_FORBIDDEN);
- eventlogger.info(elr);
+ eventlogger.info(elr
.toString()
);
resp.sendError(HttpServletResponse.SC_FORBIDDEN, message);
return;
}*/
resp.sendError(HttpServletResponse.SC_FORBIDDEN, message);
return;
}*/
@@
-341,7
+329,7
@@
public class GroupServlet extends ProxyServlet {
message = "Incorrect content-type";
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE);
message = "Incorrect content-type";
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE);
- eventlogger.
info(elr
);
+ eventlogger.
error(elr.toString()
);
sendResponseError(resp, HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE, message, eventlogger);
return;
}
sendResponseError(resp, HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE, message, eventlogger);
return;
}
@@
-350,7
+338,7
@@
public class GroupServlet extends ProxyServlet {
message = "Badly formed JSON";
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);
message = "Badly formed JSON";
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);
- eventlogger.
info(elr
);
+ eventlogger.
error(elr.toString()
);
sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);
return;
}
sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);
return;
}
@@
-364,12
+352,12
@@
public class GroupServlet extends ProxyServlet {
message = e.getMessage();
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);
message = e.getMessage();
elr.setMessage(message);
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);
- eventlogger.
info(elr
);
+ eventlogger.
error(elr.toString()
);
sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);
return;
}
//gup.setFeedid(feedid);
sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);
return;
}
//gup.setFeedid(feedid);
- //sub.setSubscriber(bhdr); // set from X-
ATT
-DR-ON-BEHALF-OF header
+ //sub.setSubscriber(bhdr); // set from X-
DMAAP
-DR-ON-BEHALF-OF header
// Check if this group already exists; not an error (yet), just warn
Group gb2 = Group.getGroupMatching(gup);
// Check if this group already exists; not an error (yet), just warn
Group gb2 = Group.getGroupMatching(gup);
@@
-385,7
+373,7
@@
public class GroupServlet extends ProxyServlet {
if (doInsert(gup)) {
// send response
elr.setResult(HttpServletResponse.SC_CREATED);
if (doInsert(gup)) {
// send response
elr.setResult(HttpServletResponse.SC_CREATED);
- eventlogger.info(elr);
+ eventlogger.info(elr
.toString()
);
resp.setStatus(HttpServletResponse.SC_CREATED);
resp.setContentType(GROUPFULL_CONTENT_TYPE);
try {
resp.setStatus(HttpServletResponse.SC_CREATED);
resp.setContentType(GROUPFULL_CONTENT_TYPE);
try {
@@
-397,7
+385,7
@@
public class GroupServlet extends ProxyServlet {
} else {
// Something went wrong with the INSERT
elr.setResult(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
} else {
// Something went wrong with the INSERT
elr.setResult(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
- eventlogger.
info(elr
);
+ eventlogger.
error(elr.toString()
);
sendResponseError(resp, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, DB_PROBLEM_MSG, eventlogger);
}
}
sendResponseError(resp, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, DB_PROBLEM_MSG, eventlogger);
}
}