Prune empty method adapter classes

spring-messaging/src/main/java/org/springframework/messaging/support/ChannelInterceptorAdapter.java

@@ -1,64 +0,0 @@
-/*
- * Copyright 2002-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.messaging.support;
-
-import org.springframework.lang.Nullable;
-import org.springframework.messaging.Message;
-import org.springframework.messaging.MessageChannel;
-
-/**
- * A {@link ChannelInterceptor} base class with empty method implementations
- * as a convenience.
- *
- * @author Mark Fisher
- * @author Rossen Stoyanchev
- * @since 4.0
- * @deprecated as of 5.0.7 {@link ChannelInterceptor} has default methods (made
- * possible by a Java 8 baseline) and can be implemented directly without the
- * need for this no-op adapter
- */
-@Deprecated
-public abstract class ChannelInterceptorAdapter implements ChannelInterceptor {
-
-	@Override
-	public Message<?> preSend(Message<?> message, MessageChannel channel) {
-		return message;
-	}
-
-	@Override
-	public void postSend(Message<?> message, MessageChannel channel, boolean sent) {
-	}
-
-	@Override
-	public void afterSendCompletion(Message<?> message, MessageChannel channel, boolean sent, @Nullable Exception ex) {
-	}
-
-	@Override
-	public boolean preReceive(MessageChannel channel) {
-		return true;
-	}
-
-	@Override
-	public Message<?> postReceive(Message<?> message, MessageChannel channel) {
-		return message;
-	}
-
-	@Override
-	public void afterReceiveCompletion(@Nullable Message<?> message, MessageChannel channel, @Nullable Exception ex) {
-	}
-
-}

spring-web/src/main/java/org/springframework/web/context/request/async/CallableProcessingInterceptorAdapter.java

@@ -1,61 +0,0 @@
-/*
- * Copyright 2002-2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.web.context.request.async;
-
-import java.util.concurrent.Callable;
-
-import org.springframework.web.context.request.NativeWebRequest;
-
-/**
- * Abstract adapter class for the {@link CallableProcessingInterceptor} interface,
- * for simplified implementation of individual methods.
- *
- * @author Rossen Stoyanchev
- * @author Rob Winch
- * @since 3.2
- * @deprecated as of 5.0 where CallableProcessingInterceptor has default methods
- */
-@Deprecated
-public abstract class CallableProcessingInterceptorAdapter implements CallableProcessingInterceptor {
-
-	@Override
-	public <T> void beforeConcurrentHandling(NativeWebRequest request, Callable<T> task) throws Exception {
-	}
-
-	@Override
-	public <T> void preProcess(NativeWebRequest request, Callable<T> task) throws Exception {
-	}
-
-	@Override
-	public <T> void postProcess(NativeWebRequest request, Callable<T> task, Object concurrentResult) throws Exception {
-	}
-
-	@Override
-	public <T> Object handleTimeout(NativeWebRequest request, Callable<T> task) throws Exception {
-		return RESULT_NONE;
-	}
-
-	@Override
-	public <T> Object handleError(NativeWebRequest request, Callable<T> task, Throwable t) throws Exception {
-		return RESULT_NONE;
-	}
-
-	@Override
-	public <T> void afterCompletion(NativeWebRequest request, Callable<T> task) throws Exception {
-	}
-
-}

spring-web/src/main/java/org/springframework/web/context/request/async/DeferredResultProcessingInterceptorAdapter.java

@@ -1,82 +0,0 @@
-/*
- * Copyright 2002-2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.web.context.request.async;
-
-import org.springframework.web.context.request.NativeWebRequest;
-
-/**
- * Abstract adapter class for the {@link DeferredResultProcessingInterceptor}
- * interface for simplified implementation of individual methods.
- *
- * @author Rossen Stoyanchev
- * @author Rob Winch
- * @since 3.2
- * @deprecated as of 5.0 where DeferredResultProcessingInterceptor has default methods
- */
-@Deprecated
-public abstract class DeferredResultProcessingInterceptorAdapter implements DeferredResultProcessingInterceptor {
-
-	/**
-	 * This implementation is empty.
-	 */
-	@Override
-	public <T> void beforeConcurrentHandling(NativeWebRequest request, DeferredResult<T> deferredResult)
-			throws Exception {
-	}
-
-	/**
-	 * This implementation is empty.
-	 */
-	@Override
-	public <T> void preProcess(NativeWebRequest request, DeferredResult<T> deferredResult) throws Exception {
-	}
-
-	/**
-	 * This implementation is empty.
-	 */
-	@Override
-	public <T> void postProcess(NativeWebRequest request, DeferredResult<T> deferredResult,
-			Object concurrentResult) throws Exception {
-	}
-
-	/**
-	 * This implementation returns {@code true} by default allowing other interceptors
-	 * to be given a chance to handle the timeout.
-	 */
-	@Override
-	public <T> boolean handleTimeout(NativeWebRequest request, DeferredResult<T> deferredResult) throws Exception {
-		return true;
-	}
-
-	/**
-	 * This implementation returns {@code true} by default allowing other interceptors
-	 * to be given a chance to handle the error.
-	 */
-	@Override
-	public <T> boolean handleError(NativeWebRequest request, DeferredResult<T> deferredResult, Throwable t)
-			throws Exception {
-		return true;
-	}
-
-	/**
-	 * This implementation is empty.
-	 */
-	@Override
-	public <T> void afterCompletion(NativeWebRequest request, DeferredResult<T> deferredResult) throws Exception {
-	}
-
-}

spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurerAdapter.java

@@ -1,191 +0,0 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.web.servlet.config.annotation;
-
-import java.util.List;
-
-import org.springframework.format.FormatterRegistry;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.lang.Nullable;
-import org.springframework.validation.MessageCodesResolver;
-import org.springframework.validation.Validator;
-import org.springframework.web.method.support.HandlerMethodArgumentResolver;
-import org.springframework.web.method.support.HandlerMethodReturnValueHandler;
-import org.springframework.web.servlet.HandlerExceptionResolver;
-
-/**
- * An implementation of {@link WebMvcConfigurer} with empty methods allowing
- * subclasses to override only the methods they're interested in.
- *
- * @author Rossen Stoyanchev
- * @since 3.1
- * @deprecated as of 5.0 {@link WebMvcConfigurer} has default methods (made
- * possible by a Java 8 baseline) and can be implemented directly without the
- * need for this adapter
- */
-@Deprecated
-public abstract class WebMvcConfigurerAdapter implements WebMvcConfigurer {
-
-	/**
-	 * {@inheritDoc}
-	 * <p>This implementation is empty.
-	 */
-	@Override
-	public void configurePathMatch(PathMatchConfigurer configurer) {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * <p>This implementation is empty.
-	 */
-	@Override
-	public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * <p>This implementation is empty.
-	 */
-	@Override
-	public void configureAsyncSupport(AsyncSupportConfigurer configurer) {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * <p>This implementation is empty.
-	 */
-	@Override
-	public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * <p>This implementation is empty.
-	 */
-	@Override
-	public void addFormatters(FormatterRegistry registry) {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * <p>This implementation is empty.
-	 */
-	@Override
-	public void addInterceptors(InterceptorRegistry registry) {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * <p>This implementation is empty.
-	 */
-	@Override
-	public void addResourceHandlers(ResourceHandlerRegistry registry) {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * <p>This implementation is empty.
-	 */
-	@Override
-	public void addCorsMappings(CorsRegistry registry) {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * <p>This implementation is empty.
-	 */
-	@Override
-	public void addViewControllers(ViewControllerRegistry registry) {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * <p>This implementation is empty.
-	 */
-	@Override
-	public void configureViewResolvers(ViewResolverRegistry registry) {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * <p>This implementation is empty.
-	 */
-	@Override
-	public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * <p>This implementation is empty.
-	 */
-	@Override
-	public void addReturnValueHandlers(List<HandlerMethodReturnValueHandler> returnValueHandlers) {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * <p>This implementation is empty.
-	 */
-	@Override
-	public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * <p>This implementation is empty.
-	 */
-	@Override
-	public void extendMessageConverters(List<HttpMessageConverter<?>> converters) {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * <p>This implementation is empty.
-	 */
-	@Override
-	public void configureHandlerExceptionResolvers(List<HandlerExceptionResolver> exceptionResolvers) {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * <p>This implementation is empty.
-	 */
-	@Override
-	public void extendHandlerExceptionResolvers(List<HandlerExceptionResolver> exceptionResolvers) {
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * <p>This implementation returns {@code null}.
-	 */
-	@Override
-	@Nullable
-	public Validator getValidator() {
-		return null;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * <p>This implementation returns {@code null}.
-	 */
-	@Override
-	@Nullable
-	public MessageCodesResolver getMessageCodesResolver() {
-		return null;
-	}
-
-}

spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerInterceptorAdapter.java

@@ -1,34 +0,0 @@
-/*
- * Copyright 2002-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.web.servlet.handler;
-
-import org.springframework.web.servlet.AsyncHandlerInterceptor;
-import org.springframework.web.servlet.HandlerInterceptor;
-
-/**
- * Abstract adapter class for the {@link AsyncHandlerInterceptor} interface,
- * for simplified implementation of pre-only/post-only interceptors.
- *
- * @author Juergen Hoeller
- * @since 05.12.2003
- * @deprecated as of 5.3 in favor of implementing {@link HandlerInterceptor}
- * and/or {@link AsyncHandlerInterceptor} directly.
- */
-@Deprecated
-public abstract class HandlerInterceptorAdapter implements AsyncHandlerInterceptor {
-
-}