diff --git a/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java b/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java index 308ecb8d9558..68bda3cd6883 100644 --- a/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java +++ b/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java @@ -31,7 +31,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; -import java.util.function.BinaryOperator; import java.util.function.Consumer; import org.reactivestreams.Publisher; @@ -57,13 +56,6 @@ public abstract class DataBufferUtils { private static final Consumer RELEASE_CONSUMER = DataBufferUtils::release; - private static final BinaryOperator WRITE_AGGREGATOR = - (dataBuffer1, dataBuffer2) -> { - DataBuffer result = dataBuffer1.write(dataBuffer2); - release(dataBuffer2); - return result; - }; - //--------------------------------------------------------------------- // Reading //--------------------------------------------------------------------- diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java index b7a72ee7304e..1b68f61ecbba 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java @@ -321,7 +321,7 @@ public void generateCode(MethodVisitor mv, CodeFlow cf) { Class publicDeclaringClass = methodExecutor.getPublicDeclaringClass(); Assert.state(publicDeclaringClass != null, "No public declaring class"); classDesc = publicDeclaringClass.getName().replace('.', '/'); - }; + } if (!isStaticMethod) { if (descriptor == null || !descriptor.substring(1).equals(classDesc)) { diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/result/ModelResultMatchers.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/ModelResultMatchers.java index 2053017c843a..2196e62e6ca3 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/result/ModelResultMatchers.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/result/ModelResultMatchers.java @@ -239,7 +239,7 @@ private ModelAndView getModelAndView(MvcResult mvcResult) { ModelAndView mav = mvcResult.getModelAndView(); if (mav == null) { fail("No ModelAndView found"); - }; + } return mav; } diff --git a/spring-web/src/main/java/org/springframework/http/server/DefaultPathContainer.java b/spring-web/src/main/java/org/springframework/http/server/DefaultPathContainer.java index df550a11476a..db54ca4cde01 100644 --- a/spring-web/src/main/java/org/springframework/http/server/DefaultPathContainer.java +++ b/spring-web/src/main/java/org/springframework/http/server/DefaultPathContainer.java @@ -194,8 +194,6 @@ private static class DefaultPathSegment implements PathSegment { private final String value; - private final char[] valueAsChars; - private final String valueToMatch; private final char[] valueToMatchAsChars; @@ -206,7 +204,6 @@ private static class DefaultPathSegment implements PathSegment { DefaultPathSegment(String value, String valueToMatch, MultiValueMap params) { Assert.isTrue(!value.contains("/"), () -> "Invalid path segment value: " + value); this.value = value; - this.valueAsChars = value.toCharArray(); this.valueToMatch = valueToMatch; this.valueToMatchAsChars = valueToMatch.toCharArray(); this.parameters = CollectionUtils.unmodifiableMultiValueMap(params); diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ServletHttpHandlerAdapter.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ServletHttpHandlerAdapter.java index 25f16ffd4bf4..f003e63490b8 100644 --- a/spring-web/src/main/java/org/springframework/http/server/reactive/ServletHttpHandlerAdapter.java +++ b/spring-web/src/main/java/org/springframework/http/server/reactive/ServletHttpHandlerAdapter.java @@ -254,7 +254,7 @@ public void onStartAsync(AsyncEvent event) { public void onComplete(AsyncEvent event) { // no-op } - }; + } private class HandlerResultSubscriber implements Subscriber { diff --git a/spring-web/src/main/java/org/springframework/web/util/DefaultUriBuilderFactory.java b/spring-web/src/main/java/org/springframework/web/util/DefaultUriBuilderFactory.java index 3b79e88316f8..8d466a2a6576 100644 --- a/spring-web/src/main/java/org/springframework/web/util/DefaultUriBuilderFactory.java +++ b/spring-web/src/main/java/org/springframework/web/util/DefaultUriBuilderFactory.java @@ -40,7 +40,7 @@ */ public class DefaultUriBuilderFactory implements UriBuilderFactory { - public enum EncodingMode {URI_COMPONENT, VALUES_ONLY, NONE }; + public enum EncodingMode {URI_COMPONENT, VALUES_ONLY, NONE } private final UriComponentsBuilder baseUri; diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/SimpleHandlerAdapter.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/SimpleHandlerAdapter.java index fd0da317e2f9..2320bc5b00dc 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/SimpleHandlerAdapter.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/SimpleHandlerAdapter.java @@ -16,11 +16,9 @@ package org.springframework.web.reactive.result; -import java.lang.reflect.Method; import reactor.core.publisher.Mono; -import org.springframework.core.MethodParameter; import org.springframework.web.reactive.DispatcherHandler; import org.springframework.web.reactive.HandlerAdapter; import org.springframework.web.reactive.HandlerResult; @@ -37,20 +35,6 @@ */ public class SimpleHandlerAdapter implements HandlerAdapter { - private static final MethodParameter RETURN_TYPE; - - static { - try { - Method method = WebHandler.class.getMethod("handle", ServerWebExchange.class); - RETURN_TYPE = new MethodParameter(method, -1); - } - catch (NoSuchMethodException ex) { - throw new IllegalStateException( - "Failed to initialize the return type for WebHandler: " + ex.getMessage()); - } - } - - @Override public boolean supports(Object handler) { return WebHandler.class.isAssignableFrom(handler.getClass()); diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebMvcStompEndpointRegistry.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebMvcStompEndpointRegistry.java index 00d434430b05..fd1d854739da 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebMvcStompEndpointRegistry.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebMvcStompEndpointRegistry.java @@ -90,7 +90,7 @@ private static SubProtocolWebSocketHandler unwrapSubProtocolWebSocketHandler(Web WebSocketHandler actual = WebSocketHandlerDecorator.unwrap(handler); if (!(actual instanceof SubProtocolWebSocketHandler)) { throw new IllegalArgumentException("No SubProtocolWebSocketHandler in " + handler); - }; + } return (SubProtocolWebSocketHandler) actual; }