Fix sonar issues in policy-api

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

diff --git a/main/src/main/java/org/onap/policy/api/main/rest/provider/PolicyTypeProvider.java b/main/src/main/java/org/onap/policy/api/main/rest/provider/PolicyTypeProvider.java
index 8fab2bd..5752451 100644 (file)
--- a/main/src/main/java/org/onap/policy/api/main/rest/provider/PolicyTypeProvider.java
+++ b/main/src/main/java/org/onap/policy/api/main/rest/provider/PolicyTypeProvider.java
@@ -24,16 +24,10 @@ package org.onap.policy.api.main.rest.provider;
 \r
 import java.util.List;\r
 import javax.ws.rs.core.Response;\r
-import org.onap.policy.api.main.parameters.ApiParameterGroup;\r
-import org.onap.policy.common.parameters.ParameterService;\r
 import org.onap.policy.models.base.PfModelException;\r
-import org.onap.policy.models.pdp.concepts.PdpGroup;\r
-import org.onap.policy.models.pdp.concepts.PdpGroupFilter;\r
-import org.onap.policy.models.provider.PolicyModelsProvider;\r
-import org.onap.policy.models.provider.PolicyModelsProviderFactory;\r
-import org.onap.policy.models.provider.PolicyModelsProviderParameters;\r
+import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;\r
+import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyFilter;\r
 import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyTypeFilter;\r
-import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyTypeIdentifier;\r
 import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;\r
 \r
 /**\r
@@ -41,18 +35,13 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
  *\r
  * @author Chenfei Gao (cgao@research.att.com)\r
  */\r
