Skip to content

Commit

Permalink
Use singletonList() where PropertyValidator has only one ValidationRule
Browse files Browse the repository at this point in the history 
gh-496
  • Loading branch information
@nealeu
nealeu committed May 28, 2021
1 parent d05b8e9 commit 8c9f90b
Show file tree
Hide file tree
Showing 14 changed files with 28 additions and 28 deletions.
4 changes: 2 additions & 2 deletions src/main/java/net/fortuna/ical4j/model/property/Categories.java
View file
Expand Up @@ -40,8 +40,8 @@
import java.io.IOException;
import java.net.URISyntaxException;
import java.text.ParseException;
import java.util.Arrays;

import static java.util.Collections.singletonList;
import static net.fortuna.ical4j.model.Parameter.LANGUAGE;
import static net.fortuna.ical4j.validate.ValidationRule.ValidationType.OneOrLess;

Expand Down Expand Up @@ -102,7 +102,7 @@ public class Categories extends Property {

private TextList categories;

private static final Validator<Property> validator = new PropertyValidator(Arrays.asList(
private static final Validator<Property> validator = new PropertyValidator(singletonList(
new ValidationRule(OneOrLess, LANGUAGE)));
/**
* Default constructor.
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/fortuna/ical4j/model/property/Comment.java
View file
Expand Up @@ -40,8 +40,8 @@
import java.io.IOException;
import java.net.URISyntaxException;
import java.text.ParseException;
import java.util.Arrays;

import static java.util.Collections.singletonList;
import static net.fortuna.ical4j.model.Parameter.ALTREP;
import static net.fortuna.ical4j.model.Parameter.LANGUAGE;

Expand All @@ -60,7 +60,7 @@ public class Comment extends Property implements Escapable {

private String value;

private static final Validator<Property> validator = new PropertyValidator(Arrays.asList(
private static final Validator<Property> validator = new PropertyValidator(singletonList(
new ValidationRule(ValidationRule.ValidationType.OneOrLess, ALTREP, LANGUAGE)));

/**
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/fortuna/ical4j/model/property/Contact.java
View file
Expand Up @@ -40,8 +40,8 @@
import java.io.IOException;
import java.net.URISyntaxException;
import java.text.ParseException;
import java.util.Arrays;

import static java.util.Collections.singletonList;
import static net.fortuna.ical4j.model.Parameter.ALTREP;
import static net.fortuna.ical4j.model.Parameter.LANGUAGE;

Expand All @@ -60,7 +60,7 @@ public class Contact extends Property implements Escapable {

private String value;

private static final Validator<Property> validator = new PropertyValidator(Arrays.asList(
private static final Validator<Property> validator = new PropertyValidator(singletonList(
new ValidationRule(ValidationRule.ValidationType.OneOrLess, ALTREP, LANGUAGE)));

/**
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/fortuna/ical4j/model/property/Country.java
View file
Expand Up @@ -40,8 +40,8 @@
import java.io.IOException;
import java.net.URISyntaxException;
import java.text.ParseException;
import java.util.Arrays;

import static java.util.Collections.singletonList;
import static net.fortuna.ical4j.model.Parameter.ABBREV;
import static net.fortuna.ical4j.validate.ValidationRule.ValidationType.OneOrLess;

Expand All @@ -61,7 +61,7 @@ public class Country extends Property implements Escapable {

private String value;

private static final Validator<Property> validator = new PropertyValidator(Arrays.asList(
private static final Validator<Property> validator = new PropertyValidator(singletonList(
new ValidationRule(OneOrLess, ABBREV)));
/**
* Default constructor.
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/fortuna/ical4j/model/property/Description.java
View file
Expand Up @@ -40,8 +40,8 @@
import java.io.IOException;
import java.net.URISyntaxException;
import java.text.ParseException;
import java.util.Arrays;

import static java.util.Collections.singletonList;
import static net.fortuna.ical4j.model.Parameter.ALTREP;
import static net.fortuna.ical4j.model.Parameter.LANGUAGE;
import static net.fortuna.ical4j.validate.ValidationRule.ValidationType.OneOrLess;
Expand All @@ -61,7 +61,7 @@ public class Description extends Property implements Escapable {

private String value;

private static final Validator<Property> validator = new PropertyValidator(Arrays.asList(
private static final Validator<Property> validator = new PropertyValidator(singletonList(
new ValidationRule(OneOrLess, ALTREP, LANGUAGE)));

/**
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/fortuna/ical4j/model/property/Location.java
View file
Expand Up @@ -40,8 +40,8 @@
import java.io.IOException;
import java.net.URISyntaxException;
import java.text.ParseException;
import java.util.Arrays;

import static java.util.Collections.singletonList;
import static net.fortuna.ical4j.model.Parameter.*;
import static net.fortuna.ical4j.validate.ValidationRule.ValidationType.OneOrLess;

Expand Down Expand Up @@ -111,7 +111,7 @@ public class Location extends Property implements Escapable {

private String value;

private static final Validator<Property> validator = new PropertyValidator(Arrays.asList(
private static final Validator<Property> validator = new PropertyValidator(singletonList(
new ValidationRule(OneOrLess, ALTREP, LANGUAGE, VVENUE)));

/**
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/fortuna/ical4j/model/property/LocationType.java
View file
Expand Up @@ -40,8 +40,8 @@
import java.io.IOException;
import java.net.URISyntaxException;
import java.text.ParseException;
import java.util.Arrays;

import static java.util.Collections.singletonList;
import static net.fortuna.ical4j.model.Parameter.LANGUAGE;
import static net.fortuna.ical4j.validate.ValidationRule.ValidationType.OneOrLess;

Expand Down Expand Up @@ -88,7 +88,7 @@ public class LocationType extends Property {

private LocationTypeList locationTypes;

private static final Validator<Property> validator = new PropertyValidator(Arrays.asList(
private static final Validator<Property> validator = new PropertyValidator(singletonList(
new ValidationRule(OneOrLess, LANGUAGE)));
/**
* Default constructor.
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/fortuna/ical4j/model/property/Region.java
View file
Expand Up @@ -40,8 +40,8 @@
import java.io.IOException;
import java.net.URISyntaxException;
import java.text.ParseException;
import java.util.Arrays;

import static java.util.Collections.singletonList;
import static net.fortuna.ical4j.model.Parameter.ABBREV;
import static net.fortuna.ical4j.validate.ValidationRule.ValidationType.OneOrLess;

Expand All @@ -61,7 +61,7 @@ public class Region extends Property implements Escapable {

private String value;

private static final Validator<Property> validator = new PropertyValidator(Arrays.asList(
private static final Validator<Property> validator = new PropertyValidator(singletonList(
new ValidationRule(OneOrLess, ABBREV)));

/**
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/fortuna/ical4j/model/property/RelatedTo.java
View file
Expand Up @@ -40,8 +40,8 @@
import java.io.IOException;
import java.net.URISyntaxException;
import java.text.ParseException;
import java.util.Arrays;

import static java.util.Collections.singletonList;
import static net.fortuna.ical4j.model.Parameter.RELTYPE;
import static net.fortuna.ical4j.validate.ValidationRule.ValidationType.OneOrLess;

Expand All @@ -60,7 +60,7 @@ public class RelatedTo extends Property implements Escapable {

private String value;

private static final Validator<Property> validator = new PropertyValidator(Arrays.asList(
private static final Validator<Property> validator = new PropertyValidator(singletonList(
new ValidationRule(OneOrLess, RELTYPE)));

/**
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/fortuna/ical4j/model/property/RequestStatus.java
View file
Expand Up @@ -43,9 +43,9 @@
import java.io.IOException;
import java.net.URISyntaxException;
import java.text.ParseException;
import java.util.Arrays;
import java.util.StringTokenizer;

import static java.util.Collections.singletonList;
import static net.fortuna.ical4j.model.Parameter.LANGUAGE;
import static net.fortuna.ical4j.validate.ValidationRule.ValidationType.OneOrLess;

Expand Down Expand Up @@ -88,7 +88,7 @@ public class RequestStatus extends Property {

private String exData;

private static final Validator<Property> validator = new PropertyValidator(Arrays.asList(
private static final Validator<Property> validator = new PropertyValidator(singletonList(
new ValidationRule(OneOrLess, LANGUAGE)));

/**
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/fortuna/ical4j/model/property/Resources.java
View file
Expand Up @@ -40,8 +40,8 @@
import java.io.IOException;
import java.net.URISyntaxException;
import java.text.ParseException;
import java.util.Arrays;

import static java.util.Collections.singletonList;
import static net.fortuna.ical4j.model.Parameter.ALTREP;
import static net.fortuna.ical4j.model.Parameter.LANGUAGE;
import static net.fortuna.ical4j.validate.ValidationRule.ValidationType.OneOrLess;
Expand All @@ -61,7 +61,7 @@ public class Resources extends Property {

private TextList resources;

private static final Validator<Property> validator = new PropertyValidator(Arrays.asList(
private static final Validator<Property> validator = new PropertyValidator(singletonList(
new ValidationRule(OneOrLess, ALTREP, LANGUAGE)));

/**
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/fortuna/ical4j/model/property/Summary.java
View file
Expand Up @@ -40,8 +40,8 @@
import java.io.IOException;
import java.net.URISyntaxException;
import java.text.ParseException;
import java.util.Arrays;

import static java.util.Collections.singletonList;
import static net.fortuna.ical4j.model.Parameter.ALTREP;
import static net.fortuna.ical4j.model.Parameter.LANGUAGE;
import static net.fortuna.ical4j.validate.ValidationRule.ValidationType.OneOrLess;
Expand Down Expand Up @@ -107,7 +107,7 @@ public class Summary extends Property implements Escapable {

private String value;

private static final Validator<Property> validator = new PropertyValidator(Arrays.asList(
private static final Validator<Property> validator = new PropertyValidator(singletonList(
new ValidationRule(OneOrLess, ALTREP, LANGUAGE)));

/**
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/fortuna/ical4j/model/property/Tel.java
View file
Expand Up @@ -40,8 +40,8 @@
import java.io.IOException;
import java.net.URISyntaxException;
import java.text.ParseException;
import java.util.Arrays;

import static java.util.Collections.singletonList;
import static net.fortuna.ical4j.model.Parameter.TYPE;
import static net.fortuna.ical4j.validate.ValidationRule.ValidationType.OneOrLess;

Expand All @@ -61,7 +61,7 @@ public class Tel extends Property implements Escapable {

private String value;

private static final Validator<Property> validator = new PropertyValidator(Arrays.asList(
private static final Validator<Property> validator = new PropertyValidator(singletonList(
new ValidationRule(OneOrLess, TYPE)));

/**
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/fortuna/ical4j/model/property/TzName.java
View file
Expand Up @@ -40,8 +40,8 @@
import java.io.IOException;
import java.net.URISyntaxException;
import java.text.ParseException;
import java.util.Arrays;

import static java.util.Collections.singletonList;
import static net.fortuna.ical4j.model.Parameter.LANGUAGE;
import static net.fortuna.ical4j.validate.ValidationRule.ValidationType.OneOrLess;

Expand All @@ -60,7 +60,7 @@ public class TzName extends Property implements Escapable {

private String value;

private static final Validator<Property> validator = new PropertyValidator(Arrays.asList(
private static final Validator<Property> validator = new PropertyValidator(singletonList(
new ValidationRule(OneOrLess, LANGUAGE)));

/**
Expand Down

0 comments on commit 8c9f90b

Please sign in to comment.