X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=main%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fapi%2Fmain%2Frest%2Fprovider%2FPolicyProvider.java;h=afed31656255f65b38a97a59258759cd141e055d;hb=a8765f7d8a9be082c281d46592307f5056f32fcd;hp=6b123952f840fc37194aabf3d880e85a120aa411;hpb=19286bf7b66750aba7192af363349db2a4d5323d;p=policy%2Fapi.git

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