-public class PolicyTypeProvider {\r
-\r
-    private PolicyModelsProvider modelsProvider;\r
+public class PolicyTypeProvider extends CommonModelProvider {\r
 \r
     /**\r
      * Default constructor.\r
      */\r
     public PolicyTypeProvider() throws PfModelException {\r
-\r
-        ApiParameterGroup parameterGroup = ParameterService.get("ApiGroup");\r
-        PolicyModelsProviderParameters providerParameters = parameterGroup.getDatabaseProviderParameters();\r
-        modelsProvider = new PolicyModelsProviderFactory().createPolicyModelsProvider(providerParameters);\r
+        super();\r
     }\r
 \r
     /**\r
@@ -68,16 +57,15 @@ public class PolicyTypeProvider {
     public ToscaServiceTemplate fetchPolicyTypes(String policyTypeId, String policyTypeVersion)\r
             throws PfModelException {\r
 \r
-        ToscaServiceTemplate serviceTemplate;\r
-        if (policyTypeId == null || policyTypeVersion == null) {\r
-            ToscaPolicyTypeFilter policyTypeFilter = ToscaPolicyTypeFilter.builder()\r
-                    .name(policyTypeId).version(policyTypeVersion).build();\r
-            serviceTemplate = modelsProvider.getFilteredPolicyTypes(policyTypeFilter);\r
-        } else {\r
-            serviceTemplate = modelsProvider.getPolicyTypes(policyTypeId, policyTypeVersion);\r
+        ToscaPolicyTypeFilter policyTypeFilter = ToscaPolicyTypeFilter.builder()\r
+                .name(policyTypeId).version(policyTypeVersion).build();\r
+        ToscaServiceTemplate serviceTemplate = modelsProvider.getFilteredPolicyTypes(policyTypeFilter);\r
+\r
+        if (policyTypeId != null && !hasPolicyType(serviceTemplate)) {\r
+            throw new PfModelException(Response.Status.NOT_FOUND,\r
+                    constructResourceNotFoundMessage(policyTypeId, policyTypeVersion));\r
         }\r
 \r
-        close();\r
         return serviceTemplate;\r
     }\r
 \r
@@ -95,8 +83,11 @@ public class PolicyTypeProvider {
         ToscaPolicyTypeFilter policyTypeFilter = ToscaPolicyTypeFilter.builder()\r
                 .name(policyTypeId).version(ToscaPolicyTypeFilter.LATEST_VERSION).build();\r
         ToscaServiceTemplate serviceTemplate = modelsProvider.getFilteredPolicyTypes(policyTypeFilter);\r
+        if (!hasPolicyType(serviceTemplate)) {\r
+            throw new PfModelException(Response.Status.NOT_FOUND,\r
+                    constructResourceNotFoundMessage(policyTypeId, null));\r
+        }\r
 \r
-        close();\r
         return serviceTemplate;\r
     }\r
 \r
@@ -110,10 +101,7 @@ public class PolicyTypeProvider {
      */\r
     public ToscaServiceTemplate createPolicyType(ToscaServiceTemplate body) throws PfModelException {\r
 \r
-        ToscaServiceTemplate serviceTemplate = modelsProvider.createPolicyTypes(body);\r
-\r
-        close();\r
-        return serviceTemplate;\r
+        return modelsProvider.createPolicyTypes(body);\r
     }\r
 \r
     /**\r
@@ -133,7 +121,11 @@ public class PolicyTypeProvider {
 \r
         ToscaServiceTemplate serviceTemplate = modelsProvider.deletePolicyType(policyTypeId, policyTypeVersion);\r
 \r
-        close();\r
+        if (!hasPolicyType(serviceTemplate)) {\r
+            throw new PfModelException(Response.Status.NOT_FOUND,\r
+                    constructResourceNotFoundMessage(policyTypeId, policyTypeVersion));\r
+        }\r
+\r
         return serviceTemplate;\r
     }\r
 \r
@@ -143,34 +135,30 @@ public class PolicyTypeProvider {
      *\r
      * @param policyTypeId the ID of policy type\r
      * @param policyTypeVersion the version of policy type\r
-     * @param policyId the ID of policy\r
-     * @param policyVersion the version of policy\r
      *\r
      * @throws PfModelException the PfModel parsing exception\r
      */\r
     private void validateDeleteEligibility(String policyTypeId, String policyTypeVersion) throws PfModelException {\r
 \r
-        PdpGroupFilter pdpGroupFilter = PdpGroupFilter.builder()\r
-                .policyType(new ToscaPolicyTypeIdentifier(policyTypeId, policyTypeVersion)).build();\r
-\r
-        List<PdpGroup> pdpGroups = modelsProvider.getFilteredPdpGroups(pdpGroupFilter);\r
-        if (!pdpGroups.isEmpty()) {\r
+        ToscaPolicyFilter policyFilter = ToscaPolicyFilter.builder()\r
+                .type(policyTypeId).typeVersion(policyTypeVersion).build();\r
+        List<ToscaPolicy> policies = modelsProvider.getFilteredPolicyList(policyFilter);\r
+        if (!policies.isEmpty()) {\r
             throw new PfModelException(Response.Status.CONFLICT,\r
-                    "the policy type is parameterized by at least one policies that have been deployed in pdp group");\r
+                    constructDeletePolicyTypeViolationMessage(policyTypeId, policyTypeVersion, policies));\r
         }\r
     }\r
 \r
     /**\r
-     * Closes the connection to database.\r
+     * Constructs returned message for not found resource.\r
      *\r
-     * @throws PfModelException the PfModel parsing exception\r
+     * @param policyTypeId the ID of policy type\r
+     * @param policyTypeVersion the version of policy type\r
+     *\r
+     * @return constructed message\r
      */\r
-    private void close() throws PfModelException {\r
-        try {\r
-            modelsProvider.close();\r
-        } catch (Exception e) {\r
-            throw new PfModelException(\r
-                    Response.Status.INTERNAL_SERVER_ERROR, "error closing connection to database", e);\r
-        }\r
+    private String constructResourceNotFoundMessage(String policyTypeId, String policyTypeVersion) {\r
+\r
+        return "policy type with ID " + policyTypeId + ":" + policyTypeVersion + " does not exist";\r
     }\r
 }\r