GH-1485: Remove Deprecations

Resolves #1485

Author: garyrussell

spring-amqp/src/main/java/org/springframework/amqp/core/AmqpMessageReturnedException.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.
@@ -32,13 +32,6 @@ public class AmqpMessageReturnedException extends AmqpException {
 
 	private final ReturnedMessage returned;
 
-	@Deprecated
-	public AmqpMessageReturnedException(String message, Message returnedMessage, int replyCode, String replyText,
-			String exchange, String routingKey) {
-
-		this(message, new ReturnedMessage(returnedMessage, replyCode, replyText, exchange, routingKey));
-	}
-
 	public AmqpMessageReturnedException(String message, ReturnedMessage returned) {
 		super(message);
 		this.returned = returned;

spring-amqp/src/main/java/org/springframework/amqp/core/Message.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-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.
@@ -74,16 +74,6 @@ public Message(byte[] body, MessageProperties messageProperties) { //NOSONAR
 		this.messageProperties = messageProperties;
 	}
 
-	/**
-	 * No longer used.
-	 * @param patterns the patterns.
-	 * @since 1.5.7
-	 * @deprecated toString() no longer deserializes the body.
-	 */
-	@Deprecated
-	public static void addAllowedListPatterns(String... patterns) {
-	}
-
 	/**
 	 * Set the encoding to use in {@link #toString()} when converting the body if
 	 * there is no {@link MessageProperties#getContentEncoding() contentEncoding} message property present.

spring-amqp/src/main/java/org/springframework/amqp/core/Queue.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-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.
@@ -32,14 +32,6 @@
  */
 public class Queue extends AbstractDeclarable implements Cloneable {
 
-	/**
-	 * Argument key for the master locator.
-	 * @since 2.1
-	 * @deprecated in favor of {@link #X_QUEUE_LEADER_LOCATOR}.
-	 */
-	@Deprecated
-	public static final String X_QUEUE_MASTER_LOCATOR = "x-queue-master-locator";
-
 	/**
 	 * Argument key for the queue leader locator.
 	 * @since 2.1
@@ -165,22 +157,6 @@ public String getActualName() {
 		return this.actualName;
 	}
 
-	/**
-	 * Set the master locator strategy argument for this queue.
-	 * @param locator the locator; null to clear the argument.
-	 * @since 2.1
-	 * @deprecated in favor of {@link #setLeaderLocator(String)}.
-	 */
-	@Deprecated
-	public final void setMasterLocator(@Nullable String locator) {
-		if (locator == null) {
-			removeArgument(X_QUEUE_LEADER_LOCATOR);
-		}
-		else {
-			addArgument(X_QUEUE_LEADER_LOCATOR, locator);
-		}
-	}
-
 	/**
 	 * Set the leader locator strategy argument for this queue.
 	 * @param locator the locator; null to clear the argument.

spring-amqp/src/main/java/org/springframework/amqp/core/QueueBuilder.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.
@@ -223,20 +223,6 @@ public QueueBuilder lazy() {
 		return withArgument("x-queue-mode", "lazy");
 	}
 
-	/**
-	 * Set the master locator mode which determines which node a queue master will be
-	 * located on a cluster of nodes.
-	 * @param locator {@link MasterLocator#minMasters}, {@link MasterLocator#clientLocal}
-	 * or {@link MasterLocator#random}.
-	 * @return the builder.
-	 * @since 2.2
-	 * @deprecated in favor of {@link #leaderLocator(LeaderLocator)}.
-	 */
-	@Deprecated
-	public QueueBuilder masterLocator(MasterLocator locator) {
-		return withArgument("x-queue-master-locator", locator.getValue());
-	}
-
 	/**
 	 * Set the master locator mode which determines which node a queue master will be
 	 * located on a cluster of nodes.
@@ -326,43 +312,6 @@ public String getValue() {
 
 	}
 
-	/**
-	 * @deprecated in favor of {@link LeaderLocator}.
-	 */
-	@Deprecated
-	public enum MasterLocator {
-
-		/**
-		 * Deploy on the node with the fewest masters.
-		 */
-		minMasters("min-masters"),
-
-		/**
-		 * Deploy on the node we are connected to.
-		 */
-		clientLocal("client-local"),
-
-		/**
-		 * Deploy on a random node.
-		 */
-		random("random");
-
-		private final String value;
-
-		MasterLocator(String value) {
-			this.value = value;
-		}
-
-		/**
-		 * Return the value.
-		 * @return the value.
-		 */
-		public String getValue() {
-			return this.value;
-		}
-
-	}
-
 	/**
 	 * Locate the queue leader.
 	 *

spring-rabbit-test/src/main/java/org/springframework/amqp/rabbit/test/mockito/LambdaAnswer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 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.
@@ -47,17 +47,6 @@ public class LambdaAnswer<T> extends ForwardsInvocations {
 
 	private final boolean hasDelegate;
 
-	/**
-	 * Deprecated.
-	 * @param callRealMethod true to call the real method.
-	 * @param callback the callback.
-	 * @deprecated in favor of {@link #LambdaAnswer(boolean, ValueToReturn, Object)}.
-	 */
-	@Deprecated
-	public LambdaAnswer(boolean callRealMethod, ValueToReturn<T> callback) {
-		this(callRealMethod, callback, null);
-	}
-
 	/**
 	 * Construct an instance with the provided properties. Use the test harness to get an
 	 * instance with the proper delegate.

spring-rabbit-test/src/main/java/org/springframework/amqp/rabbit/test/mockito/LatchCountDownAndCallRealMethodAnswer.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.
@@ -46,17 +46,6 @@ public class LatchCountDownAndCallRealMethodAnswer extends ForwardsInvocations {
 
 	private final boolean hasDelegate;
 
-	/**
-	 * Get an instance with no delegate.
-	 * @param count to set in a {@link CountDownLatch}.
-	 * @deprecated in favor of
-	 * {@link #LatchCountDownAndCallRealMethodAnswer(int, Object)}.
-	 */
-	@Deprecated
-	public LatchCountDownAndCallRealMethodAnswer(int count) {
-		this(count, null);
-	}
-
 	/**
 	 * Get an instance with the provided properties. Use the test harness to get an
 	 * instance with the proper delegate.

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/CachingConnectionFactory.java

@@ -397,45 +397,6 @@ public void setPublisherReturns(boolean publisherReturns) {
 		}
 	}
 
-	/**
-	 * Use full (correlated) publisher confirms, with correlation data and a callback for
-	 * each message.
-	 * @param publisherConfirms true for full publisher returns,
-	 * @since 1.1
-	 * @deprecated in favor of {@link #setPublisherConfirmType(ConfirmType)}.
-	 * @see #setSimplePublisherConfirms(boolean)
-	 */
-	@Deprecated
-	public void setPublisherConfirms(boolean publisherConfirms) {
-		Assert.isTrue(!publisherConfirms || !ConfirmType.SIMPLE.equals(this.confirmType),
-				"Cannot set both publisherConfirms and simplePublisherConfirms");
-		if (publisherConfirms) {
-			setPublisherConfirmType(ConfirmType.CORRELATED);
-		}
-		else if (this.confirmType.equals(ConfirmType.CORRELATED)) {
-			setPublisherConfirmType(ConfirmType.NONE);
-		}
-	}
-
-	/**
-	 * Use simple publisher confirms where the template simply waits for completion.
-	 * @param simplePublisherConfirms true for confirms.
-	 * @since 2.1
-	 * @deprecated in favor of {@link #setPublisherConfirmType(ConfirmType)}.
-	 * @see #setPublisherConfirms(boolean)
-	 */
-	@Deprecated
-	public void setSimplePublisherConfirms(boolean simplePublisherConfirms) {
-		Assert.isTrue(!simplePublisherConfirms || !ConfirmType.CORRELATED.equals(this.confirmType),
-				"Cannot set both publisherConfirms and simplePublisherConfirms");
-		if (simplePublisherConfirms) {
-			setPublisherConfirmType(ConfirmType.SIMPLE);
-		}
-		else if (this.confirmType.equals(ConfirmType.SIMPLE)) {
-			setPublisherConfirmType(ConfirmType.NONE);
-		}
-	}
-
 	@Override
 	public boolean isSimplePublisherConfirms() {
 		return this.confirmType.equals(ConfirmType.SIMPLE);

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/CorrelationData.java

@@ -20,7 +20,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import org.springframework.amqp.core.Correlation;
-import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.ReturnedMessage;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
@@ -99,44 +98,13 @@ public CompletableFuture<Confirm> getFuture() {
 	 * Return a future to check the success/failure of the publish operation.
 	 * @return the future.
 	 * @since 2.4.7
-	 * @deprecated in favor of {@link #getFuture()}.
+	 * @deprecated as of 3.0, in favor of {@link #getFuture()}.
 	 */
 	@Deprecated
 	public CompletableFuture<Confirm> getCompletableFuture() {
 		return this.future;
 	}
 
-	/**
-	 * Return a returned message, if any; requires a unique
-	 * {@link #CorrelationData(String) id}. Guaranteed to be populated before the future
-	 * is set.
-	 * @return the message or null.
-	 * @since 2.1
-	 * @deprecated in favor of {@link #getReturned()}.
-	 */
-	@Deprecated
-	@Nullable
-	public Message getReturnedMessage() {
-		if (this.returnedMessage == null) {
-			return null;
-		}
-		else {
-			return this.returnedMessage.getMessage();
-		}
-	}
-
-	/**
-	 * Set a returned message for this correlation data.
-	 * @param returnedMessage the returned message.
-	 * @since 1.7.13
-	 * @deprecated in favor of {@link #setReturned(ReturnedMessage)}.
-	 */
-	@Deprecated
-	public void setReturnedMessage(Message returnedMessage) {
-		this.returnedMessage = new ReturnedMessage(returnedMessage, 0, "not available", "not available",
-				"not available");
-	}
-
 	/**
 	 * Get the returned message and metadata, if any. Guaranteed to be populated before
 	 * the future is set.

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/PublisherCallbackChannel.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-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.
@@ -19,7 +19,6 @@
 import java.util.Collection;
 import java.util.function.Consumer;
 
-import com.rabbitmq.client.AMQP;
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Return;
 
@@ -115,37 +114,11 @@ interface Listener {
 		 */
 		void handleConfirm(PendingConfirm pendingConfirm, boolean ack);
 
-		/**
-		 * Handle a returned message.
-		 * @param replyCode the reply code.
-		 * @param replyText the reply text.
-		 * @param exchange the exchange.
-		 * @param routingKey the routing key.
-		 * @param properties the message properties.
-		 * @param body the message body.
-		 * @deprecated in favor of {@link #handleReturn(Return)}.
-		 */
-		@Deprecated
-		default void handleReturn(int replyCode,
-				String replyText,
-				String exchange,
-				String routingKey,
-				AMQP.BasicProperties properties,
-				byte[] body) {
-
-			throw new UnsupportedOperationException(
-					"This should never be called; please open a GitHub issue with a stack trace");
-		}
-
 		/**
 		 * Handle a returned message.
 		 * @param returned the message and metadata.
 		 */
-		@SuppressWarnings("deprecation")
-		default void handleReturn(Return returned) {
-			handleReturn(returned.getReplyCode(), returned.getReplyText(), returned.getExchange(),
-					returned.getRoutingKey(), returned.getProperties(), returned.getBody());
-		}
+		void handleReturn(Return returned);
 
 		/**
 		 * When called, this listener should remove all references to the