From 0c7d117a4cb41913101cfce1e8667782fd6abf21 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Wed, 31 Jul 2019 11:16:39 -0400 Subject: Remove ParameterUtils Removed ParameterUtils. Also made RestServer.getServerProperties() protected so it can be overridden. Also fixed issue in TopicParameterGroupTest to prevent it from validating static fields. Change-Id: Icb4580f5802b9edca489a38896d61ad24aece449 Issue-ID: POLICY-1953 Signed-off-by: Jim Hahn --- .../policy/common/endpoints/parameters/TopicParameterGroupTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'policy-endpoints/src/test/java/org/onap/policy/common/endpoints/parameters/TopicParameterGroupTest.java') diff --git a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/parameters/TopicParameterGroupTest.java b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/parameters/TopicParameterGroupTest.java index f1507365..98b3d84a 100644 --- a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/parameters/TopicParameterGroupTest.java +++ b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/parameters/TopicParameterGroupTest.java @@ -28,6 +28,7 @@ import static org.junit.Assert.assertTrue; import java.beans.PropertyDescriptor; import java.lang.reflect.Field; +import java.lang.reflect.Modifier; import java.util.List; import org.apache.commons.lang3.StringUtils; import org.junit.Test; @@ -127,7 +128,7 @@ public class TopicParameterGroupTest { for (TopicParameters topicParameters : topicParametersList) { Field[] fields = BusTopicParams.class.getDeclaredFields(); for (Field field : fields) { - if (!field.isSynthetic()) { + if (!field.isSynthetic() && !Modifier.isStatic(field.getModifiers())) { Object parameter = new PropertyDescriptor(field.getName(), TopicParameters.class).getReadMethod() .invoke(topicParameters); if ((parameter instanceof String && StringUtils.isBlank(parameter.toString())) -- cgit 1.2.3-korg