diff options
author | 2017-12-01 11:39:27 -0600 | |
---|---|---|
committer | 2017-12-05 15:32:45 -0600 | |
commit | b6bae924c4a794cd772ac1524089fc8739e310b1 (patch) | |
tree | e1246ed37fbf0b29831687f7980468face97c4e0 /ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/ListConfigService.java | |
parent | 0eb828b9e122865eb6e9649f766d2caf25eba771 (diff) |
Modified the code to fix various pushPolicy issues
- Added modifications per Pam's review
Change-Id: I5d67ee529cbc5245e7d1f8dbec6f2f2d453ce299
Issue-ID: POLICY-486
Signed-off-by: Michael Mokry <mm117s@att.com>
Diffstat (limited to 'ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/ListConfigService.java')
-rw-r--r-- | ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/ListConfigService.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/ListConfigService.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/ListConfigService.java index 26f491963..b1cf79b1e 100644 --- a/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/ListConfigService.java +++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/ListConfigService.java @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.Collection; import org.onap.policy.api.ConfigRequestParameters; +import org.onap.policy.api.PolicyConfigStatus; import org.onap.policy.common.logging.flexlogger.FlexLogger; import org.onap.policy.common.logging.flexlogger.Logger; import org.onap.policy.pdp.rest.api.models.PolicyConfig; @@ -43,11 +44,12 @@ public class ListConfigService { results = new ArrayList<String>(); status = HttpStatus.OK; for(PolicyConfig policyConfig : policyConfigs){ - if(policyConfig.getPolicyConfigMessage()!=null && policyConfig.getPolicyConfigMessage().contains("PE300")){ + if(policyConfig.getPolicyConfigMessage()!=null && policyConfig.getPolicyConfigMessage().contains("PE300") + && policyConfigs.size()<=1 && policyConfig.getPolicyConfigStatus().equals(PolicyConfigStatus.CONFIG_NOT_FOUND)){ results.add(policyConfig.getPolicyConfigMessage()); status = HttpStatus.BAD_REQUEST; } else { - results.add("Policy Name: " + policyConfig.getPolicyName()); + results.add(policyConfig.getPolicyName()); } } } |