Apply review suggestion - 2

Author: slawekjaranowski

compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java

@@ -29,7 +29,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.apache.maven.building.FileSource;
@@ -257,27 +256,16 @@ public Object execute(String expression, Object value) {
     }
 
     private List<Server> serversByIds(List<Server> servers) {
-
-        if (servers.stream().allMatch(server -> server.getIds().isEmpty())) {
-            return servers;
-        }
-
         return servers.stream()
-                .flatMap(server -> {
-                    List<String> ids = server.getIds();
-                    if (ids.isEmpty()) {
-                        return Stream.of(server);
-                    } else {
-                        return Stream.concat(Stream.of(server), ids.stream().map(id -> newServer(server, id)));
-                    }
-                })
-                .collect(Collectors.toList());
+                .flatMap(server -> Stream.concat(
+                        Stream.of(server), server.getIds().stream().map(id -> serverAlias(server, id))))
+                .toList();
     }
 
-    private Server newServer(Server server, String id) {
-        return new Server(org.apache.maven.api.settings.Server.newBuilder(server.getDelegate(), false)
+    private Server serverAlias(Server server, String id) {
+        return new Server(org.apache.maven.api.settings.Server.newBuilder(server.getDelegate(), true)
                 .id(id)
-                .ids(Collections.emptyList())
+                .ids(List.of())
                 .build());
     }
 }

impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultSettingsBuilder.java

@@ -26,13 +26,11 @@
 import java.io.InputStream;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Supplier;
 import java.util.function.UnaryOperator;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.apache.maven.api.Constants;
@@ -206,9 +204,7 @@ private Settings readSettings(
         settings = decrypt(settingsSource, settings, request, problems);
 
         if (!isProjectSettings) {
-            settings = Settings.newBuilder(settings, false)
-                    .servers(serversByIds(settings.getServers()))
-                    .build();
+            settings = settings.withServers(serversByIds(settings.getServers()));
         }
 
         settingsValidator.validate(settings, isProjectSettings, problems);
@@ -237,23 +233,14 @@ private Settings readSettings(
     }
 
     private List<Server> serversByIds(List<Server> servers) {
-
-        if (servers.stream().allMatch(server -> server.getIds().isEmpty())) {
-            return servers;
-        }
-
         return servers.stream()
-                .flatMap(server -> {
-                    List<String> ids = server.getIds();
-                    if (ids.isEmpty()) {
-                        return Stream.of(server);
-                    }
-                    return Stream.concat(Stream.of(server), ids.stream().map(id -> Server.newBuilder(server, true)
-                            .id(id)
-                            .ids(Collections.emptyList())
-                            .build()));
-                })
-                .collect(Collectors.toList());
+                .flatMap(server -> Stream.concat(
+                        Stream.of(server), server.getIds().stream().map(id -> serverAlias(server, id))))
+                .toList();
+    }
+
+    private Server serverAlias(Server server, String id) {
+        return Server.newBuilder(server, true).id(id).ids(List.of()).build();
     }
 
     private Settings interpolate(
@@ -360,7 +347,6 @@ public org.apache.maven.api.model.Profile convert(Profile profile) {
 
     /**
      * Collects the output of the settings builder.
-     *
      */
     static class DefaultSettingsBuilderResult implements SettingsBuilderResult {