From 8c8adec9163024ced88ef294985775241c6a73d2 Mon Sep 17 00:00:00 2001
From: joerg1985 <16140691+joerg1985@users.noreply.github.com>
Date: Sat, 6 Apr 2024 16:10:08 +0200
Subject: [PATCH] [grid] handle baseRoute like the hubRoute and the
 graphqlRoute (#13772)

Co-authored-by: Diego Molina <diemol@users.noreply.github.com>
---
 .../org/openqa/selenium/grid/TemplateGridServerCommand.java | 5 ++++-
 java/src/org/openqa/selenium/grid/commands/Hub.java         | 6 +-----
 java/src/org/openqa/selenium/grid/commands/Standalone.java  | 6 +-----
 .../org/openqa/selenium/grid/router/httpd/RouterServer.java | 6 +-----
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/java/src/org/openqa/selenium/grid/TemplateGridServerCommand.java b/java/src/org/openqa/selenium/grid/TemplateGridServerCommand.java
index 0ee7738cf1c11..331057723516e 100644
--- a/java/src/org/openqa/selenium/grid/TemplateGridServerCommand.java
+++ b/java/src/org/openqa/selenium/grid/TemplateGridServerCommand.java
@@ -69,7 +69,10 @@ private static Routable buildRoute(String url, String prefix, Function<String, R
   }
 
   protected static Routable baseRoute(String prefix, Route route) {
-    return Route.prefix(prefix).to(route);
+    if (prefix.isEmpty()) {
+      return route;
+    }
+    return Route.combine(route, Route.prefix(prefix).to(route));
   }
 
   protected abstract Handlers createHandlers(Config config);
diff --git a/java/src/org/openqa/selenium/grid/commands/Hub.java b/java/src/org/openqa/selenium/grid/commands/Hub.java
index 21a97f3c9ad79..4bd1bfa7ef8cb 100644
--- a/java/src/org/openqa/selenium/grid/commands/Hub.java
+++ b/java/src/org/openqa/selenium/grid/commands/Hub.java
@@ -187,16 +187,12 @@ protected Handlers createHandlers(Config config) {
 
     Routable appendRoute =
         Stream.of(
-                routerWithSpecChecks,
+                baseRoute(subPath, combine(routerWithSpecChecks)),
                 hubRoute(subPath, combine(routerWithSpecChecks)),
                 graphqlRoute(subPath, () -> graphqlHandler))
             .reduce(Route::combine)
             .get();
 
-    if (!subPath.isEmpty()) {
-      appendRoute = Route.combine(appendRoute, baseRoute(subPath, combine(routerWithSpecChecks)));
-    }
-
     Routable httpHandler;
     if (routerOptions.disableUi()) {
       LOG.info("Grid UI has been disabled.");
diff --git a/java/src/org/openqa/selenium/grid/commands/Standalone.java b/java/src/org/openqa/selenium/grid/commands/Standalone.java
index fd8315ff95d7d..0a9601098848f 100644
--- a/java/src/org/openqa/selenium/grid/commands/Standalone.java
+++ b/java/src/org/openqa/selenium/grid/commands/Standalone.java
@@ -192,16 +192,12 @@ protected Handlers createHandlers(Config config) {
 
     Routable appendRoute =
         Stream.of(
-                router,
+                baseRoute(subPath, combine(router)),
                 hubRoute(subPath, combine(router)),
                 graphqlRoute(subPath, () -> graphqlHandler))
             .reduce(Route::combine)
             .get();
 
-    if (!subPath.isEmpty()) {
-      appendRoute = Route.combine(appendRoute, baseRoute(subPath, combine(router)));
-    }
-
     Routable httpHandler;
     if (routerOptions.disableUi()) {
       LOG.info("Grid UI has been disabled.");
diff --git a/java/src/org/openqa/selenium/grid/router/httpd/RouterServer.java b/java/src/org/openqa/selenium/grid/router/httpd/RouterServer.java
index e4d3c831da059..d8797861cdf56 100644
--- a/java/src/org/openqa/selenium/grid/router/httpd/RouterServer.java
+++ b/java/src/org/openqa/selenium/grid/router/httpd/RouterServer.java
@@ -149,16 +149,12 @@ protected Handlers createHandlers(Config config) {
 
     Routable appendRoute =
         Stream.of(
-                routerWithSpecChecks,
+                baseRoute(subPath, combine(routerWithSpecChecks)),
                 hubRoute(subPath, combine(routerWithSpecChecks)),
                 graphqlRoute(subPath, () -> graphqlHandler))
             .reduce(Route::combine)
             .get();
 
-    if (!subPath.isEmpty()) {
-      appendRoute = Route.combine(appendRoute, baseRoute(subPath, combine(routerWithSpecChecks)));
-    }
-
     Routable route;
     if (routerOptions.disableUi()) {
       LOG.info("Grid UI has been disabled.");