From 1a5bee57522e69c98c561f5db1232bf9963bd002 Mon Sep 17 00:00:00 2001 From: Ben Fortuna Date: Mon, 24 Jan 2022 13:50:26 +1100 Subject: [PATCH] Code clean up --- .../net/fortuna/ical4j/data/AbstractOutputter.java | 7 ++++--- .../net/fortuna/ical4j/data/CalendarParserImpl.java | 2 +- .../java/net/fortuna/ical4j/data/ParserException.java | 2 +- .../java/net/fortuna/ical4j/data/UnfoldingReader.java | 6 +++--- src/main/java/net/fortuna/ical4j/filter/Filter.java | 2 +- .../java/net/fortuna/ical4j/filter/FilterTarget.java | 2 +- .../ical4j/filter/predicate/ParameterExistsRule.java | 2 +- .../fortuna/ical4j/filter/predicate/PeriodRule.java | 2 +- .../java/net/fortuna/ical4j/model/AddressList.java | 2 +- .../net/fortuna/ical4j/model/ComponentBuilder.java | 4 ++-- .../java/net/fortuna/ical4j/model/ComponentList.java | 2 +- .../net/fortuna/ical4j/model/IndexedComponentList.java | 2 +- .../net/fortuna/ical4j/model/IndexedPropertyList.java | 2 +- src/main/java/net/fortuna/ical4j/model/Iso8601.java | 10 +++++----- .../net/fortuna/ical4j/model/LocationTypeList.java | 2 +- src/main/java/net/fortuna/ical4j/model/Parameter.java | 2 +- .../java/net/fortuna/ical4j/model/PropertyBuilder.java | 2 +- src/main/java/net/fortuna/ical4j/model/Recur.java | 8 ++++---- src/main/java/net/fortuna/ical4j/model/TextList.java | 2 +- .../fortuna/ical4j/model/TimeZoneRegistryFactory.java | 2 +- .../net/fortuna/ical4j/model/TimeZoneRegistryImpl.java | 2 +- src/main/java/net/fortuna/ical4j/model/WeekDay.java | 4 ++-- .../net/fortuna/ical4j/model/component/VEvent.java | 4 ++-- .../java/net/fortuna/ical4j/model/component/VToDo.java | 2 +- .../net/fortuna/ical4j/model/parameter/Abbrev.java | 2 +- .../net/fortuna/ical4j/model/parameter/AltRep.java | 2 +- .../java/net/fortuna/ical4j/model/parameter/Cn.java | 2 +- .../net/fortuna/ical4j/model/parameter/CuType.java | 2 +- .../fortuna/ical4j/model/parameter/DelegatedFrom.java | 2 +- .../fortuna/ical4j/model/parameter/DelegatedTo.java | 2 +- .../net/fortuna/ical4j/model/parameter/Derived.java | 2 +- .../java/net/fortuna/ical4j/model/parameter/Dir.java | 2 +- .../net/fortuna/ical4j/model/parameter/Display.java | 2 +- .../net/fortuna/ical4j/model/parameter/Encoding.java | 2 +- .../net/fortuna/ical4j/model/parameter/FbType.java | 2 +- .../net/fortuna/ical4j/model/parameter/Feature.java | 2 +- .../net/fortuna/ical4j/model/parameter/FmtType.java | 2 +- .../net/fortuna/ical4j/model/parameter/Language.java | 2 +- .../net/fortuna/ical4j/model/parameter/Member.java | 2 +- .../java/net/fortuna/ical4j/model/parameter/Order.java | 2 +- .../net/fortuna/ical4j/model/parameter/PartStat.java | 2 +- .../java/net/fortuna/ical4j/model/parameter/Range.java | 2 +- .../net/fortuna/ical4j/model/parameter/RelType.java | 2 +- .../net/fortuna/ical4j/model/parameter/Related.java | 2 +- .../java/net/fortuna/ical4j/model/parameter/Role.java | 2 +- .../java/net/fortuna/ical4j/model/parameter/Rsvp.java | 2 +- .../fortuna/ical4j/model/parameter/ScheduleAgent.java | 2 +- .../fortuna/ical4j/model/parameter/ScheduleStatus.java | 2 +- .../net/fortuna/ical4j/model/parameter/Schema.java | 2 +- .../net/fortuna/ical4j/model/parameter/SentBy.java | 2 +- .../java/net/fortuna/ical4j/model/parameter/Type.java | 2 +- .../java/net/fortuna/ical4j/model/parameter/TzId.java | 2 +- .../java/net/fortuna/ical4j/model/parameter/Value.java | 2 +- .../net/fortuna/ical4j/model/parameter/Vvenue.java | 2 +- .../net/fortuna/ical4j/model/parameter/XParameter.java | 2 +- .../java/net/fortuna/ical4j/model/property/Geo.java | 9 ++++++--- .../fortuna/ical4j/model/property/StructuredData.java | 3 +-- .../fortuna/ical4j/transform/Rfc5545Transformer.java | 4 ++-- .../ical4j/transform/recurrence/ByMonthDayRule.java | 2 +- .../net/fortuna/ical4j/transform/rfc5545/TzHelper.java | 2 +- .../java/net/fortuna/ical4j/util/DecoderFactory.java | 2 +- .../java/net/fortuna/ical4j/util/EncoderFactory.java | 2 +- .../validate/AbstractCalendarValidatorFactory.java | 2 +- 63 files changed, 84 insertions(+), 81 deletions(-) diff --git a/src/main/java/net/fortuna/ical4j/data/AbstractOutputter.java b/src/main/java/net/fortuna/ical4j/data/AbstractOutputter.java index c5b56e6a5..80c9df9c7 100644 --- a/src/main/java/net/fortuna/ical4j/data/AbstractOutputter.java +++ b/src/main/java/net/fortuna/ical4j/data/AbstractOutputter.java @@ -31,10 +31,11 @@ */ package net.fortuna.ical4j.data; -import java.nio.charset.Charset; - import net.fortuna.ical4j.util.CompatibilityHints; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; + /** * Base class for model outputters. * @@ -52,7 +53,7 @@ public abstract class AbstractOutputter { /** * The default character set used to generate output. */ - protected static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8"); + protected static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8; private boolean validating; diff --git a/src/main/java/net/fortuna/ical4j/data/CalendarParserImpl.java b/src/main/java/net/fortuna/ical4j/data/CalendarParserImpl.java index 172dc0e3f..63a604bca 100644 --- a/src/main/java/net/fortuna/ical4j/data/CalendarParserImpl.java +++ b/src/main/java/net/fortuna/ical4j/data/CalendarParserImpl.java @@ -66,7 +66,7 @@ public class CalendarParserImpl implements CalendarParser { private static final String UNEXPECTED_TOKEN_MESSAGE = "Expected [{0}], read [{1}]"; - private Logger log = LoggerFactory.getLogger(CalendarParserImpl.class); + private final Logger log = LoggerFactory.getLogger(CalendarParserImpl.class); private final ComponentListParser componentListParser = new ComponentListParser(); diff --git a/src/main/java/net/fortuna/ical4j/data/ParserException.java b/src/main/java/net/fortuna/ical4j/data/ParserException.java index 4ff925f29..e9837c733 100644 --- a/src/main/java/net/fortuna/ical4j/data/ParserException.java +++ b/src/main/java/net/fortuna/ical4j/data/ParserException.java @@ -47,7 +47,7 @@ public class ParserException extends Exception { private static final String ERROR_MESSAGE_PATTERN = "Error at line {0}:"; - private int lineNo; + private final int lineNo; /** * @param lineNo line number where parsing error ocurred diff --git a/src/main/java/net/fortuna/ical4j/data/UnfoldingReader.java b/src/main/java/net/fortuna/ical4j/data/UnfoldingReader.java index 497848ee5..538c88df2 100644 --- a/src/main/java/net/fortuna/ical4j/data/UnfoldingReader.java +++ b/src/main/java/net/fortuna/ical4j/data/UnfoldingReader.java @@ -56,7 +56,7 @@ */ public class UnfoldingReader extends PushbackReader { - private Logger log = LoggerFactory.getLogger(UnfoldingReader.class); + private final Logger log = LoggerFactory.getLogger(UnfoldingReader.class); /** * The pattern used to identify a fold in an iCalendar data stream. @@ -78,9 +78,9 @@ public class UnfoldingReader extends PushbackReader { */ private static final char[] RELAXED_FOLD_PATTERN_2 = {'\n', '\t'}; - private char[][] patterns; + private final char[][] patterns; - private char[][] buffers; + private final char[][] buffers; private int linesUnfolded; diff --git a/src/main/java/net/fortuna/ical4j/filter/Filter.java b/src/main/java/net/fortuna/ical4j/filter/Filter.java index a764b37bb..efb2824b4 100644 --- a/src/main/java/net/fortuna/ical4j/filter/Filter.java +++ b/src/main/java/net/fortuna/ical4j/filter/Filter.java @@ -71,7 +71,7 @@ public class Filter { private List> rules; - private int type; + private final int type; /** * @param rules one or more rules that are applied by this filter diff --git a/src/main/java/net/fortuna/ical4j/filter/FilterTarget.java b/src/main/java/net/fortuna/ical4j/filter/FilterTarget.java index 3c4c18301..2d38ae81d 100644 --- a/src/main/java/net/fortuna/ical4j/filter/FilterTarget.java +++ b/src/main/java/net/fortuna/ical4j/filter/FilterTarget.java @@ -83,7 +83,7 @@ public int hashCode() { public static class Attribute { - private String name; + private final String name; private String value; diff --git a/src/main/java/net/fortuna/ical4j/filter/predicate/ParameterExistsRule.java b/src/main/java/net/fortuna/ical4j/filter/predicate/ParameterExistsRule.java index a00a63225..26411183c 100644 --- a/src/main/java/net/fortuna/ical4j/filter/predicate/ParameterExistsRule.java +++ b/src/main/java/net/fortuna/ical4j/filter/predicate/ParameterExistsRule.java @@ -58,7 +58,7 @@ public boolean test(Property t) { */ public static class ParameterExists implements Comparable { - private Parameter specification; + private final Parameter specification; public ParameterExists(Parameter specification) { this.specification = specification; diff --git a/src/main/java/net/fortuna/ical4j/filter/predicate/PeriodRule.java b/src/main/java/net/fortuna/ical4j/filter/predicate/PeriodRule.java index c651c1862..b6abc546a 100644 --- a/src/main/java/net/fortuna/ical4j/filter/predicate/PeriodRule.java +++ b/src/main/java/net/fortuna/ical4j/filter/predicate/PeriodRule.java @@ -47,7 +47,7 @@ */ public class PeriodRule implements Predicate { - private Period period; + private final Period period; /** * Constructs a new instance using the specified period. diff --git a/src/main/java/net/fortuna/ical4j/model/AddressList.java b/src/main/java/net/fortuna/ical4j/model/AddressList.java index 4cb02cc1f..e80035c77 100644 --- a/src/main/java/net/fortuna/ical4j/model/AddressList.java +++ b/src/main/java/net/fortuna/ical4j/model/AddressList.java @@ -54,7 +54,7 @@ public class AddressList implements Serializable, Iterable { private static final long serialVersionUID = 81383256078213569L; - private List addresses; + private final List addresses; /** * Default constructor. diff --git a/src/main/java/net/fortuna/ical4j/model/ComponentBuilder.java b/src/main/java/net/fortuna/ical4j/model/ComponentBuilder.java index 37bf57382..2d4ec4d04 100644 --- a/src/main/java/net/fortuna/ical4j/model/ComponentBuilder.java +++ b/src/main/java/net/fortuna/ical4j/model/ComponentBuilder.java @@ -11,9 +11,9 @@ public class ComponentBuilder extends AbstractContentBuilde private String name; - private PropertyList properties = new PropertyList<>(); + private final PropertyList properties = new PropertyList<>(); - private ComponentList subComponents = new ComponentList<>(); + private final ComponentList subComponents = new ComponentList<>(); public ComponentBuilder() { this(true); diff --git a/src/main/java/net/fortuna/ical4j/model/ComponentList.java b/src/main/java/net/fortuna/ical4j/model/ComponentList.java index 1f6b53a55..ad6043f62 100644 --- a/src/main/java/net/fortuna/ical4j/model/ComponentList.java +++ b/src/main/java/net/fortuna/ical4j/model/ComponentList.java @@ -76,7 +76,7 @@ public ComponentList(ComponentList components) throws ParseExceptio IOException, URISyntaxException { for (T c : components) { - add((T) c.copy()); + add(c.copy()); } } diff --git a/src/main/java/net/fortuna/ical4j/model/IndexedComponentList.java b/src/main/java/net/fortuna/ical4j/model/IndexedComponentList.java index 8c5517366..b546444f8 100644 --- a/src/main/java/net/fortuna/ical4j/model/IndexedComponentList.java +++ b/src/main/java/net/fortuna/ical4j/model/IndexedComponentList.java @@ -43,7 +43,7 @@ */ public class IndexedComponentList { - private Map> index; + private final Map> index; /** * Creates a new instance indexed on properties with the specified name. diff --git a/src/main/java/net/fortuna/ical4j/model/IndexedPropertyList.java b/src/main/java/net/fortuna/ical4j/model/IndexedPropertyList.java index 7d8cc060e..aa029ead0 100644 --- a/src/main/java/net/fortuna/ical4j/model/IndexedPropertyList.java +++ b/src/main/java/net/fortuna/ical4j/model/IndexedPropertyList.java @@ -47,7 +47,7 @@ public class IndexedPropertyList { private static final PropertyList EMPTY_LIST = new PropertyList(); - private Map> index; + private final Map> index; /** * Creates a new instance indexed on the parameters with the specified name. diff --git a/src/main/java/net/fortuna/ical4j/model/Iso8601.java b/src/main/java/net/fortuna/ical4j/model/Iso8601.java index acac7a4a5..6ce701243 100644 --- a/src/main/java/net/fortuna/ical4j/model/Iso8601.java +++ b/src/main/java/net/fortuna/ical4j/model/Iso8601.java @@ -31,13 +31,13 @@ */ package net.fortuna.ical4j.model; -import java.text.DateFormat; -import java.util.Date; - import net.fortuna.ical4j.util.CompatibilityHints; import net.fortuna.ical4j.util.Dates; import net.fortuna.ical4j.util.TimeZones; +import java.text.DateFormat; +import java.util.Date; + /** * $Id$ * @@ -57,11 +57,11 @@ public abstract class Iso8601 extends Date { private static final long serialVersionUID = -4290728005713946811L; private static final java.util.TimeZone GMT = TimeZone.getTimeZone(TimeZones.GMT_ID); - private DateFormat format; + private final DateFormat format; private DateFormat gmtFormat; - private int precision; + private final int precision; /** * @param time a time value in milliseconds diff --git a/src/main/java/net/fortuna/ical4j/model/LocationTypeList.java b/src/main/java/net/fortuna/ical4j/model/LocationTypeList.java index 21b8a37ca..166ca915d 100644 --- a/src/main/java/net/fortuna/ical4j/model/LocationTypeList.java +++ b/src/main/java/net/fortuna/ical4j/model/LocationTypeList.java @@ -50,7 +50,7 @@ public class LocationTypeList implements Serializable, Iterable { private static final long serialVersionUID = -9181735547604179160L; - private List locationTypes; + private final List locationTypes; /** * Default constructor. diff --git a/src/main/java/net/fortuna/ical4j/model/Parameter.java b/src/main/java/net/fortuna/ical4j/model/Parameter.java index 0d33548c2..7951347e5 100644 --- a/src/main/java/net/fortuna/ical4j/model/Parameter.java +++ b/src/main/java/net/fortuna/ical4j/model/Parameter.java @@ -220,7 +220,7 @@ public abstract class Parameter extends Content implements Comparable */ public static final String EXPERIMENTAL_PREFIX = "X-"; - private String name; + private final String name; private final ParameterFactory factory; diff --git a/src/main/java/net/fortuna/ical4j/model/PropertyBuilder.java b/src/main/java/net/fortuna/ical4j/model/PropertyBuilder.java index 484b46b7a..b445ec56f 100644 --- a/src/main/java/net/fortuna/ical4j/model/PropertyBuilder.java +++ b/src/main/java/net/fortuna/ical4j/model/PropertyBuilder.java @@ -22,7 +22,7 @@ public class PropertyBuilder extends AbstractContentBuilder { private String value; - private ParameterList parameters = new ParameterList(); + private final ParameterList parameters = new ParameterList(); public PropertyBuilder() { this(new ArrayList<>()); diff --git a/src/main/java/net/fortuna/ical4j/model/Recur.java b/src/main/java/net/fortuna/ical4j/model/Recur.java index c9b8a2884..2caab1b9e 100644 --- a/src/main/java/net/fortuna/ical4j/model/Recur.java +++ b/src/main/java/net/fortuna/ical4j/model/Recur.java @@ -93,7 +93,7 @@ public class Recur implements Serializable { private static final String SKIP = "SKIP"; public enum Frequency { - SECONDLY, MINUTELY, HOURLY, DAILY, WEEKLY, MONTHLY, YEARLY; + SECONDLY, MINUTELY, HOURLY, DAILY, WEEKLY, MONTHLY, YEARLY } public enum RScale { @@ -121,7 +121,7 @@ public String getChronology() { } public enum Skip { - OMIT, BACKWARD, FORWARD; + OMIT, BACKWARD, FORWARD } /** @@ -181,7 +181,7 @@ public enum Skip { */ public static final String KEY_MAX_INCREMENT_COUNT = "net.fortuna.ical4j.recur.maxincrementcount"; - private static int maxIncrementCount; + private static final int maxIncrementCount; static { maxIncrementCount = Configurator.getIntProperty(KEY_MAX_INCREMENT_COUNT).orElse(1000); @@ -225,7 +225,7 @@ public enum Skip { private int calendarWeekStartDay; - private Map experimentalValues = new HashMap(); + private final Map experimentalValues = new HashMap(); // Calendar field we increment based on frequency. private int calIncField; diff --git a/src/main/java/net/fortuna/ical4j/model/TextList.java b/src/main/java/net/fortuna/ical4j/model/TextList.java index 7b72d07fb..82c8d91a0 100644 --- a/src/main/java/net/fortuna/ical4j/model/TextList.java +++ b/src/main/java/net/fortuna/ical4j/model/TextList.java @@ -52,7 +52,7 @@ public class TextList implements Serializable, Iterable { private static final long serialVersionUID = -417427815871330636L; - private List texts; + private final List texts; /** * Default constructor. diff --git a/src/main/java/net/fortuna/ical4j/model/TimeZoneRegistryFactory.java b/src/main/java/net/fortuna/ical4j/model/TimeZoneRegistryFactory.java index a69d65c5c..d28bdba71 100644 --- a/src/main/java/net/fortuna/ical4j/model/TimeZoneRegistryFactory.java +++ b/src/main/java/net/fortuna/ical4j/model/TimeZoneRegistryFactory.java @@ -54,7 +54,7 @@ public abstract class TimeZoneRegistryFactory { */ public static final String KEY_FACTORY_CLASS = "net.fortuna.ical4j.timezone.registry"; - private static TimeZoneRegistryFactory instance; + private static final TimeZoneRegistryFactory instance; static { Optional property = Configurator.getObjectProperty(KEY_FACTORY_CLASS); instance = property.orElse(new DefaultTimeZoneRegistryFactory()); diff --git a/src/main/java/net/fortuna/ical4j/model/TimeZoneRegistryImpl.java b/src/main/java/net/fortuna/ical4j/model/TimeZoneRegistryImpl.java index fb99efa5e..e914d236a 100644 --- a/src/main/java/net/fortuna/ical4j/model/TimeZoneRegistryImpl.java +++ b/src/main/java/net/fortuna/ical4j/model/TimeZoneRegistryImpl.java @@ -107,7 +107,7 @@ public class TimeZoneRegistryImpl implements TimeZoneRegistry { private final TimeZoneLoader timeZoneLoader; - private Map timezones; + private final Map timezones; private final boolean lenientTzResolution; diff --git a/src/main/java/net/fortuna/ical4j/model/WeekDay.java b/src/main/java/net/fortuna/ical4j/model/WeekDay.java index f03a1c4b2..220ae24a9 100644 --- a/src/main/java/net/fortuna/ical4j/model/WeekDay.java +++ b/src/main/java/net/fortuna/ical4j/model/WeekDay.java @@ -89,9 +89,9 @@ public class WeekDay implements Serializable { public enum Day { SU, MO, TU, WE, TH, FR, SA } - private Day day; + private final Day day; - private int offset; + private final int offset; /** * @param value a string representation of a week day diff --git a/src/main/java/net/fortuna/ical4j/model/component/VEvent.java b/src/main/java/net/fortuna/ical4j/model/component/VEvent.java index 03520c41f..c80b23614 100644 --- a/src/main/java/net/fortuna/ical4j/model/component/VEvent.java +++ b/src/main/java/net/fortuna/ical4j/model/component/VEvent.java @@ -343,7 +343,7 @@ public final void validate(final boolean recurse) throws ValidationException { && !Status.VEVENT_CONFIRMED.getValue().equals(status.getValue()) && !Status.VEVENT_CANCELLED.getValue().equals(status.getValue())) { result.getErrors().add("Status property [" - + status.toString() + "] is not applicable for VEVENT"); + + status + "] is not applicable for VEVENT"); } if (getProperty(Property.DTEND) != null) { @@ -462,7 +462,7 @@ public final VEvent getOccurrence(final Date date) throws IOException, final PeriodList consumedTime = getConsumedTime(date, date); for (final Period p : consumedTime) { if (p.getStart().equals(date)) { - final VEvent occurrence = (VEvent) this.copy(); + final VEvent occurrence = this.copy(); occurrence.getProperties().add(new RecurrenceId(date)); return occurrence; } diff --git a/src/main/java/net/fortuna/ical4j/model/component/VToDo.java b/src/main/java/net/fortuna/ical4j/model/component/VToDo.java index f27af1f9e..8932de05f 100644 --- a/src/main/java/net/fortuna/ical4j/model/component/VToDo.java +++ b/src/main/java/net/fortuna/ical4j/model/component/VToDo.java @@ -255,7 +255,7 @@ public final void validate(final boolean recurse) throws ValidationException { && !Status.VTODO_IN_PROCESS.getValue().equals(status.getValue()) && !Status.VTODO_CANCELLED.getValue().equals(status.getValue())) { throw new ValidationException("Status property [" - + status.toString() + "] may not occur in VTODO"); + + status + "] may not occur in VTODO"); } if (recurse) { diff --git a/src/main/java/net/fortuna/ical4j/model/parameter/Abbrev.java b/src/main/java/net/fortuna/ical4j/model/parameter/Abbrev.java index 058a65007..bee8155f4 100644 --- a/src/main/java/net/fortuna/ical4j/model/parameter/Abbrev.java +++ b/src/main/java/net/fortuna/ical4j/model/parameter/Abbrev.java @@ -51,7 +51,7 @@ public class Abbrev extends Parameter implements Encodable { private static final long serialVersionUID = -8650841407406422738L; - private String value; + private final String value; /** * @param aValue a string abbreviation diff --git a/src/main/java/net/fortuna/ical4j/model/parameter/AltRep.java b/src/main/java/net/fortuna/ical4j/model/parameter/AltRep.java index f95a14829..df151e205 100644 --- a/src/main/java/net/fortuna/ical4j/model/parameter/AltRep.java +++ b/src/main/java/net/fortuna/ical4j/model/parameter/AltRep.java @@ -52,7 +52,7 @@ public class AltRep extends Parameter implements Encodable { private static final long serialVersionUID = -2445932592596993470L; - private URI uri; + private final URI uri; /** * @param aValue a string representation of an alternate text represenation diff --git a/src/main/java/net/fortuna/ical4j/model/parameter/Cn.java b/src/main/java/net/fortuna/ical4j/model/parameter/Cn.java index 93ba664bf..ee12a52ee 100644 --- a/src/main/java/net/fortuna/ical4j/model/parameter/Cn.java +++ b/src/main/java/net/fortuna/ical4j/model/parameter/Cn.java @@ -50,7 +50,7 @@ public class Cn extends Parameter implements Encodable { private static final long serialVersionUID = -8087119055007093293L; - private String value; + private final String value; /** * @param aValue a string representation of a Common Name diff --git a/src/main/java/net/fortuna/ical4j/model/parameter/CuType.java b/src/main/java/net/fortuna/ical4j/model/parameter/CuType.java index 10e510bd8..6d1e61a67 100644 --- a/src/main/java/net/fortuna/ical4j/model/parameter/CuType.java +++ b/src/main/java/net/fortuna/ical4j/model/parameter/CuType.java @@ -85,7 +85,7 @@ public class CuType extends Parameter implements Encodable { */ public static final CuType UNKNOWN = new CuType(VALUE_UNKNOWN); - private String value; + private final String value; /** * @param aValue a string representation of a Calendar User Type diff --git a/src/main/java/net/fortuna/ical4j/model/parameter/DelegatedFrom.java b/src/main/java/net/fortuna/ical4j/model/parameter/DelegatedFrom.java index abd8b24e4..217ba7d9b 100644 --- a/src/main/java/net/fortuna/ical4j/model/parameter/DelegatedFrom.java +++ b/src/main/java/net/fortuna/ical4j/model/parameter/DelegatedFrom.java @@ -50,7 +50,7 @@ public class DelegatedFrom extends Parameter { private static final long serialVersionUID = -795956139235258568L; - private AddressList delegators; + private final AddressList delegators; /** * @param aValue a string representation of Delegators diff --git a/src/main/java/net/fortuna/ical4j/model/parameter/DelegatedTo.java b/src/main/java/net/fortuna/ical4j/model/parameter/DelegatedTo.java index 6f7bf3dfb..f4ede3eaf 100644 --- a/src/main/java/net/fortuna/ical4j/model/parameter/DelegatedTo.java +++ b/src/main/java/net/fortuna/ical4j/model/parameter/DelegatedTo.java @@ -50,7 +50,7 @@ public class DelegatedTo extends Parameter { private static final long serialVersionUID = 567577003350648021L; - private AddressList delegatees; + private final AddressList delegatees; /** * @param aValue a string representation of Delegatees diff --git a/src/main/java/net/fortuna/ical4j/model/parameter/Derived.java b/src/main/java/net/fortuna/ical4j/model/parameter/Derived.java index f66cdfd53..c78eb2575 100644 --- a/src/main/java/net/fortuna/ical4j/model/parameter/Derived.java +++ b/src/main/java/net/fortuna/ical4j/model/parameter/Derived.java @@ -61,7 +61,7 @@ public class Derived extends Parameter { */ public static final Derived FALSE = new Derived(VALUE_FALSE); - private Boolean value; + private final Boolean value; /** * @param aValue a string representation diff --git a/src/main/java/net/fortuna/ical4j/model/parameter/Dir.java b/src/main/java/net/fortuna/ical4j/model/parameter/Dir.java index 5d6690325..90eb718cd 100644 --- a/src/main/java/net/fortuna/ical4j/model/parameter/Dir.java +++ b/src/main/java/net/fortuna/ical4j/model/parameter/Dir.java @@ -52,7 +52,7 @@ public class Dir extends Parameter implements Encodable { private static final long serialVersionUID = -8581904779721020689L; - private URI uri; + private final URI uri; /** * @param aValue a string representation of a directory entry reference diff --git a/src/main/java/net/fortuna/ical4j/model/parameter/Display.java b/src/main/java/net/fortuna/ical4j/model/parameter/Display.java index 4bf80821d..10f745831 100644 --- a/src/main/java/net/fortuna/ical4j/model/parameter/Display.java +++ b/src/main/java/net/fortuna/ical4j/model/parameter/Display.java @@ -58,7 +58,7 @@ public class Display extends Parameter implements Encodable { private static final String PARAMETER_NAME = "DISPLAY"; public enum Value { - BADGE, GRAPHIC, FULLSIZE, THUMBNAIL; + BADGE, GRAPHIC, FULLSIZE, THUMBNAIL } private final String[] values; diff --git a/src/main/java/net/fortuna/ical4j/model/parameter/Encoding.java b/src/main/java/net/fortuna/ical4j/model/parameter/Encoding.java index d2ae4123c..eafa0d7e5 100644 --- a/src/main/java/net/fortuna/ical4j/model/parameter/Encoding.java +++ b/src/main/java/net/fortuna/ical4j/model/parameter/Encoding.java @@ -126,7 +126,7 @@ public class Encoding extends Parameter implements Encodable { */ public static final Encoding BASE64 = new Encoding(VALUE_BASE64); - private String value; + private final String value; /** * @param aValue a string representation of an Inline Encoding diff --git a/src/main/java/net/fortuna/ical4j/model/parameter/FbType.java b/src/main/java/net/fortuna/ical4j/model/parameter/FbType.java index edd033ee6..16da2cc62 100644 --- a/src/main/java/net/fortuna/ical4j/model/parameter/FbType.java +++ b/src/main/java/net/fortuna/ical4j/model/parameter/FbType.java @@ -79,7 +79,7 @@ public class FbType extends Parameter implements Encodable { */ public static final FbType BUSY_TENTATIVE = new FbType(VALUE_BUSY_TENTATIVE); - private String value; + private final String value; /** * @param aValue a string representation of a format type diff --git a/src/main/java/net/fortuna/ical4j/model/parameter/Feature.java b/src/main/java/net/fortuna/ical4j/model/parameter/Feature.java index cdad31432..98b555019 100644 --- a/src/main/java/net/fortuna/ical4j/model/parameter/Feature.java +++ b/src/main/java/net/fortuna/ical4j/model/parameter/Feature.java @@ -50,7 +50,7 @@ public class Feature extends Parameter implements Encodable { private static final String PARAMETER_NAME = "FEATURE"; public enum Value { - AUDIO, CHAT, FEED, MODERATOR, PHONE, SCREEN, VIDEO; + AUDIO, CHAT, FEED, MODERATOR, PHONE, SCREEN, VIDEO } private final String[] values; diff --git a/src/main/java/net/fortuna/ical4j/model/parameter/FmtType.java b/src/main/java/net/fortuna/ical4j/model/parameter/FmtType.java index 677fc7160..1f1b70575 100644 --- a/src/main/java/net/fortuna/ical4j/model/parameter/FmtType.java +++ b/src/main/java/net/fortuna/ical4j/model/parameter/FmtType.java @@ -50,7 +50,7 @@ public class FmtType extends Parameter implements Encodable { private static final long serialVersionUID = -8764966004966855480L; - private String value; + private final String value; /** * @param aValue a string representation of a format type diff --git a/src/main/java/net/fortuna/ical4j/model/parameter/Language.java b/src/main/java/net/fortuna/ical4j/model/parameter/Language.java index 0ee87969b..d2cbddf3e 100644 --- a/src/main/java/net/fortuna/ical4j/model/parameter/Language.java +++ b/src/main/java/net/fortuna/ical4j/model/parameter/Language.java @@ -50,7 +50,7 @@ public class Language extends Parameter implements Encodable { private static final long serialVersionUID = 4864176270266226608L; - private String value; + private final String value; /** * @param aValue a string representation of a Language diff --git a/src/main/java/net/fortuna/ical4j/model/parameter/Member.java b/src/main/java/net/fortuna/ical4j/model/parameter/Member.java index 6aed5d4ea..ee5616a3a 100644 --- a/src/main/java/net/fortuna/ical4j/model/parameter/Member.java +++ b/src/main/java/net/fortuna/ical4j/model/parameter/Member.java @@ -50,7 +50,7 @@ public class Member extends Parameter { private static final long serialVersionUID = 287348849443687499L; - private AddressList groups; + private final AddressList groups; /** * @param aValue a string representation of a group or list membership diff --git a/src/main/java/net/fortuna/ical4j/model/parameter/Order.java b/src/main/java/net/fortuna/ical4j/model/parameter/Order.java index 7349a3062..40da11bab 100644 --- a/src/main/java/net/fortuna/ical4j/model/parameter/Order.java +++ b/src/main/java/net/fortuna/ical4j/model/parameter/Order.java @@ -47,7 +47,7 @@ public class Order extends Parameter { private static final long serialVersionUID = -5381653882942018012L; - private Integer order; + private final Integer order; /** * @param aValue a string representation diff --git a/src/main/java/net/fortuna/ical4j/model/parameter/PartStat.java b/src/main/java/net/fortuna/ical4j/model/parameter/PartStat.java index d1d8e933d..16aba510c 100644 --- a/src/main/java/net/fortuna/ical4j/model/parameter/PartStat.java +++ b/src/main/java/net/fortuna/ical4j/model/parameter/PartStat.java @@ -99,7 +99,7 @@ public class PartStat extends Parameter implements Encodable { */ public static final PartStat IN_PROCESS = new PartStat(VALUE_IN_PROCESS); - private String value; + private final String value; /** * @param aValue a string representation of a participation status diff --git a/src/main/java/net/fortuna/ical4j/model/parameter/Range.java b/src/main/java/net/fortuna/ical4j/model/parameter/Range.java index 91d015933..937562fd2 100644 --- a/src/main/java/net/fortuna/ical4j/model/parameter/Range.java +++ b/src/main/java/net/fortuna/ical4j/model/parameter/Range.java @@ -65,7 +65,7 @@ public class Range extends Parameter implements Encodable { */ public static final Range THISANDFUTURE = new Range(VALUE_THISANDFUTURE); - private String value; + private final String value; /** * @param aValue a string representation of a recurrence identifier range diff --git a/src/main/java/net/fortuna/ical4j/model/parameter/RelType.java b/src/main/java/net/fortuna/ical4j/model/parameter/RelType.java index a06063831..113cda989 100644 --- a/src/main/java/net/fortuna/ical4j/model/parameter/RelType.java +++ b/src/main/java/net/fortuna/ical4j/model/parameter/RelType.java @@ -78,7 +78,7 @@ public class RelType extends Parameter implements Encodable { */ public static final RelType SNOOZE = new RelType(VALUE_SNOOZE); - private String value; + private final String value; /** * @param aValue a string representation of a relationship type diff --git a/src/main/java/net/fortuna/ical4j/model/parameter/Related.java b/src/main/java/net/fortuna/ical4j/model/parameter/Related.java index 652899751..9819a7a7b 100644 --- a/src/main/java/net/fortuna/ical4j/model/parameter/Related.java +++ b/src/main/java/net/fortuna/ical4j/model/parameter/Related.java @@ -64,7 +64,7 @@ public class Related extends Parameter implements Encodable { */ public static final Related END = new Related(VALUE_END); - private String value; + private final String value; /** * @param aValue a string representation of an alarm trigger relationship diff --git a/src/main/java/net/fortuna/ical4j/model/parameter/Role.java b/src/main/java/net/fortuna/ical4j/model/parameter/Role.java index 52e22afd0..c13667cdf 100644 --- a/src/main/java/net/fortuna/ical4j/model/parameter/Role.java +++ b/src/main/java/net/fortuna/ical4j/model/parameter/Role.java @@ -78,7 +78,7 @@ public class Role extends Parameter implements Encodable { */ public static final Role NON_PARTICIPANT = new Role(VALUE_NON_PARTICIPANT); - private String value; + private final String value; /** * @param aValue a string representation of a participation role diff --git a/src/main/java/net/fortuna/ical4j/model/parameter/Rsvp.java b/src/main/java/net/fortuna/ical4j/model/parameter/Rsvp.java index b8e91128a..f2bcbc4fa 100644 --- a/src/main/java/net/fortuna/ical4j/model/parameter/Rsvp.java +++ b/src/main/java/net/fortuna/ical4j/model/parameter/Rsvp.java @@ -63,7 +63,7 @@ public class Rsvp extends Parameter implements Encodable { */ public static final Rsvp FALSE = new Rsvp(VALUE_FALSE); - private Boolean rsvp; + private final Boolean rsvp; /** * @param aValue a string representation of an RSVP diff --git a/src/main/java/net/fortuna/ical4j/model/parameter/ScheduleAgent.java b/src/main/java/net/fortuna/ical4j/model/parameter/ScheduleAgent.java index 3c8908283..94bce7c23 100644 --- a/src/main/java/net/fortuna/ical4j/model/parameter/ScheduleAgent.java +++ b/src/main/java/net/fortuna/ical4j/model/parameter/ScheduleAgent.java @@ -60,7 +60,7 @@ public class ScheduleAgent extends Parameter implements Encodable { public static final ScheduleAgent NONE = new ScheduleAgent(VALUE_NONE); - private String value; + private final String value; /** * @param aValue a string representation of a scheduling agent diff --git a/src/main/java/net/fortuna/ical4j/model/parameter/ScheduleStatus.java b/src/main/java/net/fortuna/ical4j/model/parameter/ScheduleStatus.java index 3fe131974..b24c134c9 100644 --- a/src/main/java/net/fortuna/ical4j/model/parameter/ScheduleStatus.java +++ b/src/main/java/net/fortuna/ical4j/model/parameter/ScheduleStatus.java @@ -47,7 +47,7 @@ public class ScheduleStatus extends Parameter implements Encodable { private static final long serialVersionUID = -96936874776850075L; - private String value; + private final String value; /** * @param aValue a string scheduling status diff --git a/src/main/java/net/fortuna/ical4j/model/parameter/Schema.java b/src/main/java/net/fortuna/ical4j/model/parameter/Schema.java index 580755c79..3840deaf7 100644 --- a/src/main/java/net/fortuna/ical4j/model/parameter/Schema.java +++ b/src/main/java/net/fortuna/ical4j/model/parameter/Schema.java @@ -52,7 +52,7 @@ public class Schema extends Parameter { private static final long serialVersionUID = -8581904779721020689L; - private URI uri; + private final URI uri; /** * @param aValue a string representation of a schema uri diff --git a/src/main/java/net/fortuna/ical4j/model/parameter/SentBy.java b/src/main/java/net/fortuna/ical4j/model/parameter/SentBy.java index e3c15df89..0eae382c7 100644 --- a/src/main/java/net/fortuna/ical4j/model/parameter/SentBy.java +++ b/src/main/java/net/fortuna/ical4j/model/parameter/SentBy.java @@ -52,7 +52,7 @@ public class SentBy extends Parameter implements Encodable { private static final long serialVersionUID = -1169413145174029391L; - private URI address; + private final URI address; /** * @param aValue a string representation of a sent by diff --git a/src/main/java/net/fortuna/ical4j/model/parameter/Type.java b/src/main/java/net/fortuna/ical4j/model/parameter/Type.java index 8246a5fc8..081198f9e 100644 --- a/src/main/java/net/fortuna/ical4j/model/parameter/Type.java +++ b/src/main/java/net/fortuna/ical4j/model/parameter/Type.java @@ -50,7 +50,7 @@ public class Type extends Parameter implements Encodable { private static final long serialVersionUID = -1153398789161059941L; - private String value; + private final String value; /** * @param aValue a string abbreviation diff --git a/src/main/java/net/fortuna/ical4j/model/parameter/TzId.java b/src/main/java/net/fortuna/ical4j/model/parameter/TzId.java index 85edf5202..76d910f52 100644 --- a/src/main/java/net/fortuna/ical4j/model/parameter/TzId.java +++ b/src/main/java/net/fortuna/ical4j/model/parameter/TzId.java @@ -54,7 +54,7 @@ public class TzId extends Parameter implements Encodable { */ public static final String PREFIX = "/"; - private String value; + private final String value; /** * @param aValue a string representation of a time zone identifier diff --git a/src/main/java/net/fortuna/ical4j/model/parameter/Value.java b/src/main/java/net/fortuna/ical4j/model/parameter/Value.java index 8a508014a..dafdab1d3 100644 --- a/src/main/java/net/fortuna/ical4j/model/parameter/Value.java +++ b/src/main/java/net/fortuna/ical4j/model/parameter/Value.java @@ -147,7 +147,7 @@ public class Value extends Parameter implements Encodable { */ public static final Value UTC_OFFSET = new Value(VALUE_UTC_OFFSET); - private String value; + private final String value; /** * @param aValue a string representation of a value data type diff --git a/src/main/java/net/fortuna/ical4j/model/parameter/Vvenue.java b/src/main/java/net/fortuna/ical4j/model/parameter/Vvenue.java index 925f685bc..edeedbb12 100644 --- a/src/main/java/net/fortuna/ical4j/model/parameter/Vvenue.java +++ b/src/main/java/net/fortuna/ical4j/model/parameter/Vvenue.java @@ -51,7 +51,7 @@ public class Vvenue extends Parameter implements Encodable { private static final long serialVersionUID = -8381878834513491869L; - private String value; + private final String value; /** * @param aValue a string abbreviation diff --git a/src/main/java/net/fortuna/ical4j/model/parameter/XParameter.java b/src/main/java/net/fortuna/ical4j/model/parameter/XParameter.java index a604c89e1..d7e58998c 100644 --- a/src/main/java/net/fortuna/ical4j/model/parameter/XParameter.java +++ b/src/main/java/net/fortuna/ical4j/model/parameter/XParameter.java @@ -49,7 +49,7 @@ public class XParameter extends Parameter implements Encodable { private static final long serialVersionUID = -3372153616695145903L; - private String value; + private final String value; /** * @param aName parameter name diff --git a/src/main/java/net/fortuna/ical4j/model/property/Geo.java b/src/main/java/net/fortuna/ical4j/model/property/Geo.java index 8740ea494..193f28a00 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/Geo.java +++ b/src/main/java/net/fortuna/ical4j/model/property/Geo.java @@ -31,7 +31,10 @@ */ package net.fortuna.ical4j.model.property; -import net.fortuna.ical4j.model.*; +import net.fortuna.ical4j.model.Content; +import net.fortuna.ical4j.model.ParameterList; +import net.fortuna.ical4j.model.Property; +import net.fortuna.ical4j.model.PropertyFactory; import net.fortuna.ical4j.validate.ValidationException; import org.apache.commons.lang3.StringUtils; @@ -227,8 +230,8 @@ public final void setValue(final String aValue) { */ @Override public final String getValue() { - return String.valueOf(getLatitude()) + ";" - + String.valueOf(getLongitude()); + return getLatitude() + ";" + + getLongitude(); } /** diff --git a/src/main/java/net/fortuna/ical4j/model/property/StructuredData.java b/src/main/java/net/fortuna/ical4j/model/property/StructuredData.java index 315a6c842..9933f5bc8 100644 --- a/src/main/java/net/fortuna/ical4j/model/property/StructuredData.java +++ b/src/main/java/net/fortuna/ical4j/model/property/StructuredData.java @@ -32,7 +32,6 @@ package net.fortuna.ical4j.model.property; import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.model.parameter.Encoding; import net.fortuna.ical4j.model.parameter.Value; import net.fortuna.ical4j.util.DecoderFactory; import net.fortuna.ical4j.util.Uris; @@ -103,7 +102,7 @@ public final void setValue(final String aValue) throws URISyntaxException { try { final BinaryDecoder decoder = DecoderFactory.getInstance() .createBinaryDecoder( - (Encoding) getParameter(Parameter.ENCODING)); + getParameter(Parameter.ENCODING)); binary = decoder.decode(aValue.getBytes()); } catch (UnsupportedEncodingException uee) { Logger log = LoggerFactory.getLogger(Attach.class); diff --git a/src/main/java/net/fortuna/ical4j/transform/Rfc5545Transformer.java b/src/main/java/net/fortuna/ical4j/transform/Rfc5545Transformer.java index 10216e05f..20864e598 100644 --- a/src/main/java/net/fortuna/ical4j/transform/Rfc5545Transformer.java +++ b/src/main/java/net/fortuna/ical4j/transform/Rfc5545Transformer.java @@ -56,8 +56,8 @@ private static void conformComponentToRfc5545(Component component){ private enum CountableProperties{ STATUS(Property.STATUS, 1); - private int maxApparitionNumber; - private String name; + private final int maxApparitionNumber; + private final String name; CountableProperties(String name, int maxApparitionNumber){ this.maxApparitionNumber = maxApparitionNumber; diff --git a/src/main/java/net/fortuna/ical4j/transform/recurrence/ByMonthDayRule.java b/src/main/java/net/fortuna/ical4j/transform/recurrence/ByMonthDayRule.java index 124dfdc01..2b1ad58aa 100644 --- a/src/main/java/net/fortuna/ical4j/transform/recurrence/ByMonthDayRule.java +++ b/src/main/java/net/fortuna/ical4j/transform/recurrence/ByMonthDayRule.java @@ -129,7 +129,7 @@ public List apply(Date date) { } } retVal.add(Dates.getInstance(getTime(date, cal), type)); - }; + } return retVal; } } diff --git a/src/main/java/net/fortuna/ical4j/transform/rfc5545/TzHelper.java b/src/main/java/net/fortuna/ical4j/transform/rfc5545/TzHelper.java index 251a986bc..e4bdc1528 100644 --- a/src/main/java/net/fortuna/ical4j/transform/rfc5545/TzHelper.java +++ b/src/main/java/net/fortuna/ical4j/transform/rfc5545/TzHelper.java @@ -46,7 +46,7 @@ private static void initMsTimezones() { while (scanner.hasNext()) { String[] arr = scanner.nextLine().split("="); String standardTzId = arr[1]; - String displayNameAndMsTzId[] = arr[0].split(";"); + String[] displayNameAndMsTzId = arr[0].split(";"); MS_TIMEZONE_NAMES.put(displayNameAndMsTzId[0], standardTzId); MS_TIMEZONE_IDS.put(displayNameAndMsTzId[1], standardTzId); } diff --git a/src/main/java/net/fortuna/ical4j/util/DecoderFactory.java b/src/main/java/net/fortuna/ical4j/util/DecoderFactory.java index 70e44c45d..6585aaa03 100644 --- a/src/main/java/net/fortuna/ical4j/util/DecoderFactory.java +++ b/src/main/java/net/fortuna/ical4j/util/DecoderFactory.java @@ -55,7 +55,7 @@ public abstract class DecoderFactory { */ public static final String KEY_FACTORY_CLASS = "net.fortuna.ical4j.factory.decoder"; - private static DecoderFactory instance; + private static final DecoderFactory instance; static { Optional property = Configurator.getObjectProperty(KEY_FACTORY_CLASS); instance = property.orElse(new DefaultDecoderFactory()); diff --git a/src/main/java/net/fortuna/ical4j/util/EncoderFactory.java b/src/main/java/net/fortuna/ical4j/util/EncoderFactory.java index b0eb0a326..9ccfbc893 100644 --- a/src/main/java/net/fortuna/ical4j/util/EncoderFactory.java +++ b/src/main/java/net/fortuna/ical4j/util/EncoderFactory.java @@ -55,7 +55,7 @@ public abstract class EncoderFactory { */ public static final String KEY_FACTORY_CLASS = "net.fortuna.ical4j.factory.encoder"; - private static EncoderFactory instance; + private static final EncoderFactory instance; static { Optional property = Configurator.getObjectProperty(KEY_FACTORY_CLASS); instance = property.orElse(new DefaultEncoderFactory()); diff --git a/src/main/java/net/fortuna/ical4j/validate/AbstractCalendarValidatorFactory.java b/src/main/java/net/fortuna/ical4j/validate/AbstractCalendarValidatorFactory.java index a78c92dd8..90d2294b9 100644 --- a/src/main/java/net/fortuna/ical4j/validate/AbstractCalendarValidatorFactory.java +++ b/src/main/java/net/fortuna/ical4j/validate/AbstractCalendarValidatorFactory.java @@ -7,7 +7,7 @@ */ public abstract class AbstractCalendarValidatorFactory { - private static CalendarValidatorFactory instance; + private static final CalendarValidatorFactory instance; static { instance = ServiceLoader.load(CalendarValidatorFactory.class, DefaultCalendarValidatorFactory.class.getClassLoader()).iterator().next(); }