Use setXxx() methods for @Property fields

Fortify generates a security exception when PropertyConfiguration
attempts to directly update private fields.  PropertyConfiguration
has been modified to invoke setXxx() methods, instead, to set the
values for the fields.
Add junit tests for new methods.

Change-Id: Ic4420b6348724c5a384d3c2c8bf7b4c0c6350fa9
Issue-ID: POLICY-906
Signed-off-by: Jim Hahn <jrh3@att.com>

diff --git a/utils/pom.xml b/utils/pom.xml
index cf34bd7..8375408 100644 (file)
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -37,6 +37,11 @@
        </properties>
   
        <dependencies>
+               <dependency>
+                       <groupId>org.apache.commons</groupId>
+                       <artifactId>commons-lang3</artifactId>
+                       <version>3.4</version>
+               </dependency>
                <dependency>
                        <groupId>junit</groupId>
                        <artifactId>junit</artifactId>

diff --git a/utils/src/main/java/org/onap/policy/common/utils/properties/PropertyConfiguration.java b/utils/src/main/java/org/onap/policy/common/utils/properties/PropertyConfiguration.java
index 7253c74..e72ebab 100644 (file)
--- a/utils/src/main/java/org/onap/policy/common/utils/properties/PropertyConfiguration.java
+++ b/utils/src/main/java/org/onap/policy/common/utils/properties/PropertyConfiguration.java
@@ -25,8 +25,11 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.Properties;
+import org.apache.commons.lang3.StringUtils;
 import org.onap.policy.common.utils.properties.exception.PropertyAccessException;
 import org.onap.policy.common.utils.properties.exception.PropertyException;
 import org.onap.policy.common.utils.properties.exception.PropertyInvalidException;
@@ -35,7 +38,9 @@ import org.onap.policy.common.utils.properties.exception.PropertyMissingExceptio
 /**
  * Configuration whose fields are initialized by reading from a set of {@link Properties},
  * as directed by the {@link Property} annotations that appear on fields within the
- * subclass.
+ * subclass. The values of the fields are set via <i>setXxx()</i> methods. As a result, if
+ * a field is annotated and there is no corresponding <i>setXxx()</i> method, then an
+ * exception will be thrown.
  * <p>
  * It is possible that an invalid <i>defaultValue</i> is specified via the
  * {@link Property} annotation. This could remain undetected until an optional property is
@@ -104,23 +109,44 @@ public class PropertyConfiguration {
 
         checkModifiable(field, prop);
 
-        if (setValue(field, props, prop)) {
+        Method setter = getSetter(field, prop);
+        checkSetter(setter, prop);
+
+        if (setValue(setter, field, props, prop)) {
             return true;
         }
 
         throw new PropertyAccessException(prop.name(), field.getName(), "unsupported field type");
     }
 
+    /**
+     * @param field field whose value is to be set
+     * @param prop property of interest
+     * @return the method to be used to set the field's value
+     * @throws PropertyAccessException if a "set" method cannot be identified
+     */
+    private Method getSetter(Field field, Property prop) throws PropertyAccessException {
+        String nm = "set" + StringUtils.capitalize(field.getName());
+
+        try {
+            return this.getClass().getMethod(nm, field.getType());
+
+        } catch (NoSuchMethodException | SecurityException e) {
+            throw new PropertyAccessException(prop.name(), nm, e);
+        }
+    }
+
     /**
      * Sets a field's value from a particular property.
      * 
+     * @param setter method to be used to set the field's value
      * @param field field whose value is to be set
      * @param props properties from which to get the value
      * @param prop property of interest
      * @return {@code true} if the property's value was set, {@code false} otherwise
      * @throws PropertyException if an error occurs
      */
-    protected boolean setValue(Field field, Properties props, Property prop) throws PropertyException {
+    protected boolean setValue(Method setter, Field field, Properties props, Property prop) throws PropertyException {
 
         try {
             Object val = getValue(field, props, prop);
@@ -128,23 +154,15 @@ public class PropertyConfiguration {
                 return false;
 
             } else {
-
-                /*
-                 * According to java docs & blogs, "field" is our own copy, so we're free
-                 * to change the flags without impacting the real permissions of the field
-                 * within the real class.
-                 */
-                field.setAccessible(true);
-
-                field.set(this, val);
+                setter.invoke(this, val);
                 return true;
             }
 
         } catch (IllegalArgumentException e) {
             throw new PropertyInvalidException(prop.name(), field.getName(), e);
 
-        } catch (IllegalAccessException e) {
-            throw new PropertyAccessException(prop.name(), field.getName(), e);
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            throw new PropertyAccessException(prop.name(), setter.getName(), e);
         }
     }
 
@@ -202,6 +220,21 @@ public class PropertyConfiguration {
         }
     }
 
