GH-75: Fix remote directory representation

Resolves spring-projects/spring-integration-aws#75

Since we can build S3 entity key any deep path,
e.g. `my_bucket/foo/bar/baz/file.name` and S3 Object `key` representation
is exactly the whole path without bucket name, we should treat only bucket
as a remote dir; the key should be as a file name

* Change `S3InboundFileSynchronizer` logic to extract bucket name before
performing `copyFileToLocalDirectory()`
* Change `S3StreamingMessageSource` to override the `S3FileInfo.remoteDirectory`
to the only bucket name after `poll()`.
* Use for both cases a new `S3Session.normalizeBucketName()` method
* Upgrade to Gradle 4.0 and some other `build.gradle` polishing

build.gradle

@@ -3,12 +3,8 @@ buildscript {
 		maven { url 'http://repo.spring.io/plugins-release' }
 	}
 	dependencies {
-		classpath 'io.spring.gradle:spring-io-plugin:0.0.6.RELEASE'
-	}
-	configurations.classpath.resolutionStrategy.eachDependency {
-		if (it.requested.name == 'dependency-management-plugin') {
-			it.useVersion '1.0.0.RELEASE'
-		}
+		classpath 'io.spring.gradle:dependency-management-plugin:1.0.2.RELEASE'
+		classpath 'io.spring.gradle:spring-io-plugin:0.0.8.RELEASE'
 	}
 }
 
@@ -17,7 +13,7 @@ plugins {
 	id 'eclipse'
 	id 'idea'
 	id 'jacoco'
-	id 'org.sonarqube' version '2.2.1'
+	id 'org.sonarqube' version '2.5'
 	id 'checkstyle'
 }
 description = 'Spring Integration AWS Support'
