diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/MethodMessageHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/MethodMessageHandlerTests.java index f96bdb67e1..705c7ac342 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/MethodMessageHandlerTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/MethodMessageHandlerTests.java @@ -216,7 +216,7 @@ public class MethodMessageHandlerTests { @Override protected String getMappingForMethod(Method method, Class handlerType) { String methodName = method.getName(); - if(methodName.startsWith("handler")) { + if (methodName.startsWith("handler")) { return "/" + methodName; } return null; @@ -240,7 +240,7 @@ public class MethodMessageHandlerTests { protected String getMatchingMapping(String mapping, Message message) { String destination = getLookupDestination(getDestination(message)); - if(mapping.equals(destination) || this.pathMatcher.match(mapping, destination)) { + if (mapping.equals(destination) || this.pathMatcher.match(mapping, destination)) { return mapping; } return null; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java index 4e887d160c..1a55230bb6 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java @@ -97,8 +97,8 @@ public abstract class HtmlEscapingAwareTag extends RequestContextAwareTag { */ protected String htmlEscape(String content) { String out = content; - if(isHtmlEscape()) { - if(isResponseEncodedHtmlEscape()) { + if (isHtmlEscape()) { + if (isResponseEncodedHtmlEscape()) { out = HtmlUtils.htmlEscape(content, this.pageContext.getResponse().getCharacterEncoding()); } else { diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java index 551bf6aa24..e7d8db60a1 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java @@ -188,12 +188,12 @@ public class MvcNamespaceTests { List> converters = adapter.getMessageConverters(); assertTrue(converters.size() > 0); for(HttpMessageConverter converter : converters) { - if(converter instanceof AbstractJackson2HttpMessageConverter) { + if (converter instanceof AbstractJackson2HttpMessageConverter) { ObjectMapper objectMapper = ((AbstractJackson2HttpMessageConverter)converter).getObjectMapper(); assertFalse(objectMapper.getDeserializationConfig().isEnabled(MapperFeature.DEFAULT_VIEW_INCLUSION)); assertFalse(objectMapper.getSerializationConfig().isEnabled(MapperFeature.DEFAULT_VIEW_INCLUSION)); assertFalse(objectMapper.getDeserializationConfig().isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)); - if(converter instanceof MappingJackson2XmlHttpMessageConverter) { + if (converter instanceof MappingJackson2XmlHttpMessageConverter) { assertEquals(XmlMapper.class, objectMapper.getClass()); } } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java index 90ca974243..e15e7f859e 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java @@ -160,12 +160,12 @@ public class WebMvcConfigurationSupportTests { List> converters = adapter.getMessageConverters(); assertEquals(9, converters.size()); for(HttpMessageConverter converter : converters) { - if(converter instanceof AbstractJackson2HttpMessageConverter) { + if (converter instanceof AbstractJackson2HttpMessageConverter) { ObjectMapper objectMapper = ((AbstractJackson2HttpMessageConverter)converter).getObjectMapper(); assertFalse(objectMapper.getDeserializationConfig().isEnabled(MapperFeature.DEFAULT_VIEW_INCLUSION)); assertFalse(objectMapper.getSerializationConfig().isEnabled(MapperFeature.DEFAULT_VIEW_INCLUSION)); assertFalse(objectMapper.getDeserializationConfig().isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)); - if(converter instanceof MappingJackson2XmlHttpMessageConverter) { + if (converter instanceof MappingJackson2XmlHttpMessageConverter) { assertEquals(XmlMapper.class, objectMapper.getClass()); } } diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/config/HandlersBeanDefinitionParser.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/HandlersBeanDefinitionParser.java index 7a1bdd44c2..c8747da141 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/config/HandlersBeanDefinitionParser.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/HandlersBeanDefinitionParser.java @@ -83,7 +83,7 @@ class HandlersBeanDefinitionParser implements BeanDefinitionParser { ManagedList interceptors = WebSocketNamespaceUtils.parseBeanSubElements(interceptorsElement, context); String allowedOriginsAttribute = element.getAttribute("allowed-origins"); List allowedOrigins = Arrays.asList(StringUtils.tokenizeToStringArray(allowedOriginsAttribute, ",")); - if(!allowedOrigins.isEmpty()) { + if (!allowedOrigins.isEmpty()) { OriginHandshakeInterceptor interceptor = new OriginHandshakeInterceptor(); interceptor.setAllowedOrigins(allowedOrigins); interceptors.add(interceptor); diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParser.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParser.java index e28bd073a8..7d7e06f27b 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParser.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParser.java @@ -286,7 +286,7 @@ class MessageBrokerBeanDefinitionParser implements BeanDefinitionParser { ManagedList interceptors = WebSocketNamespaceUtils.parseBeanSubElements(interceptorsElement, context); String allowedOriginsAttribute = element.getAttribute("allowed-origins"); List allowedOrigins = Arrays.asList(StringUtils.tokenizeToStringArray(allowedOriginsAttribute, ",")); - if(!allowedOrigins.isEmpty()) { + if (!allowedOrigins.isEmpty()) { OriginHandshakeInterceptor interceptor = new OriginHandshakeInterceptor(); interceptor.setAllowedOrigins(allowedOrigins); interceptors.add(interceptor); diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketNamespaceUtils.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketNamespaceUtils.java index d44d61e049..8756126ceb 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketNamespaceUtils.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketNamespaceUtils.java @@ -105,7 +105,7 @@ class WebSocketNamespaceUtils { ManagedList interceptors = WebSocketNamespaceUtils.parseBeanSubElements(interceptorsElement, context); String allowedOriginsAttribute = element.getAttribute("allowed-origins"); List allowedOrigins = Arrays.asList(StringUtils.tokenizeToStringArray(allowedOriginsAttribute, ",")); - if(!allowedOrigins.isEmpty()) { + if (!allowedOrigins.isEmpty()) { sockJsServiceDef.getPropertyValues().add("allowedOrigins", allowedOrigins); OriginHandshakeInterceptor interceptor = new OriginHandshakeInterceptor(); interceptor.setAllowedOrigins(allowedOrigins); diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/AbstractWebSocketHandlerRegistration.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/AbstractWebSocketHandlerRegistration.java index 1bdbd9c44d..679b82fa5c 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/AbstractWebSocketHandlerRegistration.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/AbstractWebSocketHandlerRegistration.java @@ -116,7 +116,7 @@ public abstract class AbstractWebSocketHandlerRegistration implements WebSock protected HandshakeInterceptor[] getInterceptors() { List interceptors = new ArrayList(); interceptors.addAll(this.interceptors); - if(!this.allowedOrigins.isEmpty()) { + if (!this.allowedOrigins.isEmpty()) { OriginHandshakeInterceptor interceptor = new OriginHandshakeInterceptor(); interceptor.setAllowedOrigins(this.allowedOrigins); interceptors.add(interceptor); diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebMvcStompWebSocketEndpointRegistration.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebMvcStompWebSocketEndpointRegistration.java index 46975710ca..3ef359d27e 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebMvcStompWebSocketEndpointRegistration.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebMvcStompWebSocketEndpointRegistration.java @@ -113,7 +113,7 @@ public class WebMvcStompWebSocketEndpointRegistration implements StompWebSocketE protected HandshakeInterceptor[] getInterceptors() { List interceptors = new ArrayList(); interceptors.addAll(this.interceptors); - if(!this.allowedOrigins.isEmpty()) { + if (!this.allowedOrigins.isEmpty()) { OriginHandshakeInterceptor interceptor = new OriginHandshakeInterceptor(); interceptor.setAllowedOrigins(this.allowedOrigins); interceptors.add(interceptor); diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/OriginHandshakeInterceptor.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/OriginHandshakeInterceptor.java index 505195ca33..7813f41456 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/OriginHandshakeInterceptor.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/OriginHandshakeInterceptor.java @@ -65,7 +65,7 @@ public class OriginHandshakeInterceptor implements HandshakeInterceptor { @Override public boolean beforeHandshake(ServerHttpRequest request, ServerHttpResponse response, WebSocketHandler wsHandler, Map attributes) throws Exception { - if(!isValidOrigin(request)) { + if (!isValidOrigin(request)) { response.setStatusCode(HttpStatus.FORBIDDEN); if (logger.isDebugEnabled()) { logger.debug("Handshake request rejected, Origin header value " diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/UndertowXhrTransport.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/UndertowXhrTransport.java index 24006a1b0c..5002d7177b 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/UndertowXhrTransport.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/UndertowXhrTransport.java @@ -165,7 +165,7 @@ public class UndertowXhrTransport extends AbstractXhrTransport implements XhrTra try { final ClientRequest request = new ClientRequest().setMethod(method).setPath(url.getPath()); request.getRequestHeaders().add(HttpString.tryFromString(HttpHeaders.HOST), url.getHost()); - if(body !=null && !body.isEmpty()) { + if (body !=null && !body.isEmpty()) { request.getRequestHeaders().add(HttpString.tryFromString(HttpHeaders.CONTENT_LENGTH), body.length()); } addHttpHeaders(request, headers); @@ -224,11 +224,11 @@ public class UndertowXhrTransport extends AbstractXhrTransport implements XhrTra } }); try { - if(body != null) { + if (body != null) { result.getRequestChannel().write(ByteBuffer.wrap(body.getBytes())); } result.getRequestChannel().shutdownWrites(); - if(!result.getRequestChannel().flush()) { + if (!result.getRequestChannel().flush()) { result.getRequestChannel().getWriteSetter() .set(ChannelListeners.flushingChannelListener(null, null)); result.getRequestChannel().resumeWrites(); @@ -295,7 +295,7 @@ public class UndertowXhrTransport extends AbstractXhrTransport implements XhrTra public void completed(final ClientExchange result) { ClientResponse response = result.getResponse(); - if(response.getResponseCode() != 200) { + if (response.getResponseCode() != 200) { HttpStatus status = HttpStatus.valueOf(response.getResponseCode()); IoUtils.safeClose(result.getConnection()); onFailure(new HttpServerErrorException(status, "Unexpected XHR receive status")); @@ -310,7 +310,7 @@ public class UndertowXhrTransport extends AbstractXhrTransport implements XhrTra } try { result.getRequestChannel().shutdownWrites(); - if(!result.getRequestChannel().flush()) { + if (!result.getRequestChannel().flush()) { result.getRequestChannel().getWriteSetter() .set(ChannelListeners.flushingChannelListener(null, null)); result.getRequestChannel().resumeWrites(); diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java index e5c0ebeb90..373f4efc21 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java @@ -424,7 +424,7 @@ public abstract class AbstractSockJsService implements SockJsService { HttpHeaders responseHeaders = response.getHeaders(); String origin = requestHeaders.getOrigin(); - if(!this.allowedOrigins.contains("*") && (origin == null || !this.allowedOrigins.contains(origin))) { + if (!this.allowedOrigins.contains("*") && (origin == null || !this.allowedOrigins.contains(origin))) { logger.debug("Request rejected, Origin header value " + origin + " not allowed"); response.setStatusCode(HttpStatus.FORBIDDEN); return false; @@ -439,7 +439,7 @@ public abstract class AbstractSockJsService implements SockJsService { // See SPR-11919 and https://issues.jboss.org/browse/WFLY-3474 } - if(!this.suppressCors && origin != null && !hasCorsResponseHeaders) { + if (!this.suppressCors && origin != null && !hasCorsResponseHeaders) { addCorsHeaders(request, response, httpMethods); } return true; @@ -498,14 +498,14 @@ public abstract class AbstractSockJsService implements SockJsService { public void handle(ServerHttpRequest request, ServerHttpResponse response) throws IOException { if (HttpMethod.GET.equals(request.getMethod())) { addNoCacheHeaders(response); - if(checkAndAddCorsHeaders(request, response)) { + if (checkAndAddCorsHeaders(request, response)) { response.getHeaders().setContentType(new MediaType("application", "json", UTF8_CHARSET)); String content = String.format(INFO_CONTENT, random.nextInt(), isSessionCookieNeeded(), isWebSocketEnabled()); response.getBody().write(content.getBytes()); } } else if (HttpMethod.OPTIONS.equals(request.getMethod())) { - if(checkAndAddCorsHeaders(request, response, HttpMethod.OPTIONS, + if (checkAndAddCorsHeaders(request, response, HttpMethod.OPTIONS, HttpMethod.GET)) { addCacheHeaders(response); response.setStatusCode(HttpStatus.NO_CONTENT); diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/TransportHandlingSockJsService.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/TransportHandlingSockJsService.java index 3c14770ff7..7037bedbf8 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/TransportHandlingSockJsService.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/TransportHandlingSockJsService.java @@ -207,7 +207,7 @@ public class TransportHandlingSockJsService extends AbstractSockJsService implem HttpMethod supportedMethod = transportType.getHttpMethod(); if (!supportedMethod.equals(request.getMethod())) { if (HttpMethod.OPTIONS.equals(request.getMethod()) && transportType.supportsCors()) { - if(checkAndAddCorsHeaders(request, response, HttpMethod.OPTIONS, supportedMethod)) { + if (checkAndAddCorsHeaders(request, response, HttpMethod.OPTIONS, supportedMethod)) { response.setStatusCode(HttpStatus.NO_CONTENT); addCacheHeaders(response); } @@ -251,7 +251,7 @@ public class TransportHandlingSockJsService extends AbstractSockJsService implem } if (transportType.supportsCors()) { - if(!checkAndAddCorsHeaders(request, response)) { + if (!checkAndAddCorsHeaders(request, response)) { return; } } @@ -275,7 +275,7 @@ public class TransportHandlingSockJsService extends AbstractSockJsService implem @Override protected boolean validateRequest(String serverId, String sessionId, String transport) { - if(!this.getAllowedOrigins().contains("*") && !TransportType.fromValue(transport).supportsOrigin()) { + if (!this.getAllowedOrigins().contains("*") && !TransportType.fromValue(transport).supportsOrigin()) { logger.error("Origin check has been enabled, but this transport does not support it"); return false; } diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/ContextLoaderTestUtils.java b/spring-websocket/src/test/java/org/springframework/web/socket/ContextLoaderTestUtils.java index f149e09353..ba56ae97e1 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/ContextLoaderTestUtils.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/ContextLoaderTestUtils.java @@ -36,7 +36,7 @@ public class ContextLoaderTestUtils { } public static void setCurrentWebApplicationContext(ClassLoader classLoader, WebApplicationContext applicationContext) { - if(applicationContext != null) { + if (applicationContext != null) { currentContextPerThread.put(classLoader, applicationContext); } else { currentContextPerThread.remove(classLoader); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/adapter/standard/ConvertingEncoderDecoderSupportTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/adapter/standard/ConvertingEncoderDecoderSupportTests.java index dcc524e9e0..677b5a0b7d 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/adapter/standard/ConvertingEncoderDecoderSupportTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/adapter/standard/ConvertingEncoderDecoderSupportTests.java @@ -234,7 +234,7 @@ public class ConvertingEncoderDecoderSupportTests { @Override public boolean equals(Object obj) { - if(obj instanceof MyType) { + if (obj instanceof MyType) { return ((MyType)obj).value.equals(value); } return false;