+    /**
+     * Verifies that the setter method is not <i>static</i>.
+     * 
+     * @param setter method to be checked
+     * @param prop property of interest
+     * @throws PropertyAccessException if the method is static
+     */
+    private void checkSetter(Method setter, Property prop) throws PropertyAccessException {
+        int mod = setter.getModifiers();
+
+        if (Modifier.isStatic(mod)) {
+            throw new PropertyAccessException(prop.name(), setter.getName(), "method is 'static'");
+        }
+    }
+
     /**
      * Gets a property value, coercing it to a String.
      * 

diff --git a/utils/src/test/java/org/onap/policy/common/utils/properties/PropertyConfigurationTest.java b/utils/src/test/java/org/onap/policy/common/utils/properties/PropertyConfigurationTest.java
index cf823b5..121ae38 100644 (file)
--- a/utils/src/test/java/org/onap/policy/common/utils/properties/PropertyConfigurationTest.java
+++ b/utils/src/test/java/org/onap/policy/common/utils/properties/PropertyConfigurationTest.java
@@ -68,15 +68,9 @@ public class PropertyConfigurationTest {
 
     @Test
     public void testPropertyConfiguration() throws PropertyException {
-        class Config extends PropertyConfiguration {
-
-            @Property(name = THE_VALUE)
-            private String value;
-        };
-
         props.setProperty(THE_VALUE, STRING_VALUE);
 
-        Config cfg = new Config();
+        PlainStringConfig cfg = new PlainStringConfig();
         assertEquals(null, cfg.value);
 
         cfg.setAllFields(props);
@@ -85,18 +79,8 @@ public class PropertyConfigurationTest {
 
     @Test
     public void testPropertyConfigurationProperties() throws PropertyException {
-        class Config extends PropertyConfiguration {
-
-            @Property(name = THE_VALUE)
-            private String value;
-
-            public Config(Properties props) throws PropertyException {
-                super(props);
-            }
-        };
-
         props.setProperty(THE_VALUE, STRING_VALUE);
-        Config cfg = new Config(props);
+        PlainStringConfig cfg = new PlainStringConfig(props);
 
         assertEquals(STRING_VALUE, cfg.value);
     }
@@ -111,6 +95,11 @@ public class PropertyConfigurationTest {
 
             @Property(name = "grandparent.value")
             protected boolean grandparentValue;
+
+            @SuppressWarnings("unused")
+            public void setGrandparentValue(boolean grandparentValue) {
+                this.grandparentValue = grandparentValue;
+            }
         };
 
         /*
@@ -120,12 +109,22 @@ public class PropertyConfigurationTest {
 
             @Property(name = "parent.value")
             protected long parentValue;
+
+            @SuppressWarnings("unused")
+            public void setParentValue(long parentValue) {
+                this.parentValue = parentValue;
+            }
         };
 
         class Config extends ParentConfig {
 
             @Property(name = THE_VALUE)
             private String value;
+
+            @SuppressWarnings("unused")
+            public void setValue(String value) {
+                this.value = value;
+            }
         };
 
 
@@ -158,6 +157,11 @@ public class PropertyConfigurationTest {
         class Config extends PropertyConfiguration {
 
             private String value;
+
+            @SuppressWarnings("unused")
+            public void setValue(String value) {
+                this.value = value;
+            }
         };
 
 
@@ -171,18 +175,8 @@ public class PropertyConfigurationTest {
 
     @Test
     public void testSetValueFieldProperties_FieldSet() throws PropertyException {
-        class Config extends PropertyConfiguration {
-
-            @Property(name = THE_VALUE)
-            private String value;
-
-            public Config(Properties props) throws PropertyException {
-                super(props);
-            }
-        };
-
         props.setProperty(THE_VALUE, STRING_VALUE);
-        Config cfg = new Config(props);
+        PlainStringConfig cfg = new PlainStringConfig(props);
 
         assertEquals(STRING_VALUE, cfg.value);
     }
@@ -196,6 +190,11 @@ public class PropertyConfigurationTest {
             public Config(Properties props) throws PropertyException {
                 super(props);
             }
+
+            @SuppressWarnings("unused")
+            public void setValue(String value) {
+                this.value = value;
+            }
         };
 
         props.setProperty(THE_VALUE, STRING_VALUE);
@@ -215,14 +214,19 @@ public class PropertyConfigurationTest {
             public Config(Properties props) throws PropertyException {
                 super(props);
             }
+
+            @SuppressWarnings("unused")
+            public void setValue(Exception value) {
+                this.value = value;
+            }
         };
 
         props.setProperty(THE_VALUE, STRING_VALUE);
         new Config(props);
     }
 
-    @Test(expected = PropertyMissingException.class)
-    public void testSetValueFieldPropertyProperties_NoProperty_NoDefault() throws PropertyException {
+    @Test(expected = PropertyAccessException.class)
+    public void testGetSetter_NoSetter() throws PropertyException {
         class Config extends PropertyConfiguration {
 
             @Property(name = THE_VALUE)
@@ -233,15 +237,18 @@ public class PropertyConfigurationTest {
             }
         };
 
+        props.setProperty(THE_VALUE, STRING_VALUE);
         new Config(props);
     }
 
-    @Test(expected = PropertyInvalidException.class)
-    public void testSetValueFieldPropertyProperties_InvalidValue() throws PropertyException {
-        class Config extends PropertyConfiguration {
+    @Test(expected = PropertyMissingException.class)
+    public void testSetValueMethodFieldPropertiesProperty_NoProperty_NoDefault() throws PropertyException {
+        new PlainStringConfig(props);
+    }
 
-            @Property(name = THE_VALUE)
-            private int value;
+    @Test(expected = PropertyInvalidException.class)
+    public void testSetValueMethodFieldPropertiesProperty_InvalidValue() throws PropertyException {
+        class Config extends PlainPrimIntConfig {
 
             public Config(Properties props) throws PropertyException {
                 super(props);
@@ -260,6 +267,24 @@ public class PropertyConfigurationTest {
         new Config(props);
     }
 
+    @Test(expected = PropertyAccessException.class)
+    public void testSetValueMethodFieldPropertiesProperty_MethodEx() throws PropertyException {
+        class Config extends PlainStringConfig {
+
+            public Config(Properties props) throws PropertyException {
+                super(props);
+            }
+
+            @Override
+            public void setValue(String value) {
+                throw new IllegalArgumentException("expected exception");
+            }
+        };
+
+        props.setProperty(THE_VALUE, STRING_VALUE);
+        new Config(props);
+    }
+
     @Test
     public void testGetValue() throws PropertyException {
         // this class contains all of the supported field types
@@ -295,6 +320,96 @@ public class PropertyConfigurationTest {
             public Config(Properties props) throws PropertyException {
                 super(props);
             }
+
+            @SuppressWarnings("unused")
+            public String getStringValue() {
+                return stringValue;
+            }
+
+            @SuppressWarnings("unused")
+            public void setStringValue(String stringValue) {
+                this.stringValue = stringValue;
+            }
+
+            @SuppressWarnings("unused")
+            public Boolean getBoolTrueValue() {
+                return boolTrueValue;
+            }
+
+            @SuppressWarnings("unused")
+            public void setBoolTrueValue(Boolean boolTrueValue) {
+                this.boolTrueValue = boolTrueValue;
+            }
+
+            @SuppressWarnings("unused")
+            public Boolean getBoolFalseValue() {
+                return boolFalseValue;
+            }
+
+            @SuppressWarnings("unused")
+            public void setBoolFalseValue(Boolean boolFalseValue) {
+                this.boolFalseValue = boolFalseValue;
+            }
+
+            @SuppressWarnings("unused")
+            public boolean isPrimBoolTrueValue() {
+                return primBoolTrueValue;
+            }
+
+            @SuppressWarnings("unused")
+            public void setPrimBoolTrueValue(boolean primBoolTrueValue) {
+                this.primBoolTrueValue = primBoolTrueValue;
+            }
+
+            @SuppressWarnings("unused")
+            public boolean isPrimBoolFalseValue() {
+                return primBoolFalseValue;
+            }
+
+            @SuppressWarnings("unused")
+            public void setPrimBoolFalseValue(boolean primBoolFalseValue) {
+                this.primBoolFalseValue = primBoolFalseValue;
+            }
+
+            @SuppressWarnings("unused")
+            public Integer getIntValue() {
+                return intValue;
+            }
+
+            @SuppressWarnings("unused")
+            public void setIntValue(Integer intValue) {
+                this.intValue = intValue;
+            }
+
+            @SuppressWarnings("unused")
+            public int getPrimIntValue() {
+                return primIntValue;
+            }
+
+            @SuppressWarnings("unused")
+            public void setPrimIntValue(int primIntValue) {
+                this.primIntValue = primIntValue;
+            }
+
+            @SuppressWarnings("unused")
+            public Long getLongValue() {
+                return longValue;
+            }
+
+            @SuppressWarnings("unused")
+            public void setLongValue(Long longValue) {
+                this.longValue = longValue;
+            }
+
+            @SuppressWarnings("unused")
+            public long getPrimLongValue() {
+                return primLongValue;
+            }
+
+            @SuppressWarnings("unused")
+            public void setPrimLongValue(long primLongValue) {
+                this.primLongValue = primLongValue;
+            }
         };
 
         props.setProperty("string", "a string");
@@ -331,6 +446,11 @@ public class PropertyConfigurationTest {
             public Config(Properties props) throws PropertyException {
                 super(props);
             }
+
+            @SuppressWarnings("unused")
+            public void setValue(Exception value) {
+                this.value = value;
+            }
         };
 
         props.setProperty(THE_VALUE, STRING_VALUE);
@@ -354,6 +474,21 @@ public class PropertyConfigurationTest {
             public Config(Properties props) throws PropertyException {
                 super(props);
             }
+
+            @SuppressWarnings("unused")
+            public void setPublicString(String publicString) {
+                this.publicString = publicString;
+            }
+
+            @SuppressWarnings("unused")
+            public void setPrivateString(String privateString) {
+                this.privateString = privateString;
+            }
+
+            @SuppressWarnings("unused")
+            public void setProtectedString(String protectedString) {
+                this.protectedString = protectedString;
+            }
         };
 
         props.setProperty("public", "a public string");
@@ -370,7 +505,7 @@ public class PropertyConfigurationTest {
     @Test(expected = PropertyAccessException.class)
     public void testCheckModifiable_Static() throws PropertyException {
         props.setProperty(THE_VALUE, STRING_VALUE);
-        new StaticConfig(props);
+        new StaticPropConfig(props);
     }
 
     @Test(expected = PropertyAccessException.class)
@@ -390,38 +525,24 @@ public class PropertyConfigurationTest {
         new Config(props);
     }
 
+    @Test(expected = PropertyAccessException.class)
+    public void testCheckSetter_Static() throws PropertyException {
+        props.setProperty(THE_VALUE, STRING_VALUE);
+        new StaticMethodConfig(props);
+    }
+
     @Test
     public void testGetStringValue() throws PropertyException {
-        class Config extends PropertyConfiguration {
-
-            @Property(name = THE_VALUE)
-            private String value;
-
-            public Config(Properties props) throws PropertyException {
-                super(props);
-            }
-        };
-
         props.setProperty(THE_VALUE, STRING_VALUE);
-        Config cfg = new Config(props);
+        PlainStringConfig cfg = new PlainStringConfig(props);
 
         assertEquals(STRING_VALUE, cfg.value);
     }
 
     @Test
     public void testGetBooleanValue_NoDefault() throws PropertyException {
-        class Config extends PropertyConfiguration {
-
-            @Property(name = THE_VALUE)
-            private Boolean value;
-
-            public Config(Properties props) throws PropertyException {
-                super(props);
-            }
-        };
-
         props.setProperty(THE_VALUE, "true");
-        Config cfg = new Config(props);
+        PlainBooleanConfig cfg = new PlainBooleanConfig(props);
 
         assertEquals(true, cfg.value);
     }
@@ -436,6 +557,11 @@ public class PropertyConfigurationTest {
             public Config(Properties props) throws PropertyException {
                 super(props);
             }
+
+            @SuppressWarnings("unused")
+            public void setValue(Boolean value) {
+                this.value = value;
+            }
         };
 
         props.setProperty(THE_VALUE, "true");
@@ -452,6 +578,11 @@ public class PropertyConfigurationTest {
             public Config(Properties props) throws PropertyException {
                 super(props);
             }
+
+            @SuppressWarnings("unused")
+            public void setValue(Boolean value) {
+                this.value = value;
+            }
         };
 
         // property not defined
@@ -479,6 +610,11 @@ public class PropertyConfigurationTest {
             public Config(Properties props) throws PropertyException {
                 super(props);
             }
+
+            @SuppressWarnings("unused")
+            public void setValue(Boolean value) {
+                this.value = value;
+            }
         };
 
         // property not defined
@@ -506,6 +642,11 @@ public class PropertyConfigurationTest {
             public Config(Properties props) throws PropertyException {
                 super(props);
             }
+
+            @SuppressWarnings("unused")
+            public void setValue(Integer value) {
+                this.value = value;
+            }
         };
 
         props.setProperty(THE_VALUE, "200");
@@ -524,6 +665,11 @@ public class PropertyConfigurationTest {
             public Config(Properties props) throws PropertyException {
                 super(props);
             }
+
+            @SuppressWarnings("unused")
+            public void setValue(Integer value) {
+                this.value = value;
+            }
         };
 
         props.setProperty(THE_VALUE, "200");
@@ -540,6 +686,11 @@ public class PropertyConfigurationTest {
             public Config(Properties props) throws PropertyException {
                 super(props);
             }
+
+            @SuppressWarnings("unused")
+            public void setValue(Integer value) {
+                this.value = value;
+            }
         };
 
         // property not defined
@@ -562,6 +713,11 @@ public class PropertyConfigurationTest {
             public Config(Properties props) throws PropertyException {
                 super(props);
             }
+
+            @SuppressWarnings("unused")
+            public void setValue(Long value) {
+                this.value = value;
+            }
         };
 
         props.setProperty(THE_VALUE, "20000");
@@ -580,6 +736,11 @@ public class PropertyConfigurationTest {
             public Config(Properties props) throws PropertyException {
                 super(props);
             }
+
+            @SuppressWarnings("unused")
+            public void setValue(Long value) {
+                this.value = value;
+            }
         };
 
         props.setProperty(THE_VALUE, "20000");
@@ -596,6 +757,11 @@ public class PropertyConfigurationTest {
             public Config(Properties props) throws PropertyException {
                 super(props);
             }
+
+            @SuppressWarnings("unused")
+            public void setValue(Long value) {
+                this.value = value;
+            }
         };
 
         // property not defined
@@ -610,18 +776,8 @@ public class PropertyConfigurationTest {
 
     @Test
     public void testGetPropValue_Prop_NoDefault() throws PropertyException {
-        class Config extends PropertyConfiguration {
-
-            @Property(name = THE_VALUE)
-            private String value;
-
-            public Config(Properties props) throws PropertyException {
-                super(props);
-            }
-        };
-
         props.setProperty(THE_VALUE, STRING_VALUE);
-        Config cfg = new Config(props);
+        PlainStringConfig cfg = new PlainStringConfig(props);
 
         assertEquals(STRING_VALUE, cfg.value);
     }
@@ -636,6 +792,11 @@ public class PropertyConfigurationTest {
             public Config(Properties props) throws PropertyException {
                 super(props);
             }
+
+            @SuppressWarnings("unused")
+            public void setValue(String value) {
+                this.value = value;
+            }
         };
 
         props.setProperty(THE_VALUE, STRING_VALUE);
@@ -654,6 +815,11 @@ public class PropertyConfigurationTest {
             public Config(Properties props) throws PropertyException {
                 super(props);
             }
+
+            @SuppressWarnings("unused")
+            public void setValue(String value) {
+                this.value = value;
+            }
         };
 
         props.setProperty(THE_VALUE, "");
@@ -672,6 +838,11 @@ public class PropertyConfigurationTest {
             public Config(Properties props) throws PropertyException {
                 super(props);
             }
+
+            @SuppressWarnings("unused")
+            public void setValue(String value) {
+                this.value = value;
+            }
         };
 
         Config cfg = new Config(props);
@@ -689,6 +860,11 @@ public class PropertyConfigurationTest {
             public Config(Properties props) throws PropertyException {
                 super(props);
             }
+
+            @SuppressWarnings("unused")
+            public void setValue(String value) {
+                this.value = value;
+            }
         };
 
         Config cfg = new Config(props);
@@ -706,6 +882,11 @@ public class PropertyConfigurationTest {
             public Config(Properties props) throws PropertyException {
                 super(props);
             }
+
+            @SuppressWarnings("unused")
+            public void setValue(String value) {
+                this.value = value;
+            }
         };
 
         new Config(props);
@@ -721,6 +902,11 @@ public class PropertyConfigurationTest {
             public Config(Properties props) throws PropertyException {
                 super(props);
             }
+
+            @SuppressWarnings("unused")
+            public void setValue(String value) {
+                this.value = value;
+            }
         };
 
         Config cfg = new Config(props);
@@ -730,10 +916,7 @@ public class PropertyConfigurationTest {
 
     @Test
     public void testGetRawPropertyValue() throws PropertyException {
-        class Config extends PropertyConfiguration {
-
-            @Property(name = THE_VALUE)
-            private String value;
+        class Config extends PlainStringConfig {
 
             public Config(Properties props) throws PropertyException {
                 super(props);
@@ -747,144 +930,64 @@ public class PropertyConfigurationTest {
 
         Config cfg = new Config(props);
 
-        assertEquals(STRING_VALUE, cfg.value);
+        assertEquals(STRING_VALUE, cfg.getValue());
 
     }
 
     @Test
     public void testMakeBoolean_True() throws PropertyException {
-        class Config extends PropertyConfiguration {
-
-            @Property(name = THE_VALUE)
-            private Boolean value;
-
-            public Config(Properties props) throws PropertyException {
-                super(props);
-            }
-        };
-
         props.setProperty(THE_VALUE, "true");
-        Config cfg = new Config(props);
+        PlainBooleanConfig cfg = new PlainBooleanConfig(props);
 
         assertEquals(true, cfg.value);
     }
 
     @Test
     public void testMakeBoolean_False() throws PropertyException {
-        class Config extends PropertyConfiguration {
-
-            @Property(name = THE_VALUE)
-            private Boolean value;
-
-            public Config(Properties props) throws PropertyException {
-                super(props);
-            }
-        };
-
         props.setProperty(THE_VALUE, "false");
-        Config cfg = new Config(props);
+        PlainBooleanConfig cfg = new PlainBooleanConfig(props);
 
         assertEquals(false, cfg.value);
     }
 
     @Test(expected = PropertyInvalidException.class)
     public void testMakeBoolean_Invalid() throws PropertyException {
-        class Config extends PropertyConfiguration {
-
-            @Property(name = THE_VALUE)
-            private Boolean value;
-
-            public Config(Properties props) throws PropertyException {
-                super(props);
-            }
-        };
-
         props.setProperty(THE_VALUE, INVALID_VALUE);
-        new Config(props);
+        new PlainBooleanConfig(props);
     }
 
     @Test
     public void testMakeInteger_Valid() throws PropertyException {
-        class Config extends PropertyConfiguration {
-
-            @Property(name = THE_VALUE)
-            private int value;
-
-            public Config(Properties props) throws PropertyException {
-                super(props);
-            }
-        };
-
         props.setProperty(THE_VALUE, "300");
-        Config cfg = new Config(props);
+        PlainPrimIntConfig cfg = new PlainPrimIntConfig(props);
 
         assertEquals(300, cfg.value);
     }
 
     @Test(expected = PropertyInvalidException.class)
     public void testMakeInteger_Invalid() throws PropertyException {
-        class Config extends PropertyConfiguration {
-
-            @Property(name = THE_VALUE)
-            private int value;
-
-            public Config(Properties props) throws PropertyException {
-                super(props);
-            }
-        };
-
         props.setProperty(THE_VALUE, INVALID_VALUE);
-        new Config(props);
+        new PlainPrimIntConfig(props);
     }
 
     @Test(expected = PropertyInvalidException.class)
     public void testMakeInteger_TooBig() throws PropertyException {
-        class Config extends PropertyConfiguration {
-
-            @Property(name = THE_VALUE)
-            private int value;
-
-            public Config(Properties props) throws PropertyException {
-                super(props);
-            }
-        };
-
         props.setProperty(THE_VALUE, String.valueOf(Integer.MAX_VALUE + 10L));
-        new Config(props);
+        new PlainPrimIntConfig(props);
     }
 
     @Test
     public void testMakeLong_Valid() throws PropertyException {
-        class Config extends PropertyConfiguration {
-
-            @Property(name = THE_VALUE)
-            private long value;
-
-            public Config(Properties props) throws PropertyException {
-                super(props);
-            }
-        };
-
         props.setProperty(THE_VALUE, "30000");
-        Config cfg = new Config(props);
+        PlainPrimLongConfig cfg = new PlainPrimLongConfig(props);
 
         assertEquals(30000L, cfg.value);
     }
 
     @Test(expected = PropertyInvalidException.class)
     public void testMakeLong_Invalid() throws PropertyException {
-        class Config extends PropertyConfiguration {
-
-            @Property(name = THE_VALUE)
-            private long value;
-
-            public Config(Properties props) throws PropertyException {
-                super(props);
-            }
-        };
-
         props.setProperty(THE_VALUE, INVALID_VALUE);
-        new Config(props);
+        new PlainPrimLongConfig(props);
     }
 
     @Test
@@ -897,6 +1000,11 @@ public class PropertyConfigurationTest {
             public Config(Properties props) throws PropertyException {
                 super(props);
             }
+
+            @SuppressWarnings("unused")
+            public void setValue(long value) {
+                this.value = value;
+            }
         };
 
         Config cfg = new Config(props);
@@ -914,6 +1022,11 @@ public class PropertyConfigurationTest {
             public Config(Properties props) throws PropertyException {
                 super(props);
             }
+
+            @SuppressWarnings("unused")
+            public void setValue(long value) {
+                this.value = value;
+            }
         };
 
         new Config(props);
@@ -929,6 +1042,11 @@ public class PropertyConfigurationTest {
             public Config(Properties props) throws PropertyException {
                 super(props);
             }
+
+            @SuppressWarnings("unused")
+            public void setValue(long value) {
+                this.value = value;
+            }
         };
 
         new Config(props);
@@ -944,6 +1062,11 @@ public class PropertyConfigurationTest {
             public Config(Properties props) throws PropertyException {
                 super(props);
             }
+
+            @SuppressWarnings("unused")
+            public void setValue(String value) {
+                this.value = value;
+            }
         };
 
         // missing property - should default to ""
@@ -971,6 +1094,11 @@ public class PropertyConfigurationTest {
             public Config(Properties props) throws PropertyException {
                 super(props);
             }
+
+            @SuppressWarnings("unused")
+            public void setValue(long value) {
+                this.value = value;
+            }
         };
 
         new Config(props);
@@ -986,6 +1114,11 @@ public class PropertyConfigurationTest {
             public Config(Properties props) throws PropertyException {
                 super(props);
             }
+
+            @SuppressWarnings("unused")
+            public void setValue(String value) {
+                this.value = value;
+            }
         };
 
         Config cfg = new Config(props);
@@ -1003,23 +1136,126 @@ public class PropertyConfigurationTest {
             public Config(Properties props) throws PropertyException {
                 super(props);
             }
+
+            @SuppressWarnings("unused")
+            public void setValue(long value) {
+                this.value = value;
+            }
         };
 
         new Config(props);
     }
 
     /**
-     * A config whose annotated property is "static".
+     * Config with a String value having no qualifiers.
      */
