diff options
Diffstat (limited to 'main/src/main')
2 files changed, 8 insertions, 2 deletions
diff --git a/main/src/main/java/org/onap/policy/api/main/rest/provider/LegacyGuardPolicyProvider.java b/main/src/main/java/org/onap/policy/api/main/rest/provider/LegacyGuardPolicyProvider.java index 2f450866..d0032b03 100644 --- a/main/src/main/java/org/onap/policy/api/main/rest/provider/LegacyGuardPolicyProvider.java +++ b/main/src/main/java/org/onap/policy/api/main/rest/provider/LegacyGuardPolicyProvider.java @@ -25,7 +25,9 @@ package org.onap.policy.api.main.rest.provider; import java.util.ArrayList; import java.util.List; import java.util.Map; + import javax.ws.rs.core.Response; + import org.onap.policy.models.base.PfModelException; import org.onap.policy.models.pdp.concepts.PdpGroup; import org.onap.policy.models.pdp.concepts.PdpGroupFilter; @@ -41,6 +43,7 @@ import org.onap.policy.models.tosca.legacy.concepts.LegacyGuardPolicyOutput; public class LegacyGuardPolicyProvider extends CommonModelProvider { private static final String INVALID_POLICY_VERSION = "legacy policy version is not an integer"; + private static final String LEGACY_MINOR_PATCH_SUFFIX = ".0.0"; /** @@ -108,7 +111,7 @@ public class LegacyGuardPolicyProvider extends CommonModelProvider { private void validateDeleteEligibility(String policyId, String policyVersion) throws PfModelException { List<ToscaPolicyIdentifier> policies = new ArrayList<>(); - policies.add(new ToscaPolicyIdentifier(policyId, policyVersion)); + policies.add(new ToscaPolicyIdentifier(policyId, policyVersion + LEGACY_MINOR_PATCH_SUFFIX)); PdpGroupFilter pdpGroupFilter = PdpGroupFilter.builder().policyList(policies).build(); List<PdpGroup> pdpGroups = modelsProvider.getFilteredPdpGroups(pdpGroupFilter); diff --git a/main/src/main/java/org/onap/policy/api/main/rest/provider/LegacyOperationalPolicyProvider.java b/main/src/main/java/org/onap/policy/api/main/rest/provider/LegacyOperationalPolicyProvider.java index 965ecdce..ac8fa269 100644 --- a/main/src/main/java/org/onap/policy/api/main/rest/provider/LegacyOperationalPolicyProvider.java +++ b/main/src/main/java/org/onap/policy/api/main/rest/provider/LegacyOperationalPolicyProvider.java @@ -24,7 +24,9 @@ package org.onap.policy.api.main.rest.provider; import java.util.ArrayList; import java.util.List; + import javax.ws.rs.core.Response; + import org.onap.policy.models.base.PfModelException; import org.onap.policy.models.pdp.concepts.PdpGroup; import org.onap.policy.models.pdp.concepts.PdpGroupFilter; @@ -39,6 +41,7 @@ import org.onap.policy.models.tosca.legacy.concepts.LegacyOperationalPolicy; public class LegacyOperationalPolicyProvider extends CommonModelProvider { private static final String INVALID_POLICY_VERSION = "legacy policy version is not an integer"; + private static final String LEGACY_MINOR_PATCH_SUFFIX = ".0.0"; /** @@ -105,7 +108,7 @@ public class LegacyOperationalPolicyProvider extends CommonModelProvider { private void validateDeleteEligibility(String policyId, String policyVersion) throws PfModelException { List<ToscaPolicyIdentifier> policies = new ArrayList<>(); - policies.add(new ToscaPolicyIdentifier(policyId, policyVersion)); + policies.add(new ToscaPolicyIdentifier(policyId, policyVersion + LEGACY_MINOR_PATCH_SUFFIX)); PdpGroupFilter pdpGroupFilter = PdpGroupFilter.builder().policyList(policies).build(); List<PdpGroup> pdpGroups = modelsProvider.getFilteredPdpGroups(pdpGroupFilter); |