Code Review / dmaap / datarouter.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Checkstyle fixes for datarouter prov
[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 ec4d33a..62c2f62 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
@@ -24,16 +24,18 @@
 \r
 package org.onap.dmaap.datarouter.provisioning;\r
 \r
+import static org.onap.dmaap.datarouter.provisioning.utils.HttpServletUtils.sendResponseError;\r
+\r
+import com.att.eelf.configuration.EELFLogger;\r
+import com.att.eelf.configuration.EELFManager;\r
 import java.io.IOException;\r
 import java.io.InvalidObjectException;\r
 import java.net.HttpURLConnection;\r
 import java.net.URL;\r
+import java.util.ArrayList;\r
 import java.util.List;\r
-import java.util.Vector;\r
-\r
 import javax.servlet.http.HttpServletRequest;\r
 import javax.servlet.http.HttpServletResponse;\r
-\r
 import org.json.JSONException;\r
 import org.json.JSONObject;\r
 import org.onap.dmaap.datarouter.authz.AuthorizationResponse;\r
@@ -41,11 +43,6 @@ import org.onap.dmaap.datarouter.provisioning.beans.EventLogRecord;
 import org.onap.dmaap.datarouter.provisioning.beans.Subscription;\r
 import org.onap.dmaap.datarouter.provisioning.eelf.EelfMsgs;\r
 \r
-import com.att.eelf.configuration.EELFLogger;\r
-import com.att.eelf.configuration.EELFManager;\r
-\r
-import static org.onap.dmaap.datarouter.provisioning.utils.HttpServletUtils.sendResponseError;\r
-\r
 /**\r
  * This servlet handles provisioning for the <subscriptionURL> which is generated by the provisioning server to\r
  * handle the inspection, modification, and deletion of a particular subscription to a feed. It supports DELETE to\r
@@ -58,11 +55,15 @@ import static org.onap.dmaap.datarouter.provisioning.utils.HttpServletUtils.send
 @SuppressWarnings("serial")\r
 public class SubscriptionServlet extends ProxyServlet {\r
 \r
-    public static final String SUBCNTRL_CONTENT_TYPE = "application/vnd.dmaap-dr.subscription-control";\r
+    private static final String SUBCNTRL_CONTENT_TYPE = "application/vnd.dmaap-dr.subscription-control";\r
     //Adding EELF Logger Rally:US664892\r
-    private static EELFLogger eelflogger = EELFManager.getInstance()\r
+    private static EELFLogger eelfLogger = EELFManager.getInstance()\r
         .getLogger(SubscriptionServlet.class);\r
 \r
+\r
+\r
+\r
+\r
     /**\r
      * DELETE on the &lt;subscriptionUrl&gt; -- 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
@@ -70,15 +71,16 @@ public class SubscriptionServlet extends ProxyServlet {
     @Override\r
     public void doDelete(HttpServletRequest req, HttpServletResponse resp) {\r
         setIpFqdnRequestIDandInvocationIDForEelf("doDelete", req);\r
-        eelflogger.info(EelfMsgs.ENTRY);\r
+        eelfLogger.info(EelfMsgs.ENTRY);\r
         try {\r
-            eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_SUBID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
+            eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_SUBID,\r
+                    req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
             EventLogRecord elr = new EventLogRecord(req);\r
             String message = isAuthorizedForProvisioning(req);\r
             if (message != null) {\r
                 elr.setMessage(message);\r
                 elr.setResult(HttpServletResponse.SC_FORBIDDEN);\r
-                eventlogger.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
                 return;\r
             }\r
@@ -88,58 +90,78 @@ public class SubscriptionServlet extends ProxyServlet {
             }\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.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
                 return;\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.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
                 return;\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.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_NOT_FOUND, message, eventlogger);\r
                 return;\r
             }\r
-            // Check with the Authorizer\r
-            AuthorizationResponse aresp = authz.decide(req);\r
-            if (!aresp.isAuthorized()) {\r
-                message = "Policy Engine disallows access.";\r
-                elr.setMessage(message);\r
-                elr.setResult(HttpServletResponse.SC_FORBIDDEN);\r
-                eventlogger.info(elr);\r
-                sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
-                return;\r
+            /*\r
+             * START - AAF changes\r
+             * TDP EPIC US# 307413\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 || "".equals(aafInstance) || "legacy".equalsIgnoreCase(aafInstance)) {\r
+                AuthorizationResponse aresp = authz.decide(req);\r
+                if (!aresp.isAuthorized()) {\r
+                    message = POLICY_ENGINE;\r
+                    elr.setMessage(message);\r
+                    elr.setResult(HttpServletResponse.SC_FORBIDDEN);\r
+                    eventlogger.error(elr.toString());\r
+                    sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
+                    return;\r
+                }\r
+            } else {\r
+                String permission = getSubscriberPermission(aafInstance, BaseServlet.DELETE_PERMISSION);\r
+                eventlogger.info("SubscriptionServlet.doDelete().. Permission String - " + permission);\r
+                if (!req.isUserInRole(permission)) {\r
+                    message = "AAF disallows access to permission - " + permission;\r
+                    elr.setMessage(message);\r
+                    elr.setResult(HttpServletResponse.SC_FORBIDDEN);\r
+                    eventlogger.error(elr.toString());\r
+                    sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
+                    return;\r
+                }\r
             }\r
-\r
+            /*\r
+             * END - AAF changes\r
+             */\r
             // Delete Subscription\r
             if (doDelete(sub)) {\r
                 activeSubs--;\r
                 // send response\r
                 elr.setResult(HttpServletResponse.SC_NO_CONTENT);\r
-                eventlogger.info(elr);\r
+                eventlogger.info(elr.toString());\r
                 resp.setStatus(HttpServletResponse.SC_NO_CONTENT);\r
                 provisioningDataChanged();\r
             } else {\r
                 // Something went wrong with the DELETE\r
                 elr.setResult(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);\r
-                eventlogger.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, DB_PROBLEM_MSG, intlogger);\r
             }\r
         } finally {\r
-            eelflogger.info(EelfMsgs.EXIT);\r
+            eelfLogger.info(EelfMsgs.EXIT);\r
         }\r
     }\r
 \r