-    public static class StaticConfig extends PropertyConfiguration {
+    public class PlainStringConfig extends PropertyConfiguration {
+
+        @Property(name = THE_VALUE)
+        private String value;
+        
+        public PlainStringConfig() {
+            
+        }
+        
+        public PlainStringConfig(Properties props) throws PropertyException {
+            super(props);
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public void setValue(String value) {
+            this.value = value;
+        }
+    };
+
+    /**
+     * Config with a Boolean value having no qualifiers.
+     */
+    public class PlainBooleanConfig extends PropertyConfiguration {
+
+        @Property(name = THE_VALUE)
+        private Boolean value;
+        
+        public PlainBooleanConfig(Properties props) throws PropertyException {
+            super(props);
+        }
+
+        public void setValue(Boolean value) {
+            this.value = value;
+        }
+    };
+
+    /**
+     * Config with an int value having no qualifiers.
+     */
+    public class PlainPrimIntConfig extends PropertyConfiguration {
+
+        @Property(name = THE_VALUE)
+        private int value;
+
+        public PlainPrimIntConfig(Properties props) throws PropertyException {
+            super(props);
+        }
+
+        public void setValue(int value) {
+            this.value = value;
+        }
+    };
+
+    /**
+     * Config with a long value having no qualifiers.
+     */
+    public class PlainPrimLongConfig extends PropertyConfiguration {
+
+        @Property(name = THE_VALUE)
+        private long value;
+
+        public PlainPrimLongConfig(Properties props) throws PropertyException {
+            super(props);
+        }
+
+        public void setValue(long value) {
+            this.value = value;
+        }
+    };
+
+    /**
+     * A config whose field is "static".
+     */
+    public static class StaticPropConfig extends PropertyConfiguration {
 
         // "static" field cannot be set
         @Property(name = THE_VALUE)
         private static String value;
 
-        public StaticConfig(Properties props) throws PropertyException {
+        public StaticPropConfig(Properties props) throws PropertyException {
             super(props);
         }
+
+        public static void setValue(String value) {
+            StaticPropConfig.value = value;
+        }
+    };
+
+    /**
+     * A config whose method is "static".
+     */
+    public static class StaticMethodConfig extends PropertyConfiguration {
+
+        // "static" field cannot be set
+        @Property(name = THE_VALUE)
+        private String value;
+
+        public StaticMethodConfig(Properties props) throws PropertyException {
+            super(props);
+        }
+
+        public static void setValue(String value) {
+            
+        }
     };
 
     /**

diff --git a/utils/src/test/java/org/onap/policy/common/utils/properties/SpecPropertyConfigurationTest.java b/utils/src/test/java/org/onap/policy/common/utils/properties/SpecPropertyConfigurationTest.java
index 39c8f01..b5431c2 100644 (file)
--- a/utils/src/test/java/org/onap/policy/common/utils/properties/SpecPropertyConfigurationTest.java
+++ b/utils/src/test/java/org/onap/policy/common/utils/properties/SpecPropertyConfigurationTest.java
@@ -110,6 +110,66 @@ public class SpecPropertyConfigurationTest {
             public Config(String specialization, Properties props) throws PropertyException {
                 super(specialization, props);
             }
+
+            @SuppressWarnings("unused")
+            public void setNoSpec(String noSpec) {
+                this.noSpec = noSpec;
+            }
+
+            @SuppressWarnings("unused")
+            public void setNoSpecBool(boolean noSpecBool) {
+                this.noSpecBool = noSpecBool;
+            }
+
+            @SuppressWarnings("unused")
+            public void setType1NoPrefix(String type1NoPrefix) {
+                this.type1NoPrefix = type1NoPrefix;
+            }
+
+            @SuppressWarnings("unused")
+            public void setType1NoSuffix(String type1NoSuffix) {
+                this.type1NoSuffix = type1NoSuffix;
+            }
+
+            @SuppressWarnings("unused")
+            public void setType1Both(String type1Both) {
+                this.type1Both = type1Both;
+            }
+
+            @SuppressWarnings("unused")
+            public void setType1Int(int type1Int) {
+                this.type1Int = type1Int;
+            }
+
+            @SuppressWarnings("unused")
+            public void setType2NoPrefix(String type2NoPrefix) {
+                this.type2NoPrefix = type2NoPrefix;
+            }
+
+            @SuppressWarnings("unused")
+            public void setType2NoSuffix(String type2NoSuffix) {
+                this.type2NoSuffix = type2NoSuffix;
+            }
+
+            @SuppressWarnings("unused")
+            public void setType2NoSpecPrefix(String type2NoSpecPrefix) {
+                this.type2NoSpecPrefix = type2NoSpecPrefix;
+            }
+
+            @SuppressWarnings("unused")
+            public void setType2NoSpecSuffix(String type2NoSpecSuffix) {
+                this.type2NoSpecSuffix = type2NoSpecSuffix;
+            }
+
+            @SuppressWarnings("unused")
+            public void setType2Both(String type2Both) {
+                this.type2Both = type2Both;
+            }
+
+            @SuppressWarnings("unused")
+            public void setType2Long(long type2Long) {
+                this.type2Long = type2Long;
+            }
         };
 
         props.setProperty("prefix.suffix", "no.spec");
@@ -151,6 +211,11 @@ public class SpecPropertyConfigurationTest {
             public Config(String specialization, Properties props) throws PropertyException {
                 super(specialization, props);
             }
+
+            @SuppressWarnings("unused")
+            public void setValue(String value) {
+                this.value = value;
+            }
         };
 
         props.setProperty("prefix.suffix", "no.spec");
@@ -174,6 +239,11 @@ public class SpecPropertyConfigurationTest {
             public Config(String specialization, Properties props) throws PropertyException {
                 super(specialization, props);
             }
+
+            @SuppressWarnings("unused")
+            public void setNotFound(String notFound) {
+                this.notFound = notFound;
+            }
         };
         
         new Config("not found", props);
@@ -196,6 +266,11 @@ public class SpecPropertyConfigurationTest {
             public Config(String specialization) {
                 super(specialization);
             }
+
+            @SuppressWarnings("unused")
+            public void setValue(String value) {
+                this.value = value;
+            }
         };
 
         props.setProperty(specialize(propnm, SPEC), propval);
@@ -224,6 +299,11 @@ public class SpecPropertyConfigurationTest {
             public Config(String specialization, Properties props) throws PropertyException {
                 super(specialization, props);
             }
+
+            @SuppressWarnings("unused")
+            public void setValue(int value) {
+                this.value = value;
+            }
         };
 
         props.setProperty(specialize(propnm, SPEC), String.valueOf(propval));