reorganize validation package

src/main/java/ninja/javafx/smartcsv/validation/ValidationFileReader.java

@@ -28,6 +28,7 @@ package ninja.javafx.smartcsv.validation;
 
 import com.google.gson.GsonBuilder;
 import ninja.javafx.smartcsv.FileReader;
+import ninja.javafx.smartcsv.validation.configuration.ValidationConfiguration;
 
 import java.io.File;
 import java.io.IOException;
@@ -42,7 +43,6 @@ public class ValidationFileReader implements FileReader<ValidationConfiguration>
     @Override
     public void read(File file) throws IOException {
         config = new GsonBuilder().create().fromJson(new java.io.FileReader(file), ValidationConfiguration.class);
-        System.out.println("brechpunkt");
     }
 
     public ValidationConfiguration getContent() {

src/main/java/ninja/javafx/smartcsv/validation/ValidationFileWriter.java

@@ -29,6 +29,7 @@ package ninja.javafx.smartcsv.validation;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import ninja.javafx.smartcsv.FileWriter;
+import ninja.javafx.smartcsv.validation.configuration.ValidationConfiguration;
 
 import java.io.File;
 import java.io.IOException;

src/main/java/ninja/javafx/smartcsv/validation/Validator.java

@@ -27,13 +27,16 @@
 package ninja.javafx.smartcsv.validation;
 
 import ninja.javafx.smartcsv.fx.table.model.ColumnValueProvider;
+import ninja.javafx.smartcsv.validation.checker.*;
+import ninja.javafx.smartcsv.validation.configuration.ConstraintsConfiguration;
+import ninja.javafx.smartcsv.validation.configuration.FieldConfiguration;
+import ninja.javafx.smartcsv.validation.configuration.ValidationConfiguration;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import static ninja.javafx.smartcsv.validation.ValidationFormatHelper.dateFormat;
-import static ninja.javafx.smartcsv.validation.ValidationFormatHelper.doubleToInteger;
 
 /**
  * This class checks all the validations defined in the

src/main/java/ninja/javafx/smartcsv/validation/checker/DateValidation.java

@@ -23,7 +23,9 @@
    THE SOFTWARE.
 
 */
-package ninja.javafx.smartcsv.validation;
+package ninja.javafx.smartcsv.validation.checker;
+
+import ninja.javafx.smartcsv.validation.ValidationError;
 
 import static org.apache.commons.validator.GenericValidator.isDate;
 

src/main/java/ninja/javafx/smartcsv/validation/checker/DoubleValidation.java

@@ -23,7 +23,9 @@
    THE SOFTWARE.
 
 */
-package ninja.javafx.smartcsv.validation;
+package ninja.javafx.smartcsv.validation.checker;
+
+import ninja.javafx.smartcsv.validation.ValidationError;
 
 import static org.apache.commons.validator.GenericValidator.isDouble;
 

src/main/java/ninja/javafx/smartcsv/validation/checker/EmptyValueIsValid.java

@@ -1,4 +1,4 @@
-package ninja.javafx.smartcsv.validation;
+package ninja.javafx.smartcsv.validation.checker;
 
 /**
  * validations based on this are not validated when the value is null or empty

src/main/java/ninja/javafx/smartcsv/validation/checker/GroovyValidation.java

@@ -23,11 +23,12 @@
    THE SOFTWARE.
 
 */
-package ninja.javafx.smartcsv.validation;
+package ninja.javafx.smartcsv.validation.checker;
 
 import groovy.lang.Binding;
 import groovy.lang.GroovyShell;
 import groovy.lang.Script;
+import ninja.javafx.smartcsv.validation.ValidationError;
 import org.codehaus.groovy.control.CompilationFailedException;
 
 /**

src/main/java/ninja/javafx/smartcsv/validation/checker/IntegerValidation.java

@@ -23,7 +23,9 @@
    THE SOFTWARE.
 
 */
-package ninja.javafx.smartcsv.validation;
+package ninja.javafx.smartcsv.validation.checker;
+
+import ninja.javafx.smartcsv.validation.ValidationError;
 
 import static org.apache.commons.validator.GenericValidator.isInt;
 

src/main/java/ninja/javafx/smartcsv/validation/checker/MaxLengthValidation.java

@@ -23,7 +23,9 @@
    THE SOFTWARE.
 
 */
-package ninja.javafx.smartcsv.validation;
+package ninja.javafx.smartcsv.validation.checker;
+
+import ninja.javafx.smartcsv.validation.ValidationError;
 
 import static org.apache.commons.validator.GenericValidator.maxLength;
 

src/main/java/ninja/javafx/smartcsv/validation/checker/MinLengthValidation.java

@@ -23,7 +23,9 @@
    THE SOFTWARE.
 
 */
-package ninja.javafx.smartcsv.validation;
+package ninja.javafx.smartcsv.validation.checker;
+
+import ninja.javafx.smartcsv.validation.ValidationError;
 
 import static org.apache.commons.validator.GenericValidator.minLength;
 

src/main/java/ninja/javafx/smartcsv/validation/checker/NotEmptyValidation.java

@@ -23,7 +23,9 @@
    THE SOFTWARE.
 
 */
-package ninja.javafx.smartcsv.validation;
+package ninja.javafx.smartcsv.validation.checker;
+
+import ninja.javafx.smartcsv.validation.ValidationError;
 
 import static org.apache.commons.validator.GenericValidator.isBlankOrNull;
 

src/main/java/ninja/javafx/smartcsv/validation/checker/RegExpValidation.java

@@ -23,7 +23,9 @@
    THE SOFTWARE.
 
 */
-package ninja.javafx.smartcsv.validation;
+package ninja.javafx.smartcsv.validation.checker;
+
+import ninja.javafx.smartcsv.validation.ValidationError;
 
 import static org.apache.commons.validator.GenericValidator.matchRegexp;
 

src/main/java/ninja/javafx/smartcsv/validation/checker/UniqueValidation.java

@@ -23,9 +23,10 @@
    THE SOFTWARE.
 
 */
-package ninja.javafx.smartcsv.validation;
+package ninja.javafx.smartcsv.validation.checker;
 
 import ninja.javafx.smartcsv.fx.table.model.ColumnValueProvider;
+import ninja.javafx.smartcsv.validation.ValidationError;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/ninja/javafx/smartcsv/validation/checker/Validation.java

@@ -23,7 +23,9 @@
    THE SOFTWARE.
 
 */
-package ninja.javafx.smartcsv.validation;
+package ninja.javafx.smartcsv.validation.checker;
+
+import ninja.javafx.smartcsv.validation.ValidationError;
 
 /**
  * Interface for all validations

src/main/java/ninja/javafx/smartcsv/validation/checker/ValueOfValidation.java

@@ -23,7 +23,9 @@
    THE SOFTWARE.
 
 */
-package ninja.javafx.smartcsv.validation;
+package ninja.javafx.smartcsv.validation.checker;
+
+import ninja.javafx.smartcsv.validation.ValidationError;
 
 import java.util.List;
 

src/main/java/ninja/javafx/smartcsv/validation/configuration/ConstraintsConfiguration.java

@@ -1,4 +1,4 @@
-package ninja.javafx.smartcsv.validation;
+package ninja.javafx.smartcsv.validation.configuration;
 
 import com.google.gson.annotations.SerializedName;
 

src/main/java/ninja/javafx/smartcsv/validation/configuration/FieldConfiguration.java

@@ -1,7 +1,11 @@
-package ninja.javafx.smartcsv.validation;
+package ninja.javafx.smartcsv.validation.configuration;
 
 import com.google.gson.annotations.SerializedName;
 
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 /**
  * @author abi
  */
@@ -22,6 +26,45 @@ public class FieldConfiguration {
 //        @SerializedName("geojson") GEOJSON
     }
 
+    public enum StringFormat {
+        @SerializedName("default") DEFAULT,
+        @SerializedName("email") EMAIL,
+        @SerializedName("uri") URI,
+        @SerializedName("binary") BINARY,
+        @SerializedName("uuid") UUID
+    }
+
+    public static List<String> getStringFormats() {
+        return Stream.of(StringFormat.values())
+                .map(StringFormat::name)
+                .collect(Collectors.toList());
+    }
+
+    public enum NumberFormat {
+        @SerializedName("decimalChar") DECIMAL_CHAR,
+        @SerializedName("groupChar") GROUP_CHAR,
+        @SerializedName("currency") CURRENCY
+    }
+
+    public static List<String> getNumberFormats() {
+        return Stream.of(NumberFormat.values())
+                .map(NumberFormat::name)
+                .collect(Collectors.toList());
+    }
+
+
+    public enum DateFormat {
+        @SerializedName("default") DEFAULT,
+        @SerializedName("any") ANY,
+        @SerializedName("fmtPattern") FMT_PATTERN
+    }
+
+    public static List<String> getDateFormats() {
+        return Stream.of(DateFormat.values())
+                .map(DateFormat::name)
+                .collect(Collectors.toList());
+    }
+
     private String name;
     private String title;
     private Type type;

src/main/java/ninja/javafx/smartcsv/validation/configuration/ValidationConfiguration.java

@@ -24,7 +24,7 @@
   
 */
 
-package ninja.javafx.smartcsv.validation;
+package ninja.javafx.smartcsv.validation.configuration;
 
 import com.google.gson.annotations.SerializedName;