Move URL transform methods from ServerHttpResponse to ServerWebExchange
This commit moves `encodeUrl` and `registerUrlEncoder` from ServerHttpResponse to ServerWebExchange. It also renames `encodeUrl` to `transformUrl` and `registerUrlEncoder` to `addUrlTransformer` to make it clearer that these methods do not perform actual URL encodings (i.e. they do not replaceinvalid characters). The `add` prefix (instead of `register`) makes it clearer that each function is added in addition to the previous one. Issue: SPR-15924
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2002-2016 the original author or authors.
|
||||
* 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.
|
||||
@@ -32,9 +32,7 @@ import org.springframework.core.io.buffer.DefaultDataBufferFactory;
|
||||
import org.springframework.http.ResponseCookie;
|
||||
|
||||
import static junit.framework.TestCase.assertTrue;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertFalse;
|
||||
import static org.junit.Assert.assertSame;
|
||||
import static org.junit.Assert.*;
|
||||
|
||||
/**
|
||||
* @author Rossen Stoyanchev
|
||||
@@ -42,26 +40,6 @@ import static org.junit.Assert.assertSame;
|
||||
*/
|
||||
public class ServerHttpResponseTests {
|
||||
|
||||
@Test
|
||||
public void encodeUrlDefault() throws Exception {
|
||||
TestServerHttpResponse response = new TestServerHttpResponse();
|
||||
assertEquals("/foo", response.encodeUrl("/foo"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void encodeUrlWithEncoder() throws Exception {
|
||||
TestServerHttpResponse response = new TestServerHttpResponse();
|
||||
response.registerUrlEncoder(s -> s + "?nonce=123");
|
||||
assertEquals("/foo?nonce=123", response.encodeUrl("/foo"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void encodeUrlWithMultipleEncoders() throws Exception {
|
||||
TestServerHttpResponse response = new TestServerHttpResponse();
|
||||
response.registerUrlEncoder(s -> s + ";p=abc");
|
||||
response.registerUrlEncoder(s -> s + "?q=123");
|
||||
assertEquals("/foo;p=abc?q=123", response.encodeUrl("/foo"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void writeWith() throws Exception {
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
/*
|
||||
* 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.adapter;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
|
||||
import org.springframework.mock.http.server.reactive.test.MockServerWebExchange;
|
||||
import org.springframework.web.server.ServerWebExchange;
|
||||
|
||||
import static org.junit.Assert.*;
|
||||
|
||||
/**
|
||||
* @author Arjen Poutsma
|
||||
*/
|
||||
public class ServerWebExchangeTests {
|
||||
|
||||
private ServerWebExchange exchange;
|
||||
|
||||
@Before
|
||||
public void createExchange() {
|
||||
MockServerHttpRequest request = MockServerHttpRequest.get("http://example.com").build();
|
||||
this.exchange = new MockServerWebExchange(request);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void transformUrlDefault() throws Exception {
|
||||
assertEquals("/foo", this.exchange.transformUrl("/foo"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void transformUrlWithEncoder() throws Exception {
|
||||
this.exchange.addUrlTransformer(s -> s + "?nonce=123");
|
||||
assertEquals("/foo?nonce=123", this.exchange.transformUrl("/foo"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void transformUrlWithMultipleEncoders() throws Exception {
|
||||
this.exchange.addUrlTransformer(s -> s + ";p=abc");
|
||||
this.exchange.addUrlTransformer(s -> s + "?q=123");
|
||||
assertEquals("/foo;p=abc?q=123", this.exchange.transformUrl("/foo"));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user