Resolve Deprecations in Spring Framework 6.0

garyrussell · artembilan · commit 32c1c996c018 · 2022-07-19T13:48:38.000-04:00
- TaskScheduler
diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/AsyncRabbitTemplate.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/AsyncRabbitTemplate.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.
@@ -16,7 +16,7 @@
 
 package org.springframework.amqp.rabbit;
 
-import java.util.Date;
+import java.time.Instant;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -741,7 +741,7 @@ void startTimer() {
 						throw new IllegalStateException("'AsyncRabbitTemplate' must be started.");
 					}
 					this.timeoutTask = AsyncRabbitTemplate.this.taskScheduler.schedule(new TimeoutTask(),
-							new Date(System.currentTimeMillis() + AsyncRabbitTemplate.this.receiveTimeout));
+							Instant.now().plusMillis(AsyncRabbitTemplate.this.receiveTimeout));
 				}
 			}
 			else {
diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/BatchingRabbitTemplate.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/BatchingRabbitTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 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.
@@ -25,6 +25,7 @@
 import org.springframework.amqp.rabbit.batch.MessageBatch;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
 import org.springframework.amqp.rabbit.connection.CorrelationData;
+import org.springframework.lang.Nullable;
 import org.springframework.scheduling.TaskScheduler;
 
 /**
@@ -74,12 +75,12 @@ public BatchingRabbitTemplate(ConnectionFactory connectionFactory, BatchingStrat
 	}
 
 	@Override
-	public synchronized void send(String exchange, String routingKey, Message message, CorrelationData correlationData)
-			throws AmqpException {
+	public synchronized void send(String exchange, String routingKey, Message message,
+			@Nullable CorrelationData correlationData) throws AmqpException {
 
 		if (correlationData != null) {
-			if (logger.isDebugEnabled()) {
-				logger.debug("Cannot use batching with correlation data");
+			if (this.logger.isDebugEnabled()) {
+				this.logger.debug("Cannot use batching with correlation data");
 			}
 			super.send(exchange, routingKey, message, correlationData);
 		}
@@ -93,7 +94,7 @@ public synchronized void send(String exchange, String routingKey, Message messag
 			}
 			Date next = this.batchingStrategy.nextRelease();
 			if (next != null) {
-				this.scheduledTask = this.scheduler.schedule((Runnable) () -> releaseBatches(), next);
+				this.scheduledTask = this.scheduler.schedule((Runnable) () -> releaseBatches(), next.toInstant());
 			}
 		}
 	}
diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/DirectMessageListenerContainer.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/DirectMessageListenerContainer.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.
@@ -18,11 +18,12 @@
 
 import java.io.IOException;
 import java.lang.reflect.Constructor;
+import java.time.Duration;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Date;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
@@ -510,7 +511,7 @@ private void startMonitor(long idleEventInterval, final Map<String, Queue> names
 				}
 			}
 			processMonitorTask();
-		}, this.monitorInterval);
+		}, Duration.ofMillis(this.monitorInterval));
 	}
 
 	private void checkIdle(long idleEventInterval, long now) {
@@ -578,7 +579,7 @@ private boolean restartConsumer(final Map<String, Queue> namesToQueues, List<Sim
 			this.logger.error("Cannot connect to server", e);
 			if (e.getCause() instanceof AmqpApplicationContextClosedException) {
 				this.logger.error("Application context is closed, terminating");
-				this.taskScheduler.schedule(this::stop, new Date());
+				this.taskScheduler.schedule(this::stop, Instant.now());
 			}
 			this.consumersToRestart.addAll(restartableConsumers);
 			if (this.logger.isTraceEnabled()) {
@@ -612,7 +613,7 @@ private void startConsumers(final String[] queueNames) {
 							shutdown();
 							this.logger.error("Failed to start container - fatal error or backOffs exhausted",
 									e);
-							this.taskScheduler.schedule(this::stop, new Date());
+							this.taskScheduler.schedule(this::stop, Instant.now());
 							break;
 						}
 						this.logger.error("Error creating consumer; retrying in " + nextBackOff, e);
diff --git a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/ContainerInitializationTests.java b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/ContainerInitializationTests.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.

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2016-2021 the original author or authors.`
	`2`	`+ * Copyright 2016-2022 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -16,7 +16,7 @@`
`16`	`16`
`17`	`17`	`package org.springframework.amqp.rabbit;`
`18`	`18`
`19`		`-import java.util.Date;`
	`19`	`+import java.time.Instant;`
`20`	`20`	`import java.util.UUID;`
`21`	`21`	`import java.util.concurrent.ConcurrentHashMap;`
`22`	`22`	`import java.util.concurrent.ConcurrentMap;`
`@@ -741,7 +741,7 @@ void startTimer() {`
`741`	`741`	`throw new IllegalStateException("'AsyncRabbitTemplate' must be started.");`
`742`	`742`	`}`
`743`	`743`	`this.timeoutTask = AsyncRabbitTemplate.this.taskScheduler.schedule(new TimeoutTask(),`
`744`		`- new Date(System.currentTimeMillis() + AsyncRabbitTemplate.this.receiveTimeout));`
	`744`	`+ Instant.now().plusMillis(AsyncRabbitTemplate.this.receiveTimeout));`
`745`	`745`	`}`
`746`	`746`	`}`
`747`	`747`	`else {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2014-2019 the original author or authors.`
	`2`	`+ * Copyright 2014-2022 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -25,6 +25,7 @@`
`25`	`25`	`import org.springframework.amqp.rabbit.batch.MessageBatch;`
`26`	`26`	`import org.springframework.amqp.rabbit.connection.ConnectionFactory;`
`27`	`27`	`import org.springframework.amqp.rabbit.connection.CorrelationData;`
	`28`	`+import org.springframework.lang.Nullable;`
`28`	`29`	`import org.springframework.scheduling.TaskScheduler;`
`29`	`30`
`30`	`31`	`/**`
`@@ -74,12 +75,12 @@ public BatchingRabbitTemplate(ConnectionFactory connectionFactory, BatchingStrat`
`74`	`75`	`}`
`75`	`76`
`76`	`77`	`@Override`
`77`		`- public synchronized void send(String exchange, String routingKey, Message message, CorrelationData correlationData)`
`78`		`- throws AmqpException {`
	`78`	`+ public synchronized void send(String exchange, String routingKey, Message message,`
	`79`	`+ @Nullable CorrelationData correlationData) throws AmqpException {`
`79`	`80`
`80`	`81`	`if (correlationData != null) {`
`81`		`- if (logger.isDebugEnabled()) {`
`82`		`- logger.debug("Cannot use batching with correlation data");`
	`82`	`+ if (this.logger.isDebugEnabled()) {`
	`83`	`+ this.logger.debug("Cannot use batching with correlation data");`
`83`	`84`	`}`
`84`	`85`	`super.send(exchange, routingKey, message, correlationData);`
`85`	`86`	`}`
`@@ -93,7 +94,7 @@ public synchronized void send(String exchange, String routingKey, Message messag`
`93`	`94`	`}`
`94`	`95`	`Date next = this.batchingStrategy.nextRelease();`
`95`	`96`	`if (next != null) {`
`96`		`- this.scheduledTask = this.scheduler.schedule((Runnable) () -> releaseBatches(), next);`
	`97`	`+ this.scheduledTask = this.scheduler.schedule((Runnable) () -> releaseBatches(), next.toInstant());`
`97`	`98`	`}`
`98`	`99`	`}`
`99`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2016-2020 the original author or authors.`
	`2`	`+ * Copyright 2016-2022 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`