Changes for cascaded get in policy models

[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 6c8e73e..9c9c41c 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
@@ -23,8 +23,6 @@
 \r
 package org.onap.policy.api.main.rest.provider;\r
 \r
-import javax.ws.rs.core.Response;\r
-\r
 import org.onap.policy.models.base.PfModelException;\r
 import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyTypeFilter;\r
 import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;\r
@@ -56,14 +54,7 @@ public class PolicyTypeProvider extends CommonModelProvider {
     public ToscaServiceTemplate fetchPolicyTypes(String policyTypeId, String policyTypeVersion)\r
             throws PfModelException {\r
 \r
-        ToscaServiceTemplate serviceTemplate = getFilteredPolicyTypes(policyTypeId, policyTypeVersion);\r
-\r
-        if (policyTypeId != null && !hasPolicyType(serviceTemplate)) {\r
-            throw new PfModelException(Response.Status.NOT_FOUND,\r
-                    constructResourceNotFoundMessage(policyTypeId, policyTypeVersion));\r
-        }\r
-\r
-        return serviceTemplate;\r
+        return getFilteredPolicyTypes(policyTypeId, policyTypeVersion);\r
     }\r
 \r
     /**\r
@@ -77,13 +68,7 @@ public class PolicyTypeProvider extends CommonModelProvider {
      */\r
     public ToscaServiceTemplate fetchLatestPolicyTypes(String policyTypeId) throws PfModelException {\r
 \r
-        ToscaServiceTemplate serviceTemplate =\r
-                getFilteredPolicyTypes(policyTypeId, ToscaPolicyTypeFilter.LATEST_VERSION);\r
-        if (!hasPolicyType(serviceTemplate)) {\r
-            throw new PfModelException(Response.Status.NOT_FOUND, constructResourceNotFoundMessage(policyTypeId, null));\r
-        }\r
-\r
-        return serviceTemplate;\r
+        return getFilteredPolicyTypes(policyTypeId, ToscaPolicyTypeFilter.LATEST_VERSION);\r
     }\r
 \r
     /**\r
@@ -96,11 +81,6 @@ public class PolicyTypeProvider extends CommonModelProvider {
      */\r
     public ToscaServiceTemplate createPolicyType(ToscaServiceTemplate body) throws PfModelException {\r
 \r
-        if (!hasPolicyType(body)) {\r
-            throw new PfModelException(Response.Status.BAD_REQUEST,\r
-                    "no policy types specified in the service template");\r
-        }\r
-\r
         return modelsProvider.createPolicyTypes(body);\r
     }\r
 \r
@@ -117,14 +97,7 @@ public class PolicyTypeProvider extends CommonModelProvider {
     public ToscaServiceTemplate deletePolicyType(String policyTypeId, String policyTypeVersion)\r
             throws PfModelException {\r
 \r
-        ToscaServiceTemplate serviceTemplate = modelsProvider.deletePolicyType(policyTypeId, policyTypeVersion);\r
-\r
-        if (!hasPolicyType(serviceTemplate)) {\r
-            throw new PfModelException(Response.Status.NOT_FOUND,\r
-                    constructResourceNotFoundMessage(policyTypeId, policyTypeVersion));\r
-        }\r
-\r
-        return serviceTemplate;\r
+        return modelsProvider.deletePolicyType(policyTypeId, policyTypeVersion);\r
     }\r
 \r
     /**\r
@@ -144,17 +117,4 @@ public class PolicyTypeProvider extends CommonModelProvider {
                 ToscaPolicyTypeFilter.builder().name(policyTypeName).version(policyTypeVersion).build();\r
         return modelsProvider.getFilteredPolicyTypes(policyTypeFilter);\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