Clean up code

ical4j · Apr 22, 2018 · c31667e · c31667e
1 parent 63f34c4
commit c31667e
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 16 deletions.
diff --git a/src/main/java/net/fortuna/ical4j/data/HCalendarParser.java b/src/main/java/net/fortuna/ical4j/data/HCalendarParser.java
@@ -240,7 +240,7 @@ private static List<Element> findElements(XPathExpression expr, Object context)
 
     private static Element findElement(XPathExpression expr, Object context) throws ParserException {
         Node n = findNode(expr, context);
-        if (n == null || (!(n instanceof Element)))
+        if ((!(n instanceof Element)))
             return null;
         return (Element) n;
     }
@@ -285,6 +285,7 @@ private void buildCalendar(Document d, ContentHandler handler) throws ParserExce
         try {
             handler.propertyValue(Version.VERSION_2_0.getValue());
         } catch (IOException | ParseException | URISyntaxException e) {
+            LOG.warn("Caught exception", e);
         }
         handler.endProperty(Property.VERSION);
 
@@ -417,6 +418,7 @@ private void buildProperty(Element element, String propName, ContentHandler hand
                     try {
                         handler.parameter(Parameter.VALUE, Value.DATE.getValue());
                     } catch (URISyntaxException e) {
+                        LOG.warn("Caught exception", e);
                     }
             } catch (ParseException e) {
                 throw new ParserException("Malformed date value for element '" + className + "'", -1, e);
@@ -429,6 +431,7 @@ private void buildProperty(Element element, String propName, ContentHandler hand
                 try {
                     handler.parameter(Parameter.LANGUAGE, lang);
                 } catch (URISyntaxException e) {
+                    LOG.warn("Caught exception", e);
                 }
         }
 
@@ -492,13 +495,15 @@ private static Date icalDate(String original) throws ParseException {
                 if (original.indexOf('-') == -1)
                     return new Date(original);
             } catch (ParseException e) {
+                LOG.warn("Caught exception", e);
             }
             return new Date(HCAL_DATE_FORMAT.parse(original));
         }
 
         try {
             return new DateTime(original);
         } catch (ParseException e) {
+            LOG.warn("Caught exception", e);
         }
 
         // the date-time value can represent its time zone in a few different

diff --git a/src/main/java/net/fortuna/ical4j/filter/Filter.java b/src/main/java/net/fortuna/ical4j/filter/Filter.java
@@ -170,7 +170,7 @@ public final T[] filter(final T[] objects) {
      */
     @SuppressWarnings("unchecked")
     public final Predicate<T>[] getRules() {
-        return rules.toArray(new Predicate[rules.size()]);
+        return rules.toArray(new Predicate[0]);
     }
 
     /**

diff --git a/src/main/java/net/fortuna/ical4j/model/ParameterList.java b/src/main/java/net/fortuna/ical4j/model/ParameterList.java
@@ -31,14 +31,14 @@
  */
 package net.fortuna.ical4j.model;
 
-import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 import java.io.Serializable;
 import java.net.URISyntaxException;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
@@ -216,7 +216,7 @@ public final int size() {
     public final boolean equals(final Object arg0) {
         if (arg0 instanceof ParameterList) {
             final ParameterList p = (ParameterList) arg0;
-            return ObjectUtils.equals(parameters, p.parameters);
+            return Objects.equals(parameters, p.parameters);
         }
         return super.equals(arg0);
     }

diff --git a/src/main/java/net/fortuna/ical4j/model/TimeZone.java b/src/main/java/net/fortuna/ical4j/model/TimeZone.java
@@ -135,7 +135,7 @@ public final int getRawOffset() {
      */
     public final boolean inDaylightTime(final Date date) {
         final Observance observance = vTimeZone.getApplicableObservance(new DateTime(date));
-        return (observance != null && observance instanceof Daylight);
+        return (observance instanceof Daylight);
     }
 
     /**

diff --git a/src/main/java/net/fortuna/ical4j/model/TimeZoneLoader.java b/src/main/java/net/fortuna/ical4j/model/TimeZoneLoader.java
@@ -213,8 +213,7 @@ private static void addTransitionRules(ZoneId zoneId, int rawTimeZoneOffsetInSec
 
             weekdayIndexInMonth = weekdayIndexInMonth >= 3 ? weekdayIndexInMonth - allDaysOfWeek.size() : weekdayIndexInMonth;
 
-            String rruleTemplate = RRULE_TPL;
-            String rruleText = String.format(rruleTemplate, transitionRuleMonthValue, weekdayIndexInMonth, transitionRuleDayOfWeek.name().substring(0, 2));
+            String rruleText = String.format(RRULE_TPL, transitionRuleMonthValue, weekdayIndexInMonth, transitionRuleDayOfWeek.name().substring(0, 2));
 
             try {
                 TzOffsetFrom offsetFrom = new TzOffsetFrom(new UtcOffset(transitionRule.getOffsetBefore().getTotalSeconds() * 1000L));

diff --git a/src/main/java/net/fortuna/ical4j/model/WeekDay.java b/src/main/java/net/fortuna/ical4j/model/WeekDay.java
@@ -32,11 +32,11 @@
 package net.fortuna.ical4j.model;
 
 import net.fortuna.ical4j.util.Numbers;
-import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 import java.io.Serializable;
 import java.util.Calendar;
+import java.util.Objects;
 
 /**
  * $Id$
@@ -284,7 +284,7 @@ public final boolean equals(final Object arg0) {
             return false;
         }
         final WeekDay wd = (WeekDay) arg0;
-        return ObjectUtils.equals(wd.getDay(), getDay())
+        return Objects.equals(wd.getDay(), getDay())
             && wd.getOffset() == getOffset();
     }
 

diff --git a/src/main/java/net/fortuna/ical4j/model/component/VEvent.java b/src/main/java/net/fortuna/ical4j/model/component/VEvent.java
@@ -41,7 +41,6 @@
 import net.fortuna.ical4j.validate.ValidationException;
 import net.fortuna.ical4j.validate.Validator;
 import net.fortuna.ical4j.validate.component.*;
-import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 import java.io.IOException;
@@ -50,6 +49,7 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * $Id$ [Apr 5, 2004]
@@ -670,7 +670,7 @@ public final Uid getUid() {
     public boolean equals(final Object arg0) {
         if (arg0 instanceof VEvent) {
             return super.equals(arg0)
-                    && ObjectUtils.equals(alarms, ((VEvent) arg0).getAlarms());
+                    && Objects.equals(alarms, ((VEvent) arg0).getAlarms());
         }
         return super.equals(arg0);
     }

diff --git a/src/main/java/net/fortuna/ical4j/model/component/VTimeZone.java b/src/main/java/net/fortuna/ical4j/model/component/VTimeZone.java
@@ -41,12 +41,12 @@
 import net.fortuna.ical4j.validate.ValidationException;
 import net.fortuna.ical4j.validate.Validator;
 import net.fortuna.ical4j.validate.component.VTimeZoneITIPValidator;
-import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.text.ParseException;
+import java.util.Objects;
 
 /**
  * $Id$ [Apr 5, 2004]
@@ -286,7 +286,7 @@ public final TzUrl getTimeZoneUrl() {
     public boolean equals(final Object arg0) {
         if (arg0 instanceof VTimeZone) {
             return super.equals(arg0)
-                    && ObjectUtils.equals(observances, ((VTimeZone) arg0)
+                    && Objects.equals(observances, ((VTimeZone) arg0)
                             .getObservances());
         }
         return super.equals(arg0);

diff --git a/src/main/java/net/fortuna/ical4j/model/component/VToDo.java b/src/main/java/net/fortuna/ical4j/model/component/VToDo.java
@@ -39,7 +39,6 @@
 import net.fortuna.ical4j.validate.ValidationException;
 import net.fortuna.ical4j.validate.Validator;
 import net.fortuna.ical4j.validate.component.*;
-import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 import java.io.IOException;
@@ -48,6 +47,7 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * $Id$ [Apr 5, 2004]
@@ -442,7 +442,7 @@ public final Uid getUid() {
     public boolean equals(final Object arg0) {
         if (arg0 instanceof VToDo) {
             return super.equals(arg0)
-                    && ObjectUtils.equals(alarms, ((VToDo) arg0).getAlarms());
+                    && Objects.equals(alarms, ((VToDo) arg0).getAlarms());
         }
         return super.equals(arg0);
     }

diff --git a/src/main/java/net/fortuna/ical4j/util/Calendars.java b/src/main/java/net/fortuna/ical4j/util/Calendars.java
@@ -171,7 +171,7 @@ public static Calendar[] split(final Calendar calendar) {
             }
             uidCal.getComponents().add(c);
         }
-        return calendars.values().toArray(new Calendar[calendars.values().size()]);
+        return calendars.values().toArray(new Calendar[0]);
     }
 
     /**