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

Apply SingleSpaceSeparator Checkstyle module

Browse Source 
This commit also fixes its violations.

Closes gh-31469
This commit is contained in:
Johnny Lim
2023-10-22 00:10:45 +09:00
committed by Sam Brannen
parent 8a05661707
commit 64e9fcad53
164 changed files with 229 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-web/src/main/java/org/springframework/http/client/MultipartBodyBuilder.java
View File

@@ -364,7 +364,7 @@ public final class MultipartBodyBuilder {
* @param <P> the publisher
*/
static final class PublisherEntity<T, P extends Publisher<T>> extends HttpEntity<P>
implements ResolvableTypeProvider {
implements ResolvableTypeProvider {
private final ResolvableType resolvableType;

2
spring-web/src/main/java/org/springframework/http/codec/FormHttpMessageReader.java
View File

@@ -166,7 +166,7 @@ public class FormHttpMessageReader extends LoggingCodecSupport
result.add(URLDecoder.decode(pair, charset), null);
}
else {
String name = URLDecoder.decode(pair.substring(0, idx), charset);
String name = URLDecoder.decode(pair.substring(0, idx), charset);
String value = URLDecoder.decode(pair.substring(idx + 1), charset);
result.add(name, value);
}

2
spring-web/src/main/java/org/springframework/http/codec/json/AbstractJackson2Decoder.java
View File

@@ -252,7 +252,7 @@ public abstract class AbstractJackson2Decoder extends Jackson2CodecSupport imple
@Nullable
private Class<?> getContextClass(@Nullable ResolvableType elementType) {
MethodParameter param = (elementType != null ? getParameter(elementType) : null);
MethodParameter param = (elementType != null ? getParameter(elementType) : null);
return (param != null ? param.getContainingClass() : null);
}

2
spring-web/src/main/java/org/springframework/http/codec/json/AbstractJackson2Encoder.java
View File

@@ -202,7 +202,7 @@ public abstract class AbstractJackson2Encoder extends Jackson2CodecSupport imple
}
return dataBufferFlux
.doOnNext(dataBuffer -> Hints.touchDataBuffer(dataBuffer, hintsToUse, logger))
.doOnNext(dataBuffer -> Hints.touchDataBuffer(dataBuffer, hintsToUse, logger))
.doAfterTerminate(() -> {
try {
byteBuilder.release();

4
spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriter.java
View File

@@ -110,7 +110,7 @@ public class MultipartHttpMessageWriter extends MultipartWriterSupport
* @param formWriter the fallback writer for form data, {@code null} by default
*/
public MultipartHttpMessageWriter(List<HttpMessageWriter<?>> partWriters,
@Nullable HttpMessageWriter<MultiValueMap<String, String>> formWriter) {
@Nullable HttpMessageWriter<MultiValueMap<String, String>> formWriter) {
this(() -> partWriters, formWriter);
}
@@ -125,7 +125,7 @@ public class MultipartHttpMessageWriter extends MultipartWriterSupport
* @since 6.0.3
*/
public MultipartHttpMessageWriter(Supplier<List<HttpMessageWriter<?>>> partWritersSupplier,
@Nullable HttpMessageWriter<MultiValueMap<String, String>> formWriter) {
@Nullable HttpMessageWriter<MultiValueMap<String, String>> formWriter) {
super(initMediaTypes(formWriter));
this.partWritersSupplier = partWritersSupplier;

2
spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerReadPublisher.java
View File

@@ -239,7 +239,7 @@ public abstract class AbstractListenerReadPublisher<T> implements Publisher<T> {
private boolean handlePendingCompletionOrError() {
State state = this.state.get();
if (state == State.DEMAND || state == State.NO_DEMAND) {
if (state == State.DEMAND || state == State.NO_DEMAND) {
if (this.completionPending) {
rsReadLogger.trace(getLogPrefix() + "Processing pending completion");
this.state.get().onAllDataRead(this);

2
spring-web/src/main/java/org/springframework/web/context/request/RequestContextHolder.java
View File

@@ -42,7 +42,7 @@ import org.springframework.util.ClassUtils;
* @see org.springframework.web.filter.RequestContextFilter
* @see org.springframework.web.servlet.DispatcherServlet
*/
public abstract class RequestContextHolder {
public abstract class RequestContextHolder {
private static final boolean jsfPresent =
ClassUtils.isPresent("jakarta.faces.context.FacesContext", RequestContextHolder.class.getClassLoader());

2
spring-web/src/main/java/org/springframework/web/context/request/async/DeferredResultInterceptorChain.java
View File

@@ -59,7 +59,7 @@ class DeferredResultInterceptorChain {
}
@Nullable
public Object applyPostProcess(NativeWebRequest request, DeferredResult<?> deferredResult,
public Object applyPostProcess(NativeWebRequest request, DeferredResult<?> deferredResult,
@Nullable Object concurrentResult) {
try {

2
spring-web/src/main/java/org/springframework/web/server/adapter/WebHttpHandlerBuilder.java
View File

@@ -429,7 +429,7 @@ public final class WebHttpHandlerBuilder {
*/
public HttpHandler build() {
WebHandler decorated = new FilteringWebHandler(this.webHandler, this.filters);
decorated = new ExceptionHandlingWebHandler(decorated, this.exceptionHandlers);
decorated = new ExceptionHandlingWebHandler(decorated, this.exceptionHandlers);
HttpWebHandlerAdapter adapted = new HttpWebHandlerAdapter(decorated);
if (this.sessionManager != null) {

2
spring-web/src/main/java/org/springframework/web/util/DisconnectedClientHelper.java
View File

@@ -60,7 +60,7 @@ public class DisconnectedClientHelper {
* <li>IOException "Broken pipe" or "connection reset by peer"
* </ul>
*/
public boolean isClientDisconnectedException(Throwable ex) {
public boolean isClientDisconnectedException(Throwable ex) {
String message = NestedExceptionUtils.getMostSpecificCause(ex).getMessage();
if (message != null) {
String text = message.toLowerCase();

2
spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.java
View File

@@ -751,7 +751,7 @@ final class HierarchicalUriComponents extends UriComponents {
}
private static class UriTemplateEncoder implements BiFunction<String, Type, String> {
private static class UriTemplateEncoder implements BiFunction<String, Type, String> {
private final Charset charset;

2
spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityReferences.java
View File

@@ -80,7 +80,7 @@ class HtmlCharacterEntityReferences {
}
catch (IOException ex) {
throw new IllegalStateException(
"Failed to parse reference definition file [HtmlCharacterEntityReferences.properties]: " + ex.getMessage());
"Failed to parse reference definition file [HtmlCharacterEntityReferences.properties]: " + ex.getMessage());
}
// Parse reference definition properties

2
spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java
View File

@@ -506,7 +506,7 @@ public class HttpHeadersTests {
@Test
void contentLanguageSerialized() {
headers.set(HttpHeaders.CONTENT_LANGUAGE, "de, en_CA");
headers.set(HttpHeaders.CONTENT_LANGUAGE, "de, en_CA");
assertThat(headers.getContentLanguage()).as("Expected one (first) locale").isEqualTo(Locale.GERMAN);
}

2
spring-web/src/test/java/org/springframework/http/codec/FormHttpMessageReaderTests.java
View File

@@ -124,7 +124,7 @@ public class FormHttpMessageReaderTests extends AbstractLeakCheckingTests {
private MockServerHttpRequest request(Publisher<? extends DataBuffer> body) {
return MockServerHttpRequest
.method(HttpMethod.GET, "/")
.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_FORM_URLENCODED_VALUE)
.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_FORM_URLENCODED_VALUE)
.body(body);
}

2
spring-web/src/test/java/org/springframework/http/codec/json/Jackson2JsonDecoderTests.java
View File

@@ -251,7 +251,7 @@ public class Jackson2JsonDecoderTests extends AbstractDecoderTests<Jackson2JsonD
}
@Test // SPR-15975
public void customDeserializer() {
public void customDeserializer() {
Mono<DataBuffer> input = stringBuffer("{\"test\": 1}");
testDecode(input, TestObject.class, step -> step

4
spring-web/src/test/java/org/springframework/http/codec/multipart/DefaultPartHttpMessageReaderTests.java
View File

@@ -63,7 +63,7 @@ import static org.springframework.core.io.buffer.DataBufferUtils.release;
/**
* @author Arjen Poutsma
*/
class DefaultPartHttpMessageReaderTests {
class DefaultPartHttpMessageReaderTests {
private static final String LOREM_IPSUM = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer iaculis metus id vestibulum nullam.";
@@ -139,7 +139,7 @@ class DefaultPartHttpMessageReaderTests {
}
@ParameterizedDefaultPartHttpMessageReaderTest
void noEndHeader(DefaultPartHttpMessageReader reader) {
void noEndHeader(DefaultPartHttpMessageReader reader) {
MockServerHttpRequest request = createRequest(
new ClassPathResource("no-end-header.multipart", getClass()), "boundary");
Flux<Part> result = reader.read(forClass(Part.class), request, emptyMap());

2
spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java
View File

@@ -302,7 +302,7 @@ class Jackson2ObjectMapperBuilderTests {
javaTimeModule.addDeserializer(OffsetDateTime.class, new OffsetDateTimeDeserializer());
builder.modulesToInstall(javaTimeModule);
builder.featuresToDisable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
ObjectMapper objectMapper = builder.build();
ObjectMapper objectMapper = builder.build();
DemoPojo demoPojo = objectMapper.readValue(DATA, DemoPojo.class);
assertThat(demoPojo.getOffsetDateTime()).isNotNull();
}

2
spring-web/src/test/java/org/springframework/http/converter/json/SpringHandlerInstantiatorTests.java
View File

@@ -121,7 +121,7 @@ public class SpringHandlerInstantiatorTests {
private Capitalizer capitalizer;
@Override
public User deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException {
public User deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException {
ObjectCodec oc = jsonParser.getCodec();
JsonNode node = oc.readTree(jsonParser);
return new User(this.capitalizer.capitalize(node.get("username").asText()));

4
spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java
View File

@@ -129,7 +129,7 @@ public class Jaxb2CollectionHttpMessageConverterTests {
@SuppressWarnings("unchecked")
public void readXmlRootElementExternalEntityDisabled() throws Exception {
Resource external = new ClassPathResource("external.txt", getClass());
String content = "<!DOCTYPE root [" +
String content = "<!DOCTYPE root [" +
" <!ELEMENT external ANY >\n" +
" <!ENTITY ext SYSTEM \"" + external.getURI() + "\" >]>" +
" <list><rootElement><type s=\"1\"/><external>&ext;</external></rootElement></list>";
@@ -158,7 +158,7 @@ public class Jaxb2CollectionHttpMessageConverterTests {
@SuppressWarnings("unchecked")
public void readXmlRootElementExternalEntityEnabled() throws Exception {
Resource external = new ClassPathResource("external.txt", getClass());
String content = "<!DOCTYPE root [" +
String content = "<!DOCTYPE root [" +
" <!ELEMENT external ANY >\n" +
" <!ENTITY ext SYSTEM \"" + external.getURI() + "\" >]>" +
" <list><rootElement><type s=\"1\"/><external>&ext;</external></rootElement></list>";

4
spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java
View File

@@ -124,7 +124,7 @@ public class Jaxb2RootElementHttpMessageConverterTests {
@Test
public void readXmlRootElementExternalEntityDisabled() throws Exception {
Resource external = new ClassPathResource("external.txt", getClass());
String content = "<!DOCTYPE root SYSTEM \"https://192.168.28.42/1.jsp\" [" +
String content = "<!DOCTYPE root SYSTEM \"https://192.168.28.42/1.jsp\" [" +
" <!ELEMENT external ANY >\n" +
" <!ENTITY ext SYSTEM \"" + external.getURI() + "\" >]>" +
" <rootElement><external>&ext;</external></rootElement>";
@@ -138,7 +138,7 @@ public class Jaxb2RootElementHttpMessageConverterTests {
@Test
public void readXmlRootElementExternalEntityEnabled() throws Exception {
Resource external = new ClassPathResource("external.txt", getClass());
String content = "<!DOCTYPE root [" +
String content = "<!DOCTYPE root [" +
" <!ELEMENT external ANY >\n" +
" <!ENTITY ext SYSTEM \"" + external.getURI() + "\" >]>" +
" <rootElement><external>&ext;</external></rootElement>";

4
spring-web/src/test/java/org/springframework/web/bind/annotation/ControllerMappingReflectiveProcessorTests.java
View File

@@ -235,12 +235,12 @@ public class ControllerMappingReflectiveProcessorTests {
}
@PostMapping
void postHttpEntity(HttpEntity<Request> entity) {
void postHttpEntity(HttpEntity<Request> entity) {
}
@PostMapping
@SuppressWarnings({ "rawtypes", "unchecked" })
void postRawHttpEntity(HttpEntity entity) {
void postRawHttpEntity(HttpEntity entity) {
}
@PostMapping

2
spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java
View File

@@ -199,7 +199,7 @@ class HttpMessageConverterExtractorTests {
responseHeaders.setContentType(contentType);
given(response.getStatusCode()).willReturn(HttpStatus.OK);
given(response.getHeaders()).willReturn(responseHeaders);
given(response.getBody()).willReturn(new ByteArrayInputStream("Foobar".getBytes()) {
given(response.getBody()).willReturn(new ByteArrayInputStream("Foobar".getBytes()) {
@Override
public boolean markSupported() {
return false;

2
spring-web/src/test/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolverTests.java
View File

@@ -132,7 +132,7 @@ public class ExceptionHandlerMethodResolverTests {
static class InheritedController extends ExceptionController {
@Override
public void handleIOException() {
public void handleIOException() {
}
}

2
spring-web/src/test/java/org/springframework/web/service/invoker/TestExchangeAdapter.java
View File

@@ -97,7 +97,7 @@ public class TestExchangeAdapter implements HttpExchangeAdapter {
return true;
}
protected <T> void saveInput(
protected <T> void saveInput(
String methodName, HttpRequestValues values, @Nullable ParameterizedTypeReference<T> bodyType) {
this.invokedMethodName = methodName;

2
spring-web/src/test/java/org/springframework/web/service/invoker/TestReactorExchangeAdapter.java
View File

@@ -61,7 +61,7 @@ class TestReactorExchangeAdapter extends TestExchangeAdapter implements ReactorH
@Override
public <T> Mono<T> exchangeForBodyMono(HttpRequestValues requestValues, ParameterizedTypeReference<T> bodyType) {
saveInput("exchangeForBodyMono", requestValues, bodyType);
return bodyType.getType().getTypeName().contains("List") ?
return bodyType.getType().getTypeName().contains("List") ?
(Mono<T>) Mono.just(Collections.singletonList(getInvokedMethodName())) :
(Mono<T>) Mono.just(getInvokedMethodName());
}

16
spring-web/src/test/java/org/springframework/web/util/ForwardedHeaderUtilsTests.java
View File

@@ -373,7 +373,7 @@ class ForwardedHeaderUtilsTests {
}
@Test // SPR-11856
void fromHttpRequestForwardedHeader() {
void fromHttpRequestForwardedHeader() {
MockHttpServletRequest request = new MockHttpServletRequest();
request.addHeader("Forwarded", "proto=https; host=84.198.58.199");
request.setScheme("http");
@@ -389,7 +389,7 @@ class ForwardedHeaderUtilsTests {
}
@Test
void fromHttpRequestForwardedHeaderQuoted() {
void fromHttpRequestForwardedHeaderQuoted() {
MockHttpServletRequest request = new MockHttpServletRequest();
request.addHeader("Forwarded", "proto=\"https\"; host=\"84.198.58.199\"");
request.setScheme("http");
@@ -405,7 +405,7 @@ class ForwardedHeaderUtilsTests {
}
@Test
void fromHttpRequestMultipleForwardedHeader() {
void fromHttpRequestMultipleForwardedHeader() {
MockHttpServletRequest request = new MockHttpServletRequest();
request.addHeader("Forwarded", "host=84.198.58.199;proto=https");
request.addHeader("Forwarded", "proto=ftp; host=1.2.3.4");
@@ -422,7 +422,7 @@ class ForwardedHeaderUtilsTests {
}
@Test
void fromHttpRequestMultipleForwardedHeaderComma() {
void fromHttpRequestMultipleForwardedHeaderComma() {
MockHttpServletRequest request = new MockHttpServletRequest();
request.addHeader("Forwarded", "host=84.198.58.199 ;proto=https, proto=ftp; host=1.2.3.4");
request.setScheme("http");
@@ -438,7 +438,7 @@ class ForwardedHeaderUtilsTests {
}
@Test
void fromHttpRequestForwardedHeaderWithHostPortAndWithoutServerPort() {
void fromHttpRequestForwardedHeaderWithHostPortAndWithoutServerPort() {
MockHttpServletRequest request = new MockHttpServletRequest();
request.addHeader("Forwarded", "proto=https; host=84.198.58.199:9090");
request.setScheme("http");
@@ -456,7 +456,7 @@ class ForwardedHeaderUtilsTests {
}
@Test
void fromHttpRequestForwardedHeaderWithHostPortAndServerPort() {
void fromHttpRequestForwardedHeaderWithHostPortAndServerPort() {
MockHttpServletRequest request = new MockHttpServletRequest();
request.addHeader("Forwarded", "proto=https; host=84.198.58.199:9090");
request.setScheme("http");
@@ -475,7 +475,7 @@ class ForwardedHeaderUtilsTests {
}
@Test
void fromHttpRequestForwardedHeaderWithoutHostPortAndWithServerPort() {
void fromHttpRequestForwardedHeaderWithoutHostPortAndWithServerPort() {
MockHttpServletRequest request = new MockHttpServletRequest();
request.addHeader("Forwarded", "proto=https; host=84.198.58.199");
request.setScheme("http");
@@ -494,7 +494,7 @@ class ForwardedHeaderUtilsTests {
}
@Test // SPR-16262
void fromHttpRequestForwardedHeaderWithProtoAndServerPort() {
void fromHttpRequestForwardedHeaderWithProtoAndServerPort() {
MockHttpServletRequest request = new MockHttpServletRequest();
request.addHeader("Forwarded", "proto=https");
request.setScheme("http");

2
spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java
View File

@@ -603,7 +603,7 @@ class UriComponentsBuilderTests {
}
@Test
void queryParamWithoutValueWithEquals() {
void queryParamWithoutValueWithEquals() {
UriComponents uriComponents = UriComponentsBuilder.fromUriString("https://example.com/foo?bar=").build();
assertThat(uriComponents.toUriString()).isEqualTo("https://example.com/foo?bar=");
assertThat(uriComponents.getQueryParams().get("bar").get(0)).isEmpty();

2
spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletRequest.java
View File

@@ -726,7 +726,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
}
else if (this.inputStream != null) {
throw new IllegalStateException(
"Cannot call getReader() after getInputStream() has already been called for the current request") ;
"Cannot call getReader() after getInputStream() has already been called for the current request");
}
if (this.content != null) {