Skip to content

Commit 012f5e4

Browse files
benfortunabenfortuna
committed
updated property validation
1 parent 3075133 commit 012f5e4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+663
-438
lines changed

‎src/main/java/module-info.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
exports net.fortuna.ical4j.vcard.property.immutable;
1717
exports net.fortuna.ical4j.vcard.filter;
1818
exports net.fortuna.ical4j.vcard.parameter;
19+
exports net.fortuna.ical4j.vcard.validate;
1920

2021
uses net.fortuna.ical4j.vcard.ParameterFactory;
2122
uses net.fortuna.ical4j.vcard.PropertyFactory;

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

Lines changed: 0 additions & 311 deletions
This file was deleted.

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,12 @@
3737
import net.fortuna.ical4j.util.CompatibilityHints;
3838
import net.fortuna.ical4j.validate.ValidationException;
3939
import net.fortuna.ical4j.validate.ValidationResult;
40-
import net.fortuna.ical4j.vcard.*;
40+
import net.fortuna.ical4j.vcard.Group;
41+
import net.fortuna.ical4j.vcard.GroupProperty;
42+
import net.fortuna.ical4j.vcard.PropertyFactory;
43+
import net.fortuna.ical4j.vcard.PropertyName;
4144
import net.fortuna.ical4j.vcard.parameter.Type;
45+
import net.fortuna.ical4j.vcard.validate.DeliveryPropertyValidators;
4246

4347
import java.util.Arrays;
4448

