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

GH-3: Fix BeanFactory population for AS3MH

Browse Source 
Fixes https://github.com/spring-projects/spring-integration-aws/issues/3

**Cherry-pick to 0.5.x**
This commit is contained in:
Artem Bilan
2015-02-12 11:05:22 +02:00
parent 7c091c84a4
commit d4dedef383
3 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/org/springframework/integration/aws/s3/AmazonS3MessageHandler.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2014 the original author or authors.
* Copyright 2002-2015 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 java.io.InputStream;
import java.util.Collection;
import java.util.Map;
import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.expression.Expression;
import org.springframework.messaging.Message;
import org.springframework.integration.aws.core.AWSCredentials;
@@ -41,6 +42,7 @@ import org.springframework.util.Assert;
*
* @author Amol Nayak
* @author Rob Harrop
* @author Artem Bilan
*
* @since 0.5
*
@@ -60,25 +62,30 @@ public class AmazonS3MessageHandler extends AbstractMessageHandler {
private volatile FileNameGenerationStrategy fileNameGenerator = new DefaultFileNameGenerationStrategy();
private volatile boolean fileNameGeneratorSet;
@Override
protected void onInit() throws Exception {
super.onInit();
Assert.hasText(bucket,"Bucket not set'");
Assert.notNull(remoteDirectoryProcessor, "Remote Directory processor should be present, set the remore directory expression");
Assert.notNull(remoteDirectoryProcessor,
"Remote Directory processor should be present, set the remote directory expression");
if (!this.fileNameGeneratorSet && this.fileNameGenerator instanceof BeanFactoryAware) {
((BeanFactoryAware) this.fileNameGenerator).setBeanFactory(getBeanFactory());
}
this.remoteDirectoryProcessor.setBeanFactory(getBeanFactory());
}
/**
* The constructor that initializes {@link AmazonS3MessageHandler} with the provided
* implementation of {@link AmazonS3Operations} and using the provided {@link AWSCredentials}
*
* @param credentials
* @param operations
*/
public AmazonS3MessageHandler(AWSCredentials credentials,AmazonS3Operations operations) {
public AmazonS3MessageHandler(AWSCredentials credentials, AmazonS3Operations operations) {
Assert.notNull(operations,"s3 operations is null");
Assert.notNull(credentials,"AWS Credentials are null");
this.credentials = credentials;
@@ -86,13 +93,14 @@ public class AmazonS3MessageHandler extends AbstractMessageHandler {
}
/**
* The handler implementation for the Amazon S3 used to put objects in the remote AWS S3 bucket
* the message should contain a valid payload of type {@link File}, {@link InputStream},
* byte[] or {@link String}. Various predetermined headers as defined in {@link AmazonS3MessageHeaders}
* are extracted from the message and an {@link AmazonS3Object} is constructed that is provided to
* the {@link AmazonS3Operations} implementation to be uploaded in S3.
*
* @param message
*/
@Override
@@ -172,7 +180,7 @@ public class AmazonS3MessageHandler extends AbstractMessageHandler {
return null;
}
if(expectedType.isAssignableFrom(genericHeader.getClass())) {
header = (T)genericHeader;
header = (T) genericHeader;
}
else {
logger.warn("Found header " + USER_METADATA + " in the message but was not of required type");
@@ -216,5 +224,7 @@ public class AmazonS3MessageHandler extends AbstractMessageHandler {
public void setFileNameGenerator(FileNameGenerationStrategy fileNameGenerator) {
Assert.notNull(fileNameGenerator,"File name generator is null");
this.fileNameGenerator = fileNameGenerator;
this.fileNameGeneratorSet = true;
}
}

4
src/test/java/org/springframework/integration/aws/s3/AmazonS3MessageHandlerTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2014 the original author or authors.
* Copyright 2002-2015 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.
@@ -57,6 +57,7 @@ import org.springframework.messaging.MessageHandlingException;
*
* @author Amol Nayak
* @author Rob Harrop
* @author Artem Bilan
*
* @since 0.5
*
@@ -219,6 +220,7 @@ public class AmazonS3MessageHandlerTests {
AmazonS3MessageHandler handler = getHandler();
SpelExpressionParser parser = new SpelExpressionParser();
handler.setRemoteDirectoryExpression(parser.parseExpression("headers['remoteDirectory']"));
handler.afterPropertiesSet();
handler.handleMessage(message);
Assert.assertEquals("TestBucket", holder.getBucket());
Assert.assertEquals("TestFileName.txt", holder.getObjectName());

13
src/test/java/org/springframework/integration/aws/s3/DefaultFileNameGenerationStrategyTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2014 the original author or authors.
* Copyright 2002-2015 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,9 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.mockito.Mockito;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.integration.support.MessageBuilder;
import org.springframework.messaging.Message;
@@ -34,6 +37,7 @@ import org.springframework.messaging.Message;
*
* @author Amol Nayak
* @author Rob Harrop
* @author Artem Bilan
*
* @since 0.5
*
@@ -52,6 +56,7 @@ public class DefaultFileNameGenerationStrategyTests {
.setHeader(AmazonS3MessageHeaders.FILE_NAME, "FileName.txt")
.build();
DefaultFileNameGenerationStrategy strategy = new DefaultFileNameGenerationStrategy();
strategy.setBeanFactory(Mockito.mock(BeanFactory.class));
Assert.assertEquals("FileName.txt", strategy.generateFileName(message));
}
@@ -65,6 +70,7 @@ public class DefaultFileNameGenerationStrategyTests {
Message<File> message = MessageBuilder.withPayload(file)
.build();
DefaultFileNameGenerationStrategy strategy = new DefaultFileNameGenerationStrategy();
strategy.setBeanFactory(Mockito.mock(BeanFactory.class));
Assert.assertEquals("TempFile.txt", strategy.generateFileName(message));
file.delete();
}
@@ -79,6 +85,7 @@ public class DefaultFileNameGenerationStrategyTests {
Message<File> message = MessageBuilder.withPayload(file)
.build();
DefaultFileNameGenerationStrategy strategy = new DefaultFileNameGenerationStrategy();
strategy.setBeanFactory(Mockito.mock(BeanFactory.class));
Assert.assertEquals("TempFile.txt", strategy.generateFileName(message));
file.delete();
}
@@ -91,6 +98,7 @@ public class DefaultFileNameGenerationStrategyTests {
Message<String> message = MessageBuilder.withPayload("String")
.build();
DefaultFileNameGenerationStrategy strategy = new DefaultFileNameGenerationStrategy();
strategy.setBeanFactory(Mockito.mock(BeanFactory.class));
UUID uid = message.getHeaders().getId();
Assert.assertEquals(uid.toString() + ".ext", strategy.generateFileName(message));
}
@@ -101,6 +109,7 @@ public class DefaultFileNameGenerationStrategyTests {
@Test(expected=IllegalArgumentException.class)
public void withNullExprssion() {
DefaultFileNameGenerationStrategy strategy = new DefaultFileNameGenerationStrategy();
strategy.setBeanFactory(Mockito.mock(BeanFactory.class));
strategy.setFileNameExpression(null);
}
@@ -110,6 +119,8 @@ public class DefaultFileNameGenerationStrategyTests {
@Test(expected=IllegalArgumentException.class)
public void withNullTemporarySuffix() {
DefaultFileNameGenerationStrategy strategy = new DefaultFileNameGenerationStrategy();
strategy.setBeanFactory(Mockito.mock(BeanFactory.class));
strategy.setTemporarySuffix(null);
}
}