From ed544de72af0ad915f9f44ade44311af21e9757b Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Mon, 9 Jun 2025 15:11:55 -0400 Subject: [PATCH] Fix deprecation warnings in AMPQ module * The `Confirm` in Spring AMQP is a `record` now, so not `isAck()` but just `ack()` * The `MessageBatch` in Spring AMQP is a `record` now, so not `getMessage()`, but just `message()` * Fix new deprecation warning for the `SingleRequestResponseScenarioTests` --- .../amqp/dsl/AbstractMessageListenerContainerSpec.java | 5 +++-- .../integration/amqp/dsl/package-info.java | 2 +- .../integration/amqp/outbound/AmqpOutboundEndpoint.java | 2 +- .../springframework/integration/amqp/package-info.java | 5 ----- .../integration/amqp/inbound/InboundEndpointTests.java | 8 ++++---- .../amqp/outbound/AmqpOutboundEndpointTests.java | 4 ++-- .../amqp/outbound/AmqpOutboundEndpointTests2.java | 4 ++-- .../integration/amqp/outbound/AsyncAmqpGatewayTests.java | 4 ++-- .../test/support/AbstractRequestResponseScenarioTest.java | 2 ++ .../test/support/LongRunningIntegrationTest.java | 2 +- .../test/support/SingleRequestResponseScenarioTest.java | 1 + .../test/support/SingleRequestResponseScenarioTests.java | 1 + 12 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 spring-integration-amqp/src/main/java/org/springframework/integration/amqp/package-info.java diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AbstractMessageListenerContainerSpec.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AbstractMessageListenerContainerSpec.java index d0df0d5229..4d31bfb358 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AbstractMessageListenerContainerSpec.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AbstractMessageListenerContainerSpec.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2023 the original author or authors. + * Copyright 2017-2025 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,6 +20,7 @@ import java.util.Map; import java.util.concurrent.Executor; import org.aopalliance.aop.Advice; +import org.jspecify.annotations.Nullable; import org.springframework.amqp.core.AcknowledgeMode; import org.springframework.amqp.core.MessagePostProcessor; @@ -55,7 +56,7 @@ public abstract class AbstractMessageListenerContainerSpec received = out.receive(0); assertThat(received).isNotNull(); assertThat(((List) received.getPayload())).contains("test1", "test2"); @@ -503,12 +503,12 @@ public class InboundEndpointTests { bs.addToBatch("foo", "bar", message); message = new org.springframework.amqp.core.Message("test2".getBytes(), messageProperties); MessageBatch batched = bs.addToBatch("foo", "bar", message); - listener.onMessage(batched.getMessage(), null); + listener.onMessage(batched.message(), null); Message received = out.receive(0); assertThat(received).isNotNull(); assertThat(((List) received.getPayload())).contains("test1", "test2"); org.springframework.amqp.core.Message sourceData = StaticMessageHeaderAccessor.getSourceData(received); - assertThat(sourceData).isSameAs(batched.getMessage()); + assertThat(sourceData).isSameAs(batched.message()); } @SuppressWarnings({"unchecked"}) diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpointTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpointTests.java index c9acce8632..f49ee50896 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpointTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpointTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2025 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. @@ -229,7 +229,7 @@ public class AmqpOutboundEndpointTests { assertThat(returned.getPayload()).isEqualTo(message.getPayload()); Confirm confirm = corrData.getFuture().get(10, TimeUnit.SECONDS); assertThat(confirm).isNotNull(); - assertThat(confirm.isAck()).isTrue(); + assertThat(confirm.ack()).isTrue(); assertThat(corrData.getReturned()).isNotNull(); } diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpointTests2.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpointTests2.java index 7b55cecb05..4b389169f6 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpointTests2.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpointTests2.java @@ -1,5 +1,5 @@ /* - * Copyright 2019-2023 the original author or authors. + * Copyright 2019-2025 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. @@ -84,7 +84,7 @@ public class AmqpOutboundEndpointTests2 { .setHeader("rk", "junkjunk") .setHeader(AmqpHeaders.PUBLISH_CONFIRM_CORRELATION, corr) .build()); - assertThat(corr.getFuture().get(10, TimeUnit.SECONDS).isAck()).isTrue(); + assertThat(corr.getFuture().get(10, TimeUnit.SECONDS).ack()).isTrue(); assertThat(corr.getReturned()).isNotNull(); } diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AsyncAmqpGatewayTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AsyncAmqpGatewayTests.java index 5f4d9c7ebf..1e3c792a16 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AsyncAmqpGatewayTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AsyncAmqpGatewayTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2022 the original author or authors. + * Copyright 2016-2025 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. @@ -251,7 +251,7 @@ class AsyncAmqpGatewayTests { gateway.handleMessage(MessageBuilder.withPayload("test") .setHeader(AmqpHeaders.PUBLISH_CONFIRM_CORRELATION, corr) .build()); - assertThat(corr.getFuture().get(10, TimeUnit.SECONDS).isAck()).isTrue(); + assertThat(corr.getFuture().get(10, TimeUnit.SECONDS).ack()).isTrue(); assertThat(corr.getReturned()).isNotNull(); asyncTemplate.stop(); diff --git a/spring-integration-test-support/src/main/java/org/springframework/integration/test/support/AbstractRequestResponseScenarioTest.java b/spring-integration-test-support/src/main/java/org/springframework/integration/test/support/AbstractRequestResponseScenarioTest.java index ebc595af13..c8a371279e 100644 --- a/spring-integration-test-support/src/main/java/org/springframework/integration/test/support/AbstractRequestResponseScenarioTest.java +++ b/spring-integration-test-support/src/main/java/org/springframework/integration/test/support/AbstractRequestResponseScenarioTest.java @@ -47,6 +47,8 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Gary Russell * @author Artem Bilan * @author Jiandong Ma + * + * @since 7.0 */ @SpringJUnitConfig @DirtiesContext diff --git a/spring-integration-test-support/src/main/java/org/springframework/integration/test/support/LongRunningIntegrationTest.java b/spring-integration-test-support/src/main/java/org/springframework/integration/test/support/LongRunningIntegrationTest.java index ebcbd186ca..dc47857488 100644 --- a/spring-integration-test-support/src/main/java/org/springframework/integration/test/support/LongRunningIntegrationTest.java +++ b/spring-integration-test-support/src/main/java/org/springframework/integration/test/support/LongRunningIntegrationTest.java @@ -26,7 +26,7 @@ import org.junit.runners.model.Statement; import org.springframework.integration.test.condition.LongRunningTest; /** - * Rule to prevent long running tests from running on every build; set environment + * Rule to prevent long-running tests from running on every build; set environment * variable RUN_LONG_INTEGRATION_TESTS on a CI nightly build to ensure coverage. * * @author Gary Russell diff --git a/spring-integration-test-support/src/main/java/org/springframework/integration/test/support/SingleRequestResponseScenarioTest.java b/spring-integration-test-support/src/main/java/org/springframework/integration/test/support/SingleRequestResponseScenarioTest.java index a14cf36c0e..2a2095cb21 100644 --- a/spring-integration-test-support/src/main/java/org/springframework/integration/test/support/SingleRequestResponseScenarioTest.java +++ b/spring-integration-test-support/src/main/java/org/springframework/integration/test/support/SingleRequestResponseScenarioTest.java @@ -25,6 +25,7 @@ import java.util.List; * @author David Turanski * @author Jiandong Ma * + * @since 7.0 */ public abstract class SingleRequestResponseScenarioTest extends AbstractRequestResponseScenarioTest { diff --git a/spring-integration-test-support/src/main/java/org/springframework/integration/test/support/SingleRequestResponseScenarioTests.java b/spring-integration-test-support/src/main/java/org/springframework/integration/test/support/SingleRequestResponseScenarioTests.java index 0e53de83c7..cc4a218f34 100644 --- a/spring-integration-test-support/src/main/java/org/springframework/integration/test/support/SingleRequestResponseScenarioTests.java +++ b/spring-integration-test-support/src/main/java/org/springframework/integration/test/support/SingleRequestResponseScenarioTests.java @@ -28,6 +28,7 @@ import java.util.List; * @deprecated since 7.0 in favor of {@link SingleRequestResponseScenarioTest} */ @Deprecated(since = "7.0", forRemoval = true) +@SuppressWarnings("removal") public abstract class SingleRequestResponseScenarioTests extends AbstractRequestResponseScenarioTests { @Override