@@ -151,15 +173,16 @@ public class SubscriptionServlet extends ProxyServlet {
     @Override\r
     public void doGet(HttpServletRequest req, HttpServletResponse resp) {\r
         setIpFqdnRequestIDandInvocationIDForEelf("doGet", req);\r
-        eelflogger.info(EelfMsgs.ENTRY);\r
+        eelfLogger.info(EelfMsgs.ENTRY);\r
         try {\r
-            eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_SUBID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
+            eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_SUBID,\r
+                    req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
             EventLogRecord elr = new EventLogRecord(req);\r
             String message = isAuthorizedForProvisioning(req);\r
             if (message != null) {\r
                 elr.setMessage(message);\r
                 elr.setResult(HttpServletResponse.SC_FORBIDDEN);\r
-                eventlogger.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
                 return;\r
             }\r
@@ -169,54 +192,54 @@ public class SubscriptionServlet extends ProxyServlet {
             }\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.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
                 return;\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.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
                 return;\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.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_NOT_FOUND, message, eventlogger);\r
                 return;\r
             }\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.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
                 return;\r
             }\r
 \r
             // send response\r
             elr.setResult(HttpServletResponse.SC_OK);\r
-            eventlogger.info(elr);\r
+            eventlogger.info(elr.toString());\r
             resp.setStatus(HttpServletResponse.SC_OK);\r
             resp.setContentType(SUBFULL_CONTENT_TYPE);\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
+            eelfLogger.info(EelfMsgs.EXIT);\r
         }\r
     }\r
 \r
@@ -227,15 +250,16 @@ public class SubscriptionServlet extends ProxyServlet {
     @Override\r
     public void doPut(HttpServletRequest req, HttpServletResponse resp) {\r
         setIpFqdnRequestIDandInvocationIDForEelf("doPut", req);\r
-        eelflogger.info(EelfMsgs.ENTRY);\r
+        eelfLogger.info(EelfMsgs.ENTRY);\r
         try {\r
-            eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_SUBID, req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
+            eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_SUBID,\r
+                    req.getHeader(BEHALF_HEADER), getIdFromPath(req) + "");\r
             EventLogRecord elr = new EventLogRecord(req);\r
             String message = isAuthorizedForProvisioning(req);\r
             if (message != null) {\r
                 elr.setMessage(message);\r
                 elr.setResult(HttpServletResponse.SC_FORBIDDEN);\r
-                eventlogger.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
                 return;\r
             }\r
@@ -245,58 +269,48 @@ public class SubscriptionServlet extends ProxyServlet {
             }\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.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
                 return;\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.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
                 return;\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.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_NOT_FOUND, message, eventlogger);\r
                 return;\r
             }\r
