GH-164: Fix ZipTransformer deleteFile Mode

Fixes GH-164 (https://github.com/spring-projects/spring-integration-extensions/issues/164)

* Move `deleteFile` logic to the end of of `ZipTransformer#doZipTransform()`
* Add `deleteFile = true` for the `ZipTransformerTests`
* Add `<request-handler-advice-chain>` to the transformers XSD definitions
* Upgrade to Gradle 3.0
* Upgrade dependencies

Move delete logic before reply message creation

spring-integration-zip/build.gradle

@@ -1,25 +1,42 @@
-description = 'Spring Integration Zip Adapter'
-
 buildscript {
 	repositories {
 		maven { url 'https://repo.spring.io/plugins-release' }
 	}
 }
 
-apply plugin: 'java'
-apply from:   "${rootProject.projectDir}/publish-maven.gradle"
-apply plugin: 'eclipse'
-apply plugin: 'idea'
-apply plugin: 'jacoco'
+plugins {
+	id 'java'
+	id 'eclipse'
+	id 'idea'
+	id 'jacoco'
+	id 'org.sonarqube' version '2.1-rc3'
+}
+
+description = 'Spring Integration Zip Adapter'
+
+
+apply from: "${rootProject.projectDir}/publish-maven.gradle"
 
 group = 'org.springframework.integration'
 
 repositories {
-	if (version.endsWith('BUILD-SNAPSHOT')) {
-		maven { url 'https://repo.spring.io/libs-snapshot' }
+	if (version.endsWith('BUILD-SNAPSHOT') || project.hasProperty('platformVersion')) {
+		maven { url 'http://repo.spring.io/libs-snapshot' }
 	}
 	maven { url 'https://repo.spring.io/libs-milestone' }
-	mavenCentral()
+}
+
+if (project.hasProperty('platformVersion')) {
+	apply plugin: 'spring-io'
+
+	dependencyManagement {
+		springIoTestRuntime {
+			imports {
+				mavenBom "io.spring.platform:platform-bom:${platformVersion}"
+			}
+
+		}
+	}
 }
 
 sourceCompatibility=1.6
@@ -34,8 +51,8 @@ ext {
 	linkScmConnection    = 'https://github.com/spring-projects/spring-integration-extensions.git'
 	linkScmDevConnection = 'git@github.com:spring-projects/spring-integration-extensions.git'
 
-	slf4jVersion = "1.7.13"
-	springIntegrationVersion = '4.2.4.RELEASE'
+	slf4jVersion = "1.7.21"
+	springIntegrationVersion = '4.3.1.RELEASE'
 	ztZipVersion = '1.9'
 
 	idPrefix = 'zip'
@@ -56,7 +73,7 @@ sourceSets {
 }
 
 jacoco {
-	toolVersion = "0.7.2.201409121644"
+	toolVersion = "0.7.6.201602180812"
 }
 
 dependencies {
@@ -73,14 +90,6 @@ dependencies {
 ext.xLintArg = '-Xlint:all,-options'
 [compileJava, compileTestJava]*.options*.compilerArgs = [xLintArg]
 
-jacocoTestReport {
-	reports {
-		xml.enabled false
-		csv.enabled false
-		html.destination "${buildDir}/reports/jacoco/html"
-	}
-}
-
 test {
 	// suppress all console output during testing unless running `gradle -i`
 	logging.captureStandardOutput(LogLevel.INFO)
@@ -91,6 +100,14 @@ test {
 	}
 }
 
+jacocoTestReport {
+	reports {
+		xml.enabled false
+		csv.enabled false
+		html.destination "${buildDir}/reports/jacoco/html"
+	}
+}
+
 task sourcesJar(type: Jar) {
 	classifier = 'sources'
 	from sourceSets.main.allJava
@@ -108,10 +125,8 @@ artifacts {
 
 build.dependsOn jacocoTestReport
 
-apply plugin: 'sonar-runner'
-
-sonarRunner {
-	sonarProperties {
+sonarqube {
+	properties {
 		property "sonar.jacoco.reportPath", "${buildDir.name}/jacoco.exec"
 		property "sonar.links.homepage", linkHomepage
 		property "sonar.links.ci", linkCi
@@ -245,9 +260,3 @@ task dist(dependsOn: assemble) {
 	group = 'Distribution'
 	description = 'Builds -dist, -docs and -schema distribution archives.'
 }
-
-task wrapper(type: Wrapper) {
-	description = 'Generates gradlew[.bat] scripts'
-	gradleVersion = '2.5'
-	distributionUrl = "http://services.gradle.org/distributions/gradle-${gradleVersion}-all.zip"
-}

spring-integration-zip/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Jan 07 20:03:45 EST 2016
+#Fri Sep 09 09:39:49 EDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-2.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip

spring-integration-zip/gradlew

@@ -6,12 +6,30 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -161,4 +161,9 @@ function splitJvmOpts() {
 eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
 JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
 
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+  cd "$(dirname "$0")"
+fi
+
 exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

spring-integration-zip/gradlew.bat

@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +46,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

spring-integration-zip/src/main/java/org/springframework/integration/zip/transformer/ZipTransformer.java

@@ -32,7 +32,6 @@ import org.springframework.integration.file.FileHeaders;
 import org.springframework.integration.transformer.Transformer;
 import org.springframework.integration.zip.ZipHeaders;
 import org.springframework.messaging.Message;
-import org.springframework.messaging.MessageHandlingException;
 import org.springframework.util.Assert;
 import org.springframework.util.FileCopyUtils;
 import org.springframework.util.StringUtils;
@@ -49,6 +48,7 @@ import org.springframework.util.StringUtils;
  * See also: https://blogs.oracle.com/xuemingshen/entry/zip64_support_for_4g_zipfile
  *
  * @author Gunnar Hillert
+ * @author Artem Bilan
  * @since 1.0
  *
  */
@@ -98,90 +98,99 @@ public class ZipTransformer extends AbstractZipTransformer {
 	 */
 	@Override
 	protected Object doZipTransform(Message<?> message) throws Exception {
+		final Object payload = message.getPayload();
+		final Object zippedData;
+		final String baseFileName = this.fileNameGenerator.generateFileName(message);
 
-		try {
+		final String zipEntryName;
+		final String zipFileName;
 
-			final Object payload = message.getPayload();
-			final Object zippedData;
-			final String baseFileName = this.fileNameGenerator.generateFileName(message);
-
-			final String zipEntryName;
-			final String zipFileName;
-
-			if (message.getHeaders().containsKey(ZipHeaders.ZIP_ENTRY_FILE_NAME)) {
-				zipEntryName = (String) message.getHeaders().get(ZipHeaders.ZIP_ENTRY_FILE_NAME);
-			}
-			else {
-				zipEntryName = baseFileName;
-			}
-
-			if (message.getHeaders().containsKey(FileHeaders.FILENAME)) {
-				zipFileName = baseFileName;
-			}
-			else {
-				zipFileName = baseFileName + ZIP_EXTENSION;
-			}
-
-			final Date lastModifiedDate;
-
-			if (message.getHeaders().containsKey(ZipHeaders.ZIP_ENTRY_LAST_MODIFIED_DATE)) {
-				lastModifiedDate = (Date) message.getHeaders().get(ZipHeaders.ZIP_ENTRY_LAST_MODIFIED_DATE);
-			}
-			else {
-				lastModifiedDate = new Date();
-			}
-
-			java.util.List<ZipEntrySource> entries = new ArrayList<ZipEntrySource>();
-
-			if (payload instanceof Iterable<?>) {
-				int counter = 1;
-
-				String baseName = FilenameUtils.getBaseName(zipEntryName);
-				String fileExtension = FilenameUtils.getExtension(zipEntryName);
-
-				if (StringUtils.hasText(fileExtension)) {
-					fileExtension = FilenameUtils.EXTENSION_SEPARATOR_STR + fileExtension;
-				}
-
-				for (Object item : (Iterable<?>) payload) {
-
-					final ZipEntrySource zipEntrySource = createZipEntrySource(item, lastModifiedDate, baseName + "_"
-							+ counter + fileExtension, this.useFileAttributes);
-					if (logger.isDebugEnabled()) {
-						logger.debug("ZipEntrySource path: '" + zipEntrySource.getPath() + "'");
-					}
-					entries.add(zipEntrySource);
-					counter++;
-				}
-			}
-			else {
-				final ZipEntrySource zipEntrySource =
-						createZipEntrySource(payload, lastModifiedDate, zipEntryName, this.useFileAttributes);
-				entries.add(zipEntrySource);
-			}
-
-			final byte[] zippedBytes = SpringZipUtils.pack(entries, this.compressionLevel);
-
-			if (ZipResultType.FILE.equals(this.zipResultType)) {
-				final File zippedFile = new File(this.workDirectory, zipFileName);
-				FileCopyUtils.copy(zippedBytes, zippedFile);
-				zippedData = zippedFile;
-			}
-			else if (ZipResultType.BYTE_ARRAY.equals(this.zipResultType)) {
-				zippedData = zippedBytes;
-			}
-			else {
-				throw new IllegalStateException("Unsupported zipResultType " + this.zipResultType);
-			}
-
-			return getMessageBuilderFactory()
-					.withPayload(zippedData)
-					.copyHeaders(message.getHeaders())
-					.setHeader(FileHeaders.FILENAME, zipFileName)
-					.build();
+		if (message.getHeaders().containsKey(ZipHeaders.ZIP_ENTRY_FILE_NAME)) {
+			zipEntryName = (String) message.getHeaders().get(ZipHeaders.ZIP_ENTRY_FILE_NAME);
 		}
-		catch (Exception e) {
-			throw new MessageHandlingException(message, "Failed to apply Zip transformation.", e);
+		else {
+			zipEntryName = baseFileName;
+		}
+
+		if (message.getHeaders().containsKey(FileHeaders.FILENAME)) {
+			zipFileName = baseFileName;
+		}
+		else {
+			zipFileName = baseFileName + ZIP_EXTENSION;
+		}
+
+		final Date lastModifiedDate;
+
+		if (message.getHeaders().containsKey(ZipHeaders.ZIP_ENTRY_LAST_MODIFIED_DATE)) {
+			lastModifiedDate = (Date) message.getHeaders().get(ZipHeaders.ZIP_ENTRY_LAST_MODIFIED_DATE);
+		}
+		else {
+			lastModifiedDate = new Date();
+		}
+
+		java.util.List<ZipEntrySource> entries = new ArrayList<ZipEntrySource>();
+
+		if (payload instanceof Iterable<?>) {
+			int counter = 1;
+
+			String baseName = FilenameUtils.getBaseName(zipEntryName);
+			String fileExtension = FilenameUtils.getExtension(zipEntryName);
+
+			if (StringUtils.hasText(fileExtension)) {
+				fileExtension = FilenameUtils.EXTENSION_SEPARATOR_STR + fileExtension;
+			}
+
+			for (Object item : (Iterable<?>) payload) {
+
+				final ZipEntrySource zipEntrySource = createZipEntrySource(item, lastModifiedDate, baseName + "_"
+						+ counter + fileExtension, this.useFileAttributes);
+				if (logger.isDebugEnabled()) {
+					logger.debug("ZipEntrySource path: '" + zipEntrySource.getPath() + "'");
+				}
+				entries.add(zipEntrySource);
+				counter++;
+			}
+		}
+		else {
+			final ZipEntrySource zipEntrySource =
+					createZipEntrySource(payload, lastModifiedDate, zipEntryName, this.useFileAttributes);
+			entries.add(zipEntrySource);
+		}
+
+		final byte[] zippedBytes = SpringZipUtils.pack(entries, this.compressionLevel);
+
+		if (ZipResultType.FILE.equals(this.zipResultType)) {
+			final File zippedFile = new File(this.workDirectory, zipFileName);
+			FileCopyUtils.copy(zippedBytes, zippedFile);
+			zippedData = zippedFile;
+		}
+		else if (ZipResultType.BYTE_ARRAY.equals(this.zipResultType)) {
+			zippedData = zippedBytes;
+		}
+		else {
+			throw new IllegalStateException("Unsupported zipResultType " + this.zipResultType);
+		}
+
+		if (this.deleteFiles) {
+			if (payload instanceof Iterable<?>) {
+				for (Object item : (Iterable<?>) payload) {
+					deleteFile(item);
+				}
+			}
+			else {
+				deleteFile(payload);
+			}
+		}
+		return getMessageBuilderFactory()
+				.withPayload(zippedData)
+				.copyHeaders(message.getHeaders())
+				.setHeader(FileHeaders.FILENAME, zipFileName)
+				.build();
+	}
+
+	private void deleteFile(Object fileToDelete) {
+		if (fileToDelete instanceof File && !((File) fileToDelete).delete() && logger.isWarnEnabled()) {
+			logger.warn("Failed to delete File '" + fileToDelete + "'");
 		}
 	}
 
@@ -197,15 +206,7 @@ public class ZipTransformer extends AbstractZipTransformer {
 				throw new UnsupportedOperationException("Zipping of directories is not supported.");
 			}
 
-			final FileSource fileSource = new FileSource(fileName, filePayload);
-
-			if (this.deleteFiles) {
-				if (!filePayload.delete() && logger.isWarnEnabled()) {
-					logger.warn("failed to delete File '" + filePayload + "'");
-				}
-			}
-
-			return fileSource;
+			return new FileSource(fileName, filePayload);
 
 		}
 		else if (item instanceof byte[] || item instanceof String) {
@@ -223,7 +224,7 @@ public class ZipTransformer extends AbstractZipTransformer {
 		}
 		else {
 			throw new IllegalArgumentException("Unsupported payload type. The only supported payloads are " +
-						"java.io.File, java.lang.String, and byte[]");
+					"java.io.File, java.lang.String, and byte[]");
 		}
 	}
 

spring-integration-zip/src/main/resources/org/springframework/integration/zip/config/spring-integration-zip-1.0.xsd

@@ -71,6 +71,7 @@
 	<xsd:complexType name="transformerType">
 		<xsd:sequence>
 			<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
+			<xsd:element name="request-handler-advice-chain" type="integration:handlerAdviceChainType" minOccurs="0" />
 		</xsd:sequence>
 		<xsd:attribute name="id" type="xsd:string">
 			<xsd:annotation>

spring-integration-zip/src/test/java/org/springframework/integration/zip/Zip2FileTests-context.xml

@@ -11,10 +11,14 @@
 		http://www.springframework.org/schema/integration/zip http://www.springframework.org/schema/integration/zip/spring-integration-zip.xsd
 		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd">
 
-	<int:channel id="input">
-	</int:channel>
+	<int:channel id="input"/>
+
+	<int-zip:zip-transformer input-channel="input" output-channel="write-file" result-type="BYTE_ARRAY">
+		<int-zip:request-handler-advice-chain>
+			<int:retry-advice/>
+		</int-zip:request-handler-advice-chain>
+	</int-zip:zip-transformer>
 
-	<int-zip:zip-transformer input-channel="input" output-channel="write-file" result-type="BYTE_ARRAY"/>
 	<int-file:outbound-channel-adapter id="write-file" directory="${workDir}" auto-create-directory="true"/>
 
 	<context:property-placeholder properties-ref="properties"/>

spring-integration-zip/src/test/java/org/springframework/integration/zip/Zip2FileTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 the original author or authors.
+ * Copyright 2015-2016 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.
@@ -17,7 +17,6 @@
 package org.springframework.integration.zip;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -30,6 +29,7 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
+
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -42,12 +42,14 @@ import org.springframework.messaging.MessageChannel;
 /**
  *
  * @author Gunnar Hillert
+ * @author Artem Bilan
  * @since 1.0
  *
  */
 public class Zip2FileTests {
 
 	private AnnotationConfigApplicationContext context;
+
 	private MessageChannel input;
 
 	private static final Properties properties = new Properties();
@@ -61,7 +63,6 @@ public class Zip2FileTests {
 	public void setup() throws IOException {
 		this.workDir = testFolder.newFolder();
 		properties.put("workDir", workDir);
-		System.out.print(this.workDir.getAbsolutePath());
 
 		context = new AnnotationConfigApplicationContext();
 		context.register(ContextConfiguration.class);
@@ -77,7 +78,7 @@ public class Zip2FileTests {
 	}
 
 	@Test
-	public void zipStringWithDefaultFileName() throws FileNotFoundException, IOException, InterruptedException {
+	public void zipStringWithDefaultFileName() throws IOException, InterruptedException {
 
 		final Message<String> message = MessageBuilder.withPayload("Zip me up.").build();
 
@@ -89,28 +90,33 @@ public class Zip2FileTests {
 
 		Assert.assertTrue(fileInWorkDir.isFile());
 		Assert.assertTrue(fileInWorkDir.getName().contains(message.getHeaders().getId().toString()));
-		Assert.assertTrue("The created file should have a 'zip' file extension.", fileInWorkDir.getName().endsWith(".zip"));
+		Assert.assertTrue("The created file should have a 'zip' file extension.",
+				fileInWorkDir.getName().endsWith(".zip"));
 	}
 
 	@Test
-	public void zipStringWithExplicitFileName() throws FileNotFoundException, IOException, InterruptedException {
-		input.send(MessageBuilder.withPayload("Zip me up.").setHeader(FileHeaders.FILENAME, "zipString.zip").build());
+	public void zipStringWithExplicitFileName() throws IOException, InterruptedException {
+		input.send(MessageBuilder.withPayload("Zip me up.")
+				.setHeader(FileHeaders.FILENAME, "zipString.zip")
+				.build());
 
 		Assert.assertTrue(this.workDir.list().length == 1);
 		Assert.assertEquals("zipString.zip", this.workDir.listFiles()[0].getName());
 	}
 
 	@Test
-	public void zipBytesWithExplicitFileName() throws FileNotFoundException, IOException, InterruptedException {
+	public void zipBytesWithExplicitFileName() throws IOException, InterruptedException {
 
-		input.send(MessageBuilder.withPayload("Zip me up.".getBytes()).setHeader(FileHeaders.FILENAME, "zipString.zip").build());
+		input.send(MessageBuilder.withPayload("Zip me up.".getBytes())
+				.setHeader(FileHeaders.FILENAME, "zipString.zip")
+				.build());
 
 		Assert.assertTrue(this.workDir.list().length == 1);
 		Assert.assertEquals("zipString.zip", this.workDir.listFiles()[0].getName());
 	}
 
 	@Test
-	public void zipFile() throws FileNotFoundException, IOException, InterruptedException {
+	public void zipFile() throws IOException, InterruptedException {
 
 		final File fileToCompress = testFolder.newFile();
 		FileUtils.writeStringToFile(fileToCompress, "hello world");
@@ -122,7 +128,7 @@ public class Zip2FileTests {
 	}
 
 	@Test
-	public void zipIterableWithMultipleStrings() throws FileNotFoundException, IOException, InterruptedException {
+	public void zipIterableWithMultipleStrings() throws IOException, InterruptedException {
 
 		String stringToCompress1 = "String1";
 		String stringToCompress2 = "String2";
@@ -136,17 +142,19 @@ public class Zip2FileTests {
 		stringsToCompress.add(stringToCompress3);
 		stringsToCompress.add(stringToCompress4);
 
-		input.send(MessageBuilder.withPayload(stringsToCompress).setHeader(FileHeaders.FILENAME, "zipWith4Strings.zip").build());
+		input.send(MessageBuilder.withPayload(stringsToCompress)
+				.setHeader(FileHeaders.FILENAME, "zipWith4Strings.zip")
+				.build());
 
 		Assert.assertTrue(this.workDir.list().length == 1);
 		Assert.assertEquals("zipWith4Strings.zip", this.workDir.listFiles()[0].getName());
 	}
 
 	@Test
-	public void zipIterableWithDifferentTypes() throws FileNotFoundException, IOException, InterruptedException {
+	public void zipIterableWithDifferentTypes() throws IOException, InterruptedException {
 
 		String stringToCompress = "String1";
-		byte[] bytesToCompress  = "String2".getBytes();
+		byte[] bytesToCompress = "String2".getBytes();
 		final File fileToCompress = testFolder.newFile();
 		FileUtils.writeStringToFile(fileToCompress, "hello world");
 
@@ -156,7 +164,9 @@ public class Zip2FileTests {
 		objectsToCompress.add(bytesToCompress);
 		objectsToCompress.add(fileToCompress);
 
-		input.send(MessageBuilder.withPayload(objectsToCompress).setHeader(FileHeaders.FILENAME, "objects-to-compress.zip").build());
+		input.send(MessageBuilder.withPayload(objectsToCompress)
+				.setHeader(FileHeaders.FILENAME, "objects-to-compress.zip")
+				.build());
 
 		Assert.assertTrue(this.workDir.list().length == 1);
 		Assert.assertEquals("objects-to-compress.zip", this.workDir.listFiles()[0].getName());
@@ -172,4 +182,5 @@ public class Zip2FileTests {
 		}
 
 	}
+
 }

spring-integration-zip/src/test/java/org/springframework/integration/zip/transformer/ZipTransformerTests.java

@@ -20,7 +20,6 @@ import static org.mockito.Mockito.mock;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.util.ArrayList;
@@ -54,12 +53,6 @@ public class ZipTransformerTests {
 	@Rule
 	public TemporaryFolder testFolder = new TemporaryFolder();
 
-	/**
-	 * Compress a simple String. The result will be a byte array.
-	 *
-	 * @throws FileNotFoundException
-	 * @throws IOException
-	 */
 	@Test
 	public void zipString() throws IOException {
 		final ZipTransformer zipTransformer = new ZipTransformer();
@@ -198,8 +191,9 @@ public class ZipTransformerTests {
 	@Test
 	public void zipFile() throws IOException {
 
-		final ZipTransformer zipTransformer = new ZipTransformer();
+		ZipTransformer zipTransformer = new ZipTransformer();
 		zipTransformer.setBeanFactory(mock(BeanFactory.class));
+		zipTransformer.setDeleteFiles(true);
 		zipTransformer.afterPropertiesSet();
 
 		final File testFile = createTestFile(10);