Removing clumsy code smells and adding missing JettyFilter test

[dmaap/datarouter.git] / datarouter-prov / src / main / java / org / onap / dmaap / datarouter / provisioning / utils / ThrottleFilter.java

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/ThrottleFilter.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/ThrottleFilter.java
index 5c1fd56..b0fd4f4 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/ThrottleFilter.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/ThrottleFilter.java
@@ -103,7 +103,7 @@ public class ThrottleFilter extends TimerTask implements Filter {
     private static int action = ACTION_DROP;    // action to take (throttle or drop)\r
 \r
     private static EELFLogger logger = EELFManager.getInstance().getLogger("InternalLog");\r
-    private static Map<String, Counter> map = new HashMap<String, Counter>();\r
+    private static Map<String, Counter> map = new HashMap<>();\r
     private static final Timer rolex = new Timer();\r
 \r
     @Override\r
@@ -214,13 +214,13 @@ public class ThrottleFilter extends TimerTask implements Filter {
         }\r
     }\r
 \r
-    private Map<String, List<Continuation>> suspended_requests = new HashMap<String, List<Continuation>>();\r
+    private Map<String, List<Continuation>> suspended_requests = new HashMap<>();\r
 \r
     private void register(String id, Continuation continuation) {\r
         synchronized (suspended_requests) {\r
             List<Continuation> list = suspended_requests.get(id);\r
             if (list == null) {\r
-                list = new ArrayList<Continuation>();\r
+                list = new ArrayList<>();\r
                 suspended_requests.put(id, list);\r
             }\r
             list.add(continuation);\r
@@ -258,13 +258,12 @@ public class ThrottleFilter extends TimerTask implements Filter {
                 cnt = new Counter();\r
                 map.put(key, cnt);\r
             }\r
-            int n = cnt.getRequestRate();\r
-            return n;\r
+            return cnt.getRequestRate();\r
         }\r
     }\r
 \r
     public class Counter {\r
-        private List<Long> times = new Vector<Long>();    // a record of request times\r
+        private List<Long> times = new Vector<>();    // a record of request times\r
 \r
         public int prune() {\r
             try {\r
@@ -302,8 +301,7 @@ public class ThrottleFilter extends TimerTask implements Filter {
         if (ix < 0 || ix == path.length() - 1)\r
             return -2;\r
         try {\r
-            int feedid = Integer.parseInt(path.substring(0, ix));\r
-            return feedid;\r
+            return Integer.parseInt(path.substring(0, ix));\r
         } catch (NumberFormatException e) {\r
             return -1;\r
         }\r