From 5169c51a6c5a7ac3911a367bd855f574632c95c6 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 13 Dec 2016 13:02:23 +0100 Subject: [PATCH] Polishing --- .../view/freemarker/FreeMarkerView.java | 5 ++-- .../socket/adapter/JettyWebSocketSession.java | 5 ++-- .../adapter/RxNettyWebSocketSession.java | 2 +- .../adapter/TomcatWebSocketSession.java | 5 ++-- .../adapter/UndertowWebSocketSession.java | 1 - ...stractMessageConverterMethodProcessor.java | 7 ++---- ...questResponseBodyMethodProcessorTests.java | 24 +++++++++++++------ 7 files changed, 27 insertions(+), 22 deletions(-) diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerView.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerView.java index 3c1bcee299..757489a7f3 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerView.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerView.java @@ -164,6 +164,7 @@ public class FreeMarkerView extends AbstractUrlBasedView { @Override protected Mono renderInternal(Map renderAttributes, MediaType contentType, ServerWebExchange exchange) { + // Expose all standard FreeMarker hash models. SimpleHash freeMarkerModel = getTemplateModel(renderAttributes, exchange); if (logger.isDebugEnabled()) { @@ -186,8 +187,8 @@ public class FreeMarkerView extends AbstractUrlBasedView { return exchange.getResponse().writeWith(Flux.just(dataBuffer)); } - private static Optional getCharset(MediaType mediaType) { - return mediaType != null ? Optional.ofNullable(mediaType.getCharset()) : Optional.empty(); + private Optional getCharset(MediaType mediaType) { + return (mediaType != null ? Optional.ofNullable(mediaType.getCharset()) : Optional.empty()); } /** diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketSession.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketSession.java index 5f83418870..0bd4af2a94 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketSession.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketSession.java @@ -38,7 +38,6 @@ import org.springframework.web.reactive.socket.WebSocketSession; */ public class JettyWebSocketSession extends AbstractListenerWebSocketSession { - public JettyWebSocketSession(Session session) { super(session, ObjectUtils.getIdentityHexString(session), session.getUpgradeRequest().getRequestURI()); @@ -52,12 +51,12 @@ public class JettyWebSocketSession extends AbstractListenerWebSocketSession { - public RxNettyWebSocketSession(WebSocketConnection conn, URI uri, NettyDataBufferFactory factory) { super(conn, uri, factory); } diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/adapter/TomcatWebSocketSession.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/adapter/TomcatWebSocketSession.java index 80aed582e3..aeafea79db 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/adapter/TomcatWebSocketSession.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/adapter/TomcatWebSocketSession.java @@ -40,7 +40,6 @@ import org.springframework.web.reactive.socket.WebSocketSession; */ public class TomcatWebSocketSession extends AbstractListenerWebSocketSession { - public TomcatWebSocketSession(Session session) { super(session, session.getId(), session.getRequestURI()); } @@ -53,12 +52,12 @@ public class TomcatWebSocketSession extends AbstractListenerWebSocketSession { - public UndertowWebSocketSession(WebSocketChannel channel, URI url) { super(channel, ObjectUtils.getIdentityHexString(channel), url); } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java index 9f0340c590..0026f01b63 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java @@ -90,7 +90,6 @@ public abstract class AbstractMessageConverterMethodProcessor extends AbstractMe private final Set safeExtensions = new HashSet<>(); - /** * Constructor with list of converters only. */ @@ -348,9 +347,7 @@ public abstract class AbstractMessageConverterMethodProcessor extends AbstractMe * header with a safe attachment file name ("f.txt") is added to prevent * RFD exploits. */ - private void addContentDispositionHeader(ServletServerHttpRequest request, - ServletServerHttpResponse response) { - + private void addContentDispositionHeader(ServletServerHttpRequest request, ServletServerHttpResponse response) { HttpHeaders headers = response.getHeaders(); if (headers.containsKey(HttpHeaders.CONTENT_DISPOSITION)) { return; @@ -363,7 +360,7 @@ public abstract class AbstractMessageConverterMethodProcessor extends AbstractMe } } catch (Throwable ex) { - // Ignore + // ignore } HttpServletRequest servletRequest = request.getServletRequest(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java index 8151822b96..4858f18b44 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java @@ -69,11 +69,7 @@ import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.view.json.MappingJackson2JsonView; import org.springframework.web.util.WebUtils; -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.assertTrue; +import static org.junit.Assert.*; /** * Test fixture for a {@link RequestResponseBodyMethodProcessor} with @@ -732,7 +728,6 @@ public class RequestResponseBodyMethodProcessorTests { } - String handle( @RequestBody List list, @RequestBody SimpleBean simpleBean, @@ -751,15 +746,18 @@ public class RequestResponseBodyMethodProcessorTests { return null; } + private static abstract class MyParameterizedController { @SuppressWarnings("unused") public void handleDto(@RequestBody DTO dto) {} } + private static class MySimpleParameterizedController extends MyParameterizedController { } + private interface Identifiable extends Serializable { Long getId(); @@ -767,6 +765,7 @@ public class RequestResponseBodyMethodProcessorTests { void setId(Long id); } + @SuppressWarnings("unused") private static abstract class MyParameterizedControllerWithList { @@ -774,6 +773,7 @@ public class RequestResponseBodyMethodProcessorTests { } } + @SuppressWarnings("unused") private static class MySimpleParameterizedControllerWithList extends MyParameterizedControllerWithList { } @@ -843,9 +843,12 @@ public class RequestResponseBodyMethodProcessorTests { } } + private interface MyJacksonView1 {} + private interface MyJacksonView2 {} + private static class JacksonViewBean { @JsonView(MyJacksonView1.class) @@ -881,6 +884,7 @@ public class RequestResponseBodyMethodProcessorTests { } } + @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type") public static class ParentClass { @@ -902,6 +906,7 @@ public class RequestResponseBodyMethodProcessorTests { } } + @JsonTypeName("foo") public static class Foo extends ParentClass { @@ -913,6 +918,7 @@ public class RequestResponseBodyMethodProcessorTests { } } + @JsonTypeName("bar") public static class Bar extends ParentClass { @@ -924,6 +930,7 @@ public class RequestResponseBodyMethodProcessorTests { } } + private static class JacksonController { @RequestMapping @@ -996,9 +1003,9 @@ public class RequestResponseBodyMethodProcessorTests { public String defaultCharset() { return "foo"; } - } + private static class EmptyRequestBodyAdvice implements RequestBodyAdvice { @Override @@ -1030,12 +1037,15 @@ public class RequestResponseBodyMethodProcessorTests { } } + interface MappingInterface { + default A handle(@RequestBody A arg) { return arg; } } + static class MyControllerImplementingInterface implements MappingInterface { }