Merge "Adding PolicyType to getConfig Response"

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

diff --git a/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/CreateUpdatePolicyServiceImpl.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/CreateUpdatePolicyServiceImpl.java
index 483e13c..f91f6e2 100644 (file)
--- a/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/CreateUpdatePolicyServiceImpl.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/CreateUpdatePolicyServiceImpl.java
@@ -23,7 +23,6 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.UUID;
 
-import org.glassfish.jersey.spi.Contract;
 import org.onap.policy.api.PolicyException;
 import org.onap.policy.api.PolicyParameters;
 import org.onap.policy.common.logging.flexlogger.FlexLogger;
@@ -34,7 +33,6 @@ import org.onap.policy.rest.util.PolicyValidation;
 import org.onap.policy.rest.util.PolicyValidationRequestWrapper;
 import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.springframework.http.HttpStatus;
-import org.springframework.stereotype.Controller;
 
 import com.google.common.base.Strings;
 
@@ -244,17 +242,13 @@ public class CreateUpdatePolicyServiceImpl implements CreateUpdatePolicyService
                        return false;
                }
                
-               if(policyParameters.getPolicyClass() != null){
-                       if ("Config".equals(policyParameters.getPolicyClass().toString())){
-                               String policyConfigType = policyParameters.getPolicyConfigType().toString();
-                               if(!"BRMS_Param".equalsIgnoreCase(policyConfigType)){
-                               if(Strings.isNullOrEmpty(policyParameters.getConfigBody())){
-                                       message = XACMLErrorConstants.ERROR_DATA_ISSUE + "ConfigBody: No Config Body given";
-                               LOGGER.error("Common validation did not return success:  " + message);
-                            return false;
-                               }
-                               }
-                       }
+               if(policyParameters.getPolicyClass() != null && "Config".equals(policyParameters.getPolicyClass().toString())){
+                       String policyConfigType = policyParameters.getPolicyConfigType().toString();
+                       if(!"BRMS_Param".equalsIgnoreCase(policyConfigType) && Strings.isNullOrEmpty(policyParameters.getConfigBody())){
+                               message = XACMLErrorConstants.ERROR_DATA_ISSUE + "ConfigBody: No Config Body given";
+                       LOGGER.error("Common validation did not return success:  " + message);
+                    return false;
+                       }
                }
 
                try {