Ensure sets maintain insertion order

Author: pujagani

java/src/org/openqa/selenium/grid/sessionqueue/local/LocalNewSessionQueue.java

@@ -25,8 +25,10 @@
 import java.io.Closeable;
 import java.time.Duration;
 import java.time.Instant;
+import java.util.Collections;
 import java.util.Deque;
 import java.util.Iterator;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -178,7 +180,10 @@ private void timeoutSessions() {
                                   sessionRequest.getRequestId().equals(entry.getKey())))
               .filter(entry -> isTimedOut(now, entry.getValue()))
               .map(Map.Entry::getKey)
-              .collect(Collectors.toSet());
+              .collect(
+          Collectors.collectingAndThen(
+              Collectors.toCollection(LinkedHashSet::new),
+              set -> Collections.unmodifiableSet(new LinkedHashSet<>(set))));
     } finally {
       readLock.unlock();
     }

java/src/org/openqa/selenium/grid/web/JarFileResource.java

@@ -21,6 +21,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UncheckedIOException;
+import java.util.Collections;
+import java.util.LinkedHashSet;
 import java.util.Optional;
 import java.util.Set;
 import java.util.jar.JarFile;
@@ -100,7 +102,10 @@ public Set<Resource> list() {
         .filter(e -> !e.getName().equals(prefix))
         .filter(e -> e.getName().split("/").length == count)
         .map(e -> new JarFileResource(jarFile, e.getName(), prefix))
-        .collect(Collectors.toUnmodifiableSet());
+        .collect(
+            Collectors.collectingAndThen(
+                Collectors.toCollection(LinkedHashSet::new),
+                set -> Collections.unmodifiableSet(new LinkedHashSet<>(set))));
   }
 
   @Override

java/src/org/openqa/selenium/grid/web/MergedResource.java

@@ -19,6 +19,7 @@
 
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Optional;
 import java.util.Set;
 import org.openqa.selenium.internal.Require;
@@ -67,9 +68,9 @@ public boolean isDirectory() {
 
   @Override
   public Set<Resource> list() {
-    Set<Resource> resources = new HashSet<>(base.list());
+    Set<Resource> resources = new LinkedHashSet<>(base.list());
     next.ifPresent(res -> resources.addAll(res.list()));
-    return Collections.unmodifiableSet(resources);
+    return Collections.unmodifiableSet(new LinkedHashSet<>(resources));
   }
 
   @Override

java/src/org/openqa/selenium/grid/web/PathResource.java

@@ -22,6 +22,8 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedHashSet;
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Predicate;
@@ -88,7 +90,10 @@ public Set<Resource> list() {
       return files
           .filter(allowedSubpaths)
           .map(PathResource::new)
-          .collect(Collectors.toUnmodifiableSet());
+          .collect(
+          Collectors.collectingAndThen(
+              Collectors.toCollection(LinkedHashSet::new),
+              set -> Collections.unmodifiableSet(new LinkedHashSet<>(set))));
     } catch (IOException e) {
       throw new UncheckedIOException(e);
     }