Don't require trailing / for servlet context

Fixes quarkusio#8475
gsmet · Apr 20, 2020 · 87c15bd · 87c15bd
1 parent 90a569d
commit 87c15bd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/...s/undertow/deployment/src/main/java/io/quarkus/undertow/deployment/UndertowBuildStep.java b/...s/undertow/deployment/src/main/java/io/quarkus/undertow/deployment/UndertowBuildStep.java
@@ -172,6 +172,7 @@ public ServiceStartBuildItem boot(UndertowDeploymentRecorder recorder,
             undertowProducer.accept(new DefaultRouteBuildItem(ut));
         } else {
             routeProducer.produce(new RouteBuildItem(servletContextPathBuildItem.getServletContextPath() + "/*", ut, false));
+            routeProducer.produce(new RouteBuildItem(servletContextPathBuildItem.getServletContextPath(), ut, false));
         }
         return new ServiceStartBuildItem("undertow");
     }

diff --git a/...sions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ContextPathTestCase.java b/...sions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ContextPathTestCase.java
@@ -19,6 +19,7 @@ public class ContextPathTestCase {
     static QuarkusUnitTest runner = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
                     .addClasses(TestServlet.class, TestGreeter.class)
+                    .addAsResource(new StringAsset("index"), "META-INF/resources/index.html")
                     .addAsResource(new StringAsset("quarkus.servlet.context-path=" + CONTEXT_PATH), "application.properties"));
 
     @Test
@@ -28,4 +29,12 @@ public void testServlet() {
                 .body(is("test servlet"));
     }
 
+    @Test
+    public void testNoSlash() {
+        RestAssured.given().redirects().follow(false).when().get("/foo").then()
+                .statusCode(302);
+        RestAssured.when().get("/foo").then()
+                .statusCode(200)
+                .body(is("index"));
+    }
 }