-            // Check with the Authorizer\r
-            AuthorizationResponse aresp = authz.decide(req);\r
-            if (!aresp.isAuthorized()) {\r
-                message = "Policy Engine disallows access.";\r
-                elr.setMessage(message);\r
-                elr.setResult(HttpServletResponse.SC_FORBIDDEN);\r
-                eventlogger.info(elr);\r
-                sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
-                return;\r
-            }\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
-                eventlogger.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE, message, eventlogger);\r
                 return;\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.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
                 return;\r
             }\r
@@ -310,20 +324,52 @@ public class SubscriptionServlet extends ProxyServlet {
                 message = e.getMessage();\r
                 elr.setMessage(message);\r
                 elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
-                eventlogger.info(elr);\r
+                eventlogger.error(elr.toString(), e);\r
                 sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
                 return;\r
             }\r
+\r
+            /*\r
+             * START - AAF changes\r
+             * TDP EPIC US# 307413\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 || "".equals(aafInstance) || "legacy".equalsIgnoreCase(aafInstance)) {\r
+                AuthorizationResponse aresp = authz.decide(req);\r
+                if (!aresp.isAuthorized()) {\r
+                    message = POLICY_ENGINE;\r
+                    elr.setMessage(message);\r
+                    elr.setResult(HttpServletResponse.SC_FORBIDDEN);\r
+                    eventlogger.error(elr.toString());\r
+                    sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
+                    return;\r
+                }\r
+            } else {\r
+                String permission = getSubscriberPermission(aafInstance, BaseServlet.EDIT_PERMISSION);\r
+                eventlogger.info("SubscriptionServlet.doDelete().. Permission String - " + permission);\r
+                if (!req.isUserInRole(permission)) {\r
+                    message = "AAF disallows access to permission - " + permission;\r
+                    elr.setMessage(message);\r
+                    elr.setResult(HttpServletResponse.SC_FORBIDDEN);\r
+                    eventlogger.error(elr.toString());\r
+                    sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
+                    return;\r
+                }\r
+            }\r
+            /*\r
+             * END - AAF changes\r
+             */\r
             sub.setSubid(oldsub.getSubid());\r
             sub.setFeedid(oldsub.getFeedid());\r
             sub.setSubscriber(bhdr);    // set from X-DMAAP-DR-ON-BEHALF-OF header\r
-\r
-            String subjectgroup = (req.getHeader("X-DMAAP-DR-ON-BEHALF-OF-GROUP")); //Adding for group feature:Rally US708115\r
+            //Adding for group feature:Rally US708115\r
+            String subjectgroup = (req.getHeader("X-DMAAP-DR-ON-BEHALF-OF-GROUP"));\r
             if (!oldsub.getSubscriber().equals(sub.getSubscriber()) && subjectgroup == null) {\r
                 message = "This subscriber must be modified by the same subscriber that created it.";\r
                 elr.setMessage(message);\r
                 elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
-                eventlogger.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
                 return;\r
             }\r
@@ -332,13 +378,13 @@ public class SubscriptionServlet extends ProxyServlet {
             if (doUpdate(sub)) {\r
                 // send response\r
                 elr.setResult(HttpServletResponse.SC_OK);\r
-                eventlogger.info(elr);\r
+                eventlogger.info(elr.toString());\r
                 resp.setStatus(HttpServletResponse.SC_OK);\r
                 resp.setContentType(SUBFULL_CONTENT_TYPE);\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
@@ -350,7 +396,7 @@ public class SubscriptionServlet extends ProxyServlet {
                             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
@@ -359,11 +405,11 @@ public class SubscriptionServlet extends ProxyServlet {
             } else {\r
                 // Something went wrong with the UPDATE\r
                 elr.setResult(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);\r
-                eventlogger.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, DB_PROBLEM_MSG, intlogger);\r
             }\r
         } finally {\r
-            eelflogger.info(EelfMsgs.EXIT);\r
+            eelfLogger.info(EelfMsgs.EXIT);\r
         }\r
     }\r
 \r
