Modify policy provider to support GET/CREATE

[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..19f3a75 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
@@ -27,13 +27,12 @@ import javax.ws.rs.core.Response;
 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
@@ -68,13 +67,13 @@ 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
@@ -95,6 +94,10 @@ public class PolicyTypeProvider {
         ToscaPolicyTypeFilter policyTypeFilter = ToscaPolicyTypeFilter.builder()\r
                 .name(policyTypeId).version(ToscaPolicyTypeFilter.LATEST_VERSION).build();\r
         ToscaServiceTemplate serviceTemplate = modelsProvider.getFilteredPolicyTypes(policyTypeFilter);\r
+        if (serviceTemplate.getPolicyTypes().isEmpty()) {\r
+            throw new PfModelException(Response.Status.NOT_FOUND,\r
+                    constructResourceNotFoundMessage(policyTypeId, null));\r
+        }\r
 \r
         close();\r
         return serviceTemplate;\r
@@ -143,20 +146,50 @@ 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
+                    "the policy type has been parameterized by at least one policies");\r
+        }\r
+    }\r
+\r
+    /**\r
+     * Constructs returned message for not found resource.\r
+     *\r
+     * @param policyTypeId the ID of policy type\r
+     * @param policyTypeVersion the version of policy type\r
+     *\r
+     * @return constructed message\r
+     */\r
+    private String constructResourceNotFoundMessage(String policyTypeId, String policyTypeVersion) {\r
+\r
+        return "policy type with ID " + policyTypeId + ":" + policyTypeVersion + " does not exist";\r
+    }\r
+\r
+    /**\r
+     * Checks if service template contains any policy type.\r
+     *\r
+     * @param serviceTemplate the service template to check against\r
+     *\r
+     * @return boolean whether service template contains any policy type\r
+     */\r
+    private boolean hasPolicyType(ToscaServiceTemplate serviceTemplate) {\r
+\r
+        if (serviceTemplate.getPolicyTypes() == null) {\r
+            return false;\r
+        } else if (serviceTemplate.getPolicyTypes().isEmpty()) {\r
+            return false;\r
+        } else if (serviceTemplate.getPolicyTypes().get(0).isEmpty()) {\r
+            return false;\r
+        } else {\r
+            return true;\r
         }\r
     }\r
 \r
@@ -166,6 +199,7 @@ public class PolicyTypeProvider {
      * @throws PfModelException the PfModel parsing exception\r
      */\r
     private void close() throws PfModelException {\r
+\r
         try {\r
             modelsProvider.close();\r
         } catch (Exception e) {\r