updated property validation

Author: benfortuna

src/main/java/module-info.java

@@ -16,6 +16,7 @@
     exports net.fortuna.ical4j.vcard.property.immutable;
     exports net.fortuna.ical4j.vcard.filter;
     exports net.fortuna.ical4j.vcard.parameter;
+    exports net.fortuna.ical4j.vcard.validate;
 
     uses net.fortuna.ical4j.vcard.ParameterFactory;
     uses net.fortuna.ical4j.vcard.PropertyFactory;

src/main/java/net/fortuna/ical4j/vcard/PropertyValidatorSupport.java

@@ -37,8 +37,12 @@
 import net.fortuna.ical4j.util.CompatibilityHints;
 import net.fortuna.ical4j.validate.ValidationException;
 import net.fortuna.ical4j.validate.ValidationResult;
-import net.fortuna.ical4j.vcard.*;
+import net.fortuna.ical4j.vcard.Group;
+import net.fortuna.ical4j.vcard.GroupProperty;
+import net.fortuna.ical4j.vcard.PropertyFactory;
+import net.fortuna.ical4j.vcard.PropertyName;
 import net.fortuna.ical4j.vcard.parameter.Type;
+import net.fortuna.ical4j.vcard.validate.DeliveryPropertyValidators;
 
 import java.util.Arrays;
 
@@ -58,7 +62,7 @@
  *
  * @author Ben
  */
-public class Address extends Property implements PropertyValidatorSupport, GroupProperty {
+public class Address extends Property implements GroupProperty {
 
     private static final long serialVersionUID = 6538745668985015384L;
 
@@ -316,7 +320,7 @@ public String getValue() {
      */
     @Override
     public ValidationResult validate() throws ValidationException {
-        return ADDRESS.validate(this);
+        return DeliveryPropertyValidators.ADDRESS.validate(this);
     }
 
     @Override

src/main/java/net/fortuna/ical4j/vcard/property/Address.java

@@ -38,8 +38,12 @@
 import net.fortuna.ical4j.util.Strings;
 import net.fortuna.ical4j.validate.ValidationException;
 import net.fortuna.ical4j.validate.ValidationResult;
-import net.fortuna.ical4j.vcard.*;
+import net.fortuna.ical4j.vcard.Group;
+import net.fortuna.ical4j.vcard.ParameterName;
+import net.fortuna.ical4j.vcard.PropertyFactory;
+import net.fortuna.ical4j.vcard.PropertyName;
 import net.fortuna.ical4j.vcard.parameter.Value;
+import net.fortuna.ical4j.vcard.validate.PropertyValidatorSupport;
 
 import java.net.URI;
 import java.net.URISyntaxException;

src/main/java/net/fortuna/ical4j/vcard/property/Agent.java

@@ -37,8 +37,12 @@
 import net.fortuna.ical4j.model.property.DateProperty;
 import net.fortuna.ical4j.validate.ValidationException;
 import net.fortuna.ical4j.validate.ValidationResult;
-import net.fortuna.ical4j.vcard.*;
+import net.fortuna.ical4j.vcard.Group;
+import net.fortuna.ical4j.vcard.ParameterName;
+import net.fortuna.ical4j.vcard.PropertyFactory;
+import net.fortuna.ical4j.vcard.PropertyName;
 import net.fortuna.ical4j.vcard.parameter.Value;
+import net.fortuna.ical4j.vcard.validate.IdentificationPropertyValidators;
 
 import java.time.temporal.Temporal;
 import java.util.Optional;
@@ -57,7 +61,7 @@
  *
  * @author Ben
  */
-public class Anniversary<T extends Temporal> extends DateProperty<T> implements Encodable, PropertyValidatorSupport {
+public class Anniversary<T extends Temporal> extends DateProperty<T> implements Encodable {
 
     private static final long serialVersionUID = 3009228294165154307L;
 
@@ -101,9 +105,9 @@ public void setValue(String aValue) {
     @Override
     public ValidationResult validate() throws ValidationException {
         if (Optional.of(Value.TEXT).equals(getParameter(ParameterName.VALUE.toString()))) {
-            return ANNIVERSARY_TEXT.validate(this);
+            return IdentificationPropertyValidators.ANNIVERSARY_TEXT.validate(this);
         }
-        return ANNIVERSARY_DATE.validate(this);
+        return IdentificationPropertyValidators.ANNIVERSARY_DATE.validate(this);
     }
 
     @Override

src/main/java/net/fortuna/ical4j/vcard/property/Anniversary.java

@@ -40,6 +40,7 @@
 import net.fortuna.ical4j.validate.ValidationResult;
 import net.fortuna.ical4j.vcard.*;
 import net.fortuna.ical4j.vcard.parameter.Value;
+import net.fortuna.ical4j.vcard.validate.IdentificationPropertyValidators;
 
 import java.time.format.DateTimeParseException;
 import java.time.temporal.Temporal;
@@ -57,7 +58,7 @@
  *
  * @author Ben
  */
-public class BDay<T extends Temporal> extends DateProperty<T> implements Encodable, PropertyValidatorSupport {
+public class BDay<T extends Temporal> extends DateProperty<T> implements Encodable {
 
     private static final long serialVersionUID = 4298026868242865633L;
 
@@ -130,9 +131,9 @@ public void setValue(String value) {
     @Override
     public ValidationResult validate() throws ValidationException {
         if (Optional.of(Value.TEXT).equals(getParameter(ParameterName.VALUE.toString()))) {
-            return BDAY_TEXT.validate(this);
+            return IdentificationPropertyValidators.BDAY_TEXT.validate(this);
         }
-        return BDAY_DATE.validate(this);
+        return IdentificationPropertyValidators.BDAY_DATE.validate(this);
     }
 
     @Override

src/main/java/net/fortuna/ical4j/vcard/property/BDay.java

@@ -40,7 +40,7 @@
 import net.fortuna.ical4j.vcard.Group;
 import net.fortuna.ical4j.vcard.PropertyFactory;
 import net.fortuna.ical4j.vcard.PropertyName;
-import net.fortuna.ical4j.vcard.PropertyValidatorSupport;
+import net.fortuna.ical4j.vcard.validate.PropertyValidatorSupport;
 
 import static net.fortuna.ical4j.util.Strings.unescape;
 

src/main/java/net/fortuna/ical4j/vcard/property/Birth.java

@@ -40,8 +40,8 @@
 import net.fortuna.ical4j.vcard.Group;
 import net.fortuna.ical4j.vcard.PropertyFactory;
 import net.fortuna.ical4j.vcard.PropertyName;
-import net.fortuna.ical4j.vcard.PropertyValidatorSupport;
 import net.fortuna.ical4j.vcard.parameter.Type;
+import net.fortuna.ical4j.vcard.validate.CalendarPropertyValidators;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -59,7 +59,7 @@
  *
  * @author Ben
  */
-public class CalAdrUri extends Property implements PropertyValidatorSupport {
+public class CalAdrUri extends Property {
 
     private static final long serialVersionUID = -6507220241297111022L;
 
@@ -114,7 +114,7 @@ public void setValue(String aValue) {
      */
     @Override
     public ValidationResult validate() throws ValidationException {
-        return CALADRURI.validate(this);
+        return CalendarPropertyValidators.CALADRURI.validate(this);
     }
 
     @Override

src/main/java/net/fortuna/ical4j/vcard/property/CalAdrUri.java

@@ -40,8 +40,8 @@
 import net.fortuna.ical4j.vcard.Group;
 import net.fortuna.ical4j.vcard.PropertyFactory;
 import net.fortuna.ical4j.vcard.PropertyName;
-import net.fortuna.ical4j.vcard.PropertyValidatorSupport;
 import net.fortuna.ical4j.vcard.parameter.Type;
+import net.fortuna.ical4j.vcard.validate.CalendarPropertyValidators;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -59,7 +59,7 @@
  *
  * @author Ben
  */
-public class CalUri extends Property implements PropertyValidatorSupport {
+public class CalUri extends Property {
 
     private static final long serialVersionUID = 4821378252642288695L;
 
@@ -115,7 +115,7 @@ public void setValue(String aValue) {
      */
     @Override
     public ValidationResult validate() throws ValidationException {
-        return CALURI.validate(this);
+        return CalendarPropertyValidators.CALURI.validate(this);
     }
 
     @Override

src/main/java/net/fortuna/ical4j/vcard/property/CalUri.java

@@ -40,7 +40,7 @@
 import net.fortuna.ical4j.vcard.Group;
 import net.fortuna.ical4j.vcard.PropertyFactory;
 import net.fortuna.ical4j.vcard.PropertyName;
-import net.fortuna.ical4j.vcard.PropertyValidatorSupport;
+import net.fortuna.ical4j.vcard.validate.ExplanatoryPropertyValidators;
 
 /**
  * CATEGORIES property.
@@ -54,7 +54,7 @@
  *
  * @author Ben
  */
-public class Categories extends Property implements PropertyValidatorSupport {
+public class Categories extends Property {
 
     private static final long serialVersionUID = -3233034210546002366L;
 
@@ -117,7 +117,7 @@ public void setValue(String aValue) {
      */
     @Override
     public ValidationResult validate() throws ValidationException {
-        return PropertyValidatorSupport.CATEGORIES.validate(this);
+        return ExplanatoryPropertyValidators.CATEGORIES.validate(this);
     }
 
     @Override