Update API for changes in TOSCA provider

[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 d23615c..d325f2c 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
@@ -3,6 +3,7 @@
  * ONAP Policy API\r
  * ================================================================================\r
  * Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.\r
+ * Modifications Copyright (C) 2020 Nordix Foundation.\r
  * ================================================================================\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
@@ -23,10 +24,9 @@
 package org.onap.policy.api.main.rest.provider;\r
 \r
 import java.util.ArrayList;\r
-import java.util.HashMap;\r
 import java.util.List;\r
-import java.util.Map;\r
 import java.util.Map.Entry;\r
+\r
 import javax.ws.rs.core.Response;\r
 \r
 import org.onap.policy.models.base.PfModelException;\r
@@ -87,8 +87,7 @@ public class PolicyTypeProvider extends CommonModelProvider {
         ToscaServiceTemplate serviceTemplate =\r
                 getFilteredPolicyTypes(policyTypeId, ToscaPolicyTypeFilter.LATEST_VERSION);\r
         if (!hasPolicyType(serviceTemplate)) {\r
-            throw new PfModelException(Response.Status.NOT_FOUND,\r
-                    constructResourceNotFoundMessage(policyTypeId, null));\r
+            throw new PfModelException(Response.Status.NOT_FOUND, constructResourceNotFoundMessage(policyTypeId, null));\r
         }\r
 \r
         return serviceTemplate;\r
@@ -108,7 +107,7 @@ public class PolicyTypeProvider extends CommonModelProvider {
             throw new PfModelException(Response.Status.BAD_REQUEST,\r
                     "no policy types specified in the service template");\r
         }\r
-        validatePolicyTypeVersion(body);\r
+        validatePolicyTypeVersionExist(body);\r
         return modelsProvider.createPolicyTypes(body);\r
     }\r
 \r
@@ -138,8 +137,8 @@ public class PolicyTypeProvider extends CommonModelProvider {
     }\r
 \r
     /**\r
-     * Validates whether specified policy type can be deleted based on the rule that\r
-     * policy type parameterized by at least one policies cannot be deleted.\r
+     * Validates whether specified policy type can be deleted based on the rule that policy type parameterized by at\r
+     * least one policies cannot be deleted.\r
      *\r
      * @param policyTypeId the ID of policy type\r
      * @param policyTypeVersion the version of policy type\r
@@ -148,8 +147,8 @@ public class PolicyTypeProvider extends CommonModelProvider {
      */\r
     private void validateDeleteEligibility(String policyTypeId, String policyTypeVersion) throws PfModelException {\r
 \r
-        ToscaPolicyFilter policyFilter = ToscaPolicyFilter.builder()\r
-                .type(policyTypeId).typeVersion(policyTypeVersion).build();\r
+        ToscaPolicyFilter policyFilter =\r
+                ToscaPolicyFilter.builder().type(policyTypeId).typeVersion(policyTypeVersion).build();\r
         List<ToscaPolicy> policies = modelsProvider.getFilteredPolicyList(policyFilter);\r
         if (!policies.isEmpty()) {\r
             throw new PfModelException(Response.Status.CONFLICT,\r
@@ -157,19 +156,6 @@ public class PolicyTypeProvider extends CommonModelProvider {
         }\r
     }\r
 \r
-    /**\r
-     * Validates the provided policy type version in the payload.\r
-     *\r
-     * @param body the provided TOSCA service template which contains the policy types\r
-     *\r
-     * @throws PfModelException the PfModel parsing exception\r
-     */\r
-    private void validatePolicyTypeVersion(ToscaServiceTemplate body) throws PfModelException {\r
-\r
-        validatePolicyTypeVersionExist(body);\r
-        validateNoDuplicateVersionInDb(body);\r
-    }\r
-\r
     /**\r
      * Validates that each policy type has a version specified in the payload.\r
      *\r
@@ -180,7 +166,7 @@ public class PolicyTypeProvider extends CommonModelProvider {
     private void validatePolicyTypeVersionExist(ToscaServiceTemplate body) throws PfModelException {\r
 \r
         List<String> invalidPolicyTypeNames = new ArrayList<>();\r
-        for (Entry<String, ToscaPolicyType> policyType: body.getPolicyTypes().entrySet()) {\r
+        for (Entry<String, ToscaPolicyType> policyType : body.getPolicyTypes().entrySet()) {\r
             if (!"tosca.policies.Root".equals(policyType.getValue().getDerivedFrom())\r
                     && policyType.getValue().getVersion() == null) {\r
                 invalidPolicyTypeNames.add(policyType.getKey());\r
@@ -194,41 +180,6 @@ public class PolicyTypeProvider extends CommonModelProvider {
         }\r
     }\r
 \r
-    /**\r
-     * Validates that there is no duplicate version of the policy type stored in the database.\r
-     *\r
-     * @param body the TOSCA service template payload\r
-     *\r
-     * @throws PfModelException the PfModel parsing exception\r
-     */\r
-    private void validateNoDuplicateVersionInDb(ToscaServiceTemplate body) throws PfModelException {\r
-\r
-        Map<String, String> invalidPolicyTypes = new HashMap<>();\r
-        for (Entry<String, ToscaPolicyType> policyType: body.getPolicyTypes().entrySet()) {\r
-            if ("tosca.policies.Root".equals(policyType.getValue().getDerivedFrom())) {\r
-                continue;\r
-            }\r
-            String policyTypeName = policyType.getKey();\r
-            String policyTypeVersion = policyType.getValue().getVersion();\r
-            ToscaServiceTemplate serviceTemplate = getFilteredPolicyTypes(policyTypeName, policyTypeVersion);\r
-            if (hasPolicyType(serviceTemplate)) {\r
-                String latestVersion = getFilteredPolicyTypes(policyTypeName, ToscaPolicyTypeFilter.LATEST_VERSION)\r
-                        .getPolicyTypesAsMap().entrySet().iterator().next().getKey().getVersion();\r
-                invalidPolicyTypes.put(String.join(":", policyTypeName, policyTypeVersion), latestVersion);\r
-            }\r
-        }\r
-\r
-        if (!invalidPolicyTypes.isEmpty()) {\r
-            List<String> duplicateVersions = new ArrayList<>(invalidPolicyTypes.size());\r
-            for (Entry<String, String> invalidPolicyType : invalidPolicyTypes.entrySet()) {\r
-                String eachDuplicateVersion = "policy type " + invalidPolicyType.getKey()\r
-                    + " already exists; its latest version is " + invalidPolicyType.getValue();\r
-                duplicateVersions.add(eachDuplicateVersion);\r
-            }\r
-            throw new PfModelException(Response.Status.NOT_ACCEPTABLE, String.join("\n", duplicateVersions));\r
-        }\r
-    }\r
-\r
     /**\r
      * Retrieves the specified version of the policy type.\r
      *\r
@@ -242,8 +193,8 @@ public class PolicyTypeProvider extends CommonModelProvider {
     private ToscaServiceTemplate getFilteredPolicyTypes(String policyTypeName, String policyTypeVersion)\r
             throws PfModelException {\r
 \r
-        ToscaPolicyTypeFilter policyTypeFilter = ToscaPolicyTypeFilter.builder()\r
-                .name(policyTypeName).version(policyTypeVersion).build();\r
+        ToscaPolicyTypeFilter policyTypeFilter =\r
+                ToscaPolicyTypeFilter.builder().name(policyTypeName).version(policyTypeVersion).build();\r
         return modelsProvider.getFilteredPolicyTypes(policyTypeFilter);\r
     }\r
 \r