From fd33ff9edc128b8a3cec5181b4a572b8fc0504dd Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Thu, 28 Mar 2024 12:27:22 -0400 Subject: [PATCH] GH-48: Upgrade to `spring-integration-aws:3.0.6` Fixes: #48 * Adjust `AmazonS3UploadFileTests` to new reality in the `S3MessageHandler` for `File` uploads. Related to: https://github.com/spring-projects/spring-integration-aws/commit/f2aded0686cf975bccffbe402220180f85198990 --- .../cloud/fn/consumer/s3/AmazonS3UploadFileTests.java | 7 ++++--- dependencies.gradle | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/consumer/spring-s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AmazonS3UploadFileTests.java b/consumer/spring-s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AmazonS3UploadFileTests.java index eb9f8c87..6dbf2992 100644 --- a/consumer/spring-s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AmazonS3UploadFileTests.java +++ b/consumer/spring-s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AmazonS3UploadFileTests.java @@ -32,6 +32,7 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.messaging.Message; import org.springframework.messaging.support.MessageBuilder; import org.springframework.test.context.TestPropertySource; +import org.springframework.util.FileCopyUtils; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.atLeastOnce; @@ -46,7 +47,7 @@ public class AmazonS3UploadFileTests extends AbstractAwsS3ConsumerMockTests { S3AsyncClient.class); File file = new File(temporaryRemoteFolder.toFile(), "foo.mp3"); - file.createNewFile(); + FileCopyUtils.copy(new byte[] { 1 }, file); Message message = MessageBuilder.withPayload(file).build(); this.s3Consumer.accept(message); @@ -60,13 +61,13 @@ public class AmazonS3UploadFileTests extends AbstractAwsS3ConsumerMockTests { assertThat(putObjectRequest.bucket()).isEqualTo(S3_BUCKET); assertThat(putObjectRequest.key()).isEqualTo("foo.mp3"); assertThat(putObjectRequest.contentMD5()).isEqualTo(Md5Utils.md5AsBase64(file)); - assertThat(putObjectRequest.contentLength()).isEqualTo(0L); + assertThat(putObjectRequest.contentLength()).isEqualTo(1L); assertThat(putObjectRequest.contentType()).isEqualTo("audio/mpeg"); assertThat(putObjectRequest.acl()).isEqualTo(ObjectCannedACL.PUBLIC_READ_WRITE); AsyncRequestBody asyncRequestBody = asyncRequestBodyArgumentCaptor.getValue(); StepVerifier.create(asyncRequestBody) - .assertNext((buffer) -> assertThat(TestUtils.getPropertyValue(buffer, "hb", byte[].class)).isEmpty()) + .assertNext((buffer) -> assertThat(buffer.limit()).isEqualTo(1)) .expectComplete() .verify(); diff --git a/dependencies.gradle b/dependencies.gradle index 1b14584e..4347af62 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -7,7 +7,7 @@ ext { djlVersion = '0.26.0' djlSpringVersion = '0.26' - springIntegrationAws = 'org.springframework.integration:spring-integration-aws:3.0.5' + springIntegrationAws = 'org.springframework.integration:spring-integration-aws:3.0.6' ftpserverCore = 'org.apache.ftpserver:ftpserver-core:1.2.0' mockserverNetty = 'org.mock-server:mockserver-netty:5.15.0' twitter4jStream = 'org.twitter4j:twitter4j-stream:4.0.7'