[DMAAP-DR] Remove AAF/TLS phase 1

[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 f0f1067..e117d36 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
@@ -102,9 +102,9 @@ public class ThrottleFilter extends TimerTask implements Filter {
     private static int samplingPeriod = 0;            // sampling period\r
     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 final EELFLogger logger = EELFManager.getInstance().getLogger("InternalLog");\r
     private static Map<String, Counter> map = new HashMap<>();\r
-    private Map<String, List<Continuation>> suspendedRequests = new HashMap<>();\r
+    private final Map<String, List<Continuation>> suspendedRequests = new HashMap<>();\r
     private static final Timer rolex = new Timer();\r
 \r
     @Override\r
@@ -213,7 +213,7 @@ public class ThrottleFilter extends TimerTask implements Filter {
             String str = String.format("Throttling connection: %s %d bad connections in %d minutes",\r
                 getConnectionId(request), rate, samplingPeriod);\r
             logger.info(str);\r
-            Continuation continuation = ContinuationSupport.getContinuation(request);\r
+            Continuation continuation = ContinuationSupport.getContinuation((javax.servlet.ServletRequest) request);\r
             continuation.suspend();\r
             register(id, continuation);\r
             continuation.undispatch();\r
@@ -232,11 +232,7 @@ public class ThrottleFilter extends TimerTask implements Filter {
 \r
     private void register(String id, Continuation continuation) {\r
         synchronized (suspendedRequests) {\r
-            List<Continuation> list = suspendedRequests.get(id);\r
-            if (list == null) {\r
-                list = new ArrayList<>();\r
-                suspendedRequests.put(id, list);\r
-            }\r
+            List<Continuation> list = suspendedRequests.computeIfAbsent(id, k -> new ArrayList<>());\r
             list.add(continuation);\r
         }\r
     }\r
@@ -277,8 +273,8 @@ public class ThrottleFilter extends TimerTask implements Filter {
         }\r
     }\r
 \r
-    public class Counter {\r
-        private List<Long> times = new ArrayList<>();    // a record of request times\r
+    public static class Counter {\r
+        private final List<Long> times = new ArrayList<>();    // a record of request times\r
 \r
         /**\r
          * Method to prune request rate.\r