@@ -373,24 +419,17 @@ public class SubscriptionServlet extends ProxyServlet {
      */\r
     @Override\r
     public void doPost(HttpServletRequest req, HttpServletResponse resp) {\r
-// OLD pre-3.0 code\r
-//        String message = "POST not allowed for the subscriptionURL.";\r
-//        EventLogRecord elr = new EventLogRecord(req);\r
-//        elr.setMessage(message);\r
-//        elr.setResult(HttpServletResponse.SC_METHOD_NOT_ALLOWED);\r
-//        eventlogger.info(elr);\r
-//        resp.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, message);\r
 \r
         setIpFqdnRequestIDandInvocationIDForEelf("doPost", req);\r
-        eelflogger.info(EelfMsgs.ENTRY);\r
+        eelfLogger.info(EelfMsgs.ENTRY);\r
         try {\r
-            eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF, req.getHeader(BEHALF_HEADER));\r
+            eelfLogger.info(EelfMsgs.MESSAGE_WITH_BEHALF, req.getHeader(BEHALF_HEADER));\r
             EventLogRecord elr = new EventLogRecord(req);\r
             String message = isAuthorizedForProvisioning(req);\r
             if (message != null) {\r
                 elr.setMessage(message);\r
                 elr.setResult(HttpServletResponse.SC_FORBIDDEN);\r
-                eventlogger.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
                 return;\r
             }\r
@@ -400,75 +439,75 @@ public class SubscriptionServlet extends ProxyServlet {
             }\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.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
                 return;\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.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
                 return;\r
             }\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
-                eventlogger.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE, message, eventlogger);\r
                 return;\r
             }\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.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
                 return;\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.info(elr);\r
+                eventlogger.error(elr.toString());\r
                 sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
                 return;\r
             }\r
             try {\r
                 // Only the active POD sends notifications\r
                 boolean active = SynchronizerTask.getSynchronizer().isActive();\r
-                boolean b = jo.getBoolean("failed");\r
-                if (active && !b) {\r
+                boolean bool = jo.getBoolean("failed");\r
+                if (active && !bool) {\r
                     // Notify all nodes to reset the subscription\r
-                    SubscriberNotifyThread t = new SubscriberNotifyThread();\r
-                    t.resetSubscription(subid);\r
-                    t.start();\r
+                    SubscriberNotifyThread thread = new SubscriberNotifyThread();\r
+                    thread.resetSubscription(subid);\r
+                    thread.start();\r
                 }\r
                 // send response\r
                 elr.setResult(HttpServletResponse.SC_ACCEPTED);\r
-                eventlogger.info(elr);\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.info(elr);\r
+                eventlogger.error(elr.toString(), e);\r
                 sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
             }\r
         } finally {\r
-            eelflogger.info(EelfMsgs.EXIT);\r
+            eelfLogger.info(EelfMsgs.EXIT);\r
         }\r
     }\r
 \r
@@ -476,38 +515,43 @@ public class SubscriptionServlet extends ProxyServlet {
      * A Thread class used to serially send reset notifications to all nodes in the DR network, when a POST is received\r
      * for a subscription.\r
      */\r
-    public class SubscriberNotifyThread extends Thread {\r
+    public static 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
+        static final String URL_TEMPLATE = "http://%s/internal/resetSubscription/%d";\r
+        private List<String> urls = new ArrayList<>();\r
 \r
-        public SubscriberNotifyThread() {\r
+        SubscriberNotifyThread() {\r
             setName("SubscriberNotifyThread");\r
         }\r
 \r
-        public void resetSubscription(int subid) {\r
+        void resetSubscription(int subid) {\r
             for (String nodename : BaseServlet.getNodes()) {\r
-                String u = String.format(URL_TEMPLATE, nodename, subid);\r
-                urls.add(u);\r
+                String url = String.format(URL_TEMPLATE, nodename, subid);\r
+                urls.add(url);\r
             }\r
         }\r
 \r
+        @Override\r
         public void run() {\r
             try {\r
                 while (!urls.isEmpty()) {\r
-                    String u = urls.remove(0);\r
-                    try {\r
-                        URL url = new URL(u);\r
-                        HttpURLConnection conn = (HttpURLConnection) url.openConnection();\r
-                        conn.connect();\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
-                    }\r
+                    String url = urls.remove(0);\r
+                    forceGetThrough(url);\r
                 }\r
             } catch (Exception e) {\r
-                intlogger.warn("Caught exception in SubscriberNotifyThread: " + e);\r
+                intlogger.warn("PROV0195 Caught exception in SubscriberNotifyThread: " + e.getMessage(), e);\r
+            }\r
+        }\r
+\r
+        private void forceGetThrough(String url) {\r
+            try {\r
+                URL urlObj = new URL(url);\r
+                HttpURLConnection conn = (HttpURLConnection) urlObj.openConnection();\r
+                conn.connect();\r
+                conn.getContentLength();    // Force the GET through\r
+                conn.disconnect();\r
+            } catch (IOException e) {\r
+                intlogger.info("PROV0194 Error accessing URL: " + url + ": " + e.getMessage(), e);\r
             }\r
         }\r
     }\r
The Data Routing System project is intended to provide a common framework by which data producers can make data available to data consumers and a way for potential consumers to find feeds with the data they require. The interface to DR is exposed as a RESTful web service known as the DR Publishing and Delivery API