Code Review / dmaap / datarouter.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Removing code smells
[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 ff3ed3c..715c5e1 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
@@ -63,6 +60,10 @@ public class SubscriptionServlet extends ProxyServlet {
     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
@@ -88,7 +89,7 @@ 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.error(elr.toString());\r
@@ -97,7 +98,7 @@ public class SubscriptionServlet extends ProxyServlet {
             }\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
@@ -106,7 +107,7 @@ public class SubscriptionServlet extends ProxyServlet {
             }\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
@@ -119,10 +120,10 @@ public class SubscriptionServlet extends ProxyServlet {
              * 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
@@ -189,7 +190,7 @@ 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.error(elr.toString());\r
@@ -198,7 +199,7 @@ public class SubscriptionServlet extends ProxyServlet {
             }\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
@@ -207,7 +208,7 @@ public class SubscriptionServlet extends ProxyServlet {
             }\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
@@ -217,7 +218,7 @@ public class SubscriptionServlet extends ProxyServlet {
             // 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
@@ -265,7 +266,7 @@ 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.error(elr.toString());\r
@@ -274,7 +275,7 @@ public class SubscriptionServlet extends ProxyServlet {
             }\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
@@ -283,7 +284,7 @@ public class SubscriptionServlet extends ProxyServlet {
             }\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
@@ -293,7 +294,7 @@ public class SubscriptionServlet extends ProxyServlet {
             // 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
@@ -303,7 +304,7 @@ public class SubscriptionServlet extends ProxyServlet {
             }\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
@@ -331,10 +332,10 @@ public class SubscriptionServlet extends ProxyServlet {
              * 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
@@ -435,7 +436,7 @@ 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.error(elr.toString());\r
@@ -444,7 +445,7 @@ public class SubscriptionServlet extends ProxyServlet {
             }\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
@@ -454,7 +455,7 @@ public class SubscriptionServlet extends ProxyServlet {
             // 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
@@ -465,7 +466,7 @@ public class SubscriptionServlet extends ProxyServlet {
             // 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
@@ -474,7 +475,7 @@ public class SubscriptionServlet extends ProxyServlet {
             }\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
@@ -496,7 +497,7 @@ public class SubscriptionServlet extends ProxyServlet {
                 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(), e);\r
@@ -511,39 +512,44 @@ 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
             }\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("PROV0194 Error accessing URL: " + u + ": " + e.getMessage(), e);\r
-                    }\r
+                    String url = urls.remove(0);\r
+                    forceGetThrough(url);\r
                 }\r
             } catch (Exception 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
 }\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