From a7e74f738308e067fa26b4c4a5bcc70162ce16f4 Mon Sep 17 00:00:00 2001 From: rusirijayodaillesinghe Date: Wed, 5 Mar 2025 15:24:49 +0530 Subject: [PATCH] Allow policy name matching with "_imported" suffix --- .../java/org/wso2/carbon/apimgt/impl/APIProviderImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIProviderImpl.java b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIProviderImpl.java index f231e2cea34f..877631691d59 100644 --- a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIProviderImpl.java +++ b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIProviderImpl.java @@ -1869,8 +1869,10 @@ private List validatePolicies(List apiPolicies + " policy is not found.", ExceptionCodes.INVALID_OPERATION_POLICY); } - if (!policyData.getSpecification().getName().equals(policy.getPolicyName()) || - !policyData.getSpecification().getVersion().equals(policy.getPolicyVersion())) { + boolean isPolicyNameMatch = policyData.getSpecification().getName().equals(policy.getPolicyName()) + || (policyData.getSpecification().getName()).equals(policy.getPolicyName() + "_imported"); + if (!isPolicyNameMatch || !policyData.getSpecification().getVersion() + .equals(policy.getPolicyVersion())) { throw new APIManagementException("Applied policy " + policy.getPolicyName() + "_" + policy.getPolicyVersion() + " does not match the specification"); }