JAVA-10376 Code Mismatch | Exploring the Spring 5 WebFlux URL Matching (#12509)

* JAVA-10376 Code Mismatch | Exploring the Spring 5 WebFlux URL Matching

* JAVA-10376 Code Mismatch | Exploring the Spring 5 WebFlux URL Matching

spring-5-reactive-modules/spring-5-reactive/src/main/java/com/baeldung/reactive/urlmatch/ExploreSpring5URLPatternUsingRouterFunctions.java

@@ -24,11 +24,12 @@ public class ExploreSpring5URLPatternUsingRouterFunctions {
 
     private RouterFunction<ServerResponse> routingFunction() {
 
-        return route(GET("/p?ths"), serverRequest -> ok().body(fromValue("/p?ths"))).andRoute(GET("/test/{*id}"), serverRequest -> ok().body(fromValue(serverRequest.pathVariable("id"))))
+        return route(GET("/t?st"), serverRequest -> ok().body(fromValue("Path /t?st is accessed"))).andRoute(GET("/test/{*id}"), serverRequest -> ok().body(fromValue(serverRequest.pathVariable("id"))))
-            .andRoute(GET("/*card"), serverRequest -> ok().body(fromValue("/*card path was accessed")))
+            .andRoute(GET("/baeldung/*Id"), serverRequest -> ok().body(fromValue("/baeldung/*Id path was accessed")))
             .andRoute(GET("/{var1}_{var2}"), serverRequest -> ok().body(fromValue(serverRequest.pathVariable("var1") + " , " + serverRequest.pathVariable("var2"))))
             .andRoute(GET("/{baeldung:[a-z]+}"), serverRequest -> ok().body(fromValue("/{baeldung:[a-z]+} was accessed and baeldung=" + serverRequest.pathVariable("baeldung"))))
-            .and(RouterFunctions.resources("/files/{*filepaths}", new ClassPathResource("files/")));
+            .and(RouterFunctions.resources("/files/{*filepaths}", new ClassPathResource("files/")))
+            .and(RouterFunctions.resources("/resources/**", new ClassPathResource("resources/")));
     }
 
     WebServer start() throws Exception {

spring-5-reactive-modules/spring-5-reactive/src/main/resources/resources/test/test.txt

@@ -0,0 +1 @@
+test

spring-5-reactive-modules/spring-5-reactive/src/test/java/com/baeldung/reactive/urlmatch/ExploreSpring5URLPatternUsingRouterFunctionsIntegrationTest.java

@@ -27,12 +27,12 @@ public class ExploreSpring5URLPatternUsingRouterFunctionsIntegrationTest {
     @Test
     public void givenRouter_whenGetPathWithSingleCharWildcard_thenGotPathPattern() throws Exception {
         client.get()
-            .uri("/paths")
+            .uri("/test")
             .exchange()
             .expectStatus()
             .isOk()
             .expectBody(String.class)
-            .isEqualTo("/p?ths");
+            .isEqualTo("Path /t?st is accessed");
     }
 
     @Test
@@ -50,12 +50,12 @@ public class ExploreSpring5URLPatternUsingRouterFunctionsIntegrationTest {
     public void givenRouter_whenGetMultipleCharWildcard_thenGotPathPattern() throws Exception {
 
         client.get()
-            .uri("/wildcard")
+            .uri("/baeldung/tutorialId")
             .exchange()
             .expectStatus()
             .isOk()
             .expectBody(String.class)
-            .isEqualTo("/*card path was accessed");
+            .isEqualTo("/baeldung/*Id path was accessed");
     }
 
     @Test
@@ -107,4 +107,14 @@ public class ExploreSpring5URLPatternUsingRouterFunctionsIntegrationTest {
             .isEqualTo("hello");
     }
 
+    @Test
+    public void givenRouter_whenAccess_thenGot() throws Exception {
+        client.get()
+            .uri("/resources/test/test.txt")
+            .exchange()
+            .expectStatus()
+            .isOk()
+            .expectBody(String.class)
+            .isEqualTo("test");
+    }
 }

spring-5-reactive-modules/spring-5-reactive/src/test/java/com/baeldung/reactive/urlmatch/PathPatternsUsingHandlerMethodIntegrationTest.java

@@ -27,13 +27,21 @@ public class PathPatternsUsingHandlerMethodIntegrationTest {
     @Test
     public void givenHandlerMethod_whenMultipleURIVariablePattern_then200() {
 
-        client.get()
+    	client.get()
-            .uri("/spring5/ab/cd")
+            .uri("/spring5/baeldung/tutorial")
             .exchange()
             .expectStatus()
             .is2xxSuccessful()
             .expectBody()
-            .equals("/ab/cd");
+            .equals("/baeldung/tutorial");
+
+        client.get()
+            .uri("/spring5/baeldung")
+            .exchange()
+            .expectStatus()
+            .is2xxSuccessful()
+            .expectBody()
+            .equals("/baeldung");
     }
 
     @Test