From 3e692f529ab648c930136d492054a221c1aafff6 Mon Sep 17 00:00:00 2001 From: Mike Girard Date: Tue, 4 Oct 2016 14:59:00 -0600 Subject: [PATCH] Update to spring-cloud-aws-1.1.3 Fixes GH-49 (https://github.com/spring-projects/spring-integration-aws/issues/49) --- README.md | 2 +- build.gradle | 2 +- .../integration/aws/outbound/SqsMessageHandler.java | 8 ++++---- .../integration/aws/outbound/SqsMessageHandlerTests.java | 8 ++++---- .../SqsMessageHandlerWithQueueMessagingTemplateTests.java | 8 ++++---- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index d5ea093..fa5e98a 100644 --- a/README.md +++ b/README.md @@ -274,7 +274,7 @@ The Java Configuration is pretty simple: public static class MyConfiguration { @Autowired - private AmazonSQS amazonSqs; + private AmazonSQSAsync amazonSqs; @Bean public QueueMessagingTemplate queueMessagingTemplate() { diff --git a/build.gradle b/build.gradle index f0ce2fd..5758551 100644 --- a/build.gradle +++ b/build.gradle @@ -55,7 +55,7 @@ ext { awsSdkVersion = '1.11.42' servletApiVersion = '3.1.0' slf4jVersion = '1.7.21' - springCloudAwsVersion = '1.1.1.RELEASE' + springCloudAwsVersion = '1.1.3.RELEASE' springIntegrationVersion = '4.3.4.RELEASE' idPrefix = 'aws' diff --git a/src/main/java/org/springframework/integration/aws/outbound/SqsMessageHandler.java b/src/main/java/org/springframework/integration/aws/outbound/SqsMessageHandler.java index ea794f9..bcf2236 100644 --- a/src/main/java/org/springframework/integration/aws/outbound/SqsMessageHandler.java +++ b/src/main/java/org/springframework/integration/aws/outbound/SqsMessageHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 the original author or authors. + * Copyright 2016-2017 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. @@ -28,7 +28,7 @@ import org.springframework.messaging.Message; import org.springframework.util.Assert; import org.springframework.util.StringUtils; -import com.amazonaws.services.sqs.AmazonSQS; +import com.amazonaws.services.sqs.AmazonSQSAsync; /** * The {@link AbstractMessageHandler} implementation for the Amazon SQS {@code sendMessage}. @@ -48,11 +48,11 @@ public class SqsMessageHandler extends AbstractMessageHandler { private EvaluationContext evaluationContext; - public SqsMessageHandler(AmazonSQS amazonSqs) { + public SqsMessageHandler(AmazonSQSAsync amazonSqs) { this(amazonSqs, null); } - public SqsMessageHandler(AmazonSQS amazonSqs, ResourceIdResolver resourceIdResolver) { + public SqsMessageHandler(AmazonSQSAsync amazonSqs, ResourceIdResolver resourceIdResolver) { this(new QueueMessagingTemplate(amazonSqs, resourceIdResolver)); } diff --git a/src/test/java/org/springframework/integration/aws/outbound/SqsMessageHandlerTests.java b/src/test/java/org/springframework/integration/aws/outbound/SqsMessageHandlerTests.java index 9b6d92b..4859a4e 100644 --- a/src/test/java/org/springframework/integration/aws/outbound/SqsMessageHandlerTests.java +++ b/src/test/java/org/springframework/integration/aws/outbound/SqsMessageHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2016 the original author or authors. + * Copyright 2015-2017 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. @@ -30,7 +30,7 @@ import org.springframework.messaging.MessageHandler; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.amazonaws.services.sqs.AmazonSQS; +import com.amazonaws.services.sqs.AmazonSQSAsync; import com.amazonaws.services.sqs.model.GetQueueUrlRequest; import com.amazonaws.services.sqs.model.GetQueueUrlResult; @@ -50,8 +50,8 @@ public class SqsMessageHandlerTests extends AbstractSqsMessageHandlerTests { public static class ContextConfiguration { @Bean - public AmazonSQS amazonSqs() { - AmazonSQS amazonSqs = mock(AmazonSQS.class); + public AmazonSQSAsync amazonSqs() { + AmazonSQSAsync amazonSqs = mock(AmazonSQSAsync.class); willAnswer(invocation -> { GetQueueUrlRequest getQueueUrlRequest = (GetQueueUrlRequest) invocation.getArguments()[0]; diff --git a/src/test/java/org/springframework/integration/aws/outbound/SqsMessageHandlerWithQueueMessagingTemplateTests.java b/src/test/java/org/springframework/integration/aws/outbound/SqsMessageHandlerWithQueueMessagingTemplateTests.java index 29b1ee1..7e92a32 100644 --- a/src/test/java/org/springframework/integration/aws/outbound/SqsMessageHandlerWithQueueMessagingTemplateTests.java +++ b/src/test/java/org/springframework/integration/aws/outbound/SqsMessageHandlerWithQueueMessagingTemplateTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2016 the original author or authors. + * Copyright 2015-2017 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. @@ -31,7 +31,7 @@ import org.springframework.messaging.MessageHandler; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.amazonaws.services.sqs.AmazonSQS; +import com.amazonaws.services.sqs.AmazonSQSAsync; import com.amazonaws.services.sqs.model.GetQueueUrlRequest; import com.amazonaws.services.sqs.model.GetQueueUrlResult; @@ -50,8 +50,8 @@ public class SqsMessageHandlerWithQueueMessagingTemplateTests extends AbstractSq public static class ContextConfiguration { @Bean - public AmazonSQS amazonSqs() { - AmazonSQS amazonSqs = mock(AmazonSQS.class); + public AmazonSQSAsync amazonSqs() { + AmazonSQSAsync amazonSqs = mock(AmazonSQSAsync.class); willAnswer(invocation -> { GetQueueUrlRequest getQueueUrlRequest = (GetQueueUrlRequest) invocation.getArguments()[0];