Use singleton for api statistics

[policy/api.git] / main / src / main / java / org / onap / policy / api / main / rest / ApiRestController.java

diff --git a/main/src/main/java/org/onap/policy/api/main/rest/ApiRestController.java b/main/src/main/java/org/onap/policy/api/main/rest/ApiRestController.java
index 5e84508..eb60c5e 100644 (file)
--- a/main/src/main/java/org/onap/policy/api/main/rest/ApiRestController.java
+++ b/main/src/main/java/org/onap/policy/api/main/rest/ApiRestController.java
@@ -1093,7 +1093,8 @@ public class ApiRestController extends CommonRestController {
 \r
     private void updateApiStatisticsCounter(Target target, Result result, HttpMethod http) {\r
 \r
-        ApiStatisticsManager.updateTotalApiCallCount();\r
+        var mgr = ApiStatisticsManager.getInstance();\r
+        mgr.updateTotalApiCallCount();\r
 \r
         switch (target) {\r
             case POLICY:\r
@@ -1103,98 +1104,102 @@ public class ApiRestController extends CommonRestController {
                 updatePolicyTypeStats(result, http);\r
                 break;\r
             default:\r
-                ApiStatisticsManager.updateApiCallSuccessCount();\r
+                mgr.updateApiCallSuccessCount();\r
                 break;\r
         }\r
     }\r
 \r
     private void updatePolicyStats(Result result, HttpMethod http) {\r
+        var mgr = ApiStatisticsManager.getInstance();\r
+\r
         if (result == Result.SUCCESS) {\r
             switch (http) {\r
                 case GET:\r
-                    ApiStatisticsManager.updateApiCallSuccessCount();\r
-                    ApiStatisticsManager.updateTotalPolicyGetCount();\r
-                    ApiStatisticsManager.updatePolicyGetSuccessCount();\r
+                    mgr.updateApiCallSuccessCount();\r
+                    mgr.updateTotalPolicyGetCount();\r
+                    mgr.updatePolicyGetSuccessCount();\r
                     break;\r
                 case POST:\r
-                    ApiStatisticsManager.updateApiCallSuccessCount();\r
-                    ApiStatisticsManager.updateTotalPolicyPostCount();\r
-                    ApiStatisticsManager.updatePolicyPostSuccessCount();\r
+                    mgr.updateApiCallSuccessCount();\r
+                    mgr.updateTotalPolicyPostCount();\r
+                    mgr.updatePolicyPostSuccessCount();\r
                     break;\r
                 case DELETE:\r
-                    ApiStatisticsManager.updateApiCallSuccessCount();\r
-                    ApiStatisticsManager.updateTotalPolicyDeleteCount();\r
-                    ApiStatisticsManager.updatePolicyDeleteSuccessCount();\r
+                    mgr.updateApiCallSuccessCount();\r
+                    mgr.updateTotalPolicyDeleteCount();\r
+                    mgr.updatePolicyDeleteSuccessCount();\r
                     break;\r
                 default:\r
-                    ApiStatisticsManager.updateApiCallSuccessCount();\r
+                    mgr.updateApiCallSuccessCount();\r
                     break;\r
             }\r
         } else {\r
             switch (http) {\r
                 case GET:\r
-                    ApiStatisticsManager.updateApiCallFailureCount();\r
-                    ApiStatisticsManager.updateTotalPolicyGetCount();\r
-                    ApiStatisticsManager.updatePolicyGetFailureCount();\r
+                    mgr.updateApiCallFailureCount();\r
+                    mgr.updateTotalPolicyGetCount();\r
+                    mgr.updatePolicyGetFailureCount();\r
                     break;\r
                 case POST:\r
-                    ApiStatisticsManager.updateApiCallFailureCount();\r
-                    ApiStatisticsManager.updateTotalPolicyPostCount();\r
-                    ApiStatisticsManager.updatePolicyPostFailureCount();\r
+                    mgr.updateApiCallFailureCount();\r
+                    mgr.updateTotalPolicyPostCount();\r
+                    mgr.updatePolicyPostFailureCount();\r
                     break;\r
                 case DELETE:\r
-                    ApiStatisticsManager.updateApiCallFailureCount();\r
-                    ApiStatisticsManager.updateTotalPolicyDeleteCount();\r
-                    ApiStatisticsManager.updatePolicyDeleteFailureCount();\r
+                    mgr.updateApiCallFailureCount();\r
+                    mgr.updateTotalPolicyDeleteCount();\r
+                    mgr.updatePolicyDeleteFailureCount();\r
                     break;\r
                 default:\r
-                    ApiStatisticsManager.updateApiCallFailureCount();\r
+                    mgr.updateApiCallFailureCount();\r
                     break;\r
             }\r
         }\r
     }\r
 \r
     private void updatePolicyTypeStats(Result result, HttpMethod http) {\r
+        var mgr = ApiStatisticsManager.getInstance();\r
+\r
         if (result == Result.SUCCESS) {\r
             switch (http) {\r
                 case GET:\r
-                    ApiStatisticsManager.updateApiCallSuccessCount();\r
-                    ApiStatisticsManager.updateTotalPolicyTypeGetCount();\r
-                    ApiStatisticsManager.updatePolicyTypeGetSuccessCount();\r
+                    mgr.updateApiCallSuccessCount();\r
+                    mgr.updateTotalPolicyTypeGetCount();\r
+                    mgr.updatePolicyTypeGetSuccessCount();\r
                     break;\r
                 case POST:\r
-                    ApiStatisticsManager.updateApiCallSuccessCount();\r
-                    ApiStatisticsManager.updateTotalPolicyTypePostCount();\r
-                    ApiStatisticsManager.updatePolicyTypePostSuccessCount();\r
+                    mgr.updateApiCallSuccessCount();\r
+                    mgr.updateTotalPolicyTypePostCount();\r
+                    mgr.updatePolicyTypePostSuccessCount();\r
                     break;\r
                 case DELETE:\r
-                    ApiStatisticsManager.updateApiCallSuccessCount();\r
-                    ApiStatisticsManager.updateTotalPolicyTypeDeleteCount();\r
-                    ApiStatisticsManager.updatePolicyTypeDeleteSuccessCount();\r
+                    mgr.updateApiCallSuccessCount();\r
+                    mgr.updateTotalPolicyTypeDeleteCount();\r
+                    mgr.updatePolicyTypeDeleteSuccessCount();\r
                     break;\r
                 default:\r
-                    ApiStatisticsManager.updateApiCallSuccessCount();\r
+                    mgr.updateApiCallSuccessCount();\r
                     break;\r
             }\r
         } else {\r
             switch (http) {\r
                 case GET:\r
-                    ApiStatisticsManager.updateApiCallFailureCount();\r
-                    ApiStatisticsManager.updateTotalPolicyTypeGetCount();\r
-                    ApiStatisticsManager.updatePolicyTypeGetFailureCount();\r
+                    mgr.updateApiCallFailureCount();\r
+                    mgr.updateTotalPolicyTypeGetCount();\r
+                    mgr.updatePolicyTypeGetFailureCount();\r
                     break;\r
                 case POST:\r
-                    ApiStatisticsManager.updateApiCallFailureCount();\r
-                    ApiStatisticsManager.updateTotalPolicyTypePostCount();\r
-                    ApiStatisticsManager.updatePolicyTypePostFailureCount();\r
+                    mgr.updateApiCallFailureCount();\r
+                    mgr.updateTotalPolicyTypePostCount();\r
+                    mgr.updatePolicyTypePostFailureCount();\r
                     break;\r
                 case DELETE:\r
-                    ApiStatisticsManager.updateApiCallFailureCount();\r
-                    ApiStatisticsManager.updateTotalPolicyTypeDeleteCount();\r
-                    ApiStatisticsManager.updatePolicyTypeDeleteFailureCount();\r
+                    mgr.updateApiCallFailureCount();\r
+                    mgr.updateTotalPolicyTypeDeleteCount();\r
+                    mgr.updatePolicyTypeDeleteFailureCount();\r
                     break;\r
                 default:\r
-                    ApiStatisticsManager.updateApiCallFailureCount();\r
+                    mgr.updateApiCallFailureCount();\r
                     break;\r
             }\r
         }\r