X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ONAP-PDP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fpdp%2Frest%2Fapi%2Fservices%2FDeletePolicyService.java;h=a004330f6be7ead65a227625dfb4526fc44a2957;hb=1b1640ae538cfdb3667fd3222dc4dec469b0e3f7;hp=ff0ac826f103c37671f7479519fe6f14b97541f6;hpb=d5f95d08ffd3f2e16b67aadae7007c7a51dfae19;p=policy%2Fengine.git

diff --git a/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/DeletePolicyService.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/DeletePolicyService.java
index ff0ac826f..a004330f6 100644
--- a/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/DeletePolicyService.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/DeletePolicyService.java
@@ -43,7 +43,6 @@ import org.springframework.http.HttpStatus;
 public class DeletePolicyService extends PdpApiService {
 
     private static final Logger LOGGER = FlexLogger.getLogger(DeletePolicyService.class.getName());
-    private static final String PRINT_REQUESTID = " - RequestId - ";
     private DeletePolicyParameters deletePolicyParameters = null;
     private String result = null;
     private List<PolicyNameType> policyList = new ArrayList<>();
@@ -173,7 +172,7 @@ public class DeletePolicyService extends PdpApiService {
      */
     private boolean populateFullPolicyName(final PAPServices papServices) {
         for (PolicyNameType policyData : policyList) {
-            if (policyData.getPolicyName().contains("xml")) {
+        	if (policyData.getPolicyName().endsWith("xml")) {
                 policyData.setFullPolicyName(policyData.getPolicyName());
                 continue;
             }
@@ -251,7 +250,7 @@ public class DeletePolicyService extends PdpApiService {
 
         if ("PAP".equalsIgnoreCase(deletePolicyParameters.getPolicyComponent())
                 && (deletePolicyParameters.getDeleteCondition() == null
-                        || deletePolicyParameters.getDeleteCondition().toString().trim().isEmpty())) {
+                        || StringUtils.isBlank(deletePolicyParameters.getDeleteCondition().toString()))) {
             message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No Delete Condition given.";
             LOGGER.warn(message + PRINT_REQUESTID + requestId);
             return false;