From 9b61316c2e24c695f6e541237630648bedf5b195 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Fri, 10 May 2019 17:07:12 +0200 Subject: [PATCH] Clean up warnings in spring-web --- ...mponentsAsyncClientHttpRequestFactory.java | 1 + .../http/codec/DecoderHttpMessageReader.java | 4 ++-- .../http/codec/EncoderHttpMessageWriter.java | 5 ++--- .../http/codec/support/BaseDefaultCodecs.java | 2 +- ...ServerSentEventHttpMessageReaderTests.java | 3 ++- .../codec/json/Jackson2JsonDecoderTests.java | 1 + .../MultipartHttpMessageWriterTests.java | 3 ++- .../Jackson2ObjectMapperBuilderTests.java | 1 + ...pingJackson2HttpMessageConverterTests.java | 1 + ...ufJsonFormatHttpMessageConverterTests.java | 20 ++++--------------- .../support/WebExchangeDataBinderTests.java | 1 + .../ExtractingResponseErrorHandlerTests.java | 5 +---- .../web/client/RestTemplateTests.java | 6 +++--- .../async/WebAsyncManagerTimeoutTests.java | 2 +- ...questParamMethodArgumentResolverTests.java | 2 +- 15 files changed, 24 insertions(+), 33 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsAsyncClientHttpRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsAsyncClientHttpRequestFactory.java index fbf603009a..85cf0bab0d 100644 --- a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsAsyncClientHttpRequestFactory.java +++ b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsAsyncClientHttpRequestFactory.java @@ -161,6 +161,7 @@ public class HttpComponentsAsyncClientHttpRequestFactory extends HttpComponentsC private HttpAsyncClient startAsyncClient() { HttpAsyncClient client = getAsyncClient(); if (client instanceof CloseableHttpAsyncClient) { + @SuppressWarnings("resource") CloseableHttpAsyncClient closeableAsyncClient = (CloseableHttpAsyncClient) client; if (!closeableAsyncClient.isRunning()) { closeableAsyncClient.start(); diff --git a/spring-web/src/main/java/org/springframework/http/codec/DecoderHttpMessageReader.java b/spring-web/src/main/java/org/springframework/http/codec/DecoderHttpMessageReader.java index b5d689d2e6..96cd774f59 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/DecoderHttpMessageReader.java +++ b/spring-web/src/main/java/org/springframework/http/codec/DecoderHttpMessageReader.java @@ -69,8 +69,8 @@ public class DecoderHttpMessageReader implements HttpMessageReader { private static void initLogger(Decoder decoder) { if (decoder instanceof AbstractDecoder && decoder.getClass().getName().startsWith("org.springframework.core.codec")) { - Log logger = HttpLogging.forLog(((AbstractDecoder) decoder).getLogger()); - ((AbstractDecoder) decoder).setLogger(logger); + Log logger = HttpLogging.forLog(((AbstractDecoder) decoder).getLogger()); + ((AbstractDecoder) decoder).setLogger(logger); } } diff --git a/spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java b/spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java index ce4d481429..ddc71bbeea 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java +++ b/spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java @@ -79,8 +79,8 @@ public class EncoderHttpMessageWriter implements HttpMessageWriter { private static void initLogger(Encoder encoder) { if (encoder instanceof AbstractEncoder && encoder.getClass().getName().startsWith("org.springframework.core.codec")) { - Log logger = HttpLogging.forLog(((AbstractEncoder) encoder).getLogger()); - ((AbstractEncoder) encoder).setLogger(logger); + Log logger = HttpLogging.forLog(((AbstractEncoder) encoder).getLogger()); + ((AbstractEncoder) encoder).setLogger(logger); } } @@ -108,7 +108,6 @@ public class EncoderHttpMessageWriter implements HttpMessageWriter { return this.encoder.canEncode(elementType, mediaType); } - @SuppressWarnings("unchecked") @Override public Mono write(Publisher inputStream, ResolvableType elementType, @Nullable MediaType mediaType, ReactiveHttpOutputMessage message, Map hints) { diff --git a/spring-web/src/main/java/org/springframework/http/codec/support/BaseDefaultCodecs.java b/spring-web/src/main/java/org/springframework/http/codec/support/BaseDefaultCodecs.java index 464f1d619c..564db7f262 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/support/BaseDefaultCodecs.java +++ b/spring-web/src/main/java/org/springframework/http/codec/support/BaseDefaultCodecs.java @@ -226,7 +226,7 @@ class BaseDefaultCodecs implements CodecConfigurer.DefaultCodecs { * or for multipart requests only ("true"). Generally the two sets are the * same except for the multipart writer itself. */ - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) final List> getTypedWriters(boolean forMultipart) { if (!this.registerDefaults) { return Collections.emptyList(); diff --git a/spring-web/src/test/java/org/springframework/http/codec/ServerSentEventHttpMessageReaderTests.java b/spring-web/src/test/java/org/springframework/http/codec/ServerSentEventHttpMessageReaderTests.java index e96323d778..49882eb5d5 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/ServerSentEventHttpMessageReaderTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/ServerSentEventHttpMessageReaderTests.java @@ -61,6 +61,7 @@ public class ServerSentEventHttpMessageReaderTests extends AbstractLeakCheckingT } @Test + @SuppressWarnings("rawtypes") public void readServerSentEvents() { MockServerHttpRequest request = MockServerHttpRequest.post("/") .body(Mono.just(stringBuffer( @@ -91,6 +92,7 @@ public class ServerSentEventHttpMessageReaderTests extends AbstractLeakCheckingT } @Test + @SuppressWarnings("rawtypes") public void readServerSentEventsWithMultipleChunks() { MockServerHttpRequest request = MockServerHttpRequest.post("/") .body(Flux.just( @@ -199,5 +201,4 @@ public class ServerSentEventHttpMessageReaderTests extends AbstractLeakCheckingT return buffer; } - } diff --git a/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2JsonDecoderTests.java b/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2JsonDecoderTests.java index d97a8f56af..e1885e5152 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2JsonDecoderTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/json/Jackson2JsonDecoderTests.java @@ -215,6 +215,7 @@ public class Jackson2JsonDecoderTests extends AbstractDecoderTestCase converter = new MappingJackson2HttpMessageConverter(); this.errorHandler = new ExtractingResponseErrorHandler( Collections.singletonList(converter)); @@ -184,9 +184,6 @@ public class ExtractingResponseErrorHandlerTests { return this.foo; } - public void setFoo(String foo) { - this.foo = foo; - } } } diff --git a/spring-web/src/test/java/org/springframework/web/client/RestTemplateTests.java b/spring-web/src/test/java/org/springframework/web/client/RestTemplateTests.java index d820d77376..031762039f 100644 --- a/spring-web/src/test/java/org/springframework/web/client/RestTemplateTests.java +++ b/spring-web/src/test/java/org/springframework/web/client/RestTemplateTests.java @@ -222,11 +222,11 @@ public class RestTemplateTests { @Test public void requestAvoidsDuplicateAcceptHeaderValues() throws Exception { - HttpMessageConverter firstConverter = mock(HttpMessageConverter.class); + HttpMessageConverter firstConverter = mock(HttpMessageConverter.class); given(firstConverter.canRead(any(), any())).willReturn(true); given(firstConverter.getSupportedMediaTypes()) .willReturn(Collections.singletonList(MediaType.TEXT_PLAIN)); - HttpMessageConverter secondConverter = mock(HttpMessageConverter.class); + HttpMessageConverter secondConverter = mock(HttpMessageConverter.class); given(secondConverter.canRead(any(), any())).willReturn(true); given(secondConverter.getSupportedMediaTypes()) .willReturn(Collections.singletonList(MediaType.TEXT_PLAIN)); @@ -704,7 +704,7 @@ public class RestTemplateTests { mockHttpMessageConverter(MediaType.TEXT_PLAIN, String.class); } - private void mockHttpMessageConverter(MediaType mediaType, Class type) { + private void mockHttpMessageConverter(MediaType mediaType, Class type) { given(converter.canRead(type, null)).willReturn(true); given(converter.canRead(type, mediaType)).willReturn(true); given(converter.getSupportedMediaTypes()) diff --git a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTimeoutTests.java b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTimeoutTests.java index e45dbab0ef..c87d0e3269 100644 --- a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTimeoutTests.java +++ b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTimeoutTests.java @@ -154,8 +154,8 @@ public class WebAsyncManagerTimeoutTests { verify(interceptor).beforeConcurrentHandling(this.asyncWebRequest, callable); } - @SuppressWarnings("unchecked") @Test + @SuppressWarnings({ "unchecked", "rawtypes" }) public void startCallableProcessingTimeoutAndCheckThreadInterrupted() throws Exception { StubCallable callable = new StubCallable(); diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java index 4c183477a5..a4d4f55e74 100644 --- a/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java @@ -612,7 +612,7 @@ public class RequestParamMethodArgumentResolverTests { @RequestParam(name = "name", required = false) String paramNotRequired, @RequestParam("name") Optional paramOptional, @RequestParam("name") Optional paramOptionalArray, - @RequestParam("name") Optional paramOptionalList, + @RequestParam("name") Optional> paramOptionalList, @RequestParam("mfile") Optional multipartFileOptional) { }