Use generated API interface for Swagger(2)

[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 e23604b..d440e1c 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
@@ -3,9 +3,9 @@
  * ONAP Policy API\r
  * ================================================================================\r
  * Copyright (C) 2018 Samsung Electronics Co., Ltd. All rights reserved.\r
- * Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.\r
- * Modifications Copyright (C) 2020 Nordix Foundation.\r
- * Modifications Copyright (C) 2020 Bell Canada.\r
+ * Modifications Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved.\r
+ * Modifications Copyright (C) 2020-2022 Nordix Foundation.\r
+ * Modifications Copyright (C) 2020-2022 Bell Canada. All rights reserved.\r
  * ================================================================================\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
@@ -25,38 +25,17 @@
 \r
 package org.onap.policy.api.main.rest;\r
 \r
-import io.swagger.annotations.Api;\r
-import io.swagger.annotations.ApiOperation;\r
-import io.swagger.annotations.ApiParam;\r
-import io.swagger.annotations.ApiResponse;\r
-import io.swagger.annotations.ApiResponses;\r
-import io.swagger.annotations.Authorization;\r
-import io.swagger.annotations.BasicAuthDefinition;\r
-import io.swagger.annotations.Extension;\r
-import io.swagger.annotations.ExtensionProperty;\r
-import io.swagger.annotations.Info;\r
-import io.swagger.annotations.ResponseHeader;\r
-import io.swagger.annotations.SecurityDefinition;\r
-import io.swagger.annotations.SwaggerDefinition;\r
-import java.net.HttpURLConnection;\r
 import java.util.List;\r
 import java.util.UUID;\r
-import javax.ws.rs.Consumes;\r
-import javax.ws.rs.DELETE;\r
-import javax.ws.rs.DefaultValue;\r
-import javax.ws.rs.GET;\r
-import javax.ws.rs.HeaderParam;\r
-import javax.ws.rs.POST;\r
-import javax.ws.rs.Path;\r
-import javax.ws.rs.PathParam;\r
-import javax.ws.rs.Produces;\r
-import javax.ws.rs.QueryParam;\r
-import javax.ws.rs.core.Response;\r
 import javax.ws.rs.core.Response.Status;\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 lombok.RequiredArgsConstructor;\r
+import org.onap.policy.api.main.exception.PolicyApiRuntimeException;\r
+import org.onap.policy.api.main.rest.genapi.PolicyDesignApi;\r
+import org.onap.policy.api.main.rest.provider.healthcheck.HealthCheckProvider;\r
+import org.onap.policy.api.main.rest.provider.statistics.ApiStatisticsManager;\r
+import org.onap.policy.api.main.rest.provider.statistics.StatisticsProvider;\r
+import org.onap.policy.api.main.rest.provider.statistics.StatisticsReport;\r
+import org.onap.policy.api.main.service.ToscaServiceTemplateService;\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
@@ -64,106 +43,41 @@ import org.onap.policy.common.endpoints.utils.NetLoggerUtil.EventType;
 import org.onap.policy.models.base.PfModelException;\r
 import org.onap.policy.models.base.PfModelRuntimeException;\r
 import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;\r
-import org.slf4j.Logger;\r
-import org.slf4j.LoggerFactory;\r
+import org.springframework.http.HttpMethod;\r
+import org.springframework.http.HttpStatus;\r
+import org.springframework.http.ResponseEntity;\r
+import org.springframework.web.bind.annotation.RestController;\r
 \r
 /**\r
  * Class to provide REST API services.\r
  *\r
  * @author Chenfei Gao (cgao@research.att.com)\r
  */\r
-@Path("/policy/api/v1")\r
-@Api(value = "Policy Design API")\r
-@Produces({"application/json", "application/yaml"})\r
-@Consumes({"application/json", "application/yaml"})\r
-@SwaggerDefinition(\r
-    info = @Info(\r
-        description = "Policy Design API is publicly exposed for clients to Create/Read/Update/Delete"\r
-            + " policy types, policy type implementation and policies which can be recognized"\r
-            + " and executable by incorporated policy engines. It is an"\r
-            + " independent component running rest service that takes all policy design API calls"\r
-            + " from clients and then assign them to different API working functions. Besides"\r
-            + " that, API is also exposed for clients to retrieve healthcheck status of this API"\r
-            + " rest service and the statistics report including the counters of API invocation.",\r
-        version = "1.0.0", title = "Policy Design",\r
-        extensions = {@Extension(properties = {@ExtensionProperty(name = "planned-retirement-date", value = "tbd"),\r
-            @ExtensionProperty(name = "component", value = "Policy Framework")})}),\r
-    schemes = {SwaggerDefinition.Scheme.HTTP, SwaggerDefinition.Scheme.HTTPS},\r
-    securityDefinition = @SecurityDefinition(basicAuthDefinitions = {@BasicAuthDefinition(key = "basicAuth")}))\r
-public class ApiRestController extends CommonRestController {\r
+@RestController\r
+@RequiredArgsConstructor\r
+public class ApiRestController extends CommonRestController implements PolicyDesignApi {\r
 \r
-    private static final Logger LOGGER = LoggerFactory.getLogger(ApiRestController.class);\r
-\r
-    private static final String ERROR_MESSAGE_NO_POLICIES_FOUND = "No policies found";\r
-\r
-    private static final String EXTENSION_NAME = "interface info";\r
-\r
-    private static final String API_VERSION_NAME = "api-version";\r
-    private static final String API_VERSION = "1.0.0";\r
-\r
-    private static final String LAST_MOD_NAME = "last-mod-release";\r
-\r
-    private static final String AUTHORIZATION_TYPE = "basicAuth";\r
-\r
-    private static final String VERSION_MINOR_NAME = "X-MinorVersion";\r
-    private static final String VERSION_MINOR_DESCRIPTION =\r
-        "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
-\r
-    private static final String VERSION_PATCH_NAME = "X-PatchVersion";\r
-    private static final String VERSION_PATCH_DESCRIPTION = "Used only to communicate a PATCH version in a response for"\r
-        + " troubleshooting purposes only, and will not be provided by" + " the client on request";\r
-\r
-    private static final String VERSION_LATEST_NAME = "X-LatestVersion";\r
-    private static final String VERSION_LATEST_DESCRIPTION = "Used only to communicate an API's latest version";\r
-\r
-    private static final String REQUEST_ID_NAME = "X-ONAP-RequestID";\r
-    private static final String REQUEST_ID_HDR_DESCRIPTION = "Used to track REST transactions for logging purpose";\r
-    private static final String REQUEST_ID_PARAM_DESCRIPTION = "RequestID for http transaction";\r
-\r
-    private static final String AUTHENTICATION_ERROR_MESSAGE = "Authentication Error";\r
-    private static final String AUTHORIZATION_ERROR_MESSAGE = "Authorization Error";\r
-    private static final String SERVER_ERROR_MESSAGE = "Internal Server Error";\r
-    private static final String NOT_FOUND_MESSAGE = "Resource Not Found";\r
-    private static final String INVALID_BODY_MESSAGE = "Invalid Body";\r
-    private static final String INVALID_PAYLOAD_MESSAGE = "Not Acceptable Payload";\r
-    private static final String HTTP_CONFLICT_MESSAGE = "Delete Conflict, Rule Violation";\r
+    private enum Target {\r
+        POLICY,\r
+        POLICY_TYPE,\r
+        OTHER\r
+    }\r
 \r
+    private final ToscaServiceTemplateService toscaServiceTemplateService;\r
+    private final HealthCheckProvider healthCheckProvider;\r
+    private final ApiStatisticsManager mgr;\r
+    private final StatisticsProvider statisticsProvider;\r
 \r
     /**\r
      * Retrieves the healthcheck status of the API component.\r
      *\r
      * @return the Response object containing the results of the API operation\r
      */\r
-    @GET\r
-    @Path("/healthcheck")\r
-    @ApiOperation(value = "Perform a system healthcheck", notes = "Returns healthy status of the Policy API component",\r
-        response = HealthCheckReport.class,\r
-        responseHeaders = {\r
-            @ResponseHeader(name = VERSION_MINOR_NAME,\r
-                description = VERSION_MINOR_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = VERSION_PATCH_NAME,\r
-                description = VERSION_PATCH_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = VERSION_LATEST_NAME, description = VERSION_LATEST_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = REQUEST_ID_NAME,\r
-                description = REQUEST_ID_HDR_DESCRIPTION, response = UUID.class)},\r
-        authorizations = @Authorization(value = AUTHORIZATION_TYPE), tags = {"HealthCheck", },\r
-        extensions = {\r
-            @Extension(name = EXTENSION_NAME, properties = {\r
-                @ExtensionProperty(name = API_VERSION_NAME, value = API_VERSION),\r
-                @ExtensionProperty(name = LAST_MOD_NAME, value = "Dublin")})})\r
-    @ApiResponses(value = {\r
-        @ApiResponse(code = HttpURLConnection.HTTP_UNAUTHORIZED, message = AUTHENTICATION_ERROR_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_FORBIDDEN, message = AUTHORIZATION_ERROR_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_INTERNAL_ERROR, message = SERVER_ERROR_MESSAGE)})\r
-    public Response\r
-        getHealthCheck(@HeaderParam(REQUEST_ID_NAME) @ApiParam(REQUEST_ID_PARAM_DESCRIPTION) UUID requestId) {\r
-\r
-        updateApiStatisticsCounter(Target.OTHER, Result.SUCCESS, HttpMethod.GET);\r
-        return makeOkResponse(requestId, new HealthCheckProvider().performHealthCheck());\r
+    @Override\r
+    public ResponseEntity<HealthCheckReport> getHealthCheck(UUID requestId) {\r
+        final var report = healthCheckProvider.performHealthCheck();\r
+        updateApiStatisticsCounter(Target.OTHER, HttpStatus.resolve(report.getCode()), HttpMethod.GET);\r
+        return makeResponse(requestId, report, report.getCode());\r
     }\r
 \r
     /**\r
@@ -171,37 +85,10 @@ public class ApiRestController extends CommonRestController {
      *\r
      * @return the Response object containing the results of the API operation\r
      */\r
-    @GET\r
-    @Path("/statistics")\r
-    @ApiOperation(value = "Retrieve current statistics",\r
-        notes = "Returns current statistics including the counters of API invocation",\r
-        response = StatisticsReport.class,\r
-        responseHeaders = {\r
-            @ResponseHeader(name = VERSION_MINOR_NAME,\r
-                description = VERSION_MINOR_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = VERSION_PATCH_NAME,\r
-                description = VERSION_PATCH_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = VERSION_LATEST_NAME, description = VERSION_LATEST_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = REQUEST_ID_NAME,\r
-                description = REQUEST_ID_HDR_DESCRIPTION, response = UUID.class)},\r
-        authorizations = @Authorization(value = AUTHORIZATION_TYPE), tags = {"Statistics", },\r
-        extensions = {\r
-            @Extension(name = EXTENSION_NAME, properties = {\r
-                @ExtensionProperty(name = API_VERSION_NAME, value = API_VERSION),\r
-                @ExtensionProperty(name = LAST_MOD_NAME, value = "Dublin")})})\r
-    @ApiResponses(value = {\r
-        @ApiResponse(code = HttpURLConnection.HTTP_UNAUTHORIZED, message = AUTHENTICATION_ERROR_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_FORBIDDEN, message = AUTHORIZATION_ERROR_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_INTERNAL_ERROR, message = SERVER_ERROR_MESSAGE)})\r
-    public Response\r
-        getStatistics(@HeaderParam(REQUEST_ID_NAME) @ApiParam(REQUEST_ID_PARAM_DESCRIPTION) UUID requestId) {\r
-\r
-        updateApiStatisticsCounter(Target.OTHER, Result.SUCCESS, HttpMethod.GET);\r
-\r
-        return makeOkResponse(requestId, new StatisticsProvider().fetchCurrentStatistics());\r
+    @Override\r
+    public ResponseEntity<StatisticsReport> getStatistics(UUID requestId) {\r
+        updateApiStatisticsCounter(Target.OTHER, HttpStatus.OK, HttpMethod.GET);\r
+        return makeOkResponse(requestId, statisticsProvider.fetchCurrentStatistics());\r
     }\r
 \r
     /**\r
@@ -209,42 +96,17 @@ public class ApiRestController extends CommonRestController {
      *\r
      * @return the Response object containing the results of the API operation\r
      */\r
-    @GET\r
-    @Path("/policytypes")\r
-    @ApiOperation(value = "Retrieve existing policy types",\r
-        notes = "Returns a list of existing policy types stored in Policy Framework",\r
-        response = ToscaServiceTemplate.class,\r
-        responseHeaders = {\r
-            @ResponseHeader(name = VERSION_MINOR_NAME,\r
-                description = VERSION_MINOR_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = VERSION_PATCH_NAME,\r
-                description = VERSION_PATCH_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = VERSION_LATEST_NAME, description = VERSION_LATEST_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = REQUEST_ID_NAME,\r
-                description = REQUEST_ID_HDR_DESCRIPTION, response = UUID.class)},\r
-        authorizations = @Authorization(value = AUTHORIZATION_TYPE), tags = {"PolicyType", },\r
-        extensions = {\r
-            @Extension(name = EXTENSION_NAME, properties = {\r
-                @ExtensionProperty(name = API_VERSION_NAME, value = API_VERSION),\r
-                @ExtensionProperty(name = LAST_MOD_NAME, value = "Dublin")})})\r
-    @ApiResponses(value = {\r
-        @ApiResponse(code = HttpURLConnection.HTTP_UNAUTHORIZED, message = AUTHENTICATION_ERROR_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_FORBIDDEN, message = AUTHORIZATION_ERROR_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_INTERNAL_ERROR, message = SERVER_ERROR_MESSAGE)})\r
-    public Response\r
-        getAllPolicyTypes(@HeaderParam(REQUEST_ID_NAME) @ApiParam(REQUEST_ID_PARAM_DESCRIPTION) UUID requestId) {\r
-\r
-        try (PolicyTypeProvider policyTypeProvider = new PolicyTypeProvider()) {\r
-            ToscaServiceTemplate serviceTemplate = policyTypeProvider.fetchPolicyTypes(null, null);\r
-            updateApiStatisticsCounter(Target.POLICY_TYPE, Result.SUCCESS, HttpMethod.GET);\r
+    @Override\r
+    public ResponseEntity<ToscaServiceTemplate> getAllPolicyTypes(UUID requestId) {\r
+        try {\r
+            ToscaServiceTemplate serviceTemplate = toscaServiceTemplateService.fetchPolicyTypes(null, null);\r
+            updateApiStatisticsCounter(Target.POLICY_TYPE, HttpStatus.OK, HttpMethod.GET);\r
             return makeOkResponse(requestId, serviceTemplate);\r
         } catch (PfModelException | PfModelRuntimeException pfme) {\r
-            LOGGER.warn("GET /policytypes", pfme);\r
-            updateApiStatisticsCounter(Target.POLICY_TYPE, Result.FAILURE, HttpMethod.GET);\r
-            return makeErrorResponse(requestId, pfme);\r
+            final var msg = "GET /policytypes";\r
+            updateApiStatisticsCounter(Target.POLICY_TYPE, HttpStatus.resolve(pfme.getErrorResponse().getResponseCode()\r
+                .getStatusCode()), HttpMethod.GET);\r
+            throw new PolicyApiRuntimeException(msg, pfme.getCause(), pfme.getErrorResponse(), requestId);\r
         }\r
     }\r
 \r
@@ -255,44 +117,19 @@ public class ApiRestController extends CommonRestController {
      *\r
      * @return the Response object containing the results of the API operation\r
      */\r
-    @GET\r
-    @Path("/policytypes/{policyTypeId}")\r
-    @ApiOperation(value = "Retrieve all available versions of a policy type",\r
-        notes = "Returns a list of all available versions for the specified policy type",\r
-        response = ToscaServiceTemplate.class,\r
-        responseHeaders = {\r
-            @ResponseHeader(name = VERSION_MINOR_NAME,\r
-                description = VERSION_MINOR_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = VERSION_PATCH_NAME,\r
-                description = VERSION_PATCH_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = VERSION_LATEST_NAME, description = VERSION_LATEST_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = REQUEST_ID_NAME,\r
-                description = REQUEST_ID_HDR_DESCRIPTION, response = UUID.class)},\r
-        authorizations = @Authorization(value = AUTHORIZATION_TYPE), tags = {"PolicyType", },\r
-        extensions = {\r
-            @Extension(name = EXTENSION_NAME, properties = {\r
-                @ExtensionProperty(name = API_VERSION_NAME, value = API_VERSION),\r
-                @ExtensionProperty(name = LAST_MOD_NAME, value = "Dublin")})})\r
-    @ApiResponses(value = {\r
-        @ApiResponse(code = HttpURLConnection.HTTP_UNAUTHORIZED, message = AUTHENTICATION_ERROR_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_FORBIDDEN, message = AUTHORIZATION_ERROR_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_NOT_FOUND, message = NOT_FOUND_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_INTERNAL_ERROR, message = SERVER_ERROR_MESSAGE)})\r
-    public Response getAllVersionsOfPolicyType(\r
-        @PathParam("policyTypeId") @ApiParam(value = "ID of policy type", required = true) String policyTypeId,\r
-        @HeaderParam(REQUEST_ID_NAME) @ApiParam(REQUEST_ID_PARAM_DESCRIPTION) UUID requestId) {\r
-\r
-        try (PolicyTypeProvider policyTypeProvider = new PolicyTypeProvider()) {\r
-            ToscaServiceTemplate serviceTemplate = policyTypeProvider.fetchPolicyTypes(policyTypeId, null);\r
-            updateApiStatisticsCounter(Target.POLICY_TYPE, Result.SUCCESS, HttpMethod.GET);\r
+    @Override\r
+    public ResponseEntity<ToscaServiceTemplate> getAllVersionsOfPolicyType(\r
+            String policyTypeId,\r
+            UUID requestId) {\r
+        try {\r
+            ToscaServiceTemplate serviceTemplate = toscaServiceTemplateService.fetchPolicyTypes(policyTypeId, null);\r
+            updateApiStatisticsCounter(Target.POLICY_TYPE, HttpStatus.OK, HttpMethod.GET);\r
             return makeOkResponse(requestId, serviceTemplate);\r
         } catch (PfModelException | PfModelRuntimeException pfme) {\r
-            LOGGER.warn("GET /policytypes/{}", policyTypeId, pfme);\r
-            updateApiStatisticsCounter(Target.POLICY_TYPE, Result.FAILURE, HttpMethod.GET);\r
-            return makeErrorResponse(requestId, pfme);\r
+            var msg = String.format("GET /policytypes/%s", policyTypeId);\r
+            updateApiStatisticsCounter(Target.POLICY_TYPE, HttpStatus.resolve(pfme.getErrorResponse().getResponseCode()\r
+                .getStatusCode()), HttpMethod.GET);\r
+            throw new PolicyApiRuntimeException(msg, pfme.getCause(), pfme.getErrorResponse(), requestId);\r
         }\r
     }\r
 \r
@@ -304,44 +141,21 @@ public class ApiRestController extends CommonRestController {
      *\r
      * @return the Response object containing the results of the API operation\r
      */\r
-    @GET\r
-    @Path("/policytypes/{policyTypeId}/versions/{versionId}")\r
-    @ApiOperation(value = "Retrieve one particular version of a policy type",\r
-        notes = "Returns a particular version for the specified policy type", response = ToscaServiceTemplate.class,\r
-        responseHeaders = {\r
-            @ResponseHeader(name = VERSION_MINOR_NAME,\r
-                description = VERSION_MINOR_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = VERSION_PATCH_NAME,\r
-                description = VERSION_PATCH_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = VERSION_LATEST_NAME, description = VERSION_LATEST_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = REQUEST_ID_NAME,\r
-                description = REQUEST_ID_HDR_DESCRIPTION, response = UUID.class)},\r
-        authorizations = @Authorization(value = AUTHORIZATION_TYPE), tags = {"PolicyType", },\r
-        extensions = {\r
-            @Extension(name = EXTENSION_NAME, properties = {\r
-                @ExtensionProperty(name = API_VERSION_NAME, value = API_VERSION),\r
-                @ExtensionProperty(name = LAST_MOD_NAME, value = "Dublin")})})\r
-    @ApiResponses(value = {\r
-        @ApiResponse(code = HttpURLConnection.HTTP_UNAUTHORIZED, message = AUTHENTICATION_ERROR_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_FORBIDDEN, message = AUTHORIZATION_ERROR_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_NOT_FOUND, message = NOT_FOUND_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_INTERNAL_ERROR, message = SERVER_ERROR_MESSAGE)})\r
-    public Response getSpecificVersionOfPolicyType(\r
-        @PathParam("policyTypeId") @ApiParam(value = "ID of policy type", required = true) String policyTypeId,\r
-        @PathParam("versionId") @ApiParam(value = "Version of policy type", required = true) String versionId,\r
-        @HeaderParam(REQUEST_ID_NAME) @ApiParam(REQUEST_ID_PARAM_DESCRIPTION) UUID requestId) {\r
-\r
-        try (PolicyTypeProvider policyTypeProvider = new PolicyTypeProvider()) {\r
-            ToscaServiceTemplate serviceTemplate = policyTypeProvider.fetchPolicyTypes(policyTypeId, versionId);\r
-            updateApiStatisticsCounter(Target.POLICY_TYPE, Result.SUCCESS, HttpMethod.GET);\r
+    @Override\r
+    public ResponseEntity<ToscaServiceTemplate> getSpecificVersionOfPolicyType(\r
+            String policyTypeId,\r
+            String versionId,\r
+            UUID requestId) {\r
+        try {\r
+            ToscaServiceTemplate serviceTemplate =\r
+                toscaServiceTemplateService.fetchPolicyTypes(policyTypeId, versionId);\r
+            updateApiStatisticsCounter(Target.POLICY_TYPE, HttpStatus.OK, HttpMethod.GET);\r
             return makeOkResponse(requestId, serviceTemplate);\r
         } catch (PfModelException | PfModelRuntimeException pfme) {\r
-            LOGGER.warn("GET /policytypes/{}/versions/{}", policyTypeId, versionId, pfme);\r
-            updateApiStatisticsCounter(Target.POLICY_TYPE, Result.FAILURE, HttpMethod.GET);\r
-            return makeErrorResponse(requestId, pfme);\r
+            var msg = String.format("GET /policytypes/%s/versions/%s", policyTypeId, versionId);\r
+            updateApiStatisticsCounter(Target.POLICY_TYPE, HttpStatus.resolve(pfme.getErrorResponse().getResponseCode()\r
+                .getStatusCode()), HttpMethod.GET);\r
+            throw new PolicyApiRuntimeException(msg, pfme.getCause(), pfme.getErrorResponse(), requestId);\r
         }\r
     }\r
 \r
@@ -352,43 +166,19 @@ public class ApiRestController extends CommonRestController {
      *\r
      * @return the Response object containing the results of the API operation\r
      */\r
-    @GET\r
-    @Path("/policytypes/{policyTypeId}/versions/latest")\r
-    @ApiOperation(value = "Retrieve latest version of a policy type",\r
-        notes = "Returns latest version for the specified policy type", response = ToscaServiceTemplate.class,\r
-        responseHeaders = {\r
-            @ResponseHeader(name = VERSION_MINOR_NAME,\r
-                description = VERSION_MINOR_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = VERSION_PATCH_NAME,\r
-                description = VERSION_PATCH_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = VERSION_LATEST_NAME, description = VERSION_LATEST_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = REQUEST_ID_NAME,\r
-                description = REQUEST_ID_HDR_DESCRIPTION, response = UUID.class)},\r
-        authorizations = @Authorization(value = AUTHORIZATION_TYPE), tags = {"PolicyType", },\r
-        extensions = {\r
-            @Extension(name = EXTENSION_NAME, properties = {\r
-                @ExtensionProperty(name = API_VERSION_NAME, value = API_VERSION),\r
-                @ExtensionProperty(name = LAST_MOD_NAME, value = "Dublin")})})\r
-    @ApiResponses(value = {\r
-        @ApiResponse(code = HttpURLConnection.HTTP_UNAUTHORIZED, message = AUTHENTICATION_ERROR_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_FORBIDDEN, message = AUTHORIZATION_ERROR_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_NOT_FOUND, message = NOT_FOUND_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_INTERNAL_ERROR, message = SERVER_ERROR_MESSAGE)})\r
-    public Response getLatestVersionOfPolicyType(\r
-        @PathParam("policyTypeId") @ApiParam(value = "ID of policy type", required = true) String policyTypeId,\r
-        @HeaderParam(REQUEST_ID_NAME) @ApiParam(REQUEST_ID_PARAM_DESCRIPTION) UUID requestId) {\r
-\r
-        try (PolicyTypeProvider policyTypeProvider = new PolicyTypeProvider()) {\r
-            ToscaServiceTemplate serviceTemplate = policyTypeProvider.fetchLatestPolicyTypes(policyTypeId);\r
-            updateApiStatisticsCounter(Target.POLICY_TYPE, Result.SUCCESS, HttpMethod.GET);\r
+    @Override\r
+    public ResponseEntity<ToscaServiceTemplate> getLatestVersionOfPolicyType(\r
+            String policyTypeId,\r
+            UUID requestId) {\r
+        try {\r
+            ToscaServiceTemplate serviceTemplate = toscaServiceTemplateService.fetchLatestPolicyTypes(policyTypeId);\r
+            updateApiStatisticsCounter(Target.POLICY_TYPE, HttpStatus.OK, HttpMethod.GET);\r
             return makeOkResponse(requestId, serviceTemplate);\r
         } catch (PfModelException | PfModelRuntimeException pfme) {\r
-            LOGGER.warn("GET /policytypes/{}/versions/latest", policyTypeId, pfme);\r
-            updateApiStatisticsCounter(Target.POLICY_TYPE, Result.FAILURE, HttpMethod.GET);\r
-            return makeErrorResponse(requestId, pfme);\r
+            var msg = String.format("GET /policytypes/%s/versions/latest", policyTypeId);\r
+            updateApiStatisticsCounter(Target.POLICY_TYPE, HttpStatus.resolve(pfme.getErrorResponse().getResponseCode()\r
+                .getStatusCode()), HttpMethod.GET);\r
+            throw new PolicyApiRuntimeException(msg, pfme.getCause(), pfme.getErrorResponse(), requestId);\r
         }\r
     }\r
 \r
@@ -399,48 +189,22 @@ public class ApiRestController extends CommonRestController {
      *\r
      * @return the Response object containing the results of the API operation\r
      */\r
-    @POST\r
-    @Path("/policytypes")\r
-    @ApiOperation(value = "Create a new policy type", notes = "Client should provide TOSCA body of the new policy type",\r
-        authorizations = @Authorization(value = AUTHORIZATION_TYPE), tags = {"PolicyType", },\r
-        response = ToscaServiceTemplate.class,\r
-        responseHeaders = {\r
-            @ResponseHeader(name = VERSION_MINOR_NAME,\r
-                description = VERSION_MINOR_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = VERSION_PATCH_NAME,\r
-                description = VERSION_PATCH_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = VERSION_LATEST_NAME, description = VERSION_LATEST_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = REQUEST_ID_NAME,\r
-                description = REQUEST_ID_HDR_DESCRIPTION, response = UUID.class)},\r
-        extensions = {\r
-            @Extension(name = EXTENSION_NAME, properties = {\r
-                @ExtensionProperty(name = API_VERSION_NAME, value = API_VERSION),\r
-                @ExtensionProperty(name = LAST_MOD_NAME, value = "Dublin")})})\r
-    @ApiResponses(value = {\r
-        @ApiResponse(code = HttpURLConnection.HTTP_BAD_REQUEST, message = INVALID_BODY_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_UNAUTHORIZED, message = AUTHENTICATION_ERROR_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_FORBIDDEN, message = AUTHORIZATION_ERROR_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_NOT_ACCEPTABLE, message = INVALID_PAYLOAD_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_INTERNAL_ERROR, message = SERVER_ERROR_MESSAGE)})\r
-    public Response createPolicyType(\r
-        @ApiParam(value = "Entity body of policy type", required = true) ToscaServiceTemplate body,\r
-        @HeaderParam(REQUEST_ID_NAME) @ApiParam(REQUEST_ID_PARAM_DESCRIPTION) UUID requestId) {\r
-\r
+    @Override\r
+    public ResponseEntity<ToscaServiceTemplate> createPolicyType(\r
+            ToscaServiceTemplate body,\r
+            UUID requestId) {\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
+        try {\r
+            ToscaServiceTemplate serviceTemplate = toscaServiceTemplateService.createPolicyType(body);\r
+            updateApiStatisticsCounter(Target.POLICY_TYPE, HttpStatus.OK, HttpMethod.POST);\r
             return makeOkResponse(requestId, serviceTemplate);\r
-        } catch (PfModelException | PfModelRuntimeException pfme) {\r
-            LOGGER.warn("POST /policytypes", pfme);\r
-            updateApiStatisticsCounter(Target.POLICY_TYPE, Result.FAILURE, HttpMethod.POST);\r
-            return makeErrorResponse(requestId, pfme);\r
+        } catch (PfModelRuntimeException pfme) {\r
+            final var msg = "POST /policytypes";\r
+            updateApiStatisticsCounter(Target.POLICY_TYPE, HttpStatus.resolve(pfme.getErrorResponse().getResponseCode()\r
+                .getStatusCode()), HttpMethod.POST);\r
+            throw new PolicyApiRuntimeException(msg, pfme.getCause(), pfme.getErrorResponse(), requestId);\r
         }\r
     }\r
 \r
@@ -452,48 +216,21 @@ public class ApiRestController extends CommonRestController {
      *\r
      * @return the Response object containing the results of the API operation\r
      */\r
-    @DELETE\r
-    @Path("/policytypes/{policyTypeId}/versions/{versionId}")\r
-    @ApiOperation(value = "Delete one version of a policy type",\r
-        notes = "Rule 1: pre-defined policy types cannot be deleted;"\r
-            + "Rule 2: policy types that are in use (parameterized by a TOSCA policy) cannot be deleted."\r
-            + "The parameterizing TOSCA policies must be deleted first;",\r
-        authorizations = @Authorization(value = AUTHORIZATION_TYPE), tags = {"PolicyType", },\r
-        response = ToscaServiceTemplate.class,\r
-        responseHeaders = {\r
-            @ResponseHeader(name = VERSION_MINOR_NAME,\r
-                description = VERSION_MINOR_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = VERSION_PATCH_NAME,\r
-                description = VERSION_PATCH_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = VERSION_LATEST_NAME, description = VERSION_LATEST_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = REQUEST_ID_NAME,\r
-                description = REQUEST_ID_HDR_DESCRIPTION, response = UUID.class)},\r
-        extensions = {\r
-            @Extension(name = EXTENSION_NAME, properties = {\r
-                @ExtensionProperty(name = API_VERSION_NAME, value = API_VERSION),\r
-                @ExtensionProperty(name = LAST_MOD_NAME, value = "Dublin")})})\r
-    @ApiResponses(value = {\r
-        @ApiResponse(code = HttpURLConnection.HTTP_UNAUTHORIZED, message = AUTHENTICATION_ERROR_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_FORBIDDEN, message = AUTHORIZATION_ERROR_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_NOT_FOUND, message = NOT_FOUND_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_CONFLICT, message = HTTP_CONFLICT_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_INTERNAL_ERROR, message = SERVER_ERROR_MESSAGE)})\r
-    public Response deleteSpecificVersionOfPolicyType(\r
-        @PathParam("policyTypeId") @ApiParam(value = "ID of policy type", required = true) String policyTypeId,\r
-        @PathParam("versionId") @ApiParam(value = "Version of policy type", required = true) String versionId,\r
-        @HeaderParam(REQUEST_ID_NAME) @ApiParam(REQUEST_ID_PARAM_DESCRIPTION) UUID requestId) {\r
-\r
-        try (PolicyTypeProvider policyTypeProvider = new PolicyTypeProvider()) {\r
-            ToscaServiceTemplate serviceTemplate = policyTypeProvider.deletePolicyType(policyTypeId, versionId);\r
-            updateApiStatisticsCounter(Target.POLICY_TYPE, Result.SUCCESS, HttpMethod.DELETE);\r
+    @Override\r
+    public ResponseEntity<ToscaServiceTemplate> deleteSpecificVersionOfPolicyType(\r
+            String policyTypeId,\r
+            String versionId,\r
+            UUID requestId) {\r
+        try {\r
+            ToscaServiceTemplate serviceTemplate =\r
+                toscaServiceTemplateService.deletePolicyType(policyTypeId, versionId);\r
+            updateApiStatisticsCounter(Target.POLICY_TYPE, HttpStatus.OK, HttpMethod.DELETE);\r
             return makeOkResponse(requestId, serviceTemplate);\r
-        } catch (PfModelException | PfModelRuntimeException pfme) {\r
-            LOGGER.warn("DELETE /policytypes/{}/versions/{}", policyTypeId, versionId, pfme);\r
-            updateApiStatisticsCounter(Target.POLICY_TYPE, Result.FAILURE, HttpMethod.DELETE);\r
-            return makeErrorResponse(requestId, pfme);\r
+        } catch (PfModelRuntimeException pfme) {\r
+            var msg = String.format("DELETE /policytypes/%s/versions/%s", policyTypeId, versionId);\r
+            updateApiStatisticsCounter(Target.POLICY_TYPE, HttpStatus.resolve(pfme.getErrorResponse().getResponseCode()\r
+                .getStatusCode()), HttpMethod.DELETE);\r
+            throw new PolicyApiRuntimeException(msg, pfme.getCause(), pfme.getErrorResponse(), requestId);\r
         }\r
     }\r
 \r
@@ -505,55 +242,22 @@ public class ApiRestController extends CommonRestController {
      *\r
      * @return the Response object containing the results of the API operation\r
      */\r
-    @GET\r
-    @Path("/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies")\r
-    @ApiOperation(\r
-        value = "Retrieve all versions of a policy created for a particular policy type version",\r
-        notes = "Returns a list of all versions of specified policy created for the specified policy type version",\r
-        response = ToscaServiceTemplate.class,\r
-        responseHeaders = {\r
-            @ResponseHeader(name = VERSION_MINOR_NAME,\r
-                description = VERSION_MINOR_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = VERSION_PATCH_NAME,\r
-                description = VERSION_PATCH_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = VERSION_LATEST_NAME, description = VERSION_LATEST_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = REQUEST_ID_NAME,\r
-                description = REQUEST_ID_HDR_DESCRIPTION, response = UUID.class)},\r
-        authorizations = @Authorization(value = AUTHORIZATION_TYPE), tags = {"Policy,"},\r
-        extensions = {\r
-            @Extension(name = EXTENSION_NAME, properties = {\r
-                @ExtensionProperty(name = API_VERSION_NAME, value = API_VERSION),\r
-                @ExtensionProperty(name = LAST_MOD_NAME, value = "Dublin")\r
-            })\r
-        }\r
-    )\r
-    @ApiResponses(value = {\r
-        @ApiResponse(code = HttpURLConnection.HTTP_UNAUTHORIZED, message = AUTHENTICATION_ERROR_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_FORBIDDEN, message = AUTHORIZATION_ERROR_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_NOT_FOUND, message = NOT_FOUND_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_INTERNAL_ERROR, message = SERVER_ERROR_MESSAGE)\r
-    })\r
-    public Response getAllPolicies(\r
-        @PathParam("policyTypeId") @ApiParam(value = "ID of policy type", required = true) String policyTypeId,\r
-        @PathParam("policyTypeVersion") @ApiParam(value = "Version of policy type",\r
-            required = true) String policyTypeVersion,\r
-        @HeaderParam(REQUEST_ID_NAME) @ApiParam(REQUEST_ID_PARAM_DESCRIPTION) UUID requestId,\r
-        @QueryParam("mode") @DefaultValue("bare") @ApiParam("Fetch mode for policies, BARE for bare policies (default),"\r
-            + " REFERENCED for fully referenced policies") PolicyFetchMode mode\r
-    ) {\r
-\r
-        try (PolicyProvider policyProvider = new PolicyProvider()) {\r
+    @Override\r
+    public ResponseEntity<ToscaServiceTemplate> getAllPolicies(\r
+            String policyTypeId,\r
+            String policyTypeVersion,\r
+            PolicyFetchMode mode,\r
+            UUID requestId) {\r
+        try {\r
             ToscaServiceTemplate serviceTemplate =\r
-                policyProvider.fetchPolicies(policyTypeId, policyTypeVersion, null, null, mode);\r
-            updateApiStatisticsCounter(Target.POLICY, Result.SUCCESS, HttpMethod.GET);\r
+                toscaServiceTemplateService.fetchPolicies(policyTypeId, policyTypeVersion, null, null, mode);\r
+            updateApiStatisticsCounter(Target.POLICY, HttpStatus.OK, HttpMethod.GET);\r
             return makeOkResponse(requestId, serviceTemplate);\r
         } catch (PfModelException | PfModelRuntimeException pfme) {\r
-            LOGGER.warn("GET /policytypes/{}/versions/{}/policies", policyTypeId, policyTypeVersion, pfme);\r
-            updateApiStatisticsCounter(Target.POLICY, Result.FAILURE, HttpMethod.GET);\r
-            return makeErrorResponse(requestId, pfme);\r
+            var msg = String.format("GET /policytypes/%s/versions/%s/policies", policyTypeId, policyTypeVersion);\r
+            updateApiStatisticsCounter(Target.POLICY, HttpStatus.resolve(pfme.getErrorResponse().getResponseCode()\r
+                .getStatusCode()), HttpMethod.GET);\r
+            throw new PolicyApiRuntimeException(msg, pfme.getCause(), pfme.getErrorResponse(), requestId);\r
         }\r
     }\r
 \r
@@ -566,53 +270,24 @@ public class ApiRestController extends CommonRestController {
      *\r
      * @return the Response object containing the results of the API operation\r
      */\r
-    @GET\r
-    @Path("/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies/{policyId}")\r
-    @ApiOperation(value = "Retrieve all version details of a policy created for a particular policy type version",\r
-        notes = "Returns a list of all version details of the specified policy", response = ToscaServiceTemplate.class,\r
-        responseHeaders = {\r
-            @ResponseHeader(name = VERSION_MINOR_NAME,\r
-                description = VERSION_MINOR_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = VERSION_PATCH_NAME,\r
-                description = VERSION_PATCH_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = VERSION_LATEST_NAME, description = VERSION_LATEST_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = REQUEST_ID_NAME,\r
-                description = REQUEST_ID_HDR_DESCRIPTION, response = UUID.class)},\r
-        authorizations = @Authorization(value = AUTHORIZATION_TYPE), tags = {"Policy", },\r
-        extensions = {\r
-            @Extension(name = EXTENSION_NAME, properties = {\r
-                @ExtensionProperty(name = API_VERSION_NAME, value = API_VERSION),\r
-                @ExtensionProperty(name = LAST_MOD_NAME, value = "Dublin")\r
-            })\r
-        }\r
-    )\r
-    @ApiResponses(value = {\r
-        @ApiResponse(code = HttpURLConnection.HTTP_UNAUTHORIZED, message = AUTHENTICATION_ERROR_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_FORBIDDEN, message = AUTHORIZATION_ERROR_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_NOT_FOUND, message = NOT_FOUND_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_INTERNAL_ERROR, message = SERVER_ERROR_MESSAGE)\r
-    })\r
-    public Response getAllVersionsOfPolicy(\r
-        @PathParam("policyTypeId") @ApiParam(value = "ID of policy type", required = true) String policyTypeId,\r
-        @PathParam("policyTypeVersion") @ApiParam(value = "Version of policy type",\r
-            required = true) String policyTypeVersion,\r
-        @PathParam("policyId") @ApiParam(value = "ID of policy", required = true) String policyId,\r
-        @HeaderParam(REQUEST_ID_NAME) @ApiParam(REQUEST_ID_PARAM_DESCRIPTION) UUID requestId,\r
-        @QueryParam("mode") @DefaultValue("bare") @ApiParam("Fetch mode for policies, BARE for bare policies (default),"\r
-            + " REFERENCED for fully referenced policies") PolicyFetchMode mode\r
-    ) {\r
-        try (PolicyProvider policyProvider = new PolicyProvider()) {\r
+    @Override\r
+    public ResponseEntity<ToscaServiceTemplate> getAllVersionsOfPolicy(\r
+            String policyId,\r
+            String policyTypeId,\r
+            String policyTypeVersion,\r
+            PolicyFetchMode mode,\r
+            UUID requestId) {\r
+        try {\r
             ToscaServiceTemplate serviceTemplate =\r
-                policyProvider.fetchPolicies(policyTypeId, policyTypeVersion, policyId, null, mode);\r
-            updateApiStatisticsCounter(Target.POLICY, Result.SUCCESS, HttpMethod.GET);\r
+                toscaServiceTemplateService.fetchPolicies(policyTypeId, policyTypeVersion, policyId, null, mode);\r
+            updateApiStatisticsCounter(Target.POLICY, HttpStatus.OK, HttpMethod.GET);\r
             return makeOkResponse(requestId, serviceTemplate);\r
         } catch (PfModelException | PfModelRuntimeException pfme) {\r
-            LOGGER.warn("/policytypes/{}/versions/{}/policies/{}", policyTypeId, policyTypeVersion, policyId, pfme);\r
-            updateApiStatisticsCounter(Target.POLICY, Result.FAILURE, HttpMethod.GET);\r
-            return makeErrorResponse(requestId, pfme);\r
+            var msg = String.format("/policytypes/%s/versions/%s/policies/%s",\r
+                policyTypeId, policyTypeVersion, policyId);\r
+            updateApiStatisticsCounter(Target.POLICY, HttpStatus.resolve(pfme.getErrorResponse().getResponseCode()\r
+                .getStatusCode()), HttpMethod.GET);\r
+            throw new PolicyApiRuntimeException(msg, pfme.getCause(), pfme.getErrorResponse(), requestId);\r
         }\r
     }\r
 \r
@@ -626,56 +301,25 @@ public class ApiRestController extends CommonRestController {
      *\r
      * @return the Response object containing the results of the API operation\r
      */\r
-    @GET\r
-    @Path("/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies/{policyId}/versions/{policyVersion}")\r
-    @ApiOperation(value = "Retrieve one version of a policy created for a particular policy type version",\r
-        notes = "Returns a particular version of specified policy created for the specified policy type version",\r
-        response = ToscaServiceTemplate.class,\r
-        responseHeaders = {\r
-            @ResponseHeader(name = VERSION_MINOR_NAME,\r
-                description = VERSION_MINOR_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = VERSION_PATCH_NAME,\r
-                description = VERSION_PATCH_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = VERSION_LATEST_NAME, description = VERSION_LATEST_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = REQUEST_ID_NAME,\r
-                description = REQUEST_ID_HDR_DESCRIPTION, response = UUID.class)},\r
-        authorizations = @Authorization(value = AUTHORIZATION_TYPE), tags = {"Policy", },\r
-        extensions = {\r
-            @Extension(name = EXTENSION_NAME, properties = {\r
-                @ExtensionProperty(name = API_VERSION_NAME, value = API_VERSION),\r
-                @ExtensionProperty(name = LAST_MOD_NAME, value = "Dublin")\r
-            })\r
-        }\r
-    )\r
-    @ApiResponses(value = {\r
-        @ApiResponse(code = HttpURLConnection.HTTP_UNAUTHORIZED, message = AUTHENTICATION_ERROR_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_FORBIDDEN, message = AUTHORIZATION_ERROR_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_NOT_FOUND, message = NOT_FOUND_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_INTERNAL_ERROR, message = SERVER_ERROR_MESSAGE)\r
-    })\r
-    public Response getSpecificVersionOfPolicy(\r
-        @PathParam("policyTypeId") @ApiParam(value = "ID of policy type", required = true) String policyTypeId,\r
-        @PathParam("policyTypeVersion") @ApiParam(value = "Version of policy type",\r
-            required = true) String policyTypeVersion,\r
-        @PathParam("policyId") @ApiParam(value = "ID of policy", required = true) String policyId,\r
-        @PathParam("policyVersion") @ApiParam(value = "Version of policy", required = true) String policyVersion,\r
-        @HeaderParam(REQUEST_ID_NAME) @ApiParam(REQUEST_ID_PARAM_DESCRIPTION) UUID requestId,\r
-        @QueryParam("mode") @DefaultValue("bare") @ApiParam("Fetch mode for policies, BARE for bare policies (default),"\r
-            + " REFERENCED for fully referenced policies") PolicyFetchMode mode\r
-    ) {\r
-        try (PolicyProvider policyProvider = new PolicyProvider()) {\r
-            ToscaServiceTemplate serviceTemplate =\r
-                policyProvider.fetchPolicies(policyTypeId, policyTypeVersion, policyId, policyVersion, mode);\r
-            updateApiStatisticsCounter(Target.POLICY, Result.SUCCESS, HttpMethod.GET);\r
+    @Override\r
+    public ResponseEntity<ToscaServiceTemplate> getSpecificVersionOfPolicy(\r
+            String policyId,\r
+            String policyTypeId,\r
+            String policyTypeVersion,\r
+            String policyVersion,\r
+            PolicyFetchMode mode,\r
+            UUID requestId) {\r
+        try {\r
+            ToscaServiceTemplate serviceTemplate = toscaServiceTemplateService\r
+                .fetchPolicies(policyTypeId, policyTypeVersion, policyId, policyVersion, mode);\r
+            updateApiStatisticsCounter(Target.POLICY, HttpStatus.OK, HttpMethod.GET);\r
             return makeOkResponse(requestId, serviceTemplate);\r
         } catch (PfModelException | PfModelRuntimeException pfme) {\r
-            LOGGER.warn("GET /policytypes/{}/versions/{}/policies/{}/versions/{}", policyTypeId, policyTypeVersion,\r
-                policyId, policyVersion, pfme);\r
-            updateApiStatisticsCounter(Target.POLICY, Result.FAILURE, HttpMethod.GET);\r
-            return makeErrorResponse(requestId, pfme);\r
+            var msg = String.format("GET /policytypes/%s/versions/%s/policies/%s/versions/%s",\r
+                policyTypeId, policyTypeVersion, policyId, policyVersion);\r
+            updateApiStatisticsCounter(Target.POLICY, HttpStatus.resolve(pfme.getErrorResponse().getResponseCode()\r
+                .getStatusCode()), HttpMethod.GET);\r
+            throw new PolicyApiRuntimeException(msg, pfme.getCause(), pfme.getErrorResponse(), requestId);\r
         }\r
     }\r
 \r
@@ -688,50 +332,24 @@ public class ApiRestController extends CommonRestController {
      *\r
      * @return the Response object containing the results of the API operation\r
      */\r
-    @GET\r
-    @Path("/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies/{policyId}/versions/latest")\r
-    @ApiOperation(value = "Retrieve the latest version of a particular policy",\r
-        notes = "Returns the latest version of specified policy", response = ToscaServiceTemplate.class,\r
-        responseHeaders = {\r
-            @ResponseHeader(name = VERSION_MINOR_NAME,\r
-                description = VERSION_MINOR_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = VERSION_PATCH_NAME,\r
-                description = VERSION_PATCH_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = VERSION_LATEST_NAME, description = VERSION_LATEST_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = REQUEST_ID_NAME,\r
-                description = REQUEST_ID_HDR_DESCRIPTION, response = UUID.class)},\r
-        authorizations = @Authorization(value = AUTHORIZATION_TYPE), tags = {"Policy", },\r
-        extensions = {\r
-            @Extension(name = EXTENSION_NAME, properties = {\r
-                @ExtensionProperty(name = API_VERSION_NAME, value = API_VERSION),\r
-                @ExtensionProperty(name = LAST_MOD_NAME, value = "Dublin")})})\r
-    @ApiResponses(value = {\r
-        @ApiResponse(code = HttpURLConnection.HTTP_UNAUTHORIZED, message = AUTHENTICATION_ERROR_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_FORBIDDEN, message = AUTHORIZATION_ERROR_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_NOT_FOUND, message = NOT_FOUND_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_INTERNAL_ERROR, message = SERVER_ERROR_MESSAGE)})\r
-    public Response getLatestVersionOfPolicy(\r
-        @PathParam("policyTypeId") @ApiParam(value = "ID of policy type", required = true) String policyTypeId,\r
-        @PathParam("policyTypeVersion") @ApiParam(value = "Version of policy type",\r
-            required = true) String policyTypeVersion,\r
-        @PathParam("policyId") @ApiParam(value = "ID of policy", required = true) String policyId,\r
-        @HeaderParam(REQUEST_ID_NAME) @ApiParam(REQUEST_ID_PARAM_DESCRIPTION) UUID requestId,\r
-        @QueryParam("mode") @ApiParam("Fetch mode for policies, TERSE for bare policies (default), "\r
-            + "REFERENCED for fully referenced policies") PolicyFetchMode mode) {\r
-\r
-        try (PolicyProvider policyProvider = new PolicyProvider()) {\r
+    @Override\r
+    public ResponseEntity<ToscaServiceTemplate> getLatestVersionOfPolicy(\r
+            String policyId,\r
+            String policyTypeId,\r
+            String policyTypeVersion,\r
+            PolicyFetchMode mode,\r
+            UUID requestId) {\r
+        try {\r
             ToscaServiceTemplate serviceTemplate =\r
-                policyProvider.fetchLatestPolicies(policyTypeId, policyTypeVersion, policyId, mode);\r
-            updateApiStatisticsCounter(Target.POLICY, Result.SUCCESS, HttpMethod.GET);\r
+                toscaServiceTemplateService.fetchLatestPolicies(policyTypeId, policyTypeVersion, policyId, mode);\r
+            updateApiStatisticsCounter(Target.POLICY, HttpStatus.OK, HttpMethod.GET);\r
             return makeOkResponse(requestId, serviceTemplate);\r
         } catch (PfModelException | PfModelRuntimeException pfme) {\r
-            LOGGER.warn("GET /policytypes/{}/versions/{}/policies/{}/versions/latest", policyTypeId, policyTypeVersion,\r
-                policyId, pfme);\r
-            updateApiStatisticsCounter(Target.POLICY, Result.FAILURE, HttpMethod.GET);\r
-            return makeErrorResponse(requestId, pfme);\r
+            var msg = String.format("GET /policytypes/%s/versions/%s/policies/%s/versions/latest",\r
+                policyTypeId, policyTypeVersion, policyId);\r
+            updateApiStatisticsCounter(Target.POLICY, HttpStatus.resolve(pfme.getErrorResponse().getResponseCode()\r
+                .getStatusCode()), HttpMethod.GET);\r
+            throw new PolicyApiRuntimeException(msg, pfme.getCause(), pfme.getErrorResponse(), requestId);\r
         }\r
     }\r
 \r
@@ -744,54 +362,26 @@ public class ApiRestController extends CommonRestController {
      *\r
      * @return the Response object containing the results of the API operation\r
      */\r
-    @POST\r
-    @Path("/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies")\r
-    @ApiOperation(value = "Create a new policy for a policy type version",\r
-        notes = "Client should provide TOSCA body of the new policy",\r
-        authorizations = @Authorization(value = AUTHORIZATION_TYPE), tags = {"Policy", },\r
-            response = ToscaServiceTemplate.class,\r
-        responseHeaders = {\r
-            @ResponseHeader(name = VERSION_MINOR_NAME,\r
-                description = VERSION_MINOR_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = VERSION_PATCH_NAME,\r
-                description = VERSION_PATCH_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = VERSION_LATEST_NAME, description = VERSION_LATEST_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = REQUEST_ID_NAME,\r
-                description = REQUEST_ID_HDR_DESCRIPTION, response = UUID.class)},\r
-        extensions = {\r
-            @Extension(name = EXTENSION_NAME, properties = {\r
-                @ExtensionProperty(name = API_VERSION_NAME, value = API_VERSION),\r
-                @ExtensionProperty(name = LAST_MOD_NAME, value = "Dublin")})})\r
-    @ApiResponses(value = {\r
-        @ApiResponse(code = HttpURLConnection.HTTP_BAD_REQUEST, message = INVALID_BODY_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_UNAUTHORIZED, message = AUTHENTICATION_ERROR_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_FORBIDDEN, message = AUTHORIZATION_ERROR_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_NOT_FOUND, message = NOT_FOUND_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_NOT_ACCEPTABLE, message = INVALID_PAYLOAD_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_INTERNAL_ERROR, message = SERVER_ERROR_MESSAGE)})\r
-    public Response createPolicy(\r
-        @PathParam("policyTypeId") @ApiParam(value = "ID of policy type", required = true) String policyTypeId,\r
-        @PathParam("policyTypeVersion") @ApiParam(value = "Version of policy type",\r
-            required = true) String policyTypeVersion,\r
-        @HeaderParam(REQUEST_ID_NAME) @ApiParam(REQUEST_ID_PARAM_DESCRIPTION) UUID requestId,\r
-        @ApiParam(value = "Entity body of policy", required = true) ToscaServiceTemplate body) {\r
-\r
+    @Override\r
+    public ResponseEntity<ToscaServiceTemplate> createPolicy(\r
+            String policyTypeId,\r
+            String policyTypeVersion,\r
+            ToscaServiceTemplate body,\r
+            UUID requestId) {\r
         if (NetLoggerUtil.getNetworkLogger().isInfoEnabled()) {\r
             NetLoggerUtil.log(EventType.IN, CommInfrastructure.REST,\r
                 "/policytypes/" + policyTypeId + "/versions/" + policyTypeVersion + "/policies", toJson(body));\r
         }\r
-\r
-        try (PolicyProvider policyProvider = new PolicyProvider()) {\r
-            ToscaServiceTemplate serviceTemplate = policyProvider.createPolicy(policyTypeId, policyTypeVersion, body);\r
-            updateApiStatisticsCounter(Target.POLICY, Result.SUCCESS, HttpMethod.POST);\r
+        try {\r
+            ToscaServiceTemplate serviceTemplate =\r
+                toscaServiceTemplateService.createPolicy(policyTypeId, policyTypeVersion, body);\r
+            updateApiStatisticsCounter(Target.POLICY, HttpStatus.OK, HttpMethod.POST);\r
             return makeOkResponse(requestId, serviceTemplate);\r
-        } catch (PfModelException | PfModelRuntimeException pfme) {\r
-            LOGGER.warn("POST /policytypes/{}/versions/{}/policies", policyTypeId, policyTypeVersion, pfme);\r
-            updateApiStatisticsCounter(Target.POLICY, Result.FAILURE, HttpMethod.POST);\r
-            return makeErrorResponse(requestId, pfme);\r
+        } catch (PfModelRuntimeException pfme) {\r
+            var msg = String.format("POST /policytypes/%s/versions/%s/policies", policyTypeId, policyTypeVersion);\r
+            updateApiStatisticsCounter(Target.POLICY, HttpStatus.resolve(pfme.getErrorResponse().getResponseCode()\r
+                .getStatusCode()), HttpMethod.POST);\r
+            throw new PolicyApiRuntimeException(msg, pfme.getCause(), pfme.getErrorResponse(), requestId);\r
         }\r
     }\r
 \r
@@ -805,51 +395,24 @@ public class ApiRestController extends CommonRestController {
      *\r
      * @return the Response object containing the results of the API operation\r
      */\r
-    @DELETE\r
-    @Path("/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies/{policyId}/versions/{policyVersion}")\r
-    @ApiOperation(value = "Delete a particular version of a policy",\r
-        notes = "Rule: the version that has been deployed in PDP group(s) cannot be deleted",\r
-        authorizations = @Authorization(value = AUTHORIZATION_TYPE), tags = {"Policy", },\r
-        response = ToscaServiceTemplate.class,\r
-        responseHeaders = {\r
-            @ResponseHeader(name = VERSION_MINOR_NAME,\r
-                description = VERSION_MINOR_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = VERSION_PATCH_NAME,\r
-                description = VERSION_PATCH_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = VERSION_LATEST_NAME, description = VERSION_LATEST_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = REQUEST_ID_NAME,\r
-                description = REQUEST_ID_HDR_DESCRIPTION, response = UUID.class)},\r
-        extensions = {\r
-            @Extension(name = EXTENSION_NAME, properties = {\r
-                @ExtensionProperty(name = API_VERSION_NAME, value = API_VERSION),\r
-                @ExtensionProperty(name = LAST_MOD_NAME, value = "Dublin")})})\r
-    @ApiResponses(value = {\r
-        @ApiResponse(code = HttpURLConnection.HTTP_UNAUTHORIZED, message = AUTHENTICATION_ERROR_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_FORBIDDEN, message = AUTHORIZATION_ERROR_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_NOT_FOUND, message = NOT_FOUND_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_CONFLICT, message = HTTP_CONFLICT_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_INTERNAL_ERROR, message = SERVER_ERROR_MESSAGE)})\r
-    public Response deleteSpecificVersionOfPolicy(\r
-        @PathParam("policyTypeId") @ApiParam(value = "PolicyType ID", required = true) String policyTypeId,\r
-        @PathParam("policyTypeVersion") @ApiParam(value = "Version of policy type",\r
-            required = true) String policyTypeVersion,\r
-        @PathParam("policyId") @ApiParam(value = "ID of policy", required = true) String policyId,\r
-        @PathParam("policyVersion") @ApiParam(value = "Version of policy", required = true) String policyVersion,\r
-        @HeaderParam(REQUEST_ID_NAME) @ApiParam(REQUEST_ID_PARAM_DESCRIPTION) UUID requestId) {\r
-\r
-        try (PolicyProvider policyProvider = new PolicyProvider()) {\r
+    @Override\r
+    public ResponseEntity<ToscaServiceTemplate> deleteSpecificVersionOfPolicy(\r
+        String policyTypeId,\r
+        String policyTypeVersion,\r
+        String policyId,\r
+        String policyVersion,\r
+        UUID requestId) {\r
+        try {\r
             ToscaServiceTemplate serviceTemplate =\r
-                policyProvider.deletePolicy(policyTypeId, policyTypeVersion, policyId, policyVersion);\r
-            updateApiStatisticsCounter(Target.POLICY, Result.SUCCESS, HttpMethod.DELETE);\r
+                toscaServiceTemplateService.deletePolicy(policyTypeId, policyTypeVersion, policyId, policyVersion);\r
+            updateApiStatisticsCounter(Target.POLICY, HttpStatus.OK, HttpMethod.DELETE);\r
             return makeOkResponse(requestId, serviceTemplate);\r
-        } catch (PfModelException | PfModelRuntimeException pfme) {\r
-            LOGGER.warn("DELETE /policytypes/{}/versions/{}/policies/{}/versions/{}", policyTypeId, policyTypeVersion,\r
-                policyId, policyVersion, pfme);\r
-            updateApiStatisticsCounter(Target.POLICY, Result.FAILURE, HttpMethod.DELETE);\r
-            return makeErrorResponse(requestId, pfme);\r
+        } catch (PfModelRuntimeException pfme) {\r
+            var msg = String.format("DELETE /policytypes/%s/versions/%s/policies/%s/versions/%s",\r
+                policyTypeId, policyTypeVersion, policyId, policyVersion);\r
+            updateApiStatisticsCounter(Target.POLICY, HttpStatus.resolve(pfme.getErrorResponse().getResponseCode()\r
+                .getStatusCode()), HttpMethod.DELETE);\r
+            throw new PolicyApiRuntimeException(msg, pfme.getCause(), pfme.getErrorResponse(), requestId);\r
         }\r
     }\r
 \r
@@ -858,54 +421,24 @@ public class ApiRestController extends CommonRestController {
      *\r
      * @return the Response object containing the results of the API operation\r
      */\r
-    @GET\r
-    @Path("/policies")\r
-    @ApiOperation(value = "Retrieve all versions of available policies",\r
-        notes = "Returns all version of available policies",\r
-        response = ToscaServiceTemplate.class,\r
-        responseHeaders = {\r
-            @ResponseHeader(name = VERSION_MINOR_NAME,\r
-                description = VERSION_MINOR_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = VERSION_PATCH_NAME,\r
-                description = VERSION_PATCH_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = VERSION_LATEST_NAME, description = VERSION_LATEST_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = REQUEST_ID_NAME,\r
-                description = REQUEST_ID_HDR_DESCRIPTION, response = UUID.class)},\r
-        authorizations = @Authorization(value = AUTHORIZATION_TYPE), tags = {"Policy", },\r
-        extensions = {\r
-            @Extension(name = EXTENSION_NAME, properties = {\r
-                @ExtensionProperty(name = API_VERSION_NAME, value = API_VERSION),\r
-                @ExtensionProperty(name = LAST_MOD_NAME, value = "Guilin")\r
-            })\r
-        }\r
-    )\r
-    @ApiResponses(value = {\r
-        @ApiResponse(code = HttpURLConnection.HTTP_UNAUTHORIZED, message = AUTHENTICATION_ERROR_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_FORBIDDEN, message = AUTHORIZATION_ERROR_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_NOT_FOUND, message = NOT_FOUND_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_INTERNAL_ERROR, message = SERVER_ERROR_MESSAGE)\r
-    })\r
-    public Response getPolicies(\r
-        @HeaderParam(REQUEST_ID_NAME) @ApiParam(REQUEST_ID_PARAM_DESCRIPTION) UUID requestId,\r
-        @QueryParam("mode") @DefaultValue("bare") @ApiParam("Fetch mode for policies, BARE for bare policies (default),"\r
-            + " REFERENCED for fully referenced policies") PolicyFetchMode mode\r
-    ) {\r
-        try (PolicyProvider policyProvider = new PolicyProvider()) {\r
+    @Override\r
+    public ResponseEntity<ToscaServiceTemplate> getPolicies(\r
+            PolicyFetchMode mode,\r
+            UUID requestId) {\r
+        try {\r
             ToscaServiceTemplate serviceTemplate =\r
-                policyProvider.fetchPolicies(null, null, null, null, mode);\r
-            updateApiStatisticsCounter(Target.POLICY, Result.SUCCESS, HttpMethod.GET);\r
+                toscaServiceTemplateService.fetchPolicies(null, null, null, null, mode);\r
+            updateApiStatisticsCounter(Target.POLICY, HttpStatus.OK, HttpMethod.GET);\r
             return makeOkResponse(requestId, serviceTemplate);\r
         } catch (PfModelException | PfModelRuntimeException pfme) {\r
-            LOGGER.warn("GET /policies/ --", pfme);\r
-            updateApiStatisticsCounter(Target.POLICY, Result.FAILURE, HttpMethod.GET);\r
+            final var msg = "GET /policies/ --";\r
+            updateApiStatisticsCounter(Target.POLICY, HttpStatus.resolve(pfme.getErrorResponse().getResponseCode()\r
+                .getStatusCode()), HttpMethod.GET);\r
             if (pfme.getErrorResponse().getResponseCode().equals(Status.NOT_FOUND)) {\r
                 pfme.getErrorResponse().setErrorMessage(ERROR_MESSAGE_NO_POLICIES_FOUND);\r
                 pfme.getErrorResponse().setErrorDetails(List.of(ERROR_MESSAGE_NO_POLICIES_FOUND));\r
             }\r
-            return makeErrorResponse(requestId, pfme);\r
+            throw new PolicyApiRuntimeException(msg, pfme.getCause(), pfme.getErrorResponse(), requestId);\r
         }\r
     }\r
 \r
@@ -917,52 +450,22 @@ public class ApiRestController extends CommonRestController {
      *\r
      * @return the Response object containing the results of the API operation\r
      */\r
-    @GET\r
-    @Path("/policies/{policyId}/versions/{policyVersion}")\r
-    @ApiOperation(value = "Retrieve specific version of a specified policy",\r
-        notes = "Returns a particular version of specified policy",\r
-        response = ToscaServiceTemplate.class,\r
-        responseHeaders = {\r
-            @ResponseHeader(name = VERSION_MINOR_NAME,\r
-                description = VERSION_MINOR_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = VERSION_PATCH_NAME,\r
-                description = VERSION_PATCH_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = VERSION_LATEST_NAME, description = VERSION_LATEST_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = REQUEST_ID_NAME,\r
-                description = REQUEST_ID_HDR_DESCRIPTION, response = UUID.class)},\r
-        authorizations = @Authorization(value = AUTHORIZATION_TYPE), tags = {"Policy", },\r
-        extensions = {\r
-            @Extension(name = EXTENSION_NAME, properties = {\r
-                @ExtensionProperty(name = API_VERSION_NAME, value = API_VERSION),\r
-                @ExtensionProperty(name = LAST_MOD_NAME, value = "Guilin")\r
-            })\r
-        }\r
-    )\r
-    @ApiResponses(value = {\r
-        @ApiResponse(code = HttpURLConnection.HTTP_UNAUTHORIZED, message = AUTHENTICATION_ERROR_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_FORBIDDEN, message = AUTHORIZATION_ERROR_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_NOT_FOUND, message = NOT_FOUND_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_INTERNAL_ERROR, message = SERVER_ERROR_MESSAGE)\r
-    })\r
-    public Response getSpecificPolicy(\r
-        @PathParam("policyId") @ApiParam(value = "Name of policy", required = true) String policyId,\r
-        @PathParam("policyVersion") @ApiParam(value = "Version of policy", required = true) String policyVersion,\r
-        @HeaderParam(REQUEST_ID_NAME) @ApiParam(REQUEST_ID_PARAM_DESCRIPTION) UUID requestId,\r
-        @QueryParam("mode") @DefaultValue("bare") @ApiParam("Fetch mode for policies, BARE for bare policies (default),"\r
-            + " REFERENCED for fully referenced policies") PolicyFetchMode mode\r
-    ) {\r
-        try (PolicyProvider policyProvider = new PolicyProvider()) {\r
+    @Override\r
+    public ResponseEntity<ToscaServiceTemplate> getSpecificPolicy(\r
+            String policyId,\r
+            String policyVersion,\r
+            PolicyFetchMode mode,\r
+            UUID requestId) {\r
+        try {\r
             ToscaServiceTemplate serviceTemplate =\r
-                policyProvider.fetchPolicies(null, null, policyId, policyVersion, mode);\r
-            updateApiStatisticsCounter(Target.POLICY, Result.SUCCESS, HttpMethod.GET);\r
+                toscaServiceTemplateService.fetchPolicies(null, null, policyId, policyVersion, mode);\r
+            updateApiStatisticsCounter(Target.POLICY, HttpStatus.OK, HttpMethod.GET);\r
             return makeOkResponse(requestId, serviceTemplate);\r
         } catch (PfModelException | PfModelRuntimeException pfme) {\r
-            LOGGER.warn("GET /policies/{}/versions/{}", policyId, policyVersion, pfme);\r
-            updateApiStatisticsCounter(Target.POLICY, Result.FAILURE, HttpMethod.GET);\r
-            return makeErrorResponse(requestId, pfme);\r
+            var msg = String.format("GET /policies/%s/versions/%s", policyId, policyVersion);\r
+            updateApiStatisticsCounter(Target.POLICY, HttpStatus.resolve(pfme.getErrorResponse().getResponseCode()\r
+                .getStatusCode()), HttpMethod.GET);\r
+            throw new PolicyApiRuntimeException(msg, pfme.getCause(), pfme.getErrorResponse(), requestId);\r
         }\r
     }\r
 \r
@@ -973,50 +476,22 @@ public class ApiRestController extends CommonRestController {
      *\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 = AUTHORIZATION_TYPE), tags = {"Policy", },\r
-            response = ToscaServiceTemplate.class,\r
-        responseHeaders = {\r
-            @ResponseHeader(name = VERSION_MINOR_NAME,\r
-                description = VERSION_MINOR_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = VERSION_PATCH_NAME,\r
-                description = VERSION_PATCH_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = VERSION_LATEST_NAME, description = VERSION_LATEST_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = REQUEST_ID_NAME,\r
-                description = REQUEST_ID_HDR_DESCRIPTION, response = UUID.class)},\r
-        extensions = {\r
-            @Extension(name = EXTENSION_NAME, properties = {\r
-                @ExtensionProperty(name = API_VERSION_NAME, value = API_VERSION),\r
-                @ExtensionProperty(name = LAST_MOD_NAME, value = "El Alto")})})\r
-    @ApiResponses(value = {\r
-        @ApiResponse(code = HttpURLConnection.HTTP_BAD_REQUEST, message = INVALID_BODY_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_UNAUTHORIZED, message = AUTHENTICATION_ERROR_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_FORBIDDEN, message = AUTHORIZATION_ERROR_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_NOT_FOUND, message = NOT_FOUND_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_NOT_ACCEPTABLE, message = INVALID_PAYLOAD_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_INTERNAL_ERROR, message = SERVER_ERROR_MESSAGE)})\r
-    public Response createPolicies(\r
-        @HeaderParam(REQUEST_ID_NAME) @ApiParam(REQUEST_ID_PARAM_DESCRIPTION) UUID requestId,\r
-        @ApiParam(value = "Entity body of policy", required = true) ToscaServiceTemplate body) {\r
-\r
+    @Override\r
+    public ResponseEntity<ToscaServiceTemplate> createPolicies(\r
+        ToscaServiceTemplate body,\r
+        UUID requestId) {\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
+        try {\r
+            ToscaServiceTemplate serviceTemplate = toscaServiceTemplateService.createPolicies(body);\r
+            updateApiStatisticsCounter(Target.POLICY, HttpStatus.OK, HttpMethod.POST);\r
             return makeOkResponse(requestId, serviceTemplate);\r
-        } catch (PfModelException | PfModelRuntimeException pfme) {\r
-            LOGGER.warn("POST /policies", pfme);\r
-            updateApiStatisticsCounter(Target.POLICY, Result.FAILURE, HttpMethod.POST);\r
-            return makeErrorResponse(requestId, pfme);\r
+        } catch (PfModelRuntimeException pfme) {\r
+            final var msg = "POST /policies";\r
+            updateApiStatisticsCounter(Target.POLICY, HttpStatus.resolve(pfme.getErrorResponse().getResponseCode()\r
+                .getStatusCode()), HttpMethod.POST);\r
+            throw new PolicyApiRuntimeException(msg, pfme.getCause(), pfme.getErrorResponse(), requestId);\r
         }\r
     }\r
 \r
@@ -1028,73 +503,26 @@ public class ApiRestController extends CommonRestController {
      *\r
      * @return the Response object containing the results of the API operation\r
      */\r
-    @DELETE\r
-    @Path("/policies/{policyId}/versions/{policyVersion}")\r
-    @ApiOperation(value = "Delete a particular version of a policy",\r
-        notes = "Rule: the version that has been deployed in PDP group(s) cannot be deleted",\r
-        authorizations = @Authorization(value = AUTHORIZATION_TYPE), tags = {"Policy", },\r
-        response = ToscaServiceTemplate.class,\r
-        responseHeaders = {\r
-            @ResponseHeader(name = VERSION_MINOR_NAME,\r
-                description = VERSION_MINOR_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = VERSION_PATCH_NAME,\r
-                description = VERSION_PATCH_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = VERSION_LATEST_NAME, description = VERSION_LATEST_DESCRIPTION,\r
-                response = String.class),\r
-            @ResponseHeader(name = REQUEST_ID_NAME,\r
-                description = REQUEST_ID_HDR_DESCRIPTION, response = UUID.class)},\r
-        extensions = {\r
-            @Extension(name = EXTENSION_NAME, properties = {\r
-                @ExtensionProperty(name = API_VERSION_NAME, value = API_VERSION),\r
-                @ExtensionProperty(name = LAST_MOD_NAME, value = "Guilin")})})\r
-    @ApiResponses(value = {\r
-        @ApiResponse(code = HttpURLConnection.HTTP_UNAUTHORIZED, message = AUTHENTICATION_ERROR_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_FORBIDDEN, message = AUTHORIZATION_ERROR_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_NOT_FOUND, message = NOT_FOUND_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_CONFLICT, message = HTTP_CONFLICT_MESSAGE),\r
-        @ApiResponse(code = HttpURLConnection.HTTP_INTERNAL_ERROR, message = SERVER_ERROR_MESSAGE)})\r
-    public Response deleteSpecificPolicy(\r
-        @PathParam("policyId") @ApiParam(value = "ID of policy", required = true) String policyId,\r
-        @PathParam("policyVersion") @ApiParam(value = "Version of policy", required = true) String policyVersion,\r
-        @HeaderParam(REQUEST_ID_NAME) @ApiParam(REQUEST_ID_PARAM_DESCRIPTION) UUID requestId) {\r
-\r
-        try (PolicyProvider policyProvider = new PolicyProvider()) {\r
+    @Override\r
+    public ResponseEntity<ToscaServiceTemplate> deleteSpecificPolicy(\r
+        String policyId,\r
+        String policyVersion,\r
+        UUID requestId) {\r
+        try {\r
             ToscaServiceTemplate serviceTemplate =\r
-                policyProvider.deletePolicy(null, null, policyId, policyVersion);\r
-            updateApiStatisticsCounter(Target.POLICY, Result.SUCCESS, HttpMethod.DELETE);\r
+                toscaServiceTemplateService.deletePolicy(null, null, policyId, policyVersion);\r
+            updateApiStatisticsCounter(Target.POLICY, HttpStatus.OK, HttpMethod.DELETE);\r
             return makeOkResponse(requestId, serviceTemplate);\r
-        } catch (PfModelException | PfModelRuntimeException pfme) {\r
-            LOGGER.warn("DELETE /policies/{}/versions/{}", policyId, policyVersion, pfme);\r
-            updateApiStatisticsCounter(Target.POLICY, Result.FAILURE, HttpMethod.DELETE);\r
-            return makeErrorResponse(requestId, pfme);\r
+        } catch (PfModelRuntimeException pfme) {\r
+            var msg = String.format("DELETE /policies/%s/versions/%s", policyId, policyVersion);\r
+            updateApiStatisticsCounter(Target.POLICY, HttpStatus.resolve(pfme.getErrorResponse().getResponseCode()\r
+                .getStatusCode()), HttpMethod.DELETE);\r
+            throw new PolicyApiRuntimeException(msg, pfme.getCause(), pfme.getErrorResponse(), requestId);\r
         }\r
     }\r
 \r
-\r
-\r
-    private enum Target {\r
-        POLICY,\r
-        POLICY_TYPE,\r
-        OTHER\r
-    }\r
-\r
-    private enum Result {\r
-        SUCCESS,\r
-        FAILURE\r
-    }\r
-\r
-    private enum HttpMethod {\r
-        POST,\r
-        GET,\r
-        DELETE\r
-    }\r
-\r
-    private void updateApiStatisticsCounter(Target target, Result result, HttpMethod http) {\r
-\r
-        ApiStatisticsManager.updateTotalApiCallCount();\r
-\r
+    private void updateApiStatisticsCounter(Target target, HttpStatus result, HttpMethod http) {\r
+        mgr.updateTotalApiCallCount();\r
         switch (target) {\r
             case POLICY:\r
                 updatePolicyStats(result, http);\r
@@ -1103,100 +531,100 @@ 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
-        if (result == Result.SUCCESS) {\r
+    private void updatePolicyStats(HttpStatus result, HttpMethod http) {\r
+        if (result.equals(HttpStatus.OK)) {\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
-        if (result == Result.SUCCESS) {\r
+    private void updatePolicyTypeStats(HttpStatus result, HttpMethod http) {\r
+        if (result.equals(HttpStatus.OK)) {\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
     }\r
-}
\ No newline at end of file
+}\r