Merge pull request #66 from embulk/add_validation

add validator into ConfigMapperFactory

Author: dmikurube

NOTICE_GEM

@@ -14,7 +14,7 @@ They are licensed under the Apache Software License, Version 2.0.
 The gem distribution of this product includes JARs of the Jakarta Bean Validation API 1.1 (https://beanvalidation.org/1.1/), as-is.
 It is licensed under the Apache Software License, Version 2.0.
 
-The gem distribution of this product includes JARs of Apache Commons IO, Commons Logging, Commons Virtual File System, as-is.
+The gem distribution of this product includes JARs of Apache Commons IO, Commons Logging, Commons Virtual File System, Commons BeanUtils, Commons Lang, BVal, as-is.
 They are licensed under the Apache Software License, Version 2.0.
 
 The gem distribution of this product includes JARs of JSch - Java Secure Channel (http://www.jcraft.com/jsch/), as-is.

build.gradle

@@ -13,7 +13,7 @@ repositories {
 }
 
 group = "org.embulk"
-version = "0.3.0-SNAPSHOT"
+version = "0.3.1-SNAPSHOT"
 description = "Stores files on SFTP server."
 
 sourceCompatibility = 1.8
@@ -50,6 +50,12 @@ dependencies {
     compile "com.fasterxml.jackson.core:jackson-databind:2.6.7"
     compile "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7"
     compile "javax.validation:validation-api:1.1.0.Final"
+    compile "org.apache.bval:bval-jsr303:0.5"
+    // Necessary for bval from Java 9+
+    compile 'javax.xml.bind:jaxb-api:2.2.11'
+    compile 'com.sun.xml.bind:jaxb-core:2.2.11'
+    compile 'com.sun.xml.bind:jaxb-impl:2.2.11'
+    compile 'javax.activation:activation:1.1.1'
 
     compile "org.embulk:embulk-util-retryhelper:0.8.2"
 

gradle/dependency-locks/embulkPluginRuntime.lockfile

@@ -6,9 +6,17 @@ com.fasterxml.jackson.core:jackson-core:2.6.7
 com.fasterxml.jackson.core:jackson-databind:2.6.7
 com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7
 com.jcraft:jsch:0.1.55
+com.sun.xml.bind:jaxb-core:2.2.11
+com.sun.xml.bind:jaxb-impl:2.2.11
+commons-beanutils:commons-beanutils-core:1.8.3
 commons-io:commons-io:2.6
 commons-logging:commons-logging:1.2
+javax.activation:activation:1.1.1
 javax.validation:validation-api:1.1.0.Final
+javax.xml.bind:jaxb-api:2.2.11
+org.apache.bval:bval-core:0.5
+org.apache.bval:bval-jsr303:0.5
+org.apache.commons:commons-lang3:3.1
 org.apache.commons:commons-vfs2:2.2
 org.embulk:embulk-util-config:0.3.1
 org.embulk:embulk-util-retryhelper:0.8.2

src/main/java/org/embulk/output/sftp/SftpFileOutputPlugin.java

@@ -16,6 +16,7 @@
 
 package org.embulk.output.sftp;
 
+import org.apache.bval.jsr303.ApacheValidationProvider;
 import org.embulk.config.ConfigDiff;
 import org.embulk.config.ConfigSource;
 import org.embulk.config.TaskReport;
@@ -31,6 +32,8 @@
 import org.embulk.util.config.TaskMapper;
 import org.embulk.util.config.units.LocalFile;
 
+import javax.validation.Validation;
+import javax.validation.Validator;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 
@@ -180,7 +183,9 @@ public TransactionalFileOutput open(TaskSource taskSource, final int taskIndex)
         return new SftpRemoteFileOutput(task, taskIndex, Exec.getTempFileSpace());
     }
 
-    static final ConfigMapperFactory CONFIG_MAPPER_FACTORY = ConfigMapperFactory.builder().addDefaultModules().build();
+    private static final Validator VALIDATOR =
+            Validation.byProvider(ApacheValidationProvider.class).configure().buildValidatorFactory().getValidator();
+    static final ConfigMapperFactory CONFIG_MAPPER_FACTORY = ConfigMapperFactory.builder().addDefaultModules().withValidator(VALIDATOR).build();
     static final ConfigMapper CONFIG_MAPPER = CONFIG_MAPPER_FACTORY.createConfigMapper();
     static final TaskMapper TASK_MAPPER = CONFIG_MAPPER_FACTORY.createTaskMapper();
 }