Zip: Some deep cleanup and polishing

* Upgrade to Gradle-2.5, SI-4.2.4
* Remove redundant dependencies
* Add `slf4j-log4j12` to avoid log noise during testing
* Add `settings.gradle` to allow Artifactory Release Management
* Move XSD stuff to the proper place - `org\springframework\integration\zip\config`
* Get rid of manual `enum` transformation in the `Parser`:
  - we can't do that there because `property-placeholder` and SpEL are processed later
  - no reason to do that at all - `enum`s are properly converted by the SF during bean population phase
* Fix `UnZipTransformer` to `delete()` file in the `finally` block after closing the `InputStream` on file

Author: artembilan

spring-integration-zip/README.md

@@ -61,7 +61,8 @@ If the payload is an instance of `File`, this property specifies whether to dele
 
 ### workDirectory
 
-Set the work-directory. The work directory is used when the ZipResultType is set to ZipResultType.FILE. By default this property is set to the System temporary directory containing a sub-directory "ziptransformer".
+Set the work-directory. The work directory is used when the ZipResultType is set to ZipResultType.FILE.
+By default this property is set to the System temporary directory containing a sub-directory "ziptransformer".
 
 ### ZipResultType
 
@@ -120,7 +121,8 @@ To build complete distribution including `-dist` and `-schema` zip files (result
 
 # IDE Support
 
-While your custom Spring Integration Adapter is initially created with SpringSource Tool Suite, you in fact end up with a Gradle-based project. As such, the created project can be imported into other IDEs as well.
+While your custom Spring Integration Adapter is initially created with SpringSource Tool Suite, you in fact end up with a Gradle-based project.
+As such, the created project can be imported into other IDEs as well.
 
 ## Using Spring Tool Suite
 
@@ -155,17 +157,19 @@ Check out the [spring-integration][spring-integration tag] tag on [Stack Overflo
 * [Spring Integration][]
 * [Spring Integration Samples][]
 * [Spring Integration Templates][]
+* [Spring Integration Java DSL][]
 * [Spring Integration Dsl Groovy][]
 * [Spring Integration Dsl Scala][]
 
 For more information, please also don't forget to visit the [Spring Integration][] website.
 
-[Spring Integration]: https://github.com/SpringSource/spring-integration
+[Spring Integration]: https://github.com/spring-projects/spring-integration
 [spring-integration tag]: http://stackoverflow.com/questions/tagged/spring-integration
-[Spring Integration Samples]: https://github.com/SpringSource/spring-integration-samples
-[Spring Integration Templates]: https://github.com/SpringSource/spring-integration-templates/tree/master/si-sts-templates
-[Spring Integration Dsl Groovy]: https://github.com/SpringSource/spring-integration-dsl-groovy
-[Spring Integration Dsl Scala]: https://github.com/SpringSource/spring-integration-dsl-scala
+[Spring Integration Samples]: https://github.com/spring-projects/spring-integration-samples
+[Spring Integration Templates]: https://github.com/spring-projects/spring-integration-templates/tree/master/si-sts-templates
+[Spring Integration Java DSL]: https://github.com/spring-projects/spring-integration-java-dsl
+[Spring Integration Dsl Groovy]: https://github.com/spring-projects/spring-integration-dsl-groovy
+[Spring Integration Dsl Scala]: https://github.com/spring-projects/spring-integration-dsl-scala
 [Stack Overflow]: http://stackoverflow.com/faq
 
-[Zip]: http://en.wikipedia.org/wiki/Zip_%28file_format%29
+[Zip]: http://en.wikipedia.org/wiki/Zip_%28file_format%29

spring-integration-zip/build.gradle

@@ -2,20 +2,24 @@ description = 'Spring Integration Zip Adapter'
 
 buildscript {
 	repositories {
-		maven { url 'https://repo.springsource.org/plugins-snapshot' }
+		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'
 
 group = 'org.springframework.integration'
 
 repositories {
-	maven { url 'http://repo.springsource.org/libs-milestone' }
-	maven { url 'http://repo.springsource.org/plugins-release' }
+	if (version.endsWith('BUILD-SNAPSHOT')) {
+		maven { url 'https://repo.spring.io/libs-snapshot' }
+	}
+	maven { url 'https://repo.spring.io/libs-milestone' }
+	mavenCentral()
 }
 
 sourceCompatibility=1.6
@@ -30,12 +34,9 @@ ext {
 	linkScmConnection    = 'https://github.com/spring-projects/spring-integration-extensions.git'
 	linkScmDevConnection = 'git@github.com:spring-projects/spring-integration-extensions.git'
 
-	junitVersion = '4.11'
-	log4jVersion = '1.2.17'
-	mockitoVersion = '1.9.5'
-	springVersion = '4.0.7.RELEASE'
-	springIntegrationVersion = '4.2.0.M1'
-	ztZipVersion = '1.8'
+	slf4jVersion = "1.7.13"
+	springIntegrationVersion = '4.2.4.RELEASE'
+	ztZipVersion = '1.9'
 
 	idPrefix = 'zip'
 }
@@ -54,33 +55,40 @@ sourceSets {
 	}
 }
 
-// See http://www.gradle.org/docs/current/userguide/dependency_management.html#sub:configurations
-// and http://www.gradle.org/docs/current/dsl/org.gradle.api.artifacts.ConfigurationContainer.html
-configurations {
-	jacoco //Configuration Group used by Sonar to provide Code Coverage using JaCoCo
+jacoco {
+	toolVersion = "0.7.2.201409121644"
 }
 
 dependencies {
 	compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion"
 	compile "org.springframework.integration:spring-integration-file:$springIntegrationVersion"
 	compile "org.zeroturnaround:zt-zip:$ztZipVersion"
+
 	testCompile "org.springframework.integration:spring-integration-test:$springIntegrationVersion"
-	testCompile "junit:junit:$junitVersion"
-	testCompile "log4j:log4j:$log4jVersion"
-	testCompile "org.mockito:mockito-all:$mockitoVersion"
-	testCompile "org.springframework:spring-test:$springVersion"
-	jacoco group: "org.jacoco", name: "org.jacoco.agent", version: "0.7.4.201502262128", classifier: "runtime"
+	testRuntime "org.slf4j:slf4j-log4j12:$slf4jVersion"
 }
 
 
 // enable all compiler warnings; individual projects may customize further
-ext.xLintArg = '-Xlint:all'
+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)
-	jvmArgs "-javaagent:${configurations.jacoco.asPath}=destfile=${buildDir}/jacoco.exec,includes=*"
+	maxHeapSize = "1024m"
+	jacoco {
+		append = false
+		destinationFile = file("$buildDir/jacoco.exec")
+	}
 }
 
 task sourcesJar(type: Jar) {
@@ -98,6 +106,8 @@ artifacts {
 	archives javadocJar
 }
 
+build.dependsOn jacocoTestReport
+
 apply plugin: 'sonar-runner'
 
 sonarRunner {
@@ -136,19 +146,18 @@ task schemaZip(type: Zip) {
 	def shortName = idPrefix.replaceFirst("${idPrefix}-", '')
 
 	project.sourceSets.main.resources.find {
-		it.path.endsWith('META-INF/spring.schemas')
+		it.path.endsWith("META-INF${File.separator}spring.schemas")
 	}?.withInputStream { schemas.load(it) }
 
 	for (def key : schemas.keySet()) {
 		File xsdFile = project.sourceSets.main.resources.find {
-			it.path.endsWith(schemas.get(key))
+			it.path.replaceAll('\\\\', '/').endsWith(schemas.get(key))
 		}
 		assert xsdFile != null
 		into ("integration/${shortName}") {
 			from xsdFile.path
 		}
 	}
-
 }
 
 task docsZip(type: Zip) {
@@ -239,5 +248,6 @@ task dist(dependsOn: assemble) {
 
 task wrapper(type: Wrapper) {
 	description = 'Generates gradlew[.bat] scripts'
-	gradleVersion = '2.4'
+	gradleVersion = '2.5'
+	distributionUrl = "http://services.gradle.org/distributions/gradle-${gradleVersion}-all.zip"
 }

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

@@ -1,6 +1,6 @@
-#Tue May 12 22:21:08 EDT 2015
+#Thu Jan 07 20:03:45 EST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-2.5-all.zip

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

@@ -31,10 +31,10 @@ def customizePom(pom, gradleProject) {
 		generatedPom.project {
 			name = gradleProject.description
 			description = gradleProject.description
-			url = 'https://github.com/SpringSource/spring-integration-extensions'
+			url = 'https://github.com/spring-projects/spring-integration-extensions'
 			organization {
-				name = 'SpringSource'
-				url = 'http://springsource.org'
+				name = 'SpringIO'
+				url = 'http://spring.io'
 			}
 			licenses {
 				license {
@@ -44,16 +44,16 @@ def customizePom(pom, gradleProject) {
 				}
 			}
 			scm {
-				url = 'https://github.com/SpringSource/spring-integration-extensions'
-				connection = 'scm:git:git://github.com/SpringSource/spring-integration-extensions'
-				developerConnection = 'scm:git:git://github.com/SpringSource/spring-integration-extensions'
+				url = 'https://github.com/spring-projects/spring-integration-extensions'
+				connection = 'scm:git:git://github.com/spring-projects/spring-integration-extensions'
+				developerConnection = 'scm:git:git://github.com/spring-projects/spring-integration-extensions'
 			}
 
 			developers {
 				developer {
-					id = 'not specified'
+					id = 'ghiller'
 					name = 'Gunnar Hillert'
-					email = 'not specified'
+					email = 'ghiller@pivotal.io'
 				}
 			}
 		}

spring-integration-zip/publish-maven.gradle

@@ -0,0 +1 @@
+rootProject.name = 'spring-integration-zip'

spring-integration-zip/settings.gradle

@@ -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.
@@ -21,12 +21,14 @@
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.config.xml.AbstractTransformerParser;
+import org.springframework.integration.config.xml.IntegrationNamespaceUtils;
 import org.springframework.util.StringUtils;
 
 /**
  * Base class for Zip transformer parsers.
  *
  * @author Gunnar Hillert
+ * @author Artem Bilan
  * @since 1.0
  */
 public abstract class AbstractZipTransformerParser extends AbstractTransformerParser {
@@ -42,7 +44,9 @@ protected final void parseTransformer(Element element, ParserContext parserConte
 		if (StringUtils.hasText(deleteFiles)) {
 			builder.addPropertyValue("deleteFiles", deleteFiles);
 		}
-		this.postProcessTransformer(element, parserContext, builder);
+		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "charset");
+		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "result-type", "zipResultType");
+		postProcessTransformer(element, parserContext, builder);
 	}
 
 	/**

spring-integration-zip/src/main/java/org/springframework/integration/zip/config/xml/AbstractZipTransformerParser.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.
@@ -16,18 +16,18 @@
 
 package org.springframework.integration.zip.config.xml;
 
+import org.w3c.dom.Element;
+
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.config.xml.IntegrationNamespaceUtils;
 import org.springframework.integration.zip.transformer.UnZipTransformer;
-import org.springframework.integration.zip.transformer.ZipResultType;
-import org.springframework.util.StringUtils;
-import org.w3c.dom.Element;
 
 /**
  * Parser for the 'unzip-transformer' element.
  *
  * @author Gunnar Hillert
+ * @author Artem Bilan
  * @since 1.0
  */
 public class UnZipTransformerParser extends AbstractZipTransformerParser {
@@ -39,27 +39,7 @@ protected String getTransformerClassName() {
 
 	@Override
 	protected void postProcessTransformer(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-		Object source = parserContext.extractSource(element);
-
-		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "charset");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "expect-single-result");
-
-		final String resultType     = element.getAttribute("result-type");
-
-		if (StringUtils.hasText(resultType)) {
-
-			final ZipResultType zipResultType = ZipResultType.convertToZipResultType(resultType);
-
-			if (zipResultType != null) {
-				builder.addPropertyValue("zipResultType", zipResultType);
-			}
-			else {
-				parserContext.getReaderContext().error(
-					String.format("Unable to convert the provided result-type '%s' " +
-							"to the respective ZipResultType enum.", resultType), source);
-			}
-
-		}
 	}
 
 }

spring-integration-zip/src/main/java/org/springframework/integration/zip/config/xml/UnZipTransformerParser.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.
@@ -16,18 +16,18 @@
 
 package org.springframework.integration.zip.config.xml;
 
+import org.w3c.dom.Element;
+
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.config.xml.IntegrationNamespaceUtils;
-import org.springframework.integration.zip.transformer.ZipResultType;
 import org.springframework.integration.zip.transformer.ZipTransformer;
-import org.springframework.util.StringUtils;
-import org.w3c.dom.Element;
 
 /**
  * Parser for the 'zip-transformer' element.
  *
  * @author Gunnar Hillert
+ * @author Artem Bilan
  * @since 1.0
  */
 public class ZipTransformerParser extends AbstractZipTransformerParser {
@@ -39,27 +39,7 @@ protected String getTransformerClassName() {
 
 	@Override
 	protected void postProcessTransformer(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-		Object source = parserContext.extractSource(element);
-
-		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "charset");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "compression-level");
-
-		final String resultType     = element.getAttribute("result-type");
-
-		if (StringUtils.hasText(resultType)) {
-
-			final ZipResultType zipResultType = ZipResultType.convertToZipResultType(resultType);
-
-			if (zipResultType != null) {
-				builder.addPropertyValue("zipResultType", zipResultType);
-			}
-			else {
-				parserContext.getReaderContext().error(
-					String.format("Unable to convert the provided result-type '%s' " +
-							"to the respective ZipResultType enum.", resultType), source);
-			}
-
-		}
 	}
 
 }