From 85e47aa6a194bc8069a628390708a62711a6197b Mon Sep 17 00:00:00 2001 From: Chenfei Gao Date: Wed, 22 May 2019 12:40:48 -0400 Subject: Reserve version integer check and delete eligibility check Per Jim's comment, version integer check should come first before checking delete elibibility (i.e. checking if policy is deployed in PDP group or not). Issue-ID: POLICY-1777 Change-Id: Ibd3d8d05a40ef34c558a2e9389596396a69469fe Signed-off-by: Chenfei Gao --- .../onap/policy/api/main/rest/provider/LegacyGuardPolicyProvider.java | 2 +- .../policy/api/main/rest/provider/LegacyOperationalPolicyProvider.java | 2 +- .../policy/api/main/rest/provider/TestLegacyGuardPolicyProvider.java | 2 +- .../api/main/rest/provider/TestLegacyOperationalPolicyProvider.java | 2 +- 4 files changed, 4 insertions(+), 4 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 236d26eb..44cc046f 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 @@ -98,8 +98,8 @@ public class LegacyGuardPolicyProvider implements AutoCloseable { public Map deleteGuardPolicy(String policyId, String policyVersion) throws PfModelException { - validateDeleteEligibility(policyId, policyVersion); validateLegacyGuardPolicyVersion(policyVersion); + validateDeleteEligibility(policyId, policyVersion); return modelsProvider.deleteGuardPolicy(policyId, policyVersion); } 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 5b9fdcf8..a931f593 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 @@ -95,8 +95,8 @@ public class LegacyOperationalPolicyProvider implements AutoCloseable { public LegacyOperationalPolicy deleteOperationalPolicy(String policyId, String policyVersion) throws PfModelException { - validateDeleteEligibility(policyId, policyVersion); validateLegacyOperationalPolicyVersion(policyVersion); + validateDeleteEligibility(policyId, policyVersion); return modelsProvider.deleteOperationalPolicy(policyId, policyVersion); } diff --git a/main/src/test/java/org/onap/policy/api/main/rest/provider/TestLegacyGuardPolicyProvider.java b/main/src/test/java/org/onap/policy/api/main/rest/provider/TestLegacyGuardPolicyProvider.java index 93144119..e892d417 100644 --- a/main/src/test/java/org/onap/policy/api/main/rest/provider/TestLegacyGuardPolicyProvider.java +++ b/main/src/test/java/org/onap/policy/api/main/rest/provider/TestLegacyGuardPolicyProvider.java @@ -189,7 +189,7 @@ public class TestLegacyGuardPolicyProvider { assertThatThrownBy(() -> { guardPolicyProvider.deleteGuardPolicy("dummy", null); - }).hasMessage("version is marked @NonNull but is null"); + }).hasMessage("legacy policy version is not an integer"); assertThatThrownBy(() -> { guardPolicyProvider.deleteGuardPolicy("dummy", "1.0.0"); diff --git a/main/src/test/java/org/onap/policy/api/main/rest/provider/TestLegacyOperationalPolicyProvider.java b/main/src/test/java/org/onap/policy/api/main/rest/provider/TestLegacyOperationalPolicyProvider.java index 5eee1e67..4b7827a9 100644 --- a/main/src/test/java/org/onap/policy/api/main/rest/provider/TestLegacyOperationalPolicyProvider.java +++ b/main/src/test/java/org/onap/policy/api/main/rest/provider/TestLegacyOperationalPolicyProvider.java @@ -178,7 +178,7 @@ public class TestLegacyOperationalPolicyProvider { assertThatThrownBy(() -> { operationalPolicyProvider.deleteOperationalPolicy("dummy", null); - }).hasMessage("version is marked @NonNull but is null"); + }).hasMessage("legacy policy version is not an integer"); assertThatThrownBy(() -> { operationalPolicyProvider.deleteOperationalPolicy("dummy", "dummy"); -- cgit 1.2.3-korg