@@ -37,7 +33,7 @@ repositories {
 ext {
 	assertjVersion = '3.6.2'
 	servletApiVersion = '3.1.0'
-	slf4jVersion = '1.7.22'
+	slf4jVersion = '1.7.25'
 	springCloudAwsVersion = '1.2.1.RELEASE'
 	springIntegrationVersion = '4.3.10.RELEASE'
 
@@ -95,12 +91,12 @@ dependencyManagement {
 }
 
 jacoco {
-	toolVersion = "0.7.8"
+	toolVersion = "0.7.9"
 }
 
 checkstyle {
 	configFile = file("${rootDir}/src/checkstyle/checkstyle.xml")
-	toolVersion = "6.16.1"
+	toolVersion = "8.0"
 }
 
 dependencies {
@@ -167,7 +163,7 @@ jacocoTestReport {
 	reports {
 		xml.enabled false
 		csv.enabled false
-		html.destination "${buildDir}/reports/jacoco/html"
+		html.destination file("${buildDir}/reports/jacoco/html")
 	}
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue May 30 10:53:11 EDT 2017
+#Mon Jul 10 20:22:20 EDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip

gradlew

@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -155,7 +155,7 @@ if $cygwin ; then
 fi
 
 # Escape application args
-save ( ) {
+save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }

src/main/java/org/springframework/integration/aws/inbound/S3InboundFileSynchronizer.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.
@@ -16,8 +16,12 @@
 
 package org.springframework.integration.aws.inbound;
 
+import java.io.File;
+import java.io.IOException;
+
 import org.springframework.expression.Expression;
 import org.springframework.expression.common.LiteralExpression;
+import org.springframework.integration.aws.support.S3Session;
 import org.springframework.integration.aws.support.S3SessionFactory;
 import org.springframework.integration.aws.support.filters.S3PersistentAcceptOnceFileListFilter;
 import org.springframework.integration.file.filters.FileListFilter;
@@ -79,4 +83,11 @@ public class S3InboundFileSynchronizer extends AbstractInboundFileSynchronizer<S
 		return file.getLastModified().getTime();
 	}
 
+	@Override
+	protected void copyFileToLocalDirectory(String remoteDirectoryPath, S3ObjectSummary remoteFile,
+			File localDirectory, Session<S3ObjectSummary> session) throws IOException {
+		super.copyFileToLocalDirectory(((S3Session) session).normalizeBucketName(remoteDirectoryPath),
+				remoteFile, localDirectory, session);
+	}
+
 }

src/main/java/org/springframework/integration/aws/inbound/S3StreamingMessageSource.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.
@@ -22,6 +22,7 @@ import java.util.Comparator;
 import java.util.List;
 
 import org.springframework.integration.aws.support.S3FileInfo;
+import org.springframework.integration.aws.support.S3Session;
 import org.springframework.integration.file.remote.AbstractFileInfo;
 import org.springframework.integration.file.remote.AbstractRemoteFileStreamingMessageSource;
 import org.springframework.integration.file.remote.RemoteFileTemplate;
@@ -32,6 +33,8 @@ import com.amazonaws.services.s3.model.S3ObjectSummary;
  * A {@link AbstractRemoteFileStreamingMessageSource} implementation for the Amazon S3.
  *
  * @author Christian Tzolov
+ * @author Artem Bilan
+ *
  * @since 1.1
  */
 public class S3StreamingMessageSource extends AbstractRemoteFileStreamingMessageSource<S3ObjectSummary> {
@@ -41,13 +44,13 @@ public class S3StreamingMessageSource extends AbstractRemoteFileStreamingMessage
 	}
 
 	public S3StreamingMessageSource(RemoteFileTemplate<S3ObjectSummary> template,
-									Comparator<AbstractFileInfo<S3ObjectSummary>> comparator) {
+			Comparator<AbstractFileInfo<S3ObjectSummary>> comparator) {
+
 		super(template, comparator);
 	}
 
 	@Override
 	protected List<AbstractFileInfo<S3ObjectSummary>> asFileInfoList(Collection<S3ObjectSummary> collection) {
-
 		List<AbstractFileInfo<S3ObjectSummary>> canonicalFiles = new ArrayList<AbstractFileInfo<S3ObjectSummary>>();
 		for (S3ObjectSummary s3ObjectSummary : collection) {
 			canonicalFiles.add(new S3FileInfo(s3ObjectSummary));
@@ -60,4 +63,14 @@ public class S3StreamingMessageSource extends AbstractRemoteFileStreamingMessage
 		return "aws:s3-inbound-streaming-channel-adapter";
 	}
 
+	@Override
+	protected AbstractFileInfo<S3ObjectSummary> poll() {
+		AbstractFileInfo<S3ObjectSummary> file = super.poll();
+		if (file != null) {
+			S3Session s3Session = (S3Session) getRemoteFileTemplate().getSession();
+			file.setRemoteDirectory(s3Session.normalizeBucketName(file.getRemoteDirectory()));
+		}
+		return file;
+	}
+
 }

src/main/java/org/springframework/integration/aws/support/S3Session.java

@@ -228,6 +228,10 @@ public class S3Session implements Session<S3ObjectSummary> {
 		return this.amazonS3;
 	}
 
+	public String normalizeBucketName(String path) {
+		return splitPathToBucketAndKey(path, false)[0];
+	}
+
 	private String[] splitPathToBucketAndKey(String path, boolean requireKey) {
 		Assert.hasText(path, "'path' must not be empty String.");
 

src/test/java/org/springframework/integration/aws/inbound/S3StreamingChannelAdapterTests.java

@@ -162,7 +162,7 @@ public class S3StreamingChannelAdapterTests {
 			S3RemoteFileTemplate s3FileTemplate = new S3RemoteFileTemplate(s3SessionFactory);
 			S3StreamingMessageSource s3MessageSource = new S3StreamingMessageSource(s3FileTemplate,
 					Comparator.comparing(FileInfo::getFilename));
-			s3MessageSource.setRemoteDirectory("/" + S3_BUCKET);
+			s3MessageSource.setRemoteDirectory("/" + S3_BUCKET + "/subdir");
 			s3MessageSource.setFilter(new S3PersistentAcceptOnceFileListFilter(new SimpleMetadataStore(), "streaming"));
 
 			return s3MessageSource;