Clean up some JavaDocs; remove deprecated API

Author: artembilan

spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/AbstractAmqpOutboundEndpoint.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 the original author or authors.
+ * Copyright 2016-2022 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.
@@ -618,25 +618,6 @@ private AbstractIntegrationMessageBuilder<?> prepareMessageBuilder(Object replyO
 				: getMessageBuilderFactory().withPayload(replyObject);
 	}
 
-	/**
-	 * Build Spring message object based on the provided returned AMQP message info.
-	 * @param message the returned AMQP message
-	 * @param replyCode the returned message reason code
-	 * @param replyText the returned message reason text
-	 * @param exchange the exchange the message returned from
-	 * @param returnedRoutingKey the routing key for returned message
-	 * @param converter the converter to deserialize body of the returned AMQP message
-	 * @return the Spring message which represents a returned AMQP message
-	 * @deprecated since 5.4 in favor of {@link #buildReturnedMessage(ReturnedMessage, MessageConverter)}
-	 */
-	@Deprecated
-	protected Message<?> buildReturnedMessage(org.springframework.amqp.core.Message message,
-			int replyCode, String replyText, String exchange, String returnedRoutingKey, MessageConverter converter) {
-
-		return buildReturnedMessage(new ReturnedMessage(message, replyCode, replyText, exchange, returnedRoutingKey),
-				converter);
-	}
-
 	protected Message<?> buildReturnedMessage(ReturnedMessage returnedMessage, MessageConverter converter) {
 		org.springframework.amqp.core.Message amqpMessage = returnedMessage.getMessage();
 		Object returnedObject = converter.fromMessage(amqpMessage);
@@ -731,15 +712,6 @@ public SettableListenableFuture<Confirm> getFuture() {
 			}
 		}
 
