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

Polish contribution and related code

Browse Source
This commit is contained in:
Sam Brannen
2023-01-11 13:50:46 +01:00
parent afb8a0d1b1
commit 0415975dd1
13 changed files with 240 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerRequestTests.java
View File

@@ -66,8 +66,8 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
*/
class DefaultServerRequestTests {
private final List<HttpMessageConverter<?>> messageConverters = Collections.singletonList(
new StringHttpMessageConverter());
private final List<HttpMessageConverter<?>> messageConverters = List.of(new StringHttpMessageConverter());
@Test
void method() {
@@ -84,8 +84,7 @@ class DefaultServerRequestTests {
servletRequest.setScheme("https");
servletRequest.setServerPort(443);
DefaultServerRequest request =
new DefaultServerRequest(servletRequest, this.messageConverters);
DefaultServerRequest request = new DefaultServerRequest(servletRequest, this.messageConverters);
assertThat(request.uri()).isEqualTo(URI.create("https://example.com/"));
}
@@ -95,8 +94,7 @@ class DefaultServerRequestTests {
MockHttpServletRequest servletRequest = PathPatternsTestUtils.initRequest("GET", "/path", true);
servletRequest.setQueryString("a=1");
DefaultServerRequest request =
new DefaultServerRequest(servletRequest, this.messageConverters);
DefaultServerRequest request = new DefaultServerRequest(servletRequest, this.messageConverters);
URI result = request.uriBuilder().build();
assertThat(result.getScheme()).isEqualTo("http");
@@ -111,8 +109,7 @@ class DefaultServerRequestTests {
MockHttpServletRequest servletRequest = PathPatternsTestUtils.initRequest("GET", "/", true);
servletRequest.setAttribute("foo", "bar");
DefaultServerRequest request =
new DefaultServerRequest(servletRequest, this.messageConverters);
DefaultServerRequest request = new DefaultServerRequest(servletRequest, this.messageConverters);
assertThat(request.attribute("foo")).isEqualTo(Optional.of("bar"));
}
@@ -122,8 +119,7 @@ class DefaultServerRequestTests {
MockHttpServletRequest servletRequest = PathPatternsTestUtils.initRequest("GET", "/", true);
servletRequest.setParameter("foo", "bar");
DefaultServerRequest request =
new DefaultServerRequest(servletRequest, this.messageConverters);
DefaultServerRequest request = new DefaultServerRequest(servletRequest, this.messageConverters);
assertThat(request.param("foo")).isEqualTo(Optional.of("bar"));
}
@@ -137,8 +133,7 @@ class DefaultServerRequestTests {
servletRequest.addPart(formPart);
servletRequest.addPart(filePart);
DefaultServerRequest request =
new DefaultServerRequest(servletRequest, this.messageConverters);
DefaultServerRequest request = new DefaultServerRequest(servletRequest, this.messageConverters);
MultiValueMap<String, Part> result = request.multipartData();
@@ -152,8 +147,7 @@ class DefaultServerRequestTests {
MockHttpServletRequest servletRequest = PathPatternsTestUtils.initRequest("GET", "/", true);
servletRequest.setParameter("foo", "");
DefaultServerRequest request =
new DefaultServerRequest(servletRequest, this.messageConverters);
DefaultServerRequest request = new DefaultServerRequest(servletRequest, this.messageConverters);
assertThat(request.param("foo")).isEqualTo(Optional.of(""));
}
@@ -163,8 +157,7 @@ class DefaultServerRequestTests {
MockHttpServletRequest servletRequest = PathPatternsTestUtils.initRequest("GET", "/", true);
servletRequest.setParameter("foo", "");
DefaultServerRequest request =
new DefaultServerRequest(servletRequest, this.messageConverters);
DefaultServerRequest request = new DefaultServerRequest(servletRequest, this.messageConverters);
assertThat(request.param("bar")).isEqualTo(Optional.empty());
}
@@ -173,11 +166,9 @@ class DefaultServerRequestTests {
void pathVariable() {
MockHttpServletRequest servletRequest = PathPatternsTestUtils.initRequest("GET", "/", true);
Map<String, String> pathVariables = Collections.singletonMap("foo", "bar");
servletRequest
.setAttribute(RouterFunctions.URI_TEMPLATE_VARIABLES_ATTRIBUTE, pathVariables);
servletRequest.setAttribute(RouterFunctions.URI_TEMPLATE_VARIABLES_ATTRIBUTE, pathVariables);
DefaultServerRequest request = new DefaultServerRequest(servletRequest,
this.messageConverters);
DefaultServerRequest request = new DefaultServerRequest(servletRequest, this.messageConverters);
assertThat(request.pathVariable("foo")).isEqualTo("bar");
}
@@ -186,25 +177,20 @@ class DefaultServerRequestTests {
void pathVariableNotFound() {
MockHttpServletRequest servletRequest = PathPatternsTestUtils.initRequest("GET", "/", true);
Map<String, String> pathVariables = Collections.singletonMap("foo", "bar");
servletRequest
.setAttribute(RouterFunctions.URI_TEMPLATE_VARIABLES_ATTRIBUTE, pathVariables);
servletRequest.setAttribute(RouterFunctions.URI_TEMPLATE_VARIABLES_ATTRIBUTE, pathVariables);
DefaultServerRequest request = new DefaultServerRequest(servletRequest,
this.messageConverters);
DefaultServerRequest request = new DefaultServerRequest(servletRequest, this.messageConverters);
assertThatIllegalArgumentException().isThrownBy(() ->
request.pathVariable("baz"));
assertThatIllegalArgumentException().isThrownBy(() -> request.pathVariable("baz"));
}
@Test
void pathVariables() {
MockHttpServletRequest servletRequest = PathPatternsTestUtils.initRequest("GET", "/", true);
Map<String, String> pathVariables = Collections.singletonMap("foo", "bar");
servletRequest
.setAttribute(RouterFunctions.URI_TEMPLATE_VARIABLES_ATTRIBUTE, pathVariables);
servletRequest.setAttribute(RouterFunctions.URI_TEMPLATE_VARIABLES_ATTRIBUTE, pathVariables);
DefaultServerRequest request = new DefaultServerRequest(servletRequest,
this.messageConverters);
DefaultServerRequest request = new DefaultServerRequest(servletRequest, this.messageConverters);
assertThat(request.pathVariables()).isEqualTo(pathVariables);
}
@@ -212,8 +198,7 @@ class DefaultServerRequestTests {
@Test
void header() {
HttpHeaders httpHeaders = new HttpHeaders();
List<MediaType> accept =
Collections.singletonList(MediaType.APPLICATION_JSON);
List<MediaType> accept = Collections.singletonList(MediaType.APPLICATION_JSON);
httpHeaders.setAccept(accept);
List<Charset> acceptCharset = Collections.singletonList(UTF_8);
httpHeaders.setAcceptCharset(acceptCharset);
@@ -230,8 +215,7 @@ class DefaultServerRequestTests {
httpHeaders.forEach(servletRequest::addHeader);
servletRequest.setContentType(MediaType.TEXT_PLAIN_VALUE);
DefaultServerRequest request = new DefaultServerRequest(servletRequest,
this.messageConverters);
DefaultServerRequest request = new DefaultServerRequest(servletRequest, this.messageConverters);
ServerRequest.Headers headers = request.headers();
assertThat(headers.accept()).isEqualTo(accept);
@@ -250,8 +234,7 @@ class DefaultServerRequestTests {
MockHttpServletRequest servletRequest = PathPatternsTestUtils.initRequest("GET", "/", true);
servletRequest.setCookies(cookie);
DefaultServerRequest request = new DefaultServerRequest(servletRequest,
this.messageConverters);
DefaultServerRequest request = new DefaultServerRequest(servletRequest, this.messageConverters);
MultiValueMap<String, Cookie> expected = new LinkedMultiValueMap<>();
expected.add("foo", cookie);
@@ -266,8 +249,7 @@ class DefaultServerRequestTests {
servletRequest.setContentType(MediaType.TEXT_PLAIN_VALUE);
servletRequest.setContent("foo".getBytes(UTF_8));
DefaultServerRequest request = new DefaultServerRequest(servletRequest,
this.messageConverters);
DefaultServerRequest request = new DefaultServerRequest(servletRequest, this.messageConverters);
String result = request.body(String.class);
assertThat(result).isEqualTo("foo");
@@ -280,7 +262,7 @@ class DefaultServerRequestTests {
servletRequest.setContent("[\"foo\",\"bar\"]".getBytes(UTF_8));
DefaultServerRequest request = new DefaultServerRequest(servletRequest,
Collections.singletonList(new MappingJackson2HttpMessageConverter()));
List.of(new MappingJackson2HttpMessageConverter()));
List<String> result = request.body(new ParameterizedTypeReference<List<String>>() {});
assertThat(result).hasSize(2);
@@ -294,11 +276,10 @@ class DefaultServerRequestTests {
servletRequest.setContentType(MediaType.TEXT_PLAIN_VALUE);
servletRequest.setContent("foo".getBytes(UTF_8));
DefaultServerRequest request =
new DefaultServerRequest(servletRequest, Collections.emptyList());
DefaultServerRequest request = new DefaultServerRequest(servletRequest, Collections.emptyList());
assertThatExceptionOfType(HttpMediaTypeNotSupportedException.class).isThrownBy(() ->
request.body(String.class));
assertThatExceptionOfType(HttpMediaTypeNotSupportedException.class)
.isThrownBy(() -> request.body(String.class));
}
@Test
@@ -307,11 +288,9 @@ class DefaultServerRequestTests {
MockHttpSession session = new MockHttpSession();
servletRequest.setSession(session);
DefaultServerRequest request = new DefaultServerRequest(servletRequest,
this.messageConverters);
DefaultServerRequest request = new DefaultServerRequest(servletRequest, this.messageConverters);
assertThat(request.session()).isEqualTo(session);
}
@Test
@@ -320,8 +299,7 @@ class DefaultServerRequestTests {
Principal principal = () -> "foo";
servletRequest.setUserPrincipal(principal);
DefaultServerRequest request = new DefaultServerRequest(servletRequest,
this.messageConverters);
DefaultServerRequest request = new DefaultServerRequest(servletRequest, this.messageConverters);
assertThat(request.principal().get()).isEqualTo(principal);
}

10
spring-webmvc/src/test/java/org/springframework/web/servlet/function/ToStringVisitorTests.java
View File

@@ -35,10 +35,10 @@ import static org.springframework.web.servlet.function.RouterFunctions.route;
/**
* @author Arjen Poutsma
*/
public class ToStringVisitorTests {
class ToStringVisitorTests {
@Test
public void nested() {
void nested() {
HandlerFunction<ServerResponse> handler = new SimpleHandlerFunction();
RouterFunction<ServerResponse> routerFunction = route()
.path("/foo", builder ->
@@ -62,7 +62,7 @@ public class ToStringVisitorTests {
}
@Test
public void predicates() {
void predicates() {
testPredicate(methods(HttpMethod.GET), "GET");
testPredicate(methods(HttpMethod.GET, HttpMethod.POST), "[GET, POST]");
@@ -95,9 +95,7 @@ public class ToStringVisitorTests {
private void testPredicate(RequestPredicate predicate, String expected) {
ToStringVisitor visitor = new ToStringVisitor();
predicate.accept(visitor);
String result = visitor.toString();
assertThat(result).isEqualTo(expected);
assertThat(visitor).asString().isEqualTo(expected);
}

48
spring-webmvc/src/test/java/org/springframework/web/servlet/resource/CssLinkResourceTransformerTests.java
View File

@@ -16,10 +16,9 @@
package org.springframework.web.servlet.resource;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -28,11 +27,11 @@ import org.mockito.Mockito;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import org.springframework.util.StringUtils;
import org.springframework.web.servlet.resource.EncodedResourceResolver.EncodedResource;
import org.springframework.web.servlet.resource.GzipSupport.GzippedFiles;
import org.springframework.web.testfixture.servlet.MockHttpServletRequest;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.assertj.core.api.Assertions.assertThat;
/**
@@ -44,7 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* @since 4.1
*/
@ExtendWith(GzipSupport.class)
public class CssLinkResourceTransformerTests {
class CssLinkResourceTransformerTests {
private ResourceTransformerChain transformerChain;
@@ -52,14 +51,12 @@ public class CssLinkResourceTransformerTests {
@BeforeEach
public void setUp() {
void setUp() {
VersionResourceResolver versionResolver = new VersionResourceResolver();
versionResolver.setStrategyMap(Collections.singletonMap("/**", new ContentVersionStrategy()));
PathResourceResolver pathResolver = new PathResourceResolver();
pathResolver.setAllowedLocations(new ClassPathResource("test/", getClass()));
List<ResourceResolver> resolvers = new ArrayList<>();
resolvers.add(versionResolver);
resolvers.add(new PathResourceResolver());
List<ResourceResolver> resolvers = List.of(versionResolver, new PathResourceResolver());
ResourceUrlProvider resourceUrlProvider = createUrlProvider(resolvers);
CssLinkResourceTransformer cssLinkTransformer = new CssLinkResourceTransformer();
@@ -72,16 +69,16 @@ public class CssLinkResourceTransformerTests {
private ResourceUrlProvider createUrlProvider(List<ResourceResolver> resolvers) {
ResourceHttpRequestHandler resourceHandler = new ResourceHttpRequestHandler();
resourceHandler.setResourceResolvers(resolvers);
resourceHandler.setLocations(Collections.singletonList(new ClassPathResource("test/", getClass())));
resourceHandler.setLocations(List.of(new ClassPathResource("test/", getClass())));
ResourceUrlProvider resourceUrlProvider = new ResourceUrlProvider();
resourceUrlProvider.setHandlerMap(Collections.singletonMap("/static/**", resourceHandler));
resourceUrlProvider.setHandlerMap(Map.of("/static/**", resourceHandler));
return resourceUrlProvider;
}
@Test
public void transform() throws Exception {
void transform() throws Exception {
this.request = new MockHttpServletRequest("GET", "/static/main.css");
Resource css = getResource("main.css");
String expected = """
@@ -97,13 +94,12 @@ public class CssLinkResourceTransformerTests {
""";
TransformedResource actual = (TransformedResource) this.transformerChain.transform(this.request, css);
String result = new String(actual.getByteArray(), StandardCharsets.UTF_8);
result = StringUtils.deleteAny(result, "\r");
assertThat(result).isEqualTo(expected);
String result = new String(actual.getByteArray(), UTF_8);
assertThat(result).isEqualToNormalizingNewlines(expected);
}
@Test
public void transformNoLinks() throws Exception {
void transformNoLinks() throws Exception {
this.request = new MockHttpServletRequest("GET", "/static/foo.css");
Resource expected = getResource("foo.css");
Resource actual = this.transformerChain.transform(this.request, expected);
@@ -111,7 +107,7 @@ public class CssLinkResourceTransformerTests {
}
@Test
public void transformExtLinksNotAllowed() throws Exception {
void transformExtLinksNotAllowed() throws Exception {
this.request = new MockHttpServletRequest("GET", "/static/external.css");
List<ResourceTransformer> transformers = Collections.singletonList(new CssLinkResourceTransformer());
@@ -125,18 +121,17 @@ public class CssLinkResourceTransformerTests {
figure { background: url("//example.org/style.css")}""";
TransformedResource transformedResource = (TransformedResource) chain.transform(this.request, resource);
String result = new String(transformedResource.getByteArray(), StandardCharsets.UTF_8);
result = StringUtils.deleteAny(result, "\r");
assertThat(result).isEqualTo(expected);
String result = new String(transformedResource.getByteArray(), UTF_8);
assertThat(result).isEqualToNormalizingNewlines(expected);
List<Resource> locations = Collections.singletonList(resource);
List<Resource> locations = List.of(resource);
Mockito.verify(mockChain, Mockito.never()).resolveUrlPath("https://example.org/fonts/css", locations);
Mockito.verify(mockChain, Mockito.never()).resolveUrlPath("file:///home/spring/image.png", locations);
Mockito.verify(mockChain, Mockito.never()).resolveUrlPath("//example.org/style.css", locations);
}
@Test
public void transformSkippedForNonCssResource() throws Exception {
void transformSkippedForNonCssResource() throws Exception {
this.request = new MockHttpServletRequest("GET", "/static/images/image.png");
Resource expected = getResource("images/image.png");
Resource actual = this.transformerChain.transform(this.request, expected);
@@ -145,7 +140,7 @@ public class CssLinkResourceTransformerTests {
}
@Test
public void transformSkippedForGzippedResource(GzippedFiles gzippedFiles) throws Exception {
void transformSkippedForGzippedResource(GzippedFiles gzippedFiles) throws Exception {
gzippedFiles.create("main.css");
this.request = new MockHttpServletRequest("GET", "/static/main.css");
@@ -157,18 +152,17 @@ public class CssLinkResourceTransformerTests {
}
@Test // https://github.com/spring-projects/spring-framework/issues/22602
public void transformEmptyUrlFunction() throws Exception {
void transformEmptyUrlFunction() throws Exception {
this.request = new MockHttpServletRequest("GET", "/static/empty_url_function.css");
Resource css = getResource("empty_url_function.css");
String expected = """
.fooStyle {
\tbackground: transparent url() no-repeat left top;
background: transparent url() no-repeat left top;
}""";
TransformedResource actual = (TransformedResource) this.transformerChain.transform(this.request, css);
String result = new String(actual.getByteArray(), StandardCharsets.UTF_8);
result = StringUtils.deleteAny(result, "\r");
assertThat(result).isEqualTo(expected);
String result = new String(actual.getByteArray(), UTF_8);
assertThat(result).isEqualToNormalizingNewlines(expected);
}
private Resource getResource(String filePath) {