Changes for cascaded get in policy models

[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 6b12395..afed316 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
@@ -27,8 +27,6 @@ import java.util.ArrayList;
 import java.util.List;\r
 import java.util.Map;\r
 \r
-import javax.ws.rs.core.Response;\r
-\r
 import org.apache.commons.lang3.tuple.Pair;\r
 import org.onap.policy.models.base.PfConceptKey;\r
 import org.onap.policy.models.base.PfModelException;\r
@@ -65,15 +63,7 @@ public class PolicyProvider extends CommonModelProvider {
     public ToscaServiceTemplate fetchPolicies(String policyTypeId, String policyTypeVersion, String policyId,\r
             String policyVersion) throws PfModelException {\r
 \r
-        ToscaServiceTemplate serviceTemplate =\r
-                getFilteredPolicies(policyTypeId, policyTypeVersion, policyId, policyVersion);\r
-\r
-        if (!hasPolicy(serviceTemplate)) {\r
-            throw new PfModelException(Response.Status.NOT_FOUND,\r
-                    constructResourceNotFoundMessage(policyTypeId, policyTypeVersion, policyId, policyVersion));\r
-        }\r
-\r
-        return serviceTemplate;\r
+        return getFilteredPolicies(policyTypeId, policyTypeVersion, policyId, policyVersion);\r
     }\r
 \r
     /**\r
@@ -90,15 +80,7 @@ public class PolicyProvider extends CommonModelProvider {
     public ToscaServiceTemplate fetchLatestPolicies(String policyTypeId, String policyTypeVersion, String policyId)\r
             throws PfModelException {\r
 \r
-        ToscaServiceTemplate serviceTemplate =\r
-                getFilteredPolicies(policyTypeId, policyTypeVersion, policyId, ToscaPolicyFilter.LATEST_VERSION);\r
-\r
-        if (!hasPolicy(serviceTemplate)) {\r
-            throw new PfModelException(Response.Status.NOT_FOUND,\r
-                    constructResourceNotFoundMessage(policyTypeId, policyTypeVersion, policyId, null));\r
-        }\r
-\r
-        return serviceTemplate;\r
+        return getFilteredPolicies(policyTypeId, policyTypeVersion, policyId, ToscaPolicyFilter.LATEST_VERSION);\r
     }\r
 \r
     /**\r
@@ -164,14 +146,7 @@ public class PolicyProvider extends CommonModelProvider {
     public ToscaServiceTemplate deletePolicy(String policyTypeId, String policyTypeVersion, String policyId,\r
             String policyVersion) throws PfModelException {\r
 \r
-        ToscaServiceTemplate serviceTemplate = modelsProvider.deletePolicy(policyId, policyVersion);\r
-\r
-        if (!hasPolicy(serviceTemplate)) {\r
-            throw new PfModelException(Response.Status.NOT_FOUND,\r
-                    constructResourceNotFoundMessage(policyTypeId, policyTypeVersion, policyId, policyVersion));\r
-        }\r
-\r
-        return serviceTemplate;\r
+        return modelsProvider.deletePolicy(policyId, policyVersion);\r
     }\r
 \r
     /**\r
@@ -193,21 +168,4 @@ public class PolicyProvider extends CommonModelProvider {
                 .type(policyTypeName).typeVersion(policyTypeVersion).build();\r
         return modelsProvider.getFilteredPolicies(policyFilter);\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
-     * @param policyId the ID of policy\r
-     * @param policyVersion the version of policy\r
-     *\r
-     * @return constructed message\r
-     */\r
-    private String constructResourceNotFoundMessage(String policyTypeId, String policyTypeVersion, String policyId,\r
-            String policyVersion) {\r
-\r
-        return "policy with ID " + policyId + ":" + policyVersion + " and type " + policyTypeId + ":"\r
-                + policyTypeVersion + " does not exist";\r
-    }\r
 }\r