-		@Override
-		@Deprecated
-		public void setReturnedMessage(org.springframework.amqp.core.Message returnedMessage) {
-			if (this.userData instanceof CorrelationData) {
-				((CorrelationData) this.userData).setReturnedMessage(returnedMessage);
-			}
-			super.setReturnedMessage(returnedMessage);
-		}
-
 		@Override
 		public void setReturned(ReturnedMessage returned) {
 			if (this.userData instanceof CorrelationData) {

spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/ManualAckListenerExecutionFailedException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2020 the original author or authors.
+ * Copyright 2019-2022 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.
@@ -16,6 +16,8 @@
 
 package org.springframework.integration.amqp.support;
 
+import java.io.Serial;
+
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.support.ListenerExecutionFailedException;
 
@@ -26,37 +28,20 @@
  * Used for conversion errors when using manual acks.
  *
  * @author Gary Russell
+ * @author Artem Bilan
  *
  * @since 5.1.3
  *
  */
 public class ManualAckListenerExecutionFailedException extends ListenerExecutionFailedException {
 
+	@Serial
 	private static final long serialVersionUID = 1L;
 
 	private final Channel channel;
 
 	private final long deliveryTag;
 
-	/**
-	 * Construct an instance with the provided properties.
-	 * @param msg the exception message.
-	 * @param cause the cause.
-	 * @param failedMessage the failed message.
-	 * @param channel the channel.
-	 * @param deliveryTag the delivery tag for the message.
-	 * @deprecated in favor of
-	 * {@link #ManualAckListenerExecutionFailedException(String, Throwable, Channel, long, Message...)}.
-	 */
-	@Deprecated
-	public ManualAckListenerExecutionFailedException(String msg, Throwable cause, Message failedMessage,
-			Channel channel, long deliveryTag) {
-
-		super(msg, cause, failedMessage);
-		this.channel = channel;
-		this.deliveryTag = deliveryTag;
-	}
-
 	/**
 	 * Construct an instance with the provided properties.
 	 * @param msg the exception message.

spring-integration-core/src/main/java/org/springframework/integration/aop/AbstractMessageSourceAdvice.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2022 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.
@@ -18,7 +18,6 @@
 
 import org.springframework.integration.core.MessageSource;
 import org.springframework.integration.util.CompoundTrigger;
-import org.springframework.lang.Nullable;
 import org.springframework.messaging.Message;
 import org.springframework.scheduling.Trigger;
 import org.springframework.util.Assert;
@@ -55,17 +54,9 @@ public CompoundTriggerAdvice(CompoundTrigger compoundTrigger, Trigger overrideTr
 	 * @param result the received message.
 	 * @param source the message source.
 	 * @return the message or null
-	 * @deprecated since 5.3 in favor of {@link #afterReceive(Message, Object)}
 	 */
 	@Override
-	@Deprecated
 	public Message<?> afterReceive(Message<?> result, MessageSource<?> source) {
-		return afterReceive(result, (Object) source);
-	}
-
-	@Override
-	@Nullable
-	public Message<?> afterReceive(@Nullable Message<?> result, Object source) {
 		if (result == null) {
 			this.compoundTrigger.setOverride(this.override);
 		}

spring-integration-core/src/main/java/org/springframework/integration/aop/CompoundTriggerAdvice.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 the original author or authors.
+ * Copyright 2014-2022 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.
@@ -42,33 +42,19 @@
 @Import({ MicrometerMetricsCaptorImportSelector.class, IntegrationManagementConfiguration.class })
 public @interface EnableIntegrationManagement {
 
-	/**
-	 * @deprecated this property is no longer used.
-	 * @return the patterns.
-	 */
-	@Deprecated
-	String[] metersEnabled() default "*";
-
-	/**
-	 * @deprecated this property is no longer used.
-	 * @return the value; false by default, or true when JMX is enabled.
-	 */
-	@Deprecated
-	String defaultCountsEnabled() default "false";
 
 	/**
-	 * Use to disable all logging in the main message flow in framework components. When 'false', such logging will be
-	 * skipped, regardless of logging level. When 'true', the logging is controlled as normal by the logging
-	 * subsystem log level configuration.
+	 * Use for disabling all logging in the main message flow in framework components. When 'false',
+	 * such logging will be skipped, regardless of logging level. When 'true',
+	 * the logging is controlled as normal by the logging subsystem log level configuration.
 	 * <p>
 	 * It has been found that in high-volume messaging environments, calls to methods such as
 	 * {@code logger.isDebuggingEnabled()} can be quite expensive and account for an inordinate amount of CPU
 	 * time.
 	 * <p>
-	 * Set this to false to disable logging by default in all framework components that implement
+	 * Set this to false for disabling logging by default in all framework components that implement
 	 * {@link org.springframework.integration.support.management.IntegrationManagement}
-	 * (channels, message handlers etc). This turns off logging such as
-	 * "PreSend on channel", "Received message" etc.
+	 * (channels, message handlers etc). It turns off logging such as "PreSend on channel", "Received message" etc.
 	 * <p>
 	 * After the context is initialized, individual components can have their setting changed by invoking
 	 * {@link org.springframework.integration.support.management.IntegrationManagement#setLoggingEnabled(boolean)}.

spring-integration-core/src/main/java/org/springframework/integration/aop/SimpleActiveIdleMessageSourceAdvice.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 the original author or authors.
+ * Copyright 2014-2022 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.
@@ -20,7 +20,6 @@
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.integration.channel.DirectChannel;
-import org.springframework.integration.context.IntegrationContextUtils;
 
 /**
  * Shared utility methods for Integration configuration.
@@ -31,12 +30,6 @@
  */
 public final class IntegrationConfigUtils {
 
-	/**
-	 * @deprecated in favor of {@link IntegrationContextUtils#BASE_PACKAGE}.
-	 */
-	@Deprecated
-	public static final String BASE_PACKAGE = IntegrationContextUtils.BASE_PACKAGE;
-
 	public static final String HANDLER_ALIAS_SUFFIX = ".handler";
 
 	public static void registerSpelFunctionBean(BeanDefinitionRegistry registry, String functionId, String className,