private static EELFLogger eelfLogger = EELFManager.getInstance()\r
.getLogger(SubscriptionServlet.class);\r
\r
+\r
+\r
+\r
+\r
/**\r
* DELETE on the <subscriptionUrl> -- delete a subscription. See the <i>Deleting a Subscription</i> section in\r
* the <b>Provisioning API</b> document for details on how this method should be invoked.\r
}\r
String bhdr = req.getHeader(BEHALF_HEADER);\r
if (bhdr == null) {\r
- message = "Missing " + BEHALF_HEADER + " header.";\r
+ message = MISSING_ON_BEHALF;\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
eventlogger.error(elr.toString());\r
}\r
int subid = getIdFromPath(req);\r
if (subid < 0) {\r
- message = "Missing or bad subscription number.";\r
+ message = BAD_SUB;\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
eventlogger.error(elr.toString());\r
}\r
Subscription sub = Subscription.getSubscriptionById(subid);\r
if (sub == null) {\r
- message = "Missing or bad subscription number.";\r
+ message = BAD_SUB;\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_NOT_FOUND);\r
eventlogger.error(elr.toString());\r
* CADI code - check on permissions based on Legacy/AAF users to allow to delete/remove subscription\r
*/\r
String aafInstance = sub.getAafInstance();\r
- if (aafInstance == null || aafInstance.equals("") || aafInstance.equalsIgnoreCase("legacy")) {\r
+ if (aafInstance == null || "".equals(aafInstance) || "legacy".equalsIgnoreCase(aafInstance)) {\r
AuthorizationResponse aresp = authz.decide(req);\r
if (!aresp.isAuthorized()) {\r
- message = "Policy Engine disallows access.";\r
+ message = POLICY_ENGINE;\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_FORBIDDEN);\r
eventlogger.error(elr.toString());\r
}\r
String bhdr = req.getHeader(BEHALF_HEADER);\r
if (bhdr == null) {\r
- message = "Missing " + BEHALF_HEADER + " header.";\r
+ message = MISSING_ON_BEHALF;\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
eventlogger.error(elr.toString());\r
}\r
int subid = getIdFromPath(req);\r
if (subid < 0) {\r
- message = "Missing or bad subscription number.";\r
+ message = BAD_SUB;\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
eventlogger.error(elr.toString());\r
}\r
Subscription sub = Subscription.getSubscriptionById(subid);\r
if (sub == null) {\r
- message = "Missing or bad subscription number.";\r
+ message = BAD_SUB;\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_NOT_FOUND);\r
eventlogger.error(elr.toString());\r
// Check with the Authorizer\r
AuthorizationResponse aresp = authz.decide(req);\r
if (!aresp.isAuthorized()) {\r
- message = "Policy Engine disallows access.";\r
+ message = POLICY_ENGINE;\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_FORBIDDEN);\r
eventlogger.error(elr.toString());\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
String bhdr = req.getHeader(BEHALF_HEADER);\r
if (bhdr == null) {\r
- message = "Missing " + BEHALF_HEADER + " header.";\r
+ message = MISSING_ON_BEHALF;\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
eventlogger.error(elr.toString());\r
}\r
int subid = getIdFromPath(req);\r
if (subid < 0) {\r
- message = "Missing or bad subscription number.";\r
+ message = BAD_SUB;\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
eventlogger.error(elr.toString());\r
}\r
Subscription oldsub = Subscription.getSubscriptionById(subid);\r
if (oldsub == null) {\r
- message = "Missing or bad subscription number.";\r
+ message = BAD_SUB;\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_NOT_FOUND);\r
eventlogger.error(elr.toString());\r
// check content type is SUB_CONTENT_TYPE, version 1.0\r
ContentHeader ch = getContentHeader(req);\r
String ver = ch.getAttribute("version");\r
- if (!ch.getType().equals(SUB_BASECONTENT_TYPE) || !(ver.equals("1.0") || ver.equals("2.0"))) {\r
+ if (!ch.getType().equals(SUB_BASECONTENT_TYPE) || !("1.0".equals(ver) || "2.0".equals(ver))) {\r
message = "Incorrect content-type";\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE);\r
}\r
JSONObject jo = getJSONfromInput(req);\r
if (jo == null) {\r
- message = "Badly formed JSON";\r
+ message = BAD_JSON;\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
eventlogger.error(elr.toString());\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
* CADI code - check on permissions based on Legacy/AAF users to allow to delete/remove subscription\r
*/\r
String aafInstance = sub.getAafInstance();\r
- if (aafInstance == null || aafInstance.equals("") || aafInstance.equalsIgnoreCase("legacy")) {\r
+ if (aafInstance == null || "".equals(aafInstance) || "legacy".equalsIgnoreCase(aafInstance)) {\r
AuthorizationResponse aresp = authz.decide(req);\r
if (!aresp.isAuthorized()) {\r
- message = "Policy Engine disallows access.";\r
+ message = POLICY_ENGINE;\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_FORBIDDEN);\r
eventlogger.error(elr.toString());\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
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
String bhdr = req.getHeader(BEHALF_HEADER);\r
if (bhdr == null) {\r
- message = "Missing " + BEHALF_HEADER + " header.";\r
+ message = MISSING_ON_BEHALF;\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
eventlogger.error(elr.toString());\r
}\r
final int subid = getIdFromPath(req);\r
if (subid < 0 || Subscription.getSubscriptionById(subid) == null) {\r
- message = "Missing or bad subscription number.";\r
+ message = BAD_SUB;\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
eventlogger.error(elr.toString());\r
// check content type is SUBCNTRL_CONTENT_TYPE, version 1.0\r
ContentHeader ch = getContentHeader(req);\r
String ver = ch.getAttribute("version");\r
- if (!ch.getType().equals(SUBCNTRL_CONTENT_TYPE) || !ver.equals("1.0")) {\r
+ if (!ch.getType().equals(SUBCNTRL_CONTENT_TYPE) || !"1.0".equals(ver)) {\r
message = "Incorrect content-type";\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE);\r
// Check with the Authorizer\r
AuthorizationResponse aresp = authz.decide(req);\r
if (!aresp.isAuthorized()) {\r
- message = "Policy Engine disallows access.";\r
+ message = POLICY_ENGINE;\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_FORBIDDEN);\r
eventlogger.error(elr.toString());\r
}\r
JSONObject jo = getJSONfromInput(req);\r
if (jo == null) {\r
- message = "Badly formed JSON";\r
+ message = BAD_JSON;\r
elr.setMessage(message);\r
elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
eventlogger.error(elr.toString());\r
eventlogger.info(elr.toString());\r
resp.setStatus(HttpServletResponse.SC_ACCEPTED);\r
} catch (JSONException e) {\r
- message = "Badly formed JSON";\r
+ message = BAD_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
public class SubscriberNotifyThread extends Thread {\r
\r
public static final String URL_TEMPLATE = "http://%s/internal/resetSubscription/%d";\r
- private List<String> urls = new Vector<String>();\r
+ private List<String> urls = new Vector<>();\r
\r
public SubscriberNotifyThread() {\r
setName("SubscriberNotifyThread");\r
}\r
}\r
\r
+ @Override\r
public void run() {\r
+\r
try {\r
while (!urls.isEmpty()) {\r
String u = urls.remove(0);\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
- intlogger.warn("Caught exception in SubscriberNotifyThread: " + e.getMessage());\r
+ intlogger.warn("PROV0195 Caught exception in SubscriberNotifyThread: " + e.getMessage(), e);\r
}\r
}\r
}\r