@@ -58,7 +62,7 @@
5862
*
5963
* @author Ben
6064
*/
61-
public class Address extends Property implements PropertyValidatorSupport, GroupProperty {
65+
public class Address extends Property implements GroupProperty {
6266

6367
private static final long serialVersionUID = 6538745668985015384L;
6468

@@ -316,7 +320,7 @@ public String getValue() {
316320
*/
317321
@Override
318322
public ValidationResult validate() throws ValidationException {
319-
return ADDRESS.validate(this);
323+
return DeliveryPropertyValidators.ADDRESS.validate(this);
320324
}
321325

322326
@Override

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,12 @@
3838
import net.fortuna.ical4j.util.Strings;
3939
import net.fortuna.ical4j.validate.ValidationException;
4040
import net.fortuna.ical4j.validate.ValidationResult;
41-
import net.fortuna.ical4j.vcard.*;
41+
import net.fortuna.ical4j.vcard.Group;
42+
import net.fortuna.ical4j.vcard.ParameterName;
43+
import net.fortuna.ical4j.vcard.PropertyFactory;
44+
import net.fortuna.ical4j.vcard.PropertyName;
4245
import net.fortuna.ical4j.vcard.parameter.Value;
46+
import net.fortuna.ical4j.vcard.validate.PropertyValidatorSupport;
4347

4448
import java.net.URI;
4549
import java.net.URISyntaxException;

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,12 @@
3737
import net.fortuna.ical4j.model.property.DateProperty;
3838
import net.fortuna.ical4j.validate.ValidationException;
3939
import net.fortuna.ical4j.validate.ValidationResult;
40-
import net.fortuna.ical4j.vcard.*;
40+
import net.fortuna.ical4j.vcard.Group;
41+
import net.fortuna.ical4j.vcard.ParameterName;
42+
import net.fortuna.ical4j.vcard.PropertyFactory;
43+
import net.fortuna.ical4j.vcard.PropertyName;
4144
import net.fortuna.ical4j.vcard.parameter.Value;
45+
import net.fortuna.ical4j.vcard.validate.IdentificationPropertyValidators;
4246

4347
import java.time.temporal.Temporal;
4448
import java.util.Optional;
@@ -57,7 +61,7 @@
5761
*
5862
* @author Ben
5963
*/
60-
public class Anniversary<T extends Temporal> extends DateProperty<T> implements Encodable, PropertyValidatorSupport {
64+
public class Anniversary<T extends Temporal> extends DateProperty<T> implements Encodable {
6165

6266
private static final long serialVersionUID = 3009228294165154307L;
6367

@@ -101,9 +105,9 @@ public void setValue(String aValue) {
101105
@Override
102106
public ValidationResult validate() throws ValidationException {
103107
if (Optional.of(Value.TEXT).equals(getParameter(ParameterName.VALUE.toString()))) {
104-
return ANNIVERSARY_TEXT.validate(this);
108+
return IdentificationPropertyValidators.ANNIVERSARY_TEXT.validate(this);
105109
}
106-
return ANNIVERSARY_DATE.validate(this);
110+
return IdentificationPropertyValidators.ANNIVERSARY_DATE.validate(this);
107111
}
108112

109113
@Override

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import net.fortuna.ical4j.validate.ValidationResult;
4141
import net.fortuna.ical4j.vcard.*;
4242
import net.fortuna.ical4j.vcard.parameter.Value;
43+
import net.fortuna.ical4j.vcard.validate.IdentificationPropertyValidators;
4344

4445
import java.time.format.DateTimeParseException;
4546
import java.time.temporal.Temporal;
@@ -57,7 +58,7 @@
5758
*
5859
* @author Ben
5960
*/
60-
public class BDay<T extends Temporal> extends DateProperty<T> implements Encodable, PropertyValidatorSupport {
61+
public class BDay<T extends Temporal> extends DateProperty<T> implements Encodable {
6162

6263
private static final long serialVersionUID = 4298026868242865633L;
6364

@@ -130,9 +131,9 @@ public void setValue(String value) {
130131
@Override
131132
public ValidationResult validate() throws ValidationException {
132133
if (Optional.of(Value.TEXT).equals(getParameter(ParameterName.VALUE.toString()))) {
133-
return BDAY_TEXT.validate(this);
134+
return IdentificationPropertyValidators.BDAY_TEXT.validate(this);
134135
}
135-
return BDAY_DATE.validate(this);
136+
return IdentificationPropertyValidators.BDAY_DATE.validate(this);
136137
}
137138

138139
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import net.fortuna.ical4j.vcard.Group;
4141
import net.fortuna.ical4j.vcard.PropertyFactory;
4242
import net.fortuna.ical4j.vcard.PropertyName;
43-
import net.fortuna.ical4j.vcard.PropertyValidatorSupport;
43+
import net.fortuna.ical4j.vcard.validate.PropertyValidatorSupport;
4444

4545
import static net.fortuna.ical4j.util.Strings.unescape;
4646

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
import net.fortuna.ical4j.vcard.Group;
4141
import net.fortuna.ical4j.vcard.PropertyFactory;
4242
import net.fortuna.ical4j.vcard.PropertyName;
43-
import net.fortuna.ical4j.vcard.PropertyValidatorSupport;
4443
import net.fortuna.ical4j.vcard.parameter.Type;
44+
import net.fortuna.ical4j.vcard.validate.CalendarPropertyValidators;
4545

4646
import java.net.URI;
4747
import java.net.URISyntaxException;
@@ -59,7 +59,7 @@
5959
*
6060
* @author Ben
6161
*/
62-
public class CalAdrUri extends Property implements PropertyValidatorSupport {
62+
public class CalAdrUri extends Property {
6363

6464
private static final long serialVersionUID = -6507220241297111022L;
6565

@@ -114,7 +114,7 @@ public void setValue(String aValue) {
114114
*/
115115
@Override
116116
public ValidationResult validate() throws ValidationException {
117-
return CALADRURI.validate(this);
117+
return CalendarPropertyValidators.CALADRURI.validate(this);
118118
}
119119

120120
@Override

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
import net.fortuna.ical4j.vcard.Group;
4141
import net.fortuna.ical4j.vcard.PropertyFactory;
4242
import net.fortuna.ical4j.vcard.PropertyName;
43-
import net.fortuna.ical4j.vcard.PropertyValidatorSupport;
4443
import net.fortuna.ical4j.vcard.parameter.Type;
44+
import net.fortuna.ical4j.vcard.validate.CalendarPropertyValidators;
4545

4646
import java.net.URI;
4747
import java.net.URISyntaxException;
@@ -59,7 +59,7 @@
5959
*
6060
* @author Ben
6161
*/
62-
public class CalUri extends Property implements PropertyValidatorSupport {
62+
public class CalUri extends Property {
6363

6464
private static final long serialVersionUID = 4821378252642288695L;
6565

@@ -115,7 +115,7 @@ public void setValue(String aValue) {
115115
*/
116116
@Override
117117
public ValidationResult validate() throws ValidationException {
118-
return CALURI.validate(this);
118+
return CalendarPropertyValidators.CALURI.validate(this);
119119
}
120120

121121
@Override

‎src/main/java/net/fortuna/ical4j/vcard/property/Categories.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import net.fortuna.ical4j.vcard.Group;
4141
import net.fortuna.ical4j.vcard.PropertyFactory;
4242
import net.fortuna.ical4j.vcard.PropertyName;
43-
import net.fortuna.ical4j.vcard.PropertyValidatorSupport;
43+
import net.fortuna.ical4j.vcard.validate.ExplanatoryPropertyValidators;
4444

4545
/**
4646
* CATEGORIES property.
@@ -54,7 +54,7 @@
5454
*
5555
* @author Ben
5656
*/
57-
public class Categories extends Property implements PropertyValidatorSupport {
57+
public class Categories extends Property {
5858

5959
private static final long serialVersionUID = -3233034210546002366L;
6060

@@ -117,7 +117,7 @@ public void setValue(String aValue) {
117117
*/
118118
@Override
119119
public ValidationResult validate() throws ValidationException {
120-
return PropertyValidatorSupport.CATEGORIES.validate(this);
120+
return ExplanatoryPropertyValidators.CATEGORIES.validate(this);
121121
}
122122

123123
@Override

0 commit comments

Comments
 (0)