Code Review / dmaap / datarouter.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Add RequestId and InvocationId to DR
[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 5fa370d..be79e2f 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
@@ -61,7 +61,7 @@ public class SubscriptionServlet extends ProxyServlet {
     public static final String SUBCNTRL_CONTENT_TYPE = "application/vnd.att-dr.subscription-control";\r
     //Adding EELF Logger Rally:US664892\r
     private static EELFLogger eelflogger = EELFManager.getInstance()\r
-        .getLogger("org.onap.dmaap.datarouter.provisioning.SubscriptionServlet");\r
+        .getLogger(SubscriptionServlet.class);\r
 \r
     /**\r
      * DELETE on the &lt;subscriptionUrl&gt; -- delete a subscription. See the <i>Deleting a Subscription</i> section in\r
@@ -69,72 +69,77 @@ public class SubscriptionServlet extends ProxyServlet {
      */\r
     @Override\r
     public void doDelete(HttpServletRequest req, HttpServletResponse resp) {\r
-        setIpAndFqdnForEelf("doDelete");\r
-        eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_SUBID, 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
-            sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
-            return;\r
-        }\r
-        if (isProxyServer()) {\r
-            super.doDelete(req, resp);\r
-            return;\r
-        }\r
-        String bhdr = req.getHeader(BEHALF_HEADER);\r
-        if (bhdr == null) {\r
-            message = "Missing " + BEHALF_HEADER + " header.";\r
-            elr.setMessage(message);\r
-            elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
-            eventlogger.info(elr);\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
-            elr.setMessage(message);\r
-            elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
-            eventlogger.info(elr);\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
-            elr.setMessage(message);\r
-            elr.setResult(HttpServletResponse.SC_NOT_FOUND);\r
-            eventlogger.info(elr);\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
+        setIpFqdnRequestIDandInvocationIDForEelf("doDelete", req);\r
+        eelflogger.info(EelfMsgs.ENTRY);\r
+        try {\r
+            eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_SUBID, 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
+                sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
+                return;\r
+            }\r
+            if (isProxyServer()) {\r
+                super.doDelete(req, resp);\r
+                return;\r
+            }\r
+            String bhdr = req.getHeader(BEHALF_HEADER);\r
+            if (bhdr == null) {\r
+                message = "Missing " + BEHALF_HEADER + " header.";\r
+                elr.setMessage(message);\r
+                elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
+                eventlogger.info(elr);\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
+                elr.setMessage(message);\r
+                elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
+                eventlogger.info(elr);\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
+                elr.setMessage(message);\r
+                elr.setResult(HttpServletResponse.SC_NOT_FOUND);\r
+                eventlogger.info(elr);\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
 \r
-        // Delete Subscription\r
-        if (doDelete(sub)) {\r
-            activeSubs--;\r
-            // send response\r
-            elr.setResult(HttpServletResponse.SC_NO_CONTENT);\r
-            eventlogger.info(elr);\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
-            sendResponseError(resp, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, DB_PROBLEM_MSG, intlogger);\r
+            // Delete Subscription\r
+            if (doDelete(sub)) {\r
+                activeSubs--;\r
+                // send response\r
+                elr.setResult(HttpServletResponse.SC_NO_CONTENT);\r
+                eventlogger.info(elr);\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
+                sendResponseError(resp, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, DB_PROBLEM_MSG, intlogger);\r
+            }\r
+        } finally {\r
+            eelflogger.info(EelfMsgs.EXIT);\r
         }\r
     }\r
 \r
@@ -145,68 +150,73 @@ public class SubscriptionServlet extends ProxyServlet {
      */\r
     @Override\r
     public void doGet(HttpServletRequest req, HttpServletResponse resp) {\r
-        setIpAndFqdnForEelf("doGet");\r
-        eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_SUBID, 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
-            sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
-            return;\r
-        }\r
-        if (isProxyServer()) {\r
-            super.doGet(req, resp);\r
-            return;\r
-        }\r
-        String bhdr = req.getHeader(BEHALF_HEADER);\r
-        if (bhdr == null) {\r
-            message = "Missing " + BEHALF_HEADER + " header.";\r
-            elr.setMessage(message);\r
-            elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
-            eventlogger.info(elr);\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
-            elr.setMessage(message);\r
-            elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
-            eventlogger.info(elr);\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
-            elr.setMessage(message);\r
-            elr.setResult(HttpServletResponse.SC_NOT_FOUND);\r
-            eventlogger.info(elr);\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
-\r
-        // send response\r
-        elr.setResult(HttpServletResponse.SC_OK);\r
-        eventlogger.info(elr);\r
-        resp.setStatus(HttpServletResponse.SC_OK);\r
-        resp.setContentType(SUBFULL_CONTENT_TYPE);\r
+        setIpFqdnRequestIDandInvocationIDForEelf("doGet", req);\r
+        eelflogger.info(EelfMsgs.ENTRY);\r
         try {\r
-            resp.getOutputStream().print(sub.asJSONObject(true).toString());\r
-        } catch (IOException ioe) {\r
-            eventlogger.error("IOException: " + ioe.getMessage());\r
+            eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_SUBID, 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
+                sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
+                return;\r
+            }\r
+            if (isProxyServer()) {\r
+                super.doGet(req, resp);\r
+                return;\r
+            }\r
+            String bhdr = req.getHeader(BEHALF_HEADER);\r
+            if (bhdr == null) {\r
+                message = "Missing " + BEHALF_HEADER + " header.";\r
+                elr.setMessage(message);\r
+                elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
+                eventlogger.info(elr);\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
+                elr.setMessage(message);\r
+                elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
+                eventlogger.info(elr);\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
+                elr.setMessage(message);\r
+                elr.setResult(HttpServletResponse.SC_NOT_FOUND);\r
+                eventlogger.info(elr);\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
+\r
+            // send response\r
+            elr.setResult(HttpServletResponse.SC_OK);\r
+            eventlogger.info(elr);\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
+            }\r
+        } finally {\r
+            eelflogger.info(EelfMsgs.EXIT);\r
         }\r
     }\r
 \r
@@ -216,139 +226,144 @@ public class SubscriptionServlet extends ProxyServlet {
      */\r
     @Override\r
     public void doPut(HttpServletRequest req, HttpServletResponse resp) {\r
-        setIpAndFqdnForEelf("doPut");\r
-        eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_SUBID, 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
-            sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
-            return;\r
-        }\r
-        if (isProxyServer()) {\r
-            super.doPut(req, resp);\r
-            return;\r
-        }\r
-        String bhdr = req.getHeader(BEHALF_HEADER);\r
-        if (bhdr == null) {\r
-            message = "Missing " + BEHALF_HEADER + " header.";\r
-            elr.setMessage(message);\r
-            elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
-            eventlogger.info(elr);\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
-            elr.setMessage(message);\r
-            elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
-            eventlogger.info(elr);\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
-            elr.setMessage(message);\r
-            elr.setResult(HttpServletResponse.SC_NOT_FOUND);\r
-            eventlogger.info(elr);\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
-            message = "Incorrect content-type";\r
-            elr.setMessage(message);\r
-            elr.setResult(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE);\r
-            eventlogger.info(elr);\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
-            elr.setMessage(message);\r
-            elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
-            eventlogger.info(elr);\r
-            sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
-            return;\r
-        }\r
-        if (intlogger.isDebugEnabled()) {\r
-            intlogger.debug(jo.toString());\r
-        }\r
-        Subscription sub = null;\r
+        setIpFqdnRequestIDandInvocationIDForEelf("doPut", req);\r
+        eelflogger.info(EelfMsgs.ENTRY);\r
         try {\r
-            sub = new Subscription(jo);\r
-        } catch (InvalidObjectException e) {\r
-            message = e.getMessage();\r
-            elr.setMessage(message);\r
-            elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
-            eventlogger.info(elr);\r
-            sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
-            return;\r
-        }\r
-        sub.setSubid(oldsub.getSubid());\r
-        sub.setFeedid(oldsub.getFeedid());\r
-        sub.setSubscriber(bhdr);    // set from X-ATT-DR-ON-BEHALF-OF header\r
-\r
-        String subjectgroup = (req.getHeader("X-ATT-DR-ON-BEHALF-OF-GROUP")); //Adding for group feature:Rally US708115\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
-            sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
-            return;\r
-        }\r
-\r
-        // Update SUBSCRIPTIONS table entries\r
-        if (doUpdate(sub)) {\r
-            // send response\r
-            elr.setResult(HttpServletResponse.SC_OK);\r
-            eventlogger.info(elr);\r
-            resp.setStatus(HttpServletResponse.SC_OK);\r
-            resp.setContentType(SUBFULL_CONTENT_TYPE);\r
+            eelflogger.info(EelfMsgs.MESSAGE_WITH_BEHALF_AND_SUBID, 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
+                sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
+                return;\r
+            }\r
+            if (isProxyServer()) {\r
+                super.doPut(req, resp);\r
+                return;\r
+            }\r
+            String bhdr = req.getHeader(BEHALF_HEADER);\r
+            if (bhdr == null) {\r
+                message = "Missing " + BEHALF_HEADER + " header.";\r
+                elr.setMessage(message);\r
+                elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
+                eventlogger.info(elr);\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
+                elr.setMessage(message);\r
+                elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
+                eventlogger.info(elr);\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
+                elr.setMessage(message);\r
+                elr.setResult(HttpServletResponse.SC_NOT_FOUND);\r
+                eventlogger.info(elr);\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
+                message = "Incorrect content-type";\r
+                elr.setMessage(message);\r
+                elr.setResult(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE);\r
+                eventlogger.info(elr);\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
+                elr.setMessage(message);\r
+                elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
+                eventlogger.info(elr);\r
+                sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
+                return;\r
+            }\r
+            if (intlogger.isDebugEnabled()) {\r
+                intlogger.debug(jo.toString());\r
+            }\r
+            Subscription sub = null;\r
             try {\r
-                resp.getOutputStream().print(sub.asLimitedJSONObject().toString());\r
-            } catch (IOException ioe) {\r
-                eventlogger.error("IOException: " + ioe.getMessage());\r
+                sub = new Subscription(jo);\r
+            } catch (InvalidObjectException e) {\r
+                message = e.getMessage();\r
+                elr.setMessage(message);\r
+                elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
+                eventlogger.info(elr);\r
+                sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
+                return;\r
             }\r
+            sub.setSubid(oldsub.getSubid());\r
+            sub.setFeedid(oldsub.getFeedid());\r
+            sub.setSubscriber(bhdr);    // set from X-ATT-DR-ON-BEHALF-OF header\r
 \r
-            /**Change Owner ship of Subscriber     Adding for group feature:Rally US708115*/\r
-            if (jo.has("changeowner") && subjectgroup != null) {\r
+            String subjectgroup = (req.getHeader("X-ATT-DR-ON-BEHALF-OF-GROUP")); //Adding for group feature:Rally US708115\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
+                sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
+                return;\r
+            }\r
+\r
+            // Update SUBSCRIPTIONS table entries\r
+            if (doUpdate(sub)) {\r
+                // send response\r
+                elr.setResult(HttpServletResponse.SC_OK);\r
+                eventlogger.info(elr);\r
+                resp.setStatus(HttpServletResponse.SC_OK);\r
+                resp.setContentType(SUBFULL_CONTENT_TYPE);\r
                 try {\r
-                    Boolean changeowner = (Boolean) jo.get("changeowner");\r
-                    if (changeowner != null && changeowner.equals(true)) {\r
-                        sub.setSubscriber(req.getHeader(BEHALF_HEADER));\r
-                        sub.changeOwnerShip();\r
+                    resp.getOutputStream().print(sub.asLimitedJSONObject().toString());\r
+                } catch (IOException ioe) {\r
+                    eventlogger.error("IOException: " + ioe.getMessage());\r
+                }\r
+\r
+                /**Change Owner ship of Subscriber     Adding for group feature:Rally US708115*/\r
+                if (jo.has("changeowner") && subjectgroup != null) {\r
+                    try {\r
+                        Boolean changeowner = (Boolean) jo.get("changeowner");\r
+                        if (changeowner != null && changeowner.equals(true)) {\r
+                            sub.setSubscriber(req.getHeader(BEHALF_HEADER));\r
+                            sub.changeOwnerShip();\r
+                        }\r
+                    } catch (JSONException je) {\r
+                        eventlogger.error("JSONException: " + je.getMessage());\r
                     }\r
-                } catch (JSONException je) {\r
-                    eventlogger.error("JSONException: " + je.getMessage());\r
                 }\r
-            }\r
-            /***End of change ownership*/\r
+                /***End of change ownership*/\r
 \r
-            provisioningDataChanged();\r
-        } else {\r
-            // Something went wrong with the UPDATE\r
-            elr.setResult(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);\r
-            eventlogger.info(elr);\r
-            sendResponseError(resp, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, DB_PROBLEM_MSG, intlogger);\r
+                provisioningDataChanged();\r
+            } else {\r
+                // Something went wrong with the UPDATE\r
+                elr.setResult(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);\r
+                eventlogger.info(elr);\r
+                sendResponseError(resp, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, DB_PROBLEM_MSG, intlogger);\r
+            }\r
+        } finally {\r
+            eelflogger.info(EelfMsgs.EXIT);\r
         }\r
     }\r
 \r
@@ -366,89 +381,94 @@ public class SubscriptionServlet extends ProxyServlet {
 //        eventlogger.info(elr);\r
 //        resp.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, message);\r
 \r
-        setIpAndFqdnForEelf("doPost");\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
-            sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
-            return;\r
-        }\r
-        if (isProxyServer()) {\r
-            super.doPost(req, resp);\r
-            return;\r
-        }\r
-        String bhdr = req.getHeader(BEHALF_HEADER);\r
-        if (bhdr == null) {\r
-            message = "Missing " + BEHALF_HEADER + " header.";\r
-            elr.setMessage(message);\r
-            elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
-            eventlogger.info(elr);\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
-            elr.setMessage(message);\r
-            elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
-            eventlogger.info(elr);\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
-            message = "Incorrect content-type";\r
-            elr.setMessage(message);\r
-            elr.setResult(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE);\r
-            eventlogger.info(elr);\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
-            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
-        JSONObject jo = getJSONfromInput(req);\r
-        if (jo == null) {\r
-            message = "Badly formed JSON";\r
-            elr.setMessage(message);\r
-            elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
-            eventlogger.info(elr);\r
-            sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
-            return;\r
-        }\r
+        setIpFqdnRequestIDandInvocationIDForEelf("doPost", req);\r
+        eelflogger.info(EelfMsgs.ENTRY);\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
-                // Notify all nodes to reset the subscription\r
-                SubscriberNotifyThread t = new SubscriberNotifyThread();\r
-                t.resetSubscription(subid);\r
-                t.start();\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
+                sendResponseError(resp, HttpServletResponse.SC_FORBIDDEN, message, eventlogger);\r
+                return;\r
             }\r
-            // send response\r
-            elr.setResult(HttpServletResponse.SC_ACCEPTED);\r
-            eventlogger.info(elr);\r
-            resp.setStatus(HttpServletResponse.SC_ACCEPTED);\r
-        } catch (JSONException e) {\r
-            message = "Badly formed JSON";\r
-            elr.setMessage(message);\r
-            elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
-            eventlogger.info(elr);\r
-            sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
+            if (isProxyServer()) {\r
+                super.doPost(req, resp);\r
+                return;\r
+            }\r
+            String bhdr = req.getHeader(BEHALF_HEADER);\r
+            if (bhdr == null) {\r
+                message = "Missing " + BEHALF_HEADER + " header.";\r
+                elr.setMessage(message);\r
+                elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
+                eventlogger.info(elr);\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
+                elr.setMessage(message);\r
+                elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
+                eventlogger.info(elr);\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
+                message = "Incorrect content-type";\r
+                elr.setMessage(message);\r
+                elr.setResult(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE);\r
+                eventlogger.info(elr);\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
+                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
+            JSONObject jo = getJSONfromInput(req);\r
+            if (jo == null) {\r
+                message = "Badly formed JSON";\r
+                elr.setMessage(message);\r
+                elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
+                eventlogger.info(elr);\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
+                    // Notify all nodes to reset the subscription\r
+                    SubscriberNotifyThread t = new SubscriberNotifyThread();\r
+                    t.resetSubscription(subid);\r
+                    t.start();\r
+                }\r
+                // send response\r
+                elr.setResult(HttpServletResponse.SC_ACCEPTED);\r
+                eventlogger.info(elr);\r
+                resp.setStatus(HttpServletResponse.SC_ACCEPTED);\r
+            } catch (JSONException e) {\r
+                message = "Badly formed JSON";\r
+                elr.setMessage(message);\r
+                elr.setResult(HttpServletResponse.SC_BAD_REQUEST);\r
+                eventlogger.info(elr);\r
+                sendResponseError(resp, HttpServletResponse.SC_BAD_REQUEST, message, eventlogger);\r
+            }\r
+        } finally {\r
+            eelflogger.info(EelfMsgs.EXIT);\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