Simplify string formatting following a suggestion Alexander Weigl

key.core/src/main/java/de/uka/ilkd/key/logic/op/Function.java

@@ -116,7 +116,7 @@ public final String proofToString() {
             new StringBuilder((sort() == Sort.FORMULA ? "" : sort().toString()) + " ");
         s.append(name());
         if (arity() > 0) {
-            s.append(Strings.formatAsList(argSorts().iterator(), "(", ",", ")"));
+            s.append(Strings.formatAsList(argSorts(), "(", ",", ")"));
         }
         s.append(";\n");
         return s.toString();

key.util/src/main/java/org/key_project/util/Strings.java

@@ -4,10 +4,11 @@
 package org.key_project.util;
 
 
-import java.util.Iterator;
 import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
 
 /**
  * Helper functions for {@link String}s
@@ -57,51 +58,6 @@ public static boolean isJMLComment(String comment) {
         }
     }
 
-    /**
-     * outputs the collection represented by the iterator in the format
-     * <code> open element1 sep element2 sep element3 close</code>
-     *
-     * @param it the Iterator over the collection to be printed
-     * @param open the String used to open the list
-     * @param sep the String separating the different elements
-     * @param close the String used to close the list
-     * @param mapper a Function that maps the elements of type S to their String representation
-     * @return the CharSequence in the described format
-     * @param <S> the type of the elements of the iterated collection
-     */
-    public static <S, T> String formatAsList(Iterator<S> it,
-            CharSequence open, CharSequence sep, CharSequence close,
-            Function<S, T> mapper) {
-        final StringBuilder str = new StringBuilder();
-        str.append(open);
-        var hasNext = it.hasNext();
-        while (hasNext) {
-            str.append(mapper.apply(it.next()));
-            hasNext = it.hasNext();
-            if (hasNext) {
-                str.append(sep);
-            }
-        }
-        str.append(close);
-        return str.toString();
-    }
-
-    /**
-     * outputs the collection represented by the iterator in the format
-     * <code> open element1 sep element2 sep element3 close</code>
-     *
-     * @param it the Iterator over the collection to be printed
-     * @param open the String used to open the list
-     * @param sep the String separating the different elements
-     * @param close the String used to close the list
-     * @return the CharSequence in the described format
-     * @param <S> the type of the elements of the iterated collection
-     */
-    public static <S> String formatAsList(Iterator<S> it,
-            CharSequence open, CharSequence sep, CharSequence close) {
-        return formatAsList(it, open, sep, close, Function.identity());
-    }
-
     /**
      * outputs the collection represented by the iterator in the format
      * <code> open element1 sep element2 sep element3 close</code>
@@ -117,7 +73,9 @@ public static <S> String formatAsList(Iterator<S> it,
     public static <S, T> String formatAsList(Iterable<S> it,
             CharSequence open, CharSequence sep, CharSequence close,
             Function<S, T> mapper) {
-        return formatAsList(it.iterator(), open, sep, close, mapper);
+        return StreamSupport.stream(it.spliterator(), false)
+                .map(a -> mapper.apply(a).toString())
+                .collect(Collectors.joining(sep, open, close));
     }
 
     /**

key.util/src/main/java/org/key_project/util/collection/DefaultImmutableMap.java

@@ -224,7 +224,7 @@ public Iterator<ImmutableMapEntry<S, T>> iterator() {
     }
 
     public String toString() {
-        return Strings.formatAsList(iterator(), "[", ",", "]");
+        return Strings.formatAsList(this, "[", ",", "]");
     }
 
     @SuppressWarnings("unchecked")

key.util/src/main/java/org/key_project/util/collection/DefaultImmutableSet.java

@@ -328,7 +328,7 @@ public static <T> ImmutableSet<T> fromCollection(@Nullable Collection<T> seq) {
 
     @Override
     public String toString() {
-        return Strings.formatAsList(iterator(), "{", ",", "}");
+        return Strings.formatAsList(this, "{", ",", "}");
     }
 
     /** represents the empty set for elements of type <T> */

key.util/src/main/java/org/key_project/util/collection/ImmutableArray.java

@@ -147,7 +147,7 @@ public boolean equals(Object o) {
 
     @Override
     public String toString() {
-        return Strings.formatAsList(iterator(), "[", ",", "]");
+        return Strings.formatAsList(this, "[", ",", "]");
     }
 
     @Override

key.util/src/main/java/org/key_project/util/collection/ImmutableLeftistHeap.java

@@ -333,7 +333,7 @@ public Iterator<T> sortedIterator() {
 
 
     public String toString() {
-        return Strings.formatAsList(iterator(), "[", ",", "]");
+        return Strings.formatAsList(this, "[", ",", "]");
     }
 
 

key.util/src/main/java/org/key_project/util/collection/ImmutableSLList.java

@@ -453,7 +453,7 @@ public boolean equals(Object o) {
 
         @Override
         public String toString() {
-            return Strings.formatAsList(this.iterator(), "[", ",", "]");
+            return Strings.formatAsList(this, "[", ",", "]");
         }
     }