Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use undecoded pathWithinApplication in WebFlux

Browse Source 
Introduce pathWithinApplication() in ServerHttpRequest and use it for
request mapping purposes instead of LookupPath.

In turn this means that for request mapping purposes:
1) the path is not decoded
2) suffix pattern matching is not supported

Issue: SPR-15640
This commit is contained in:
Rossen Stoyanchev
2017-06-06 17:44:39 -04:00
parent ff2af660cf
commit 95196e1aee
19 changed files with 109 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-web/src/test/java/org/springframework/web/cors/reactive/UrlBasedCorsConfigurationSourceTests.java
View File

@@ -21,8 +21,6 @@ import org.junit.Test;
import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.server.ServerWebExchange;
import org.springframework.web.server.support.HttpRequestPathHelper;
import org.springframework.web.server.support.LookupPath;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
@@ -41,7 +39,6 @@ public class UrlBasedCorsConfigurationSourceTests {
@Test
public void empty() {
ServerWebExchange exchange = MockServerHttpRequest.get("/bar/test.html").toExchange();
LookupPath.getOrCreate(exchange, new HttpRequestPathHelper());
assertNull(this.configSource.getCorsConfiguration(exchange));
}
@@ -51,11 +48,9 @@ public class UrlBasedCorsConfigurationSourceTests {
this.configSource.registerCorsConfiguration("/bar/**", config);
ServerWebExchange exchange = MockServerHttpRequest.get("/foo/test.html").toExchange();
LookupPath.getOrCreate(exchange, new HttpRequestPathHelper());
assertNull(this.configSource.getCorsConfiguration(exchange));
exchange = MockServerHttpRequest.get("/bar/test.html").toExchange();
LookupPath.getOrCreate(exchange, new HttpRequestPathHelper());
assertEquals(config, this.configSource.getCorsConfiguration(exchange));
}

60
spring-web/src/test/java/org/springframework/web/server/support/LookupPathTests.java
View File

@@ -1,60 +0,0 @@
/*
* Copyright 2002-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.web.server.support;
import org.junit.Test;
import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
import org.springframework.web.server.ServerWebExchange;
import static org.junit.Assert.assertEquals;
/**
* Unit tests for {@link LookupPath}
* @author Brian Clozel
*/
public class LookupPathTests {
@Test
public void parsePath() {
LookupPath path = create("/foo");
assertEquals("/foo", path.getPath());
assertEquals("/foo", path.getPathWithoutExtension());
}
@Test
public void parsePathWithExtension() {
LookupPath path = create("/foo.txt");
assertEquals("/foo.txt", path.getPath());
assertEquals("/foo", path.getPathWithoutExtension());
assertEquals(".txt", path.getFileExtension());
}
@Test
public void parsePathWithParams() {
LookupPath path = create("/test;spring=framework/foo.txt;foo=bar?framework=spring");
assertEquals("/test;spring=framework/foo.txt;foo=bar", path.getPath());
assertEquals("/test;spring=framework/foo", path.getPathWithoutExtension());
assertEquals(".txt", path.getFileExtension());
}
private LookupPath create(String path) {
HttpRequestPathHelper helper = new HttpRequestPathHelper();
ServerWebExchange exchange = MockServerHttpRequest.get(path).build().toExchange();
return helper.getLookupPathForRequest(exchange);
}
}