From 8c9f90bda16cad84b06ea694dd8e596b956019b4 Mon Sep 17 00:00:00 2001 From: Neale Upstone Date: Fri, 28 May 2021 10:22:07 +0100 Subject: [PATCH] Use singletonList() where PropertyValidator has only one ValidationRule gh-496 --- .../java/net/fortuna/ical4j/model/property/Categories.java | 4 ++-- src/main/java/net/fortuna/ical4j/model/property/Comment.java | 4 ++-- src/main/java/net/fortuna/ical4j/model/property/Contact.java | 4 ++-- src/main/java/net/fortuna/ical4j/model/property/Country.java | 4 ++-- .../java/net/fortuna/ical4j/model/property/Description.java | 4 ++-- src/main/java/net/fortuna/ical4j/model/property/Location.java | 4 ++-- .../java/net/fortuna/ical4j/model/property/LocationType.java | 4 ++-- src/main/java/net/fortuna/ical4j/model/property/Region.java | 4 ++-- .../java/net/fortuna/ical4j/model/property/RelatedTo.java | 4 ++-- .../java/net/fortuna/ical4j/model/property/RequestStatus.java | 4 ++-- .../java/net/fortuna/ical4j/model/property/Resources.java | 4 ++-- src/main/java/net/fortuna/ical4j/model/property/Summary.java | 4 ++-- src/main/java/net/fortuna/ical4j/model/property/Tel.java | 4 ++-- src/main/java/net/fortuna/ical4j/model/property/TzName.java | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/main/java/net/fortuna/ical4j/model/property/Categories.java b/src/main/java/net/fortuna/ical4j/model/property/Categories.java index 5c7bf2592..63e01a7e2 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/Categories.java +++ b/src/main/java/net/fortuna/ical4j/model/property/Categories.java @@ -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; @@ -102,7 +102,7 @@ public class Categories extends Property { private TextList categories; - private static final Validator validator = new PropertyValidator(Arrays.asList( + private static final Validator validator = new PropertyValidator(singletonList( new ValidationRule(OneOrLess, LANGUAGE))); /** * Default constructor. diff --git a/src/main/java/net/fortuna/ical4j/model/property/Comment.java b/src/main/java/net/fortuna/ical4j/model/property/Comment.java index 9a6d9905b..8929ebb0a 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/Comment.java +++ b/src/main/java/net/fortuna/ical4j/model/property/Comment.java @@ -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; @@ -60,7 +60,7 @@ public class Comment extends Property implements Escapable { private String value; - private static final Validator validator = new PropertyValidator(Arrays.asList( + private static final Validator validator = new PropertyValidator(singletonList( new ValidationRule(ValidationRule.ValidationType.OneOrLess, ALTREP, LANGUAGE))); /** diff --git a/src/main/java/net/fortuna/ical4j/model/property/Contact.java b/src/main/java/net/fortuna/ical4j/model/property/Contact.java index 2a6a9e00a..a03691c25 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/Contact.java +++ b/src/main/java/net/fortuna/ical4j/model/property/Contact.java @@ -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; @@ -60,7 +60,7 @@ public class Contact extends Property implements Escapable { private String value; - private static final Validator validator = new PropertyValidator(Arrays.asList( + private static final Validator validator = new PropertyValidator(singletonList( new ValidationRule(ValidationRule.ValidationType.OneOrLess, ALTREP, LANGUAGE))); /** diff --git a/src/main/java/net/fortuna/ical4j/model/property/Country.java b/src/main/java/net/fortuna/ical4j/model/property/Country.java index a2517cd36..5623194c8 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/Country.java +++ b/src/main/java/net/fortuna/ical4j/model/property/Country.java @@ -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; @@ -61,7 +61,7 @@ public class Country extends Property implements Escapable { private String value; - private static final Validator validator = new PropertyValidator(Arrays.asList( + private static final Validator validator = new PropertyValidator(singletonList( new ValidationRule(OneOrLess, ABBREV))); /** * Default constructor. diff --git a/src/main/java/net/fortuna/ical4j/model/property/Description.java b/src/main/java/net/fortuna/ical4j/model/property/Description.java index 11b749195..115e25d6f 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/Description.java +++ b/src/main/java/net/fortuna/ical4j/model/property/Description.java @@ -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; @@ -61,7 +61,7 @@ public class Description extends Property implements Escapable { private String value; - private static final Validator validator = new PropertyValidator(Arrays.asList( + private static final Validator validator = new PropertyValidator(singletonList( new ValidationRule(OneOrLess, ALTREP, LANGUAGE))); /** diff --git a/src/main/java/net/fortuna/ical4j/model/property/Location.java b/src/main/java/net/fortuna/ical4j/model/property/Location.java index 463ab5338..fb9e1ebb0 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/Location.java +++ b/src/main/java/net/fortuna/ical4j/model/property/Location.java @@ -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; @@ -111,7 +111,7 @@ public class Location extends Property implements Escapable { private String value; - private static final Validator validator = new PropertyValidator(Arrays.asList( + private static final Validator validator = new PropertyValidator(singletonList( new ValidationRule(OneOrLess, ALTREP, LANGUAGE, VVENUE))); /** diff --git a/src/main/java/net/fortuna/ical4j/model/property/LocationType.java b/src/main/java/net/fortuna/ical4j/model/property/LocationType.java index f6240925f..62cc5c544 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/LocationType.java +++ b/src/main/java/net/fortuna/ical4j/model/property/LocationType.java @@ -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; @@ -88,7 +88,7 @@ public class LocationType extends Property { private LocationTypeList locationTypes; - private static final Validator validator = new PropertyValidator(Arrays.asList( + private static final Validator validator = new PropertyValidator(singletonList( new ValidationRule(OneOrLess, LANGUAGE))); /** * Default constructor. diff --git a/src/main/java/net/fortuna/ical4j/model/property/Region.java b/src/main/java/net/fortuna/ical4j/model/property/Region.java index e8de74912..6d6c9617d 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/Region.java +++ b/src/main/java/net/fortuna/ical4j/model/property/Region.java @@ -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; @@ -61,7 +61,7 @@ public class Region extends Property implements Escapable { private String value; - private static final Validator validator = new PropertyValidator(Arrays.asList( + private static final Validator validator = new PropertyValidator(singletonList( new ValidationRule(OneOrLess, ABBREV))); /** diff --git a/src/main/java/net/fortuna/ical4j/model/property/RelatedTo.java b/src/main/java/net/fortuna/ical4j/model/property/RelatedTo.java index 47aa50b63..90aa0d2f7 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/RelatedTo.java +++ b/src/main/java/net/fortuna/ical4j/model/property/RelatedTo.java @@ -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; @@ -60,7 +60,7 @@ public class RelatedTo extends Property implements Escapable { private String value; - private static final Validator validator = new PropertyValidator(Arrays.asList( + private static final Validator validator = new PropertyValidator(singletonList( new ValidationRule(OneOrLess, RELTYPE))); /** diff --git a/src/main/java/net/fortuna/ical4j/model/property/RequestStatus.java b/src/main/java/net/fortuna/ical4j/model/property/RequestStatus.java index 93f1a8d9f..8cc7f1a9c 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/RequestStatus.java +++ b/src/main/java/net/fortuna/ical4j/model/property/RequestStatus.java @@ -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; @@ -88,7 +88,7 @@ public class RequestStatus extends Property { private String exData; - private static final Validator validator = new PropertyValidator(Arrays.asList( + private static final Validator validator = new PropertyValidator(singletonList( new ValidationRule(OneOrLess, LANGUAGE))); /** diff --git a/src/main/java/net/fortuna/ical4j/model/property/Resources.java b/src/main/java/net/fortuna/ical4j/model/property/Resources.java index ae0132b97..275db5e46 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/Resources.java +++ b/src/main/java/net/fortuna/ical4j/model/property/Resources.java @@ -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; @@ -61,7 +61,7 @@ public class Resources extends Property { private TextList resources; - private static final Validator validator = new PropertyValidator(Arrays.asList( + private static final Validator validator = new PropertyValidator(singletonList( new ValidationRule(OneOrLess, ALTREP, LANGUAGE))); /** diff --git a/src/main/java/net/fortuna/ical4j/model/property/Summary.java b/src/main/java/net/fortuna/ical4j/model/property/Summary.java index 56ec0dbfa..8379d1b9e 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/Summary.java +++ b/src/main/java/net/fortuna/ical4j/model/property/Summary.java @@ -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; @@ -107,7 +107,7 @@ public class Summary extends Property implements Escapable { private String value; - private static final Validator validator = new PropertyValidator(Arrays.asList( + private static final Validator validator = new PropertyValidator(singletonList( new ValidationRule(OneOrLess, ALTREP, LANGUAGE))); /** diff --git a/src/main/java/net/fortuna/ical4j/model/property/Tel.java b/src/main/java/net/fortuna/ical4j/model/property/Tel.java index da0a2fa48..640a280e1 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/Tel.java +++ b/src/main/java/net/fortuna/ical4j/model/property/Tel.java @@ -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; @@ -61,7 +61,7 @@ public class Tel extends Property implements Escapable { private String value; - private static final Validator validator = new PropertyValidator(Arrays.asList( + private static final Validator validator = new PropertyValidator(singletonList( new ValidationRule(OneOrLess, TYPE))); /** diff --git a/src/main/java/net/fortuna/ical4j/model/property/TzName.java b/src/main/java/net/fortuna/ical4j/model/property/TzName.java index 1e01d7d94..fa9ec7ac6 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/TzName.java +++ b/src/main/java/net/fortuna/ical4j/model/property/TzName.java @@ -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; @@ -60,7 +60,7 @@ public class TzName extends Property implements Escapable { private String value; - private static final Validator validator = new PropertyValidator(Arrays.asList( + private static final Validator validator = new PropertyValidator(singletonList( new ValidationRule(OneOrLess, LANGUAGE))); /**