diff --git a/src/main/java/ninja/javafx/smartcsv/validation/Validator.java b/src/main/java/ninja/javafx/smartcsv/validation/Validator.java index f054c79..9a9d728 100644 --- a/src/main/java/ninja/javafx/smartcsv/validation/Validator.java +++ b/src/main/java/ninja/javafx/smartcsv/validation/Validator.java @@ -30,7 +30,6 @@ import ninja.javafx.smartcsv.fx.table.model.ColumnValueProvider; import ninja.javafx.smartcsv.validation.checker.*; import ninja.javafx.smartcsv.validation.configuration.Constraints; import ninja.javafx.smartcsv.validation.configuration.Field; -import ninja.javafx.smartcsv.validation.configuration.StringFormat; import ninja.javafx.smartcsv.validation.configuration.ValidationConfiguration; import java.util.HashMap; @@ -202,6 +201,10 @@ public class Validator { if (column.getType() == STRING && column.getFormat().equalsIgnoreCase(BINARY.getExternalValue())) { add(column.getName(), new BinaryValidation()); } + + if (column.getType() == STRING && column.getFormat() == null) { + columnValidationMap.get(column).remove(Validation.Type.STRING); + } } String groovy = column.getGroovy(); diff --git a/src/main/java/ninja/javafx/smartcsv/validation/checker/BinaryValidation.java b/src/main/java/ninja/javafx/smartcsv/validation/checker/BinaryValidation.java index 496a964..73ca314 100644 --- a/src/main/java/ninja/javafx/smartcsv/validation/checker/BinaryValidation.java +++ b/src/main/java/ninja/javafx/smartcsv/validation/checker/BinaryValidation.java @@ -28,7 +28,6 @@ package ninja.javafx.smartcsv.validation.checker; import ninja.javafx.smartcsv.validation.ValidationError; import java.util.Base64; -import java.util.UUID; /** * checks if the value is a base64 encoded string representing binary data @@ -46,6 +45,6 @@ public class BinaryValidation extends EmptyValueIsValid { @Override public Type getType() { - return Type.BINARY; + return Type.STRING; } } diff --git a/src/main/java/ninja/javafx/smartcsv/validation/checker/EmailValidation.java b/src/main/java/ninja/javafx/smartcsv/validation/checker/EmailValidation.java index d287f8a..4c759db 100644 --- a/src/main/java/ninja/javafx/smartcsv/validation/checker/EmailValidation.java +++ b/src/main/java/ninja/javafx/smartcsv/validation/checker/EmailValidation.java @@ -42,6 +42,6 @@ public class EmailValidation extends EmptyValueIsValid { @Override public Type getType() { - return Type.EMAIL; + return Type.STRING; } } diff --git a/src/main/java/ninja/javafx/smartcsv/validation/checker/UriValidation.java b/src/main/java/ninja/javafx/smartcsv/validation/checker/UriValidation.java index c92db38..764e3b1 100644 --- a/src/main/java/ninja/javafx/smartcsv/validation/checker/UriValidation.java +++ b/src/main/java/ninja/javafx/smartcsv/validation/checker/UriValidation.java @@ -46,6 +46,6 @@ public class UriValidation extends EmptyValueIsValid { @Override public Type getType() { - return Type.URI; + return Type.STRING; } } diff --git a/src/main/java/ninja/javafx/smartcsv/validation/checker/UuidValidation.java b/src/main/java/ninja/javafx/smartcsv/validation/checker/UuidValidation.java index a4bbc34..366866f 100644 --- a/src/main/java/ninja/javafx/smartcsv/validation/checker/UuidValidation.java +++ b/src/main/java/ninja/javafx/smartcsv/validation/checker/UuidValidation.java @@ -27,8 +27,6 @@ package ninja.javafx.smartcsv.validation.checker; import ninja.javafx.smartcsv.validation.ValidationError; -import java.net.URI; -import java.net.URISyntaxException; import java.util.UUID; /** @@ -47,6 +45,6 @@ public class UuidValidation extends EmptyValueIsValid { @Override public Type getType() { - return Type.UUID; + return Type.STRING; } } diff --git a/src/main/java/ninja/javafx/smartcsv/validation/checker/Validation.java b/src/main/java/ninja/javafx/smartcsv/validation/checker/Validation.java index 8014c0e..59af85b 100644 --- a/src/main/java/ninja/javafx/smartcsv/validation/checker/Validation.java +++ b/src/main/java/ninja/javafx/smartcsv/validation/checker/Validation.java @@ -32,7 +32,7 @@ import ninja.javafx.smartcsv.validation.ValidationError; */ public interface Validation { - enum Type { NOT_EMPTY, UNIQUE, DOUBLE, INTEGER, MIN_LENGTH, MAX_LENGTH, DATE, REGEXP, VALUE_OF, EMAIL, UUID, URI, BINARY, GROOVY } + enum Type { NOT_EMPTY, UNIQUE, DOUBLE, INTEGER, MIN_LENGTH, MAX_LENGTH, DATE, REGEXP, VALUE_OF, STRING, GROOVY } void check(int row, String value, ValidationError error); Type getType(); boolean canBeChecked(String value);