[grid] handle baseRoute like the hubRoute and the graphqlRoute (#13772)

Co-authored-by: Diego Molina <[email protected]>

Author: joerg1985

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);

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.");

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.");

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.");