Remove major and minor code smells in dr-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 ff3ed3c..125c50d 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
@@ -63,6 +63,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 +92,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 +101,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 +110,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 +123,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 +193,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 +202,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 +211,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 +221,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 +269,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 +278,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 +287,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 +297,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 +307,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 +335,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 +439,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 +448,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 +458,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 +469,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 +478,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 +500,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
@@ -514,7 +518,7 @@ public class SubscriptionServlet extends ProxyServlet {
     public class SubscriberNotifyThread extends Thread {\r
 \r
         public static final String URL_TEMPLATE = "http://%s/internal/resetSubscription/%d";\r
-        private List<String> urls = new Vector<String>();\r
+        private List<String> urls = new Vector<>();\r
 \r
         public SubscriberNotifyThread() {\r
             setName("SubscriberNotifyThread");\r
@@ -527,7 +531,9 @@ public class SubscriptionServlet extends ProxyServlet {
             }\r
         }\r
 \r
+        @Override\r
         public void run() {\r
+\r
             try {\r
                 while (!urls.isEmpty()) {\r
                     String u = urls.remove(0);\r