Allow context-path to be an empty String (#10231)

* Allow context-path to be an empty String * Update ConfigurableUriNamingStrategySpec
micronaut-projects · Dec 7, 2023 · fc01a73 · fc01a73
1 parent 34b5231
commit fc01a73
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 5 deletions.
diff --git a/...server-netty/src/test/groovy/io/micronaut/http/server/netty/context/ContextURISpec.groovy b/...server-netty/src/test/groovy/io/micronaut/http/server/netty/context/ContextURISpec.groovy
@@ -32,4 +32,18 @@ class ContextURISpec extends Specification {
         cleanup:
         embeddedServer.close()
     }
+
+    void "test getContextURI returns the base URI when context path is set to an empty string"() {
+        when:
+        EmbeddedServer embeddedServer = ApplicationContext.run(EmbeddedServer, [
+                'micronaut.server.context-path': '',
+                'micronaut.server.port': 60006
+        ])
+
+        then:
+        embeddedServer.getContextURI().toString() == 'http://localhost:60006'
+
+        cleanup:
+        embeddedServer.close()
+    }
 }
diff --git a/router/src/main/java/io/micronaut/web/router/naming/ConfigurableUriNamingStrategy.java b/router/src/main/java/io/micronaut/web/router/naming/ConfigurableUriNamingStrategy.java
@@ -21,6 +21,7 @@
 import io.micronaut.context.annotation.Value;
 import io.micronaut.core.annotation.NonNull;
 import io.micronaut.core.naming.conventions.PropertyConvention;
+import io.micronaut.core.util.StringUtils;
 import io.micronaut.inject.BeanDefinition;
 import jakarta.inject.Singleton;
 
@@ -69,11 +70,13 @@ public String resolveUri(Class type) {
     }
 
     private String normalizeContextPath(String contextPath) {
-        if (contextPath.charAt(0) != '/') {
-            contextPath = '/' + contextPath;
-        }
-        if (contextPath.charAt(contextPath.length() - 1) == '/') {
-            contextPath = contextPath.substring(0, contextPath.length() - 1);
+        if (StringUtils.isNotEmpty(contextPath)) {
+            if (contextPath.charAt(0) != '/') {
+                contextPath = '/' + contextPath;
+            }
+            if (contextPath.charAt(contextPath.length() - 1) == '/') {
+                contextPath = contextPath.substring(0, contextPath.length() - 1);
+            }
         }
         return contextPath;
     }

diff --git a/router/src/test/groovy/io/micronaut/web/router/ConfigurableUriNamingStrategySpec.groovy b/router/src/test/groovy/io/micronaut/web/router/ConfigurableUriNamingStrategySpec.groovy
@@ -59,6 +59,8 @@ class ConfigurableUriNamingStrategySpec extends Specification {
         applicationContext.close()
     }
 
+
+
     @Unroll
     void "Test 'micronaut.server.context-path' matches with #route"() {
         given:
@@ -163,6 +165,32 @@ class ConfigurableUriNamingStrategySpec extends Specification {
         GET    | '/test/city/country/Spain' | 'Country Spain'
     }
 
+    @Unroll
+    void "Test 'micronaut.server.context-path' set to empty String matches with #route"() {
+        given:
+        def applicationContext = ApplicationContext.run(
+                PropertySource.of(
+                        'test',
+                        ['micronaut.server.context-path': '']
+                )
+        )
+                .start()
+        def router = applicationContext.getBean(Router)
+
+        expect:
+        router."$method"(route).isPresent()
+        router."$method"(route).get().invoke() == result
+
+        cleanup:
+        applicationContext.close()
+
+        where:
+        method | route                 | result
+        GET    | '/city'               | 'Hello city'
+        GET    | '/city/Madrid'        | 'City Madrid'
+        GET    | '/city/country/Spain' | 'Country Spain'
+    }
+
     @Controller('/city')
     static class CityController {