Merge "Make clientAuth header optional and log request"

[policy/engine.git] / ONAP-PDP-REST / src / main / java / org / onap / policy / pdp / rest / api / services / DeletePolicyService.java

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 47569a8..a004330 100644 (file)
--- 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
@@ -172,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;
             }
@@ -250,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;