Validate default values (#128)

* Add test showing problematic behaviour

* Validate default parameter values as well

Author: todvora

src/main/java/com/github/joschi/jadconfig/JadConfig.java

@@ -186,12 +186,9 @@ private void processClassField(Object configurationBean, Field field) throws Val
                 } catch (ParameterException e) {
                     throw new ParameterException("Couldn't convert value for parameter \"" + parameterName + "\"", e);
                 }
-
-                LOG.debug("Validating parameter {}", parameterName);
-                final List<Class<? extends Validator<?>>> validators =
-                        new ArrayList<>(Collections.<Class<? extends Validator<?>>>singleton(parameter.validator()));
-                validators.addAll(Arrays.asList(parameter.validators()));
-                validateParameter(validators, parameterName, fieldValue);
+                validateFieldValue(parameterName, parameter, fieldValue);
+            } else if (fieldValue != null) {
+                validateFieldValue(parameterName, parameter, fieldValue);
             }
 
             LOG.debug("Setting parameter {} to {}", parameterName, fieldValue);
@@ -204,6 +201,14 @@ private void processClassField(Object configurationBean, Field field) throws Val
         }
     }
 
+    private void validateFieldValue(String parameterName, Parameter parameter, Object fieldValue) throws ValidationException {
+        LOG.debug("Validating parameter {}", parameterName);
+        final List<Class<? extends Validator<?>>> validators =
+                new ArrayList<>(Collections.<Class<? extends Validator<?>>>singleton(parameter.validator()));
+        validators.addAll(Arrays.asList(parameter.validators()));
+        validateParameter(validators, parameterName, fieldValue);
+    }
+
     private String lookupFallbackParameter(Parameter parameter) {
         final Optional<String> fallbackValue = Optional.ofNullable(parameter.fallbackPropertyName())
                 .filter(fallbackName -> !fallbackName.trim().isEmpty())

src/test/java/com/github/joschi/jadconfig/JadConfigTest.java

@@ -8,6 +8,7 @@
 import com.github.joschi.jadconfig.testbeans.FoobarConfigurationBean;
 import com.github.joschi.jadconfig.testbeans.InheritedBeanSubClass;
 import com.github.joschi.jadconfig.testbeans.InheritedBeanSubSubClass;
+import com.github.joschi.jadconfig.testbeans.InvalidDefaultValueValidatorBean;
 import com.github.joschi.jadconfig.testbeans.Multi1ConfigurationBean;
 import com.github.joschi.jadconfig.testbeans.Multi2ConfigurationBean;
 import com.github.joschi.jadconfig.testbeans.NonExistingParameterBean;
@@ -503,6 +504,16 @@ public void testProcessValidatedBean() throws RepositoryException, ValidationExc
         Assert.assertEquals(1234567890123L, configurationBean.getMyLong());
     }
 
+    @Test
+    public void testProcessValidatedBeanInvalidDefaultValue() {
+        InvalidDefaultValueValidatorBean configurationBean = new InvalidDefaultValueValidatorBean();
+        jadConfig = new JadConfig(repository, configurationBean);
+
+        // the default value is -1, validator expects only positive longs => validation exception
+        Assert.assertThrows(ValidationException.class, () -> jadConfig.process());
+    }
+
+
     @Test
     public void testProcessNullPropertiesDoNotOverwriteDefaultValues() throws RepositoryException, ValidationException {
         final SingleFieldBean bean = new SingleFieldBean();

src/test/java/com/github/joschi/jadconfig/testbeans/InvalidDefaultValueValidatorBean.java

@@ -0,0 +1,14 @@
+package com.github.joschi.jadconfig.testbeans;
+
+import com.github.joschi.jadconfig.Parameter;
+import com.github.joschi.jadconfig.validators.PositiveLongValidator;
+
+public class InvalidDefaultValueValidatorBean {
+
+    @Parameter(value = "test.positive.long", validator = PositiveLongValidator.class)
+    private long myPositiveLong = -1;
+
+    public long getMyPositiveLong() {
+        return myPositiveLong;
+    }
+}