1 files changed, 7 insertions, 11 deletions

diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/util/PolicyValidationRequestWrapper.java b/ONAP-REST/src/main/java/org/onap/policy/rest/util/PolicyValidationRequestWrapper.java
index 03c1fb0c7..ac97fb0ee 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/util/PolicyValidationRequestWrapper.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/util/PolicyValidationRequestWrapper.java
@@ -62,7 +62,7 @@ public class PolicyValidationRequestWrapper {
 			JsonNode root = mapper.readTree(request.getReader());
 			policyData = mapper.readValue(root.get("policyData").toString(), PolicyRestAdapter.class);
 			
-			JsonObject json = null;
+			JsonObject json;
 			json = stringToJsonObject(root.toString());
 			
 			if(json != null){
@@ -181,14 +181,14 @@ public class PolicyValidationRequestWrapper {
 				
 			} else if("Action".equals(parameters.getPolicyClass().toString())){
 				
-				ArrayList<Object> ruleAlgorithmChoices = new ArrayList<Object>();
+				ArrayList<Object> ruleAlgorithmChoices = new ArrayList<>();
 								
 				List<String> dynamicLabelRuleAlgorithms = parameters.getDynamicRuleAlgorithmLabels();
 				List<String> dynamicFieldFunctionRuleAlgorithms = parameters.getDynamicRuleAlgorithmFunctions();
 				List<String> dynamicFieldOneRuleAlgorithms = parameters.getDynamicRuleAlgorithmField1();
 				List<String> dyrnamicFieldTwoRuleAlgorithms = parameters.getDynamicRuleAlgorithmField2();
 	            
-				if (dynamicLabelRuleAlgorithms != null && dynamicLabelRuleAlgorithms.size() > 0) {
+				if (dynamicLabelRuleAlgorithms != null && !dynamicLabelRuleAlgorithms.isEmpty()) {
 	                int i = dynamicLabelRuleAlgorithms.size() - 1;
 
 	                for (String labelAttr : dynamicLabelRuleAlgorithms) {
@@ -349,14 +349,10 @@ public class PolicyValidationRequestWrapper {
 				
 	}
 	
-    private JsonObject stringToJsonObject(String value)
-            throws JsonException, IllegalStateException {
-    	
-    	try{
-            JsonReader jsonReader = Json.createReader(new StringReader(value));
-            JsonObject object = jsonReader.readObject();
-            jsonReader.close();
-            return object;
+    private JsonObject stringToJsonObject(String value) {
+
+    	try(JsonReader jsonReader = Json.createReader(new StringReader(value))){
+			return jsonReader.readObject();
         } catch(JsonException| IllegalStateException e){
             LOGGER.info(XACMLErrorConstants.ERROR_DATA_ISSUE+ "Improper JSON format... may or may not cause issues in validating the policy: " + value, e);
             return null;