Refactored to use streams

ical4j · Dec 7, 2018 · ca3c6ff · ca3c6ff
1 parent 2769c01
commit ca3c6ff
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 37 deletions.
diff --git a/src/main/java/net/fortuna/ical4j/model/AddressList.java b/src/main/java/net/fortuna/ical4j/model/AddressList.java
@@ -42,6 +42,7 @@
 import java.util.List;
 import java.util.StringTokenizer;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.stream.Collectors;
 
 /**
  * $Id$ [23-Apr-2004]
@@ -91,14 +92,8 @@ public AddressList(final String aValue) throws URISyntaxException {
      * {@inheritDoc}
      */
     public final String toString() {
-        final StringBuilder b = new StringBuilder();
-        for (final Iterator<URI> i = addresses.iterator(); i.hasNext();) {
-            b.append(Strings.quote(Uris.decode(Strings.valueOf(i.next()))));
-            if (i.hasNext()) {
-                b.append(',');
-            }
-        }
-        return b.toString();
+        return addresses.stream().map(a -> Strings.quote(Uris.decode(Strings.valueOf(a))))
+                .collect(Collectors.joining(","));
     }
 
     /**

diff --git a/src/main/java/net/fortuna/ical4j/model/ComponentList.java b/src/main/java/net/fortuna/ical4j/model/ComponentList.java
@@ -37,6 +37,7 @@
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * $Id$ [Apr 5, 2004]
@@ -91,11 +92,7 @@ public ComponentList(List<? extends T> components) {
      * {@inheritDoc}
      */
     public final String toString() {
-        final StringBuilder buffer = new StringBuilder();
-        for (final T c : this) {
-            buffer.append(c.toString());
-        }
-        return buffer.toString();
+        return stream().map(Component::toString).collect(Collectors.joining(""));
     }
 
     /**

diff --git a/src/main/java/net/fortuna/ical4j/model/LocationTypeList.java b/src/main/java/net/fortuna/ical4j/model/LocationTypeList.java
@@ -36,6 +36,7 @@
 import java.util.List;
 import java.util.StringTokenizer;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.stream.Collectors;
 
 /**
  * $Id LocationTypeList.java $ [23-Apr-2004]
@@ -76,14 +77,7 @@ public LocationTypeList(final String aValue) {
      * {@inheritDoc}
      */
     public final String toString() {
-        final StringBuilder b = new StringBuilder();
-        for (final Iterator<String> i = locationTypes.iterator(); i.hasNext();) {
-            b.append(i.next());
-            if (i.hasNext()) {
-                b.append(',');
-            }
-        }
-        return b.toString();
+        return locationTypes.stream().collect(Collectors.joining(","));
     }
 
     /**

diff --git a/src/main/java/net/fortuna/ical4j/model/ParameterList.java b/src/main/java/net/fortuna/ical4j/model/ParameterList.java
@@ -40,6 +40,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.stream.Collectors;
 
 /**
  * $Id$ [Apr 5, 2004]
@@ -103,12 +104,11 @@ public ParameterList(final ParameterList list, final boolean unmodifiable) {
      * {@inheritDoc}
      */
     public final String toString() {
-        final StringBuilder buffer = new StringBuilder();
-        for (final Parameter parameter : parameters) {
-            buffer.append(';');
-            buffer.append(parameter.toString());
+        if (!parameters.isEmpty()) {
+            return parameters.stream().map(Parameter::toString)
+                    .collect(Collectors.joining(";", ";", ""));
         }
-        return buffer.toString();
+        return "";
     }
 
     /**

diff --git a/src/main/java/net/fortuna/ical4j/model/PropertyList.java b/src/main/java/net/fortuna/ical4j/model/PropertyList.java
@@ -36,6 +36,7 @@
 import java.net.URISyntaxException;
 import java.text.ParseException;
 import java.util.ArrayList;
+import java.util.stream.Collectors;
 
 /**
  * $Id$ [Apr 5, 2004]
@@ -81,9 +82,7 @@ public PropertyList(PropertyList<? extends T> properties) throws ParseException,
      * {@inheritDoc}
      */
     public final String toString() {
-        final StringBuilder sb = new StringBuilder();
-        forEach(t -> sb.append(t.toString()));
-        return sb.toString();
+        return stream().map(Property::toString).collect(Collectors.joining(""));
     }
 
     /**

diff --git a/src/main/java/net/fortuna/ical4j/model/TextList.java b/src/main/java/net/fortuna/ical4j/model/TextList.java
@@ -40,6 +40,7 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 /**
  * $Id$ [23-Apr-2004]
@@ -87,14 +88,7 @@ public TextList(String[] textValues) {
      * {@inheritDoc}
      */
     public final String toString() {
-        final StringBuilder b = new StringBuilder();
-        for (final Iterator<String> i = texts.iterator(); i.hasNext();) {
-            b.append(Strings.escape(i.next()));
-            if (i.hasNext()) {
-                b.append(',');
-            }
-        }
-        return b.toString();
+        return texts.stream().map(t -> Strings.escape(t)).collect(Collectors.joining(","));
     }
 
     /**