Use String.join instead of Collectors.joining (#3973)

* Use String.join instead of Collectors.joining

String.join results in less code when joining an Iterable or Array.

Signed-off-by: Wouter Born <github@maindrain.net>

bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/commands/AutomationCommandsPluggable.java

@@ -16,7 +16,6 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Locale;
-import java.util.stream.Collectors;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
@@ -122,7 +121,7 @@ public class AutomationCommandsPluggable extends AutomationCommands implements C
     @Override
     public void execute(String[] args, Console console) {
         if (args.length == 0) {
-            console.println(getUsages().stream().collect(Collectors.joining("\n")));
+            console.println(String.join("\n", getUsages()));
             return;
         }
 

bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/item/MetadataSelectorMatcher.java

@@ -65,7 +65,7 @@ public class MetadataSelectorMatcher {
                     .distinct() //
                     .collect(Collectors.toSet());
 
-            String namespacePattern = originalNamespaces.stream().collect(Collectors.joining("|"));
+            String namespacePattern = String.join("|", originalNamespaces);
 
             Pattern pattern = Pattern.compile("(" + namespacePattern + ")$");
 

bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/filter/CorsFilter.java

@@ -15,7 +15,6 @@ package org.openhab.core.io.rest.internal.filter;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.container.ContainerResponseContext;
@@ -77,8 +76,7 @@ public class CorsFilter implements ContainerResponseFilter {
     static final List<String> ACCEPTED_HTTP_METHODS_LIST = List.of(HTTP_GET_METHOD, HTTP_POST_METHOD, HTTP_PUT_METHOD,
             HTTP_DELETE_METHOD, HTTP_HEAD_METHOD, HTTP_OPTIONS_METHOD);
 
-    static final String ACCEPTED_HTTP_METHODS = ACCEPTED_HTTP_METHODS_LIST.stream()
+    static final String ACCEPTED_HTTP_METHODS = String.join(HEADERS_SEPARATOR, ACCEPTED_HTTP_METHODS_LIST);
-            .collect(Collectors.joining(HEADERS_SEPARATOR));
 
     private final transient Logger logger = LoggerFactory.getLogger(CorsFilter.class);
 

bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortUtil.java

@@ -114,8 +114,7 @@ public class SerialPortUtil {
             serialPorts = new HashSet<>();
         }
         if (serialPorts.add(port)) {
-            return serialPorts.stream().collect(Collectors.joining(pathSeparator)); // see
+            return String.join(pathSeparator, serialPorts); // see RXTXCommDriver#addSpecifiedPorts
-                                                                                    // RXTXCommDriver#addSpecifiedPorts
         }
         return null;
     }

bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/ModelRepositoryImpl.java

@@ -24,7 +24,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.stream.Collectors;
 
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
@@ -281,7 +280,7 @@ public class ModelRepositoryImpl implements ModelRepository {
                     }
                     if (!warnings.isEmpty()) {
                         logger.info("Validation issues found in configuration model '{}', using it anyway:\n{}", name,
-                                warnings.stream().collect(Collectors.joining("\n")));
+                                String.join("\n", warnings));
                     }
                 } catch (NullPointerException e) {
                     // see https://github.com/eclipse/smarthome/issues/3335

bundles/org.openhab.core.model.thing/src/org/openhab/core/model/thing/valueconverter/UIDtoStringConverter.java

@@ -12,9 +12,6 @@
  */
 package org.openhab.core.model.thing.valueconverter;
 
-import java.util.Arrays;
-import java.util.stream.Collectors;
-
 import org.eclipse.xtext.conversion.IValueConverter;
 import org.eclipse.xtext.conversion.ValueConverterException;
 import org.eclipse.xtext.nodemodel.INode;
@@ -30,14 +27,14 @@ import org.openhab.core.thing.UID;
  */
 public class UIDtoStringConverter implements IValueConverter<String> {
 
-    private static final String SEPERATOR = ":";
+    private static final String SEPARATOR = ":";
 
     @Override
     public String toValue(final String string, INode node) throws ValueConverterException {
         if (string == null) {
             return null;
         }
-        String[] ids = string.split(SEPERATOR);
+        String[] ids = string.split(SEPARATOR);
         for (int i = 0; i < ids.length; i++) {
             String id = ids[i];
             if (id != null && id.startsWith("\"") && id.endsWith("\"")) {
@@ -48,7 +45,7 @@ public class UIDtoStringConverter implements IValueConverter<String> {
                 }
             }
         }
-        return Arrays.stream(ids).collect(Collectors.joining(SEPERATOR));
+        return String.join(SEPARATOR, ids);
     }
 
     @Override
@@ -56,7 +53,7 @@ public class UIDtoStringConverter implements IValueConverter<String> {
         if (value == null) {
             throw new ValueConverterException("Value may not be null.", null, null);
         }
-        String[] ids = value.split(SEPERATOR);
+        String[] ids = value.split(SEPARATOR);
         for (int i = 0; i < ids.length; i++) {
             String id = ids[i];
             if (id != null && !id.matches("[A-Za-z0-9_]*")) {
@@ -65,7 +62,7 @@ public class UIDtoStringConverter implements IValueConverter<String> {
                 ids[i] = toEscapedString(id);
             }
         }
-        return Arrays.stream(ids).collect(Collectors.joining(SEPERATOR));
+        return String.join(SEPARATOR, ids);
     }
 
     protected String toEscapedString(String value) {

bundles/org.openhab.core/src/main/java/org/openhab/core/items/GenericItem.java

@@ -23,7 +23,6 @@ import java.util.Set;
 import java.util.WeakHashMap;
 import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.concurrent.ExecutorService;
-import java.util.stream.Collectors;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
@@ -338,13 +337,13 @@ public abstract class GenericItem implements ActiveItem {
         if (!getTags().isEmpty()) {
             sb.append(", ");
             sb.append("Tags=[");
-            sb.append(getTags().stream().collect(Collectors.joining(", ")));
+            sb.append(String.join(", ", getTags()));
             sb.append("]");
         }
         if (!getGroupNames().isEmpty()) {
             sb.append(", ");
             sb.append("Groups=[");
-            sb.append(getGroupNames().stream().collect(Collectors.joining(", ")));
+            sb.append(String.join(", ", getGroupNames()));
             sb.append("]");
         }
         sb.append(")");

bundles/org.openhab.core/src/main/java/org/openhab/core/items/GroupItem.java

@@ -342,13 +342,13 @@ public class GroupItem extends GenericItem implements StateChangeListener, Metad
         if (!getTags().isEmpty()) {
             sb.append(", ");
             sb.append("Tags=[");
-            sb.append(getTags().stream().collect(Collectors.joining(", ")));
+            sb.append(String.join(", ", getTags()));
             sb.append("]");
         }
         if (!getGroupNames().isEmpty()) {
             sb.append(", ");
             sb.append("Groups=[");
-            sb.append(getGroupNames().stream().collect(Collectors.joining(", ")));
+            sb.append(String.join(", ", getGroupNames()));
             sb.append("]");
         }
         sb.append(")");

itests/org.openhab.core.config.dispatch.tests/src/main/java/org/openhab/core/config/dispatch/internal/ConfigDispatcherOSGiTest.java

@@ -28,7 +28,6 @@ import java.nio.file.attribute.FileTime;
 import java.time.Instant;
 import java.util.Collection;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
@@ -1057,8 +1056,7 @@ public class ConfigDispatcherOSGiTest extends JavaOSGiTest {
     private void truncateLastLine(File file) throws IOException {
         final Path path = file.toPath();
         List<String> lines = Files.readAllLines(path, StandardCharsets.UTF_8);
-        Files.writeString(path, lines.subList(0, lines.size() - 1).stream().collect(Collectors.joining("\n")),
+        Files.writeString(path, String.join("\n", lines.subList(0, lines.size() - 1)), StandardCharsets.UTF_8);
-                StandardCharsets.UTF_8);
     }
 
     private @Nullable String getLastModifiedValueForPoperty(String path, String property) {