Spring/spring-integration-aws
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to spring-cloud-aws-1.1.3

Browse Source 
Fixes GH-49 (https://github.com/spring-projects/spring-integration-aws/issues/49)
This commit is contained in:
Mike Girard
2016-10-04 14:59:00 -06:00
committed by Artem Bilan
parent ace4055ed9
commit 3e692f529a
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -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() {

2
build.gradle
View File

@@ -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'

8
src/main/java/org/springframework/integration/aws/outbound/SqsMessageHandler.java
View File

@@ -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));
}

8
src/test/java/org/springframework/integration/aws/outbound/SqsMessageHandlerTests.java
View File

@@ -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];

8
src/test/java/org/springframework/integration/aws/outbound/SqsMessageHandlerWithQueueMessagingTemplateTests.java
View File

@@ -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];