Created a new simplified API for creating policies
[policy/api.git] / main / src / main / java / org / onap / policy / api / main / rest / ApiRestController.java
index 2431542..67baa8a 100644 (file)
@@ -48,13 +48,15 @@ import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;\r
 import javax.ws.rs.Produces;\r
 import javax.ws.rs.core.Response;\r
-import javax.ws.rs.core.Response.ResponseBuilder;\r
 import org.apache.commons.lang3.tuple.Pair;\r
 import org.onap.policy.api.main.rest.provider.HealthCheckProvider;\r
 import org.onap.policy.api.main.rest.provider.PolicyProvider;\r
 import org.onap.policy.api.main.rest.provider.PolicyTypeProvider;\r
 import org.onap.policy.api.main.rest.provider.StatisticsProvider;\r
+import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure;\r
 import org.onap.policy.common.endpoints.report.HealthCheckReport;\r
+import org.onap.policy.common.endpoints.utils.NetLoggerUtil;\r
+import org.onap.policy.common.endpoints.utils.NetLoggerUtil.EventType;\r
 import org.onap.policy.models.base.PfModelException;\r
 import org.onap.policy.models.base.PfModelRuntimeException;\r
 import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;\r
@@ -89,7 +91,7 @@ import org.slf4j.LoggerFactory;
         }),\r
         schemes = { SwaggerDefinition.Scheme.HTTP, SwaggerDefinition.Scheme.HTTPS },\r
         securityDefinition = @SecurityDefinition(basicAuthDefinitions = { @BasicAuthDefinition(key = "basicAuth") }))\r
-public class ApiRestController {\r
+public class ApiRestController extends CommonRestController {\r
 \r
     private static final Logger LOGGER = LoggerFactory.getLogger(ApiRestController.class);\r
 \r
@@ -137,8 +139,7 @@ public class ApiRestController {
             @HeaderParam("X-ONAP-RequestID") @ApiParam("RequestID for http transaction") UUID requestId) {\r
 \r
         updateApiStatisticsCounter(Target.OTHER, Result.SUCCESS, HttpMethod.GET);\r
-        return addLoggingHeaders(addVersionControlHeaders(Response.status(Response.Status.OK)), requestId)\r
-            .entity(new HealthCheckProvider().performHealthCheck()).build();\r
+        return makeOkResponse(requestId, new HealthCheckProvider().performHealthCheck());\r
     }\r
 \r
     /**\r
@@ -185,8 +186,8 @@ public class ApiRestController {
             @HeaderParam("X-ONAP-RequestID") @ApiParam("RequestID for http transaction") UUID requestId) {\r
 \r
         updateApiStatisticsCounter(Target.OTHER, Result.SUCCESS, HttpMethod.GET);\r
-        return addLoggingHeaders(addVersionControlHeaders(Response.status(Response.Status.OK)), requestId)\r
-            .entity(new StatisticsProvider().fetchCurrentStatistics()).build();\r
+\r
+        return makeOkResponse(requestId, new StatisticsProvider().fetchCurrentStatistics());\r
     }\r
 \r
     /**\r
@@ -235,14 +236,11 @@ public class ApiRestController {
         try (PolicyTypeProvider policyTypeProvider = new PolicyTypeProvider()) {\r
             ToscaServiceTemplate serviceTemplate = policyTypeProvider.fetchPolicyTypes(null, null);\r
             updateApiStatisticsCounter(Target.POLICY_TYPE, Result.SUCCESS, HttpMethod.GET);\r
-            return addLoggingHeaders(addVersionControlHeaders(Response.status(Response.Status.OK)), requestId)\r
-                    .entity(serviceTemplate).build();\r
+            return makeOkResponse(requestId, serviceTemplate);\r
         } catch (PfModelException | PfModelRuntimeException pfme) {\r
             LOGGER.error("GET /policytypes", pfme);\r
             updateApiStatisticsCounter(Target.POLICY_TYPE, Result.FAILURE, HttpMethod.GET);\r
-            return addLoggingHeaders(addVersionControlHeaders(\r
-                    Response.status(pfme.getErrorResponse().getResponseCode())), requestId)\r
-                    .entity(pfme.getErrorResponse()).build();\r
+            return makeErrorResponse(requestId, pfme);\r
         }\r
     }\r
 \r
@@ -296,14 +294,11 @@ public class ApiRestController {
         try (PolicyTypeProvider policyTypeProvider = new PolicyTypeProvider()) {\r
             ToscaServiceTemplate serviceTemplate = policyTypeProvider.fetchPolicyTypes(policyTypeId, null);\r
             updateApiStatisticsCounter(Target.POLICY_TYPE, Result.SUCCESS, HttpMethod.GET);\r
-            return addLoggingHeaders(addVersionControlHeaders(Response.status(Response.Status.OK)), requestId)\r
-                    .entity(serviceTemplate).build();\r
+            return makeOkResponse(requestId, serviceTemplate);\r
         } catch (PfModelException | PfModelRuntimeException pfme) {\r
             LOGGER.error("GET /policytypes/{}", policyTypeId, pfme);\r
             updateApiStatisticsCounter(Target.POLICY_TYPE, Result.FAILURE, HttpMethod.GET);\r
-            return addLoggingHeaders(addVersionControlHeaders(\r
-                    Response.status(pfme.getErrorResponse().getResponseCode())), requestId)\r
-                    .entity(pfme.getErrorResponse()).build();\r
+            return makeErrorResponse(requestId, pfme);\r
         }\r
     }\r
 \r
@@ -359,14 +354,11 @@ public class ApiRestController {
         try (PolicyTypeProvider policyTypeProvider = new PolicyTypeProvider()) {\r
             ToscaServiceTemplate serviceTemplate = policyTypeProvider.fetchPolicyTypes(policyTypeId, versionId);\r
             updateApiStatisticsCounter(Target.POLICY_TYPE, Result.SUCCESS, HttpMethod.GET);\r
-            return addLoggingHeaders(addVersionControlHeaders(Response.status(Response.Status.OK)), requestId)\r
-                    .entity(serviceTemplate).build();\r
+            return makeOkResponse(requestId, serviceTemplate);\r
         } catch (PfModelException | PfModelRuntimeException pfme) {\r
             LOGGER.error("GET /policytypes/{}/versions/{}", policyTypeId, versionId, pfme);\r
             updateApiStatisticsCounter(Target.POLICY_TYPE, Result.FAILURE, HttpMethod.GET);\r
-            return addLoggingHeaders(addVersionControlHeaders(\r
-                    Response.status(pfme.getErrorResponse().getResponseCode())), requestId)\r
-                    .entity(pfme.getErrorResponse()).build();\r
+            return makeErrorResponse(requestId, pfme);\r
         }\r
     }\r
 \r
@@ -420,14 +412,11 @@ public class ApiRestController {
         try (PolicyTypeProvider policyTypeProvider = new PolicyTypeProvider()) {\r
             ToscaServiceTemplate serviceTemplate = policyTypeProvider.fetchLatestPolicyTypes(policyTypeId);\r
             updateApiStatisticsCounter(Target.POLICY_TYPE, Result.SUCCESS, HttpMethod.GET);\r
-            return addLoggingHeaders(addVersionControlHeaders(Response.status(Response.Status.OK)), requestId)\r
-                    .entity(serviceTemplate).build();\r
+            return makeOkResponse(requestId, serviceTemplate);\r
         } catch (PfModelException | PfModelRuntimeException pfme) {\r
             LOGGER.error("GET /policytypes/{}/versions/latest", policyTypeId, pfme);\r
             updateApiStatisticsCounter(Target.POLICY_TYPE, Result.FAILURE, HttpMethod.GET);\r
-            return addLoggingHeaders(addVersionControlHeaders(\r
-                    Response.status(pfme.getErrorResponse().getResponseCode())), requestId)\r
-                    .entity(pfme.getErrorResponse()).build();\r
+            return makeErrorResponse(requestId, pfme);\r
         }\r
     }\r
 \r
@@ -478,17 +467,18 @@ public class ApiRestController {
             @ApiParam(value = "Entity body of policy type", required = true) ToscaServiceTemplate body,\r
             @HeaderParam("X-ONAP-RequestID") @ApiParam("RequestID for http transaction") UUID requestId) {\r
 \r
+        if (NetLoggerUtil.getNetworkLogger().isInfoEnabled()) {\r
+            NetLoggerUtil.log(EventType.IN, CommInfrastructure.REST, "/policytypes", toJson(body));\r
+        }\r
+\r
         try (PolicyTypeProvider policyTypeProvider = new PolicyTypeProvider()) {\r
             ToscaServiceTemplate serviceTemplate = policyTypeProvider.createPolicyType(body);\r
             updateApiStatisticsCounter(Target.POLICY_TYPE, Result.SUCCESS, HttpMethod.POST);\r
-            return addLoggingHeaders(addVersionControlHeaders(Response.status(Response.Status.OK)), requestId)\r
-                    .entity(serviceTemplate).build();\r
+            return makeOkResponse(requestId, serviceTemplate);\r
         } catch (PfModelException | PfModelRuntimeException pfme) {\r
             LOGGER.error("POST /policytypes", pfme);\r
             updateApiStatisticsCounter(Target.POLICY_TYPE, Result.FAILURE, HttpMethod.POST);\r
-            return addLoggingHeaders(addVersionControlHeaders(\r
-                    Response.status(pfme.getErrorResponse().getResponseCode())), requestId)\r
-                    .entity(pfme.getErrorResponse()).build();\r
+            return makeErrorResponse(requestId, pfme);\r
         }\r
     }\r
 \r
@@ -546,13 +536,10 @@ public class ApiRestController {
 \r
         try (PolicyTypeProvider policyTypeProvider = new PolicyTypeProvider()) {\r
             ToscaServiceTemplate serviceTemplate = policyTypeProvider.deletePolicyType(policyTypeId, versionId);\r
-            return addLoggingHeaders(addVersionControlHeaders(Response.status(Response.Status.OK)), requestId)\r
-                    .entity(serviceTemplate).build();\r
+            return makeOkResponse(requestId, serviceTemplate);\r
         } catch (PfModelException | PfModelRuntimeException pfme) {\r
             LOGGER.error("DELETE /policytypes/{}/versions/{}", policyTypeId, versionId, pfme);\r
-            return addLoggingHeaders(addVersionControlHeaders(\r
-                    Response.status(pfme.getErrorResponse().getResponseCode())), requestId)\r
-                    .entity(pfme.getErrorResponse()).build();\r
+            return makeErrorResponse(requestId, pfme);\r
         }\r
     }\r
 \r
@@ -610,14 +597,11 @@ public class ApiRestController {
             ToscaServiceTemplate serviceTemplate =\r
                     policyProvider.fetchPolicies(policyTypeId, policyTypeVersion, null, null);\r
             updateApiStatisticsCounter(Target.POLICY, Result.SUCCESS, HttpMethod.GET);\r
-            return addLoggingHeaders(addVersionControlHeaders(Response.status(Response.Status.OK)), requestId)\r
-                    .entity(serviceTemplate).build();\r
+            return makeOkResponse(requestId, serviceTemplate);\r
         } catch (PfModelException | PfModelRuntimeException pfme) {\r
             LOGGER.error("GET /policytypes/{}/versions/{}/policies", policyTypeId, policyTypeVersion, pfme);\r
             updateApiStatisticsCounter(Target.POLICY, Result.FAILURE, HttpMethod.GET);\r
-            return addLoggingHeaders(addVersionControlHeaders(\r
-                    Response.status(pfme.getErrorResponse().getResponseCode())), requestId)\r
-                    .entity(pfme.getErrorResponse()).build();\r
+            return makeErrorResponse(requestId, pfme);\r
         }\r
     }\r
 \r
@@ -677,15 +661,12 @@ public class ApiRestController {
             ToscaServiceTemplate serviceTemplate = policyProvider\r
                     .fetchPolicies(policyTypeId, policyTypeVersion, policyId, null);\r
             updateApiStatisticsCounter(Target.POLICY, Result.SUCCESS, HttpMethod.GET);\r
-            return addLoggingHeaders(addVersionControlHeaders(Response.status(Response.Status.OK)), requestId)\r
-                    .entity(serviceTemplate).build();\r
+            return makeOkResponse(requestId, serviceTemplate);\r
         } catch (PfModelException | PfModelRuntimeException pfme) {\r
             LOGGER.error("/policytypes/{}/versions/{}/policies/{}", policyTypeId, policyTypeVersion, policyId,\r
                     pfme);\r
             updateApiStatisticsCounter(Target.POLICY, Result.FAILURE, HttpMethod.GET);\r
-            return addLoggingHeaders(addVersionControlHeaders(\r
-                    Response.status(pfme.getErrorResponse().getResponseCode())), requestId)\r
-                    .entity(pfme.getErrorResponse()).build();\r
+            return makeErrorResponse(requestId, pfme);\r
         }\r
     }\r
 \r
@@ -747,15 +728,12 @@ public class ApiRestController {
             ToscaServiceTemplate serviceTemplate = policyProvider\r
                     .fetchPolicies(policyTypeId, policyTypeVersion, policyId, policyVersion);\r
             updateApiStatisticsCounter(Target.POLICY, Result.SUCCESS, HttpMethod.GET);\r
-            return addLoggingHeaders(addVersionControlHeaders(Response.status(Response.Status.OK)), requestId)\r
-                    .entity(serviceTemplate).build();\r
+            return makeOkResponse(requestId, serviceTemplate);\r
         } catch (PfModelException | PfModelRuntimeException pfme) {\r
             LOGGER.error("GET /policytypes/{}/versions/{}/policies/{}/versions/{}", policyTypeId,\r
                     policyTypeVersion, policyId, policyVersion, pfme);\r
             updateApiStatisticsCounter(Target.POLICY, Result.FAILURE, HttpMethod.GET);\r
-            return addLoggingHeaders(addVersionControlHeaders(\r
-                    Response.status(pfme.getErrorResponse().getResponseCode())), requestId)\r
-                    .entity(pfme.getErrorResponse()).build();\r
+            return makeErrorResponse(requestId, pfme);\r
         }\r
     }\r
 \r
@@ -815,20 +793,17 @@ public class ApiRestController {
             ToscaServiceTemplate serviceTemplate =\r
                     policyProvider.fetchLatestPolicies(policyTypeId, policyTypeVersion, policyId);\r
             updateApiStatisticsCounter(Target.POLICY, Result.SUCCESS, HttpMethod.GET);\r
-            return addLoggingHeaders(addVersionControlHeaders(Response.status(Response.Status.OK)), requestId)\r
-                    .entity(serviceTemplate).build();\r
+            return makeOkResponse(requestId, serviceTemplate);\r
         } catch (PfModelException | PfModelRuntimeException pfme) {\r
             LOGGER.error("GET /policytypes/{}/versions/{}/policies/{}/versions/latest", policyTypeId,\r
                     policyTypeVersion, policyId, pfme);\r
             updateApiStatisticsCounter(Target.POLICY, Result.FAILURE, HttpMethod.GET);\r
-            return addLoggingHeaders(addVersionControlHeaders(\r
-                    Response.status(pfme.getErrorResponse().getResponseCode())), requestId)\r
-                    .entity(pfme.getErrorResponse()).build();\r
+            return makeErrorResponse(requestId, pfme);\r
         }\r
     }\r
 \r
     /**\r
-     * Retrieves deployed versions of a particular policy in pdp groups.\r
+     * Retrieves deployed versions of a particular policy in PDP groups.\r
      *\r
      * @param policyTypeId the ID of specified policy type\r
      * @param policyTypeVersion the version of specified policy type\r
@@ -883,15 +858,12 @@ public class ApiRestController {
             Map<Pair<String, String>, List<ToscaPolicy>> deployedPolicies = policyProvider\r
                     .fetchDeployedPolicies(policyTypeId, policyTypeVersion, policyId);\r
             updateApiStatisticsCounter(Target.POLICY, Result.SUCCESS, HttpMethod.GET);\r
-            return addLoggingHeaders(addVersionControlHeaders(Response.status(Response.Status.OK)), requestId)\r
-                    .entity(deployedPolicies).build();\r
+            return makeOkResponse(requestId, deployedPolicies);\r
         } catch (PfModelException | PfModelRuntimeException pfme) {\r
             LOGGER.error("GET /policytypes/{}/versions/{}/policies/{}/versions/deployed", policyTypeId,\r
                     policyTypeVersion, policyId, pfme);\r
             updateApiStatisticsCounter(Target.POLICY, Result.FAILURE, HttpMethod.GET);\r
-            return addLoggingHeaders(addVersionControlHeaders(\r
-                    Response.status(pfme.getErrorResponse().getResponseCode())), requestId)\r
-                    .entity(pfme.getErrorResponse()).build();\r
+            return makeErrorResponse(requestId, pfme);\r
         }\r
     }\r
 \r
@@ -948,18 +920,84 @@ public class ApiRestController {
             @HeaderParam("X-ONAP-RequestID") @ApiParam("RequestID for http transaction") UUID requestId,\r
             @ApiParam(value = "Entity body of policy", required = true) ToscaServiceTemplate body) {\r
 \r
+        if (NetLoggerUtil.getNetworkLogger().isInfoEnabled()) {\r
+            NetLoggerUtil.log(EventType.IN, CommInfrastructure.REST,\r
+                            "/policytypes/" + policyTypeId + "/versions/" + policyTypeVersion + "/policies",\r
+                            toJson(body));\r
+        }\r
+\r
         try (PolicyProvider policyProvider = new PolicyProvider()) {\r
             ToscaServiceTemplate serviceTemplate = policyProvider\r
                     .createPolicy(policyTypeId, policyTypeVersion, body);\r
             updateApiStatisticsCounter(Target.POLICY, Result.SUCCESS, HttpMethod.POST);\r
-            return addLoggingHeaders(addVersionControlHeaders(Response.status(Response.Status.OK)), requestId)\r
-                    .entity(serviceTemplate).build();\r
+            return makeOkResponse(requestId, serviceTemplate);\r
         } catch (PfModelException | PfModelRuntimeException pfme) {\r
             LOGGER.error("POST /policytypes/{}/versions/{}/policies", policyTypeId, policyTypeVersion, pfme);\r
             updateApiStatisticsCounter(Target.POLICY, Result.FAILURE, HttpMethod.POST);\r
-            return addLoggingHeaders(addVersionControlHeaders(\r
-                    Response.status(pfme.getErrorResponse().getResponseCode())), requestId)\r
-                    .entity(pfme.getErrorResponse()).build();\r
+            return makeErrorResponse(requestId, pfme);\r
+        }\r
+    }\r
+\r
+    /**\r
+     * Creates one or more new policies in one call.\r
+     *\r
+     * @param body the body of policy following TOSCA definition\r
+     *\r
+     * @return the Response object containing the results of the API operation\r
+     */\r
+    @POST\r
+    @Path("/policies")\r
+    @ApiOperation(value = "Create one or more new policies",\r
+            notes = "Client should provide TOSCA body of the new polic(ies)",\r
+            authorizations = @Authorization(value = "basicAuth"),\r
+            tags = { "Policy", },\r
+            response = ToscaServiceTemplate.class,\r
+            responseHeaders = {\r
+                    @ResponseHeader(name = "X-MinorVersion",\r
+                                    description = "Used to request or communicate a MINOR version back from the client"\r
+                                                + " to the server, and from the server back to the client",\r
+                                    response = String.class),\r
+                    @ResponseHeader(name = "X-PatchVersion",\r
+                                    description = "Used only to communicate a PATCH version in a response for"\r
+                                                + " troubleshooting purposes only, and will not be provided by"\r
+                                                + " the client on request",\r
+                                    response = String.class),\r
+                    @ResponseHeader(name = "X-LatestVersion",\r
+                                    description = "Used only to communicate an API's latest version",\r
+                                    response = String.class),\r
+                    @ResponseHeader(name = "X-ONAP-RequestID",\r
+                                    description = "Used to track REST transactions for logging purpose",\r
+                                    response = UUID.class)\r
+            },\r
+            extensions = {\r
+                    @Extension(name = "interface info", properties = {\r
+                            @ExtensionProperty(name = "api-version", value = "1.0.0"),\r
+                            @ExtensionProperty(name = "last-mod-release", value = "El Alto")\r
+                    })\r
+            })\r
+    @ApiResponses(value = {\r
+            @ApiResponse(code = 400, message = "Invalid Body"),\r
+            @ApiResponse(code = 401, message = "Authentication Error"),\r
+            @ApiResponse(code = 403, message = "Authorization Error"),\r
+            @ApiResponse(code = 404, message = "Resource Not Found"),\r
+            @ApiResponse(code = 500, message = "Internal Server Error")\r
+        })\r
+    public Response createPolicies(\r
+            @HeaderParam("X-ONAP-RequestID") @ApiParam("RequestID for http transaction") UUID requestId,\r
+            @ApiParam(value = "Entity body of policy", required = true) ToscaServiceTemplate body) {\r
+\r
+        if (NetLoggerUtil.getNetworkLogger().isInfoEnabled()) {\r
+            NetLoggerUtil.log(EventType.IN, CommInfrastructure.REST, "/policies", toJson(body));\r
+        }\r
+\r
+        try (PolicyProvider policyProvider = new PolicyProvider()) {\r
+            ToscaServiceTemplate serviceTemplate = policyProvider.createPolicies(body);\r
+            updateApiStatisticsCounter(Target.POLICY, Result.SUCCESS, HttpMethod.POST);\r
+            return makeOkResponse(requestId, serviceTemplate);\r
+        } catch (PfModelException | PfModelRuntimeException pfme) {\r
+            LOGGER.error("POST /policies", pfme);\r
+            updateApiStatisticsCounter(Target.POLICY, Result.FAILURE, HttpMethod.POST);\r
+            return makeErrorResponse(requestId, pfme);\r
         }\r
     }\r
 \r
@@ -1021,29 +1059,14 @@ public class ApiRestController {
         try (PolicyProvider policyProvider = new PolicyProvider()) {\r
             ToscaServiceTemplate serviceTemplate = policyProvider\r
                     .deletePolicy(policyTypeId, policyTypeVersion, policyId, policyVersion);\r
-            return addLoggingHeaders(addVersionControlHeaders(Response.status(Response.Status.OK)), requestId)\r
-                    .entity(serviceTemplate).build();\r
+            return makeOkResponse(requestId, serviceTemplate);\r
         } catch (PfModelException | PfModelRuntimeException pfme) {\r
             LOGGER.error("DELETE /policytypes/{}/versions/{}/policies/{}/versions/{}", policyTypeId,\r
                     policyTypeVersion, policyId, policyVersion, pfme);\r
-            return addLoggingHeaders(addVersionControlHeaders(\r
-                    Response.status(pfme.getErrorResponse().getResponseCode())), requestId)\r
-                    .entity(pfme.getErrorResponse()).build();\r
+            return makeErrorResponse(requestId, pfme);\r
         }\r
     }\r
 \r
-    private ResponseBuilder addVersionControlHeaders(ResponseBuilder rb) {\r
-        return rb.header("X-MinorVersion", "0").header("X-PatchVersion", "0").header("X-LatestVersion", "1.0.0");\r
-    }\r
-\r
-    private ResponseBuilder addLoggingHeaders(ResponseBuilder rb, UUID requestId) {\r
-        if (requestId == null) {\r
-            // Generate a random uuid if client does not embed requestId in rest request\r
-            return rb.header("X-ONAP-RequestID", UUID.randomUUID());\r
-        }\r
-        return rb.header("X-ONAP-RequestID", requestId);\r
-    }\r
-\r
     private enum Target {\r
         POLICY, POLICY_TYPE, OTHER\r
     }\r
@@ -1059,52 +1082,65 @@ public class ApiRestController {
     private void updateApiStatisticsCounter(Target target, Result result, HttpMethod http) {\r
 \r
         ApiStatisticsManager.updateTotalApiCallCount();\r
-        if (target == Target.POLICY) {\r
-            if (result == Result.SUCCESS) {\r
-                if (http == HttpMethod.GET) {\r
-                    ApiStatisticsManager.updateApiCallSuccessCount();\r
-                    ApiStatisticsManager.updateTotalPolicyGetCount();\r
-                    ApiStatisticsManager.updatePolicyGetSuccessCount();\r
-                } else if (http == HttpMethod.POST) {\r
-                    ApiStatisticsManager.updateApiCallSuccessCount();\r
-                    ApiStatisticsManager.updateTotalPolicyPostCount();\r
-                    ApiStatisticsManager.updatePolicyPostSuccessCount();\r
-                }\r
-            } else {\r
-                if (http == HttpMethod.GET) {\r
-                    ApiStatisticsManager.updateApiCallFailureCount();\r
-                    ApiStatisticsManager.updateTotalPolicyGetCount();\r
-                    ApiStatisticsManager.updatePolicyGetFailureCount();\r
-                } else {\r
-                    ApiStatisticsManager.updateApiCallFailureCount();\r
-                    ApiStatisticsManager.updateTotalPolicyPostCount();\r
-                    ApiStatisticsManager.updatePolicyPostFailureCount();\r
-                }\r
+\r
+        switch (target) {\r
+            case POLICY:\r
+                updatePolicyStats(result, http);\r
+                break;\r
+            case POLICY_TYPE:\r
+                updatePolicyTypeStats(result, http);\r
+                break;\r
+            default:\r
+                ApiStatisticsManager.updateApiCallSuccessCount();\r
+                break;\r
+        }\r
+    }\r
+\r
+    private void updatePolicyStats(Result result, HttpMethod http) {\r
+        if (result == Result.SUCCESS) {\r
+            if (http == HttpMethod.GET) {\r
+                ApiStatisticsManager.updateApiCallSuccessCount();\r
+                ApiStatisticsManager.updateTotalPolicyGetCount();\r
+                ApiStatisticsManager.updatePolicyGetSuccessCount();\r
+            } else if (http == HttpMethod.POST) {\r
+                ApiStatisticsManager.updateApiCallSuccessCount();\r
+                ApiStatisticsManager.updateTotalPolicyPostCount();\r
+                ApiStatisticsManager.updatePolicyPostSuccessCount();\r
             }\r
-        } else if (target == Target.POLICY_TYPE) {\r
-            if (result == Result.SUCCESS) {\r
-                if (http == HttpMethod.GET) {\r
-                    ApiStatisticsManager.updateApiCallSuccessCount();\r
-                    ApiStatisticsManager.updateTotalPolicyTypeGetCount();\r
-                    ApiStatisticsManager.updatePolicyTypeGetSuccessCount();\r
-                } else if (http == HttpMethod.POST) {\r
-                    ApiStatisticsManager.updateApiCallSuccessCount();\r
-                    ApiStatisticsManager.updatePolicyTypePostSuccessCount();\r
-                    ApiStatisticsManager.updatePolicyTypePostSuccessCount();\r
-                }\r
+        } else {\r
+            if (http == HttpMethod.GET) {\r
+                ApiStatisticsManager.updateApiCallFailureCount();\r
+                ApiStatisticsManager.updateTotalPolicyGetCount();\r
+                ApiStatisticsManager.updatePolicyGetFailureCount();\r
             } else {\r
-                if (http == HttpMethod.GET) {\r
-                    ApiStatisticsManager.updateApiCallFailureCount();\r
-                    ApiStatisticsManager.updateTotalPolicyTypeGetCount();\r
-                    ApiStatisticsManager.updatePolicyTypeGetFailureCount();\r
-                } else {\r
-                    ApiStatisticsManager.updateApiCallFailureCount();\r
-                    ApiStatisticsManager.updateTotalPolicyTypePostCount();\r
-                    ApiStatisticsManager.updatePolicyTypePostFailureCount();\r
-                }\r
+                ApiStatisticsManager.updateApiCallFailureCount();\r
+                ApiStatisticsManager.updateTotalPolicyPostCount();\r
+                ApiStatisticsManager.updatePolicyPostFailureCount();\r
+            }\r
+        }\r
+    }\r
+\r
+    private void updatePolicyTypeStats(Result result, HttpMethod http) {\r
+        if (result == Result.SUCCESS) {\r
+            if (http == HttpMethod.GET) {\r
+                ApiStatisticsManager.updateApiCallSuccessCount();\r
+                ApiStatisticsManager.updateTotalPolicyTypeGetCount();\r
+                ApiStatisticsManager.updatePolicyTypeGetSuccessCount();\r
+            } else if (http == HttpMethod.POST) {\r
+                ApiStatisticsManager.updateApiCallSuccessCount();\r
+                ApiStatisticsManager.updatePolicyTypePostSuccessCount();\r
+                ApiStatisticsManager.updatePolicyTypePostSuccessCount();\r
             }\r
         } else {\r
-            ApiStatisticsManager.updateApiCallSuccessCount();\r
+            if (http == HttpMethod.GET) {\r
+                ApiStatisticsManager.updateApiCallFailureCount();\r
+                ApiStatisticsManager.updateTotalPolicyTypeGetCount();\r
+                ApiStatisticsManager.updatePolicyTypeGetFailureCount();\r
+            } else {\r
+                ApiStatisticsManager.updateApiCallFailureCount();\r
+                ApiStatisticsManager.updateTotalPolicyTypePostCount();\r
+                ApiStatisticsManager.updatePolicyTypePostFailureCount();\r
+            }\r
         }\r
     }\r
 }
\ No newline at end of file