From fe5d78724f723a451ddc0d7cc41d6fc60092b314 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Thu, 13 Jun 2019 12:34:17 -0400 Subject: More sonar fixes in policy/common Note: this does not increase code coverage, but should fix other code issues. Resolved cyclomatic complexity issue in ParameterValidationResult. Refactored duplicate code in GroupValidationResult. Removed IOException from NetworkUtil "throws". Replaced null/empty string tests with StringUtils.isBlank(). Added @FunctionalInterface where needed. Replaced anonymous classes with lambda expressions. Replaced duplicate strings with a constant. Added private constructors for utility classes. Removed sleep() from tests. Removed unused parameter from method call. Made some protected methods private. Compute integrity monitor's state-transition table once. Use for-loop instead of iterator. Moved constructors. Fixed some checkstyle issues (tabs => spaces, trailing spaces). Change-Id: I9a962ca45c4ff3f212c6014da799d06f07b232ef Issue-ID: POLICY-1791 Signed-off-by: Jim Hahn --- .../onap/policy/common/parameters/testclasses/TestParametersL00.java | 5 +++-- .../onap/policy/common/parameters/testclasses/TestParametersL10.java | 3 ++- .../expectedValidationResults/TestParametersL0_2_Invalid.txt | 2 +- .../expectedValidationResults/TestParametersL0_2_Observation.txt | 2 +- .../expectedValidationResults/TestParametersL0_2_Warning.txt | 2 +- .../expectedValidationResults/TestParametersL0_3_Invalid.txt | 4 ++-- .../expectedValidationResults/TestParametersL0_3_Observation.txt | 4 ++-- .../expectedValidationResults/TestParametersL0_3_Warning.txt | 4 ++-- 8 files changed, 14 insertions(+), 12 deletions(-) (limited to 'common-parameters/src/test') diff --git a/common-parameters/src/test/java/org/onap/policy/common/parameters/testclasses/TestParametersL00.java b/common-parameters/src/test/java/org/onap/policy/common/parameters/testclasses/TestParametersL00.java index ea5ae853..2b41d0fb 100644 --- a/common-parameters/src/test/java/org/onap/policy/common/parameters/testclasses/TestParametersL00.java +++ b/common-parameters/src/test/java/org/onap/policy/common/parameters/testclasses/TestParametersL00.java @@ -24,6 +24,7 @@ package org.onap.policy.common.parameters.testclasses; import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; +import org.apache.commons.lang3.StringUtils; import org.onap.policy.common.parameters.GroupValidationResult; import org.onap.policy.common.parameters.ParameterConstants; import org.onap.policy.common.parameters.ParameterGroupImpl; @@ -163,11 +164,11 @@ public class TestParametersL00 extends ParameterGroupImpl { public GroupValidationResult validate() { GroupValidationResult validationResult = super.validate(); - if (getName() == null || getName().trim().length() == 0) { + if (StringUtils.isBlank(getName())) { validationResult.setResult("name", ValidationStatus.INVALID, "name must be a non-blank string"); } - if (l00StringField == null || l00StringField.trim().length() == 0) { + if (StringUtils.isBlank(l00StringField)) { validationResult.setResult(L00_STRING_FIELD, ValidationStatus.INVALID, "l00StringField must be a non-blank string"); } else if (l00StringField.equals(L00_STRING_FIELD)) { diff --git a/common-parameters/src/test/java/org/onap/policy/common/parameters/testclasses/TestParametersL10.java b/common-parameters/src/test/java/org/onap/policy/common/parameters/testclasses/TestParametersL10.java index 2fba9ba2..e1642beb 100644 --- a/common-parameters/src/test/java/org/onap/policy/common/parameters/testclasses/TestParametersL10.java +++ b/common-parameters/src/test/java/org/onap/policy/common/parameters/testclasses/TestParametersL10.java @@ -24,6 +24,7 @@ package org.onap.policy.common.parameters.testclasses; import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; +import org.apache.commons.lang3.StringUtils; import org.onap.policy.common.parameters.GroupValidationResult; import org.onap.policy.common.parameters.ParameterConstants; import org.onap.policy.common.parameters.ParameterGroupImpl; @@ -146,7 +147,7 @@ public class TestParametersL10 extends ParameterGroupImpl { public GroupValidationResult validate() { GroupValidationResult validationResult = super.validate(); - if (l10StringField == null || l10StringField.trim().length() == 0) { + if (StringUtils.isBlank(l10StringField)) { validationResult.setResult(L10_STRING_FIELD, ValidationStatus.INVALID, "l10StringField must be a non-blank string"); } else if (l10StringField.equals(L10_STRING_FIELD)) { diff --git a/common-parameters/src/test/resources/expectedValidationResults/TestParametersL0_2_Invalid.txt b/common-parameters/src/test/resources/expectedValidationResults/TestParametersL0_2_Invalid.txt index d9301997..412a36c1 100644 --- a/common-parameters/src/test/resources/expectedValidationResults/TestParametersL0_2_Invalid.txt +++ b/common-parameters/src/test/resources/expectedValidationResults/TestParametersL0_2_Invalid.txt @@ -7,7 +7,7 @@ parameter group "l0Parameters" type "org.onap.policy.common.parameters.testclass parameter group "l00LGenericNested" type "org.onap.policy.common.parameters.testclasses.TestParametersLGeneric" INVALID, parameter group has status INVALID field "lgenericIntField" type "int" value "-1" INVALID, lgenericIntField must be a positive integer field "lgenericStringField" type "java.lang.String" value "" INVALID, must be a non-blank string - parameter group map "l00LGenericNestedMap" INVALID, parameter group has status INVALID + parameter group map "l00LGenericNestedMap" INVALID, parameter group map has status INVALID parameter group "l00LGenericNestedMapVal0" type "org.onap.policy.common.parameters.testclasses.TestParametersLGeneric" INVALID, parameter group has status INVALID field "lgenericIntField" type "int" value "-1" INVALID, lgenericIntField must be a positive integer field "lgenericStringField" type "java.lang.String" value "" INVALID, must be a non-blank string diff --git a/common-parameters/src/test/resources/expectedValidationResults/TestParametersL0_2_Observation.txt b/common-parameters/src/test/resources/expectedValidationResults/TestParametersL0_2_Observation.txt index e0e78ccb..c1989226 100644 --- a/common-parameters/src/test/resources/expectedValidationResults/TestParametersL0_2_Observation.txt +++ b/common-parameters/src/test/resources/expectedValidationResults/TestParametersL0_2_Observation.txt @@ -7,7 +7,7 @@ parameter group "l0Parameters" type "org.onap.policy.common.parameters.testclass parameter group "l00LGenericNested" type "org.onap.policy.common.parameters.testclasses.TestParametersLGeneric" OBSERVATION, parameter group has status OBSERVATION field "lgenericIntField" type "int" value "2" OBSERVATION, this field has been set to 2 field "lgenericStringField" type "java.lang.String" value "aString" OBSERVATION, this value for name is unhelpful - parameter group map "l00LGenericNestedMap" OBSERVATION, parameter group has status OBSERVATION + parameter group map "l00LGenericNestedMap" OBSERVATION, parameter group map has status OBSERVATION parameter group "l00LGenericNestedMapVal0" type "org.onap.policy.common.parameters.testclasses.TestParametersLGeneric" OBSERVATION, parameter group has status OBSERVATION field "lgenericIntField" type "int" value "2" OBSERVATION, this field has been set to 2 field "lgenericStringField" type "java.lang.String" value "aString" OBSERVATION, this value for name is unhelpful diff --git a/common-parameters/src/test/resources/expectedValidationResults/TestParametersL0_2_Warning.txt b/common-parameters/src/test/resources/expectedValidationResults/TestParametersL0_2_Warning.txt index d03ecdf5..380ded8f 100644 --- a/common-parameters/src/test/resources/expectedValidationResults/TestParametersL0_2_Warning.txt +++ b/common-parameters/src/test/resources/expectedValidationResults/TestParametersL0_2_Warning.txt @@ -7,7 +7,7 @@ parameter group "l0Parameters" type "org.onap.policy.common.parameters.testclass parameter group "l00LGenericNested" type "org.onap.policy.common.parameters.testclasses.TestParametersLGeneric" WARNING, parameter group has status WARNING field "lgenericIntField" type "int" value "3" WARNING, values greater than 2 are not recommended field "lgenericStringField" type "java.lang.String" value "lgenericStringField" WARNING, using the field name for the parameter value is dangerous - parameter group map "l00LGenericNestedMap" WARNING, parameter group has status WARNING + parameter group map "l00LGenericNestedMap" WARNING, parameter group map has status WARNING parameter group "l00LGenericNestedMapVal0" type "org.onap.policy.common.parameters.testclasses.TestParametersLGeneric" WARNING, parameter group has status WARNING field "lgenericIntField" type "int" value "3" WARNING, values greater than 2 are not recommended field "lgenericStringField" type "java.lang.String" value "lgenericStringField" WARNING, using the field name for the parameter value is dangerous diff --git a/common-parameters/src/test/resources/expectedValidationResults/TestParametersL0_3_Invalid.txt b/common-parameters/src/test/resources/expectedValidationResults/TestParametersL0_3_Invalid.txt index e45a7a6b..12bce5c3 100644 --- a/common-parameters/src/test/resources/expectedValidationResults/TestParametersL0_3_Invalid.txt +++ b/common-parameters/src/test/resources/expectedValidationResults/TestParametersL0_3_Invalid.txt @@ -10,7 +10,7 @@ parameter group "l0Parameters" type "org.onap.policy.common.parameters.testclass parameter group "l10LGenericNested1" type "org.onap.policy.common.parameters.testclasses.TestParametersLGeneric" INVALID, parameter group has status INVALID field "lgenericIntField" type "int" value "-1" INVALID, lgenericIntField must be a positive integer field "lgenericStringField" type "java.lang.String" value "" INVALID, must be a non-blank string - parameter group map "l10LGenericNestedMap" INVALID, parameter group has status INVALID + parameter group map "l10LGenericNestedMap" INVALID, parameter group map has status INVALID parameter group "l10LGenericNestedMapVal0" type "org.onap.policy.common.parameters.testclasses.TestParametersLGeneric" INVALID, parameter group has status INVALID field "lgenericIntField" type "int" value "-1" INVALID, lgenericIntField must be a positive integer field "lgenericStringField" type "java.lang.String" value "" INVALID, must be a non-blank string @@ -20,7 +20,7 @@ parameter group "l0Parameters" type "org.onap.policy.common.parameters.testclass parameter group "l00LGenericNested" type "org.onap.policy.common.parameters.testclasses.TestParametersLGeneric" INVALID, parameter group has status INVALID field "lgenericIntField" type "int" value "-1" INVALID, lgenericIntField must be a positive integer field "lgenericStringField" type "java.lang.String" value "" INVALID, must be a non-blank string - parameter group map "l00LGenericNestedMap" INVALID, parameter group has status INVALID + parameter group map "l00LGenericNestedMap" INVALID, parameter group map has status INVALID parameter group "l00LGenericNestedMapVal0" type "org.onap.policy.common.parameters.testclasses.TestParametersLGeneric" INVALID, parameter group has status INVALID field "lgenericIntField" type "int" value "-1" INVALID, lgenericIntField must be a positive integer field "lgenericStringField" type "java.lang.String" value "" INVALID, must be a non-blank string diff --git a/common-parameters/src/test/resources/expectedValidationResults/TestParametersL0_3_Observation.txt b/common-parameters/src/test/resources/expectedValidationResults/TestParametersL0_3_Observation.txt index da943135..36517cef 100644 --- a/common-parameters/src/test/resources/expectedValidationResults/TestParametersL0_3_Observation.txt +++ b/common-parameters/src/test/resources/expectedValidationResults/TestParametersL0_3_Observation.txt @@ -10,7 +10,7 @@ parameter group "l0Parameters" type "org.onap.policy.common.parameters.testclass parameter group "l10LGenericNested1" type "org.onap.policy.common.parameters.testclasses.TestParametersLGeneric" OBSERVATION, parameter group has status OBSERVATION field "lgenericIntField" type "int" value "2" OBSERVATION, this field has been set to 2 field "lgenericStringField" type "java.lang.String" value "aString" OBSERVATION, this value for name is unhelpful - parameter group map "l10LGenericNestedMap" OBSERVATION, parameter group has status OBSERVATION + parameter group map "l10LGenericNestedMap" OBSERVATION, parameter group map has status OBSERVATION parameter group "l10LGenericNestedMapVal0" type "org.onap.policy.common.parameters.testclasses.TestParametersLGeneric" OBSERVATION, parameter group has status OBSERVATION field "lgenericIntField" type "int" value "2" OBSERVATION, this field has been set to 2 field "lgenericStringField" type "java.lang.String" value "aString" OBSERVATION, this value for name is unhelpful @@ -20,7 +20,7 @@ parameter group "l0Parameters" type "org.onap.policy.common.parameters.testclass parameter group "l00LGenericNested" type "org.onap.policy.common.parameters.testclasses.TestParametersLGeneric" OBSERVATION, parameter group has status OBSERVATION field "lgenericIntField" type "int" value "2" OBSERVATION, this field has been set to 2 field "lgenericStringField" type "java.lang.String" value "aString" OBSERVATION, this value for name is unhelpful - parameter group map "l00LGenericNestedMap" OBSERVATION, parameter group has status OBSERVATION + parameter group map "l00LGenericNestedMap" OBSERVATION, parameter group map has status OBSERVATION parameter group "l00LGenericNestedMapVal0" type "org.onap.policy.common.parameters.testclasses.TestParametersLGeneric" OBSERVATION, parameter group has status OBSERVATION field "lgenericIntField" type "int" value "2" OBSERVATION, this field has been set to 2 field "lgenericStringField" type "java.lang.String" value "aString" OBSERVATION, this value for name is unhelpful diff --git a/common-parameters/src/test/resources/expectedValidationResults/TestParametersL0_3_Warning.txt b/common-parameters/src/test/resources/expectedValidationResults/TestParametersL0_3_Warning.txt index 67a0932e..28747670 100644 --- a/common-parameters/src/test/resources/expectedValidationResults/TestParametersL0_3_Warning.txt +++ b/common-parameters/src/test/resources/expectedValidationResults/TestParametersL0_3_Warning.txt @@ -10,7 +10,7 @@ parameter group "l0Parameters" type "org.onap.policy.common.parameters.testclass parameter group "l10LGenericNested1" type "org.onap.policy.common.parameters.testclasses.TestParametersLGeneric" WARNING, parameter group has status WARNING field "lgenericIntField" type "int" value "3" WARNING, values greater than 2 are not recommended field "lgenericStringField" type "java.lang.String" value "lgenericStringField" WARNING, using the field name for the parameter value is dangerous - parameter group map "l10LGenericNestedMap" WARNING, parameter group has status WARNING + parameter group map "l10LGenericNestedMap" WARNING, parameter group map has status WARNING parameter group "l10LGenericNestedMapVal0" type "org.onap.policy.common.parameters.testclasses.TestParametersLGeneric" WARNING, parameter group has status WARNING field "lgenericIntField" type "int" value "3" WARNING, values greater than 2 are not recommended field "lgenericStringField" type "java.lang.String" value "lgenericStringField" WARNING, using the field name for the parameter value is dangerous @@ -20,7 +20,7 @@ parameter group "l0Parameters" type "org.onap.policy.common.parameters.testclass parameter group "l00LGenericNested" type "org.onap.policy.common.parameters.testclasses.TestParametersLGeneric" WARNING, parameter group has status WARNING field "lgenericIntField" type "int" value "3" WARNING, values greater than 2 are not recommended field "lgenericStringField" type "java.lang.String" value "lgenericStringField" WARNING, using the field name for the parameter value is dangerous - parameter group map "l00LGenericNestedMap" WARNING, parameter group has status WARNING + parameter group map "l00LGenericNestedMap" WARNING, parameter group map has status WARNING parameter group "l00LGenericNestedMapVal0" type "org.onap.policy.common.parameters.testclasses.TestParametersLGeneric" WARNING, parameter group has status WARNING field "lgenericIntField" type "int" value "3" WARNING, values greater than 2 are not recommended field "lgenericStringField" type "java.lang.String" value "lgenericStringField" WARNING, using the field name for the parameter value is dangerous -- cgit 1.2.3-korg