diff --git a/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java b/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java index 3dac6113bc..ad5b16ae71 100644 --- a/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java +++ b/spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java @@ -255,7 +255,6 @@ final class HierarchicalUriComponents extends UriComponents { // Encoding HierarchicalUriComponents encodeTemplate(Charset charset) { - if (this.encodeState.isEncoded()) { return this; } diff --git a/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java b/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java index 2505518932..38941d2a5c 100644 --- a/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java +++ b/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java @@ -325,25 +325,22 @@ public class UriComponentsBuilder implements UriBuilder, Cloneable { } - // encode methods + // Encode methods /** * Request to have the URI template encoded first at build time, and * URI variables encoded later when expanded. - * *

In comparison to {@link UriComponents#encode()}, this method has the * same effect on the URI template, i.e. each URI component is encoded by * quoting only illegal characters within that URI component type. * However URI variables are encoded more strictly, by quoting both illegal * characters and characters with reserved meaning. - * *

For most cases, prefer this method over {@link UriComponents#encode()} * which is useful only if intentionally expanding variables with reserved * characters. For example ';' is legal in a path, but also has reserved * meaning as a separator. When expanding a variable that contains ';' it * probably should be encoded, unless the intent is to insert path params * through the expanded variable. - * * @since 5.0.8 */ public final UriComponentsBuilder encode() { @@ -362,7 +359,7 @@ public class UriComponentsBuilder implements UriBuilder, Cloneable { } - // build methods + // Build methods /** * Build a {@code UriComponents} instance from the various components contained in this builder. @@ -387,8 +384,7 @@ public class UriComponentsBuilder implements UriBuilder, Cloneable { HierarchicalUriComponents uriComponents = new HierarchicalUriComponents(this.scheme, this.fragment, this.userInfo, this.host, this.port, this.pathBuilder.build(), this.queryParams, encoded); - - return this.encodeTemplate ? uriComponents.encodeTemplate(this.charset) : uriComponents; + return (this.encodeTemplate ? uriComponents.encodeTemplate(this.charset) : uriComponents); } } diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java index 11a731a63a..a5f42d4211 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java @@ -62,7 +62,7 @@ public class Jaxb2CollectionHttpMessageConverterTests { @Before - public void setUp() { + public void setup() { converter = new Jaxb2CollectionHttpMessageConverter>(); rootElementListType = new ParameterizedTypeReference>() {}.getType(); rootElementSetType = new ParameterizedTypeReference>() {}.getType(); @@ -72,7 +72,7 @@ public class Jaxb2CollectionHttpMessageConverterTests { @Test - public void canRead() throws Exception { + public void canRead() { assertTrue(converter.canRead(rootElementListType, null, null)); assertTrue(converter.canRead(rootElementSetType, null, null)); assertTrue(converter.canRead(typeSetType, null, null)); diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java index 85bc624bef..722d9ff432 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -16,13 +16,7 @@ package org.springframework.http.converter.xml; -import static org.junit.Assert.*; -import static org.xmlunit.diff.ComparisonType.*; -import static org.xmlunit.diff.DifferenceEvaluators.*; -import static org.xmlunit.matchers.CompareMatcher.*; - import java.nio.charset.StandardCharsets; - import javax.xml.bind.Marshaller; import javax.xml.bind.Unmarshaller; import javax.xml.bind.annotation.XmlAttribute; @@ -48,6 +42,11 @@ import org.springframework.http.MockHttpInputMessage; import org.springframework.http.MockHttpOutputMessage; import org.springframework.http.converter.HttpMessageNotReadableException; +import static org.junit.Assert.*; +import static org.xmlunit.diff.ComparisonType.*; +import static org.xmlunit.diff.DifferenceEvaluators.*; +import static org.xmlunit.matchers.CompareMatcher.*; + /** * Tests for {@link Jaxb2RootElementHttpMessageConverter}. * @@ -68,7 +67,7 @@ public class Jaxb2RootElementHttpMessageConverterTests { @Before - public void setUp() { + public void setup() { converter = new Jaxb2RootElementHttpMessageConverter(); rootElement = new RootElement(); DefaultAopProxyFactory proxyFactory = new DefaultAopProxyFactory(); @@ -81,7 +80,7 @@ public class Jaxb2RootElementHttpMessageConverterTests { @Test - public void canRead() throws Exception { + public void canRead() { assertTrue("Converter does not support reading @XmlRootElement", converter.canRead(RootElement.class, null)); assertTrue("Converter does not support reading @XmlType", @@ -89,7 +88,7 @@ public class Jaxb2RootElementHttpMessageConverterTests { } @Test - public void canWrite() throws Exception { + public void canWrite() { assertTrue("Converter does not support writing @XmlRootElement", converter.canWrite(RootElement.class, null)); assertTrue("Converter does not support writing @XmlRootElement subclass", diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverterTests.java index 48e4c9ecf0..6601d1311a 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverterTests.java @@ -43,7 +43,7 @@ import static org.mockito.BDDMockito.*; public class MarshallingHttpMessageConverterTests { @Test - public void canRead() throws Exception { + public void canRead() { Unmarshaller unmarshaller = mock(Unmarshaller.class); given(unmarshaller.supports(Integer.class)).willReturn(false); @@ -58,7 +58,7 @@ public class MarshallingHttpMessageConverterTests { } @Test - public void canWrite() throws Exception { + public void canWrite() { Marshaller marshaller = mock(Marshaller.class); given(marshaller.supports(Integer.class)).willReturn(false); @@ -136,8 +136,8 @@ public class MarshallingHttpMessageConverterTests { MarshallingHttpMessageConverter converter = new MarshallingHttpMessageConverter(marshaller); converter.write(body, null, outputMessage); - assertEquals("Invalid content-type", new MediaType("application", "xml"), outputMessage.getHeaders() - .getContentType()); + assertEquals("Invalid content-type", new MediaType("application", "xml"), + outputMessage.getHeaders().getContentType()); } @Test diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java index 51a6f39e92..96b6678c59 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -48,13 +48,8 @@ import org.springframework.http.MockHttpOutputMessage; import org.springframework.http.converter.HttpMessageNotReadableException; import org.springframework.util.FileCopyUtils; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.xmlunit.matchers.CompareMatcher.isSimilarTo; - -// Do NOT statically import org.junit.Assert.*, since XMLAssert extends junit.framework.Assert +import static org.junit.Assert.*; +import static org.xmlunit.matchers.CompareMatcher.*; /** * @author Arjen Poutsma @@ -73,7 +68,7 @@ public class SourceHttpMessageConverterTests { @Before - public void setUp() throws IOException { + public void setup() throws IOException { converter = new SourceHttpMessageConverter<>(); Resource external = new ClassPathResource("external.txt", getClass()); @@ -163,7 +158,7 @@ public class SourceHttpMessageConverterTests { XMLReader reader = result.getXMLReader(); reader.setContentHandler(new DefaultHandler() { @Override - public void characters(char[] ch, int start, int length) throws SAXException { + public void characters(char[] ch, int start, int length) { String s = new String(ch, start, length); assertNotEquals("Invalid result", "Foo Bar", s); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterIntegrationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterIntegrationTests.java index adec9a29fb..05503093d9 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterIntegrationTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterIntegrationTests.java @@ -29,7 +29,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; - import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -86,13 +85,7 @@ import org.springframework.web.servlet.HandlerMapping; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.util.UriComponentsBuilder; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; /** * A test fixture with a controller with all supported method signature styles @@ -378,7 +371,7 @@ public class RequestMappingHandlerAdapterIntegrationTests { User user, @ModelAttribute OtherUser otherUser, Model model, - UriComponentsBuilder builder) throws Exception { + UriComponentsBuilder builder) { model.addAttribute("cookie", cookie).addAttribute("pathvar", pathvar).addAttribute("header", header) .addAttribute("systemHeader", systemHeader).addAttribute("headerMap", headerMap) @@ -404,7 +397,7 @@ public class RequestMappingHandlerAdapterIntegrationTests { @ResponseStatus(code = HttpStatus.ACCEPTED) @ResponseBody - public String handleAndValidateRequestBody(@Valid TestBean modelAttr, Errors errors) throws Exception { + public String handleAndValidateRequestBody(@Valid TestBean modelAttr, Errors errors) { return "Error count [" + errors.getErrorCount() + "]"; } @@ -453,7 +446,7 @@ public class RequestMappingHandlerAdapterIntegrationTests { private static class ColorArgumentResolver implements WebArgumentResolver { @Override - public Object resolveArgument(MethodParameter methodParameter, NativeWebRequest webRequest) throws Exception { + public Object resolveArgument(MethodParameter methodParameter, NativeWebRequest webRequest) { return new Color(0); } } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java index 1597667119..7b357d7118 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java @@ -54,8 +54,7 @@ import org.springframework.web.servlet.DispatcherServlet; import org.springframework.web.servlet.FlashMap; import org.springframework.web.servlet.ModelAndView; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; /** * Unit tests for {@link RequestMappingHandlerAdapter}.