Merge pull request #30 from ical4j/develop

Refactored property validation

Author: benfortuna

.env

@@ -1,4 +1,4 @@
-CHANGELOG_START_TAG=ical4j-vcard-2.0.0-alpha8
+CHANGELOG_START_TAG=ical4j-vcard-2.0.0
 CHANGELOG_END_TAG=HEAD
 
 GRADLE_VERSION=8.4

.github/workflows/publish-snapshots.yml

@@ -5,7 +5,10 @@ on:
     branches:
       - 'develop'
 
-permissions: read-all
+permissions:
+  contents: read
+  checks: write
+  pull-requests: write
 
 jobs:
   test:

.palantir/revapi.yml

@@ -1,5 +1,4 @@
 plugins {
-    id 'java'
     id 'java-library'
     id 'groovy'
     id 'maven-publish'
@@ -9,7 +8,6 @@ plugins {
     id "com.palantir.revapi" version "1.7.0"
 //    id "net.ltgt.errorprone" version "2.0.2" apply false
     id "biz.aQute.bnd.builder" version "$bndVersion"
-    id 'org.javamodularity.moduleplugin' version '1.8.15'
 }
 
 sourceCompatibility = 11
@@ -32,8 +30,6 @@ java {
     }
 }
 
-sourcesJar.dependsOn ':compileModuleInfoJava'
-
 dependencies {
     api "org.mnode.ical4j:ical4j:$ical4jVersion", "commons-io:commons-io:$commonsIoVersion"
 
@@ -58,17 +54,7 @@ dependencies {
     }
 }
 
-compileTestJava {
-    moduleOptions {
-        compileOnClasspath = true
-    }
-}
-
 test {
-    moduleOptions {
-        runOnClasspath = true
-    }
-
     useJUnitPlatform()
 
     finalizedBy jacocoTestCoverageVerification, jacocoTestReport // Ensure Jacoco is run after tests have completed
@@ -133,8 +119,6 @@ jar {
                 'Implementation-Vendor': 'Ben Fortuna'
         )
     }
-
-    duplicatesStrategy = DuplicatesStrategy.WARN
 }
 
 revapi {

build.gradle

@@ -1,4 +1,4 @@
-ical4jVersion=4.0.4
+ical4jVersion=4.0.7
 log4jVersion=2.23.1
 commonsIoVersion=2.16.1
 groovyVersion=3.0.22
@@ -7,4 +7,4 @@ junitVintageVersion=5.10.3
 spockVersion=2.4-M1-groovy-3.0
 
 jacoco_htmlReport=true
-revApiOldVersion=1.0.7
+revApiOldVersion=2.0.0

gradle.properties

@@ -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/module-info.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;
 
@@ -48,14 +52,17 @@
 
 /**
  * ADDRESS property.
+ *
+ * <a href="https://www.rfc-editor.org/rfc/rfc6350.html#section-6.3.1">vCard - ADR</a>
+ * 
  * <p>
  * $Id$
  * <p>
  * Created on 23/08/2008
  *
  * @author Ben
  */
-public class Address extends Property implements PropertyValidatorSupport, GroupProperty {
+public class Address extends Property implements GroupProperty {
 
     private static final long serialVersionUID = 6538745668985015384L;
 
@@ -313,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/PropertyValidatorSupport.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/Address.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;
@@ -47,14 +51,17 @@
 
 /**
  * DEATH property.
+ *
+ * <a href="https://www.rfc-editor.org/rfc/rfc6350.html#section-6.2.6">vCard - ANNIVERSARY</a>
+ *
  * <p>
  * $Id$
  * <p>
  * Created on 23/08/2008
  *
  * @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;
 
@@ -98,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