Add more filtering conditions to filter returned PdpGroups with specified policy...

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

diff --git a/main/src/main/java/org/onap/policy/api/main/rest/provider/PolicyProvider.java b/main/src/main/java/org/onap/policy/api/main/rest/provider/PolicyProvider.java
index 1cb3af5..102f6f8 100644 (file)
--- a/main/src/main/java/org/onap/policy/api/main/rest/provider/PolicyProvider.java
+++ b/main/src/main/java/org/onap/policy/api/main/rest/provider/PolicyProvider.java
@@ -34,6 +34,7 @@ import org.onap.policy.models.base.PfModelException;
 import org.onap.policy.models.pdp.concepts.PdpGroup;\r
 import org.onap.policy.models.pdp.concepts.PdpGroupFilter;\r
 import org.onap.policy.models.pdp.concepts.PdpSubGroup;\r
+import org.onap.policy.models.pdp.enums.PdpState;\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
@@ -48,7 +49,7 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
  *\r
  * @author Chenfei Gao (cgao@research.att.com)\r
  */\r
-public class PolicyProvider {\r
+public class PolicyProvider implements AutoCloseable {\r
 \r
     private PolicyModelsProvider modelsProvider;\r
 \r
@@ -87,7 +88,6 @@ public class PolicyProvider {
                     constructResourceNotFoundMessage(policyTypeId, policyTypeVersion, policyId, policyVersion));\r
         }\r
 \r
-        close();\r
         return serviceTemplate;\r
     }\r
 \r
@@ -115,7 +115,6 @@ public class PolicyProvider {
                     constructResourceNotFoundMessage(policyTypeId, policyTypeVersion, policyId, null));\r
         }\r
 \r
-        close();\r
         return serviceTemplate;\r
     }\r
 \r
@@ -135,7 +134,8 @@ public class PolicyProvider {
 \r
         List<ToscaPolicyTypeIdentifier> policyTypes = new ArrayList<>();\r
         policyTypes.add(new ToscaPolicyTypeIdentifier(policyTypeId, policyTypeVersion));\r
-        PdpGroupFilter pdpGroupFilter = PdpGroupFilter.builder().policyTypeList(policyTypes).build();\r
+        PdpGroupFilter pdpGroupFilter = PdpGroupFilter.builder().policyTypeList(policyTypes)\r
+                .groupState(PdpState.ACTIVE).pdpState(PdpState.ACTIVE).build();\r
         List<PdpGroup> pdpGroups = modelsProvider.getFilteredPdpGroups(pdpGroupFilter);\r
 \r
         if (pdpGroups.isEmpty()) {\r
@@ -143,14 +143,13 @@ public class PolicyProvider {
                     constructDeploymentNotFoundMessage(policyTypeId, policyTypeVersion, policyId));\r
         }\r
 \r
-        Map<Pair<String, String>, List<ToscaPolicy>> deployedPolicyMap = constructDeployedPolicyMap(\r
-                pdpGroups, policyId);\r
+        Map<Pair<String, String>, List<ToscaPolicy>> deployedPolicyMap =\r
+                constructDeployedPolicyMap(pdpGroups, policyId);\r
         if (deployedPolicyMap.isEmpty()) {\r
             throw new PfModelException(Response.Status.NOT_FOUND,\r
                     constructDeploymentNotFoundMessage(policyTypeId, policyTypeVersion, policyId));\r
         }\r
 \r
-        close();\r
         return deployedPolicyMap;\r
     }\r
 \r
@@ -171,10 +170,7 @@ public class PolicyProvider {
         validatePolicyTypeExist(policyTypeId, policyTypeVersion);\r
         validatePolicyTypeMatch(policyTypeId, policyTypeVersion, body);\r
 \r
-        ToscaServiceTemplate serviceTemplate = modelsProvider.createPolicies(body);\r
-\r
-        close();\r
-        return serviceTemplate;\r
+        return modelsProvider.createPolicies(body);\r
     }\r
 \r
     /**\r
@@ -201,7 +197,6 @@ public class PolicyProvider {
                     constructResourceNotFoundMessage(policyTypeId, policyTypeVersion, policyId, policyVersion));\r
         }\r
 \r
-        close();\r
         return serviceTemplate;\r
     }\r
 \r
@@ -215,10 +210,10 @@ public class PolicyProvider {
      */\r
     private void validatePolicyTypeExist(String policyTypeId, String policyTypeVersion) throws PfModelException {\r
 \r
-        try {\r
-            modelsProvider.getPolicyTypes(policyTypeId, policyTypeVersion);\r
-        } catch (Exception e) {\r
-            throw new PfModelException(Response.Status.NOT_FOUND, "specified policy type does not exist", e);\r
+        ToscaServiceTemplate serviceTemplate = modelsProvider.getPolicyTypes(policyTypeId, policyTypeVersion);\r
+        if (!hasPolicyType(serviceTemplate)) {\r
+            throw new PfModelException(Response.Status.NOT_FOUND,\r
+                    "policy type with ID " + policyTypeId + ":" + policyTypeVersion + " does not exist");\r
         }\r
     }\r
 \r
@@ -274,10 +269,42 @@ public class PolicyProvider {
         List<PdpGroup> pdpGroups = modelsProvider.getFilteredPdpGroups(pdpGroupFilter);\r
 \r
         if (!pdpGroups.isEmpty()) {\r
-            throw new PfModelException(Response.Status.CONFLICT, "the policy has been deployed in pdp group");\r
+            throw new PfModelException(Response.Status.CONFLICT,\r
+                    constructDeleteRuleViolationMessage(policyId, policyVersion, pdpGroups));\r
         }\r
     }\r
 \r
+    /**\r
+     * Constructs returned message for policy delete rule violation.\r
+     *\r
+     * @param policyId the ID of policy\r
+     * @param policyVersion the version of policy\r
+     * @param pdpGroups the list of pdp groups\r
+     *\r
+     * @return the constructed message\r
+     */\r
+    private String constructDeleteRuleViolationMessage(\r
+            String policyId, String policyVersion, List<PdpGroup> pdpGroups) {\r
+\r
+        List<String> pdpGroupNameVersionList = new ArrayList<>();\r
+        for (PdpGroup pdpGroup : pdpGroups) {\r
+            pdpGroupNameVersionList.add(pdpGroup.getName() + ":" + pdpGroup.getVersion());\r
+        }\r
+        String deployedPdpGroups = String.join(",", pdpGroupNameVersionList);\r
+        return "policy with ID " + policyId + ":" + policyVersion\r
+                + " cannot be deleted as it is deployed in pdp groups " + deployedPdpGroups;\r
+    }\r
+\r
+    /**\r
+     * Constructs the map of deployed pdp groups and deployed policies.\r
+     *\r
+     * @param pdpGroups the list of pdp groups that contain the specified policy\r
+     * @param policyId the ID of policy\r
+     *\r
+     * @return the constructed map of pdp groups and deployed policies\r
+     *\r
+     * @throws PfModelException the PfModel parsing exception\r
+     */\r
     private Map<Pair<String, String>, List<ToscaPolicy>> constructDeployedPolicyMap(\r
             List<PdpGroup> pdpGroups, String policyId) throws PfModelException {\r
 \r
@@ -359,17 +386,34 @@ public class PolicyProvider {
         }\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
     /**\r
      * Closes the connection to database.\r
      *\r
      * @throws PfModelException the PfModel parsing exception\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
+    @Override\r
+    public void close() throws PfModelException {\r
+\r
+        modelsProvider.close();\r
     }\r
 }\r