[DMAAP-DR] Remove AAF/TLS phase 1

[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 715c5e1..1851d03 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
@@ -34,14 +34,15 @@ import java.net.HttpURLConnection;
 import java.net.URL;\r
 import java.util.ArrayList;\r
 import java.util.List;\r
-import javax.servlet.http.HttpServletRequest;\r
-import javax.servlet.http.HttpServletResponse;\r
+import jakarta.servlet.http.HttpServletRequest;\r
+import jakarta.servlet.http.HttpServletResponse;\r
 import org.json.JSONException;\r
 import org.json.JSONObject;\r
 import org.onap.dmaap.datarouter.authz.AuthorizationResponse;\r
 import org.onap.dmaap.datarouter.provisioning.beans.EventLogRecord;\r
 import org.onap.dmaap.datarouter.provisioning.beans.Subscription;\r
 import org.onap.dmaap.datarouter.provisioning.eelf.EelfMsgs;\r
+import org.onap.dmaap.datarouter.provisioning.utils.SynchronizerTask;\r
 \r
 /**\r
  * This servlet handles provisioning for the <subscriptionURL> which is generated by the provisioning server to\r
@@ -52,18 +53,13 @@ import org.onap.dmaap.datarouter.provisioning.eelf.EelfMsgs;
  * @author Robert Eby\r
  * @version $Id$\r
  */\r
-@SuppressWarnings("serial")\r
 public class SubscriptionServlet extends ProxyServlet {\r
 \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 final 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
@@ -73,7 +69,8 @@ public class SubscriptionServlet extends ProxyServlet {
         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
+            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
@@ -174,7 +171,8 @@ public class SubscriptionServlet extends ProxyServlet {
         setIpFqdnRequestIDandInvocationIDForEelf("doGet", req);\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
@@ -250,7 +248,8 @@ public class SubscriptionServlet extends ProxyServlet {
         setIpFqdnRequestIDandInvocationIDForEelf("doPut", req);\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
@@ -311,10 +310,7 @@ public class SubscriptionServlet extends ProxyServlet {
                 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
+            Subscription sub;\r
             try {\r
                 sub = new Subscription(jo);\r
             } catch (InvalidObjectException e) {\r
@@ -360,8 +356,8 @@ public class SubscriptionServlet extends ProxyServlet {
             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
@@ -384,7 +380,7 @@ public class SubscriptionServlet extends ProxyServlet {
                     eventlogger.error("PROV0192 SubscriptionServlet.doPut: " + ioe.getMessage(), ioe);\r
                 }\r
 \r
-                /**Change Owner ship of Subscriber     Adding for group feature:Rally US708115*/\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
@@ -396,7 +392,7 @@ public class SubscriptionServlet extends ProxyServlet {
                         eventlogger.error("PROV0193 SubscriptionServlet.doPut: " + je.getMessage(), je);\r
                     }\r
                 }\r
-                /***End of change ownership*/\r
+                /***End of change ownership.*/\r
 \r
                 provisioningDataChanged();\r
             } else {\r
@@ -485,12 +481,12 @@ public class SubscriptionServlet extends ProxyServlet {
             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
@@ -523,8 +519,8 @@ public class SubscriptionServlet extends ProxyServlet {
 \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