INTEXT-116: Migrate to Gradle

JIRA: https://jira.spring.io/browse/INTEXT-116

Fix all compilation and JavaDocs warnings

INTEXT-116: Addressing PR comments

.gitignore

@@ -3,3 +3,7 @@ target
 .springBeans
 .classpath
 .project
+/.idea
+/.gradle
+/build
+/*.iml

.springBeans

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beansProjectDescription>
-	<version>1</version>
-	<pluginVersion><![CDATA[2.8.0.201108100015-M1]]></pluginVersion>
-	<configSuffixes>
-		<configSuffix><![CDATA[xml]]></configSuffix>
-	</configSuffixes>
-	<enableImports><![CDATA[false]]></enableImports>
-	<configs>
-		<config>src/test/resources/FlowConfigNamespaceTest-context.xml</config>
-		<config>src/test/resources/FlowClientNamespaceTest-context.xml</config>
-		<config>src/test/resources/ref-bean-config.xml</config>
-		<config>src/test/resources/META-INF/spring/integration/flows/subflow1/subflow1-context.xml</config>
-		<config>src/test/resources/TransactionalFlowTest-context.xml</config>
-		<config>src/test/resources/txmanager-config.xml</config>
-		<config>src/test/resources/autowired-referenced-beans.xml</config>
-		<config>src/test/resources/META-INF/spring/integration/flows/autowired/autowired-flow-context.xml</config>
-		<config>src/test/resources/FlowWithAutowireTest-context.xml</config>
-	</configs>
-	<configSets>
-	</configSets>
-</beansProjectDescription>

build.gradle

@@ -0,0 +1,239 @@
+description = 'Spring Integration Flow'
+
+buildscript {
+	repositories {
+		maven { url 'http://repo.spring.io/plugins-release' }
+	}
+	dependencies {
+		classpath 'org.springframework.build.gradle:spring-io-plugin:0.0.3.RELEASE'
+	}
+}
+
+apply plugin: 'java'
+apply from: "${rootProject.projectDir}/publish-maven.gradle"
+apply plugin: 'eclipse'
+apply plugin: 'idea'
+
+if (project.hasProperty('platformVersion')) {
+	apply plugin: 'spring-io'
+
+	repositories {
+		maven { url "https://repo.spring.io/libs-snapshot" }
+	}
+
+	dependencies {
+		springIoVersions "io.spring.platform:platform-versions:${platformVersion}@properties"
+	}
+}
+
+group = 'org.springframework.integration'
+
+repositories {
+	maven { url 'http://repo.spring.io/libs-milestone' }
+}
+
+sourceCompatibility = 1.6
+targetCompatibility = 1.6
+
+ext {
+
+	commonsLangVersion = '2.6'
+	jacocoVersion = '0.7.1.201405082137'
+	springIntegrationVersion = '4.0.5.RELEASE'
+
+	linkHomepage = 'https://github.com/spring-projects/spring-integration-extensions'
+	linkCi = 'https://build.spring.io/browse/INTEXT'
+	linkIssue = 'https://jira.spring.io/browse/INTEXT'
+	linkScmUrl = 'https://github.com/spring-projects/spring-integration-extensions'
+	linkScmConnection = 'https://github.com/spring-projects/spring-integration-extensions.git'
+	linkScmDevConnection = 'git@github.com:spring-projects/spring-integration-extensions.git'
+
+	shortName = 'flow'
+}
+
+// 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
+}
+
+dependencies {
+	compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion"
+	compile "commons-lang:commons-lang:$commonsLangVersion"
+
+	testCompile "org.springframework.integration:spring-integration-test:$springIntegrationVersion"
+	testCompile "org.springframework.integration:spring-integration-groovy:$springIntegrationVersion"
+	testCompile "org.springframework.integration:spring-integration-jmx:$springIntegrationVersion"
+
+	jacoco "org.jacoco:org.jacoco.agent:$jacocoVersion:runtime"
+}
+
+
+eclipse {
+	project {
+		natures += 'org.springframework.ide.eclipse.core.springnature'
+	}
+}
+
+sourceSets {
+	test {
+		resources {
+			srcDirs = ['src/test/resources', 'src/test/java']
+		}
+	}
+}
+
+// enable all compiler warnings; individual projects may customize further
+[compileJava, compileTestJava]*.options*.compilerArgs = ['-Xlint:all,-options']
+
+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=*"
+}
+
+task sourcesJar(type: Jar) {
+	classifier = 'sources'
+	from sourceSets.main.allJava
+}
+
+task javadocJar(type: Jar) {
+	classifier = 'javadoc'
+	from javadoc
+}
+
+artifacts {
+	archives sourcesJar
+	archives javadocJar
+}
+
+apply plugin: 'sonar-runner'
+
+sonarRunner {
+	sonarProperties {
+		property "sonar.jacoco.reportPath", "${buildDir.name}/jacoco.exec"
+		property "sonar.links.homepage", linkHomepage
+		property "sonar.links.ci", linkCi
+		property "sonar.links.issue", linkIssue
+		property "sonar.links.scm", linkScmUrl
+		property "sonar.links.scm_dev", linkScmDevConnection
+		property "sonar.java.coveragePlugin", "jacoco"
+	}
+}
+
+task api(type: Javadoc) {
+	group = 'Documentation'
+	description = 'Generates aggregated Javadoc API documentation.'
+	title = "${rootProject.description} ${version} API"
+	options.memberLevel = org.gradle.external.javadoc.JavadocMemberLevel.PROTECTED
+	options.author = true
+	options.header = rootProject.description
+	options.overview = 'src/api/overview.html'
+	source subprojects.collect { project ->
+		project.sourceSets.main.allJava
+	}
+	destinationDir = new File(buildDir, "api")
+	classpath = files(subprojects.collect { project ->
+		project.sourceSets.main.compileClasspath
+	})
+}
+
+task schemaZip(type: Zip) {
+	description = "Builds -${classifier} archive containing all " +
+			"XSDs for deployment at static.springframework.org/schema."
+
+	group = 'Distribution'
+	classifier = 'schema'
+
+	duplicatesStrategy = 'exclude'
+
+	def Properties schemas = new Properties();
+
+	project.sourceSets.main.resources.find {
+		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.replaceAll('\\\\', '/').endsWith(schemas.get(key))
+		}
+		assert xsdFile != null
+		into("integration/${shortName}") {
+			from xsdFile.path
+		}
+	}
+}
+
+task distZip(type: Zip, dependsOn: schemaZip) {
+	group = 'Distribution'
+	classifier = 'dist'
+	description = "Builds -${classifier} archive, containing all jars and docs, " +
+			"suitable for community download page."
+
+	ext.baseDir = "${project.name}-${project.version}";
+
+	from('src/dist') {
+		include 'readme.txt'
+		include 'license.txt'
+		include 'notice.txt'
+		into "${baseDir}"
+	}
+
+	from(zipTree(schemaZip.archivePath)) {
+		into "${baseDir}/schema"
+	}
+
+    into("${baseDir}/libs") {
+			from jar
+			from sourcesJar
+			from javadocJar
+	}
+}
+
+// Create an optional "with dependencies" distribution.
+// Not published by default; only for use when building from source.
+task depsZip(type: Zip, dependsOn: distZip) { zipTask ->
+	group = 'Distribution'
+	classifier = 'dist-with-deps'
+	description = "Builds -${classifier} archive, containing everything " +
+			"in the -${distZip.classifier} archive plus all dependencies."
+
+	from zipTree(distZip.archivePath)
+
+	gradle.taskGraph.whenReady { taskGraph ->
+		if (taskGraph.hasTask(":${zipTask.name}")) {
+			def projectNames = rootProject.subprojects*.name
+			def artifacts = new HashSet()
+			subprojects.each { subproject ->
+				subproject.configurations.runtime.resolvedConfiguration.resolvedArtifacts.each { artifact ->
+					def dependency = artifact.moduleVersion.id
+					if (!projectNames.contains(dependency.name)) {
+						artifacts << artifact.file
+					}
+				}
+			}
+
+			zipTask.from(artifacts) {
+				into "${distZip.baseDir}/deps"
+			}
+		}
+	}
+}
+
+artifacts {
+	archives distZip
+	archives schemaZip
+}
+
+task dist(dependsOn: assemble) {
+	group = 'Distribution'
+	description = 'Builds -dist, -docs and -schema distribution archives.'
+}
+
+task wrapper(type: Wrapper) {
+	description = 'Generates gradlew[.bat] scripts'
+	gradleVersion = '1.12'
+	distributionUrl = "http://services.gradle.org/distributions/gradle-${gradleVersion}-all.zip"
+}
+
+defaultTasks 'build'

gradle.properties

@@ -0,0 +1 @@
+version=1.0.0.BUILD-SNAPSHOT

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Thu Nov 13 20:20:08 EET 2014
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip

gradlew

@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=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.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

gradlew.bat

@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@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 Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz 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.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+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
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

publish-maven.gradle

@@ -0,0 +1,74 @@
+apply plugin: 'maven'
+
+ext.optionalDeps = []
+ext.providedDeps = []
+
+ext.optional = { optionalDeps << it }
+ext.provided = { providedDeps << it }
+
+install {
+	repositories.mavenInstaller {
+		customizePom(pom, project)
+	}
+}
+
+def customizePom(pom, gradleProject) {
+	pom.whenConfigured { generatedPom ->
+		// respect 'optional' and 'provided' dependencies
+		gradleProject.optionalDeps.each { dep ->
+			generatedPom.dependencies.find { it.artifactId == dep.name }?.optional = true
+		}
+		gradleProject.providedDeps.each { dep ->
+			generatedPom.dependencies.find { it.artifactId == dep.name }?.scope = 'provided'
+		}
+
+		// eliminate test-scoped dependencies (no need in maven central poms)
+		generatedPom.dependencies.removeAll { dep ->
+			dep.scope == 'test'
+		}
+
+		// add all items necessary for maven central publication
+		generatedPom.project {
+			name = gradleProject.description
+			description = gradleProject.description
+			url = linkHomepage
+			organization {
+				name = 'SpringIO'
+				url = 'http://spring.io'
+			}
+			licenses {
+				license {
+					name 'The Apache Software License, Version 2.0'
+					url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+					distribution 'repo'
+				}
+			}
+
+			scm {
+				url = linkScmUrl
+				connection = 'scm:git:' + linkScmConnection
+				developerConnection = 'scm:git:' + linkScmDevConnection
+			}
+
+			issueManagement {
+				system = "Jira"
+				url = linkIssue
+			}
+
+			developers {
+				developer {
+					id = 'markfisher'
+					name = 'Mark Fisher'
+					email = 'mfisher@pivotal.io'
+					roles = ["project founder and lead emeritus"]
+				}
+				developer {
+					id = 'davidturanski'
+					name = 'David Turanski'
+					email = 'dturanski@pivotal.io'
+					roles = ["project lead"]
+				}
+			}
+		}
+	}
+}

settings.gradle

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

src/main/java/org/springframework/integration/flow/ChannelNamePortConfiguration.java

@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2011 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. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -25,7 +25,7 @@ import java.util.List;
 /**
  * Container for {@link Flow} {@link PortConfiguration} metadata
  * @author David Turanski
- * 
+ *
  */
 public class ChannelNamePortConfiguration implements PortConfiguration {
 
@@ -46,8 +46,8 @@ public class ChannelNamePortConfiguration implements PortConfiguration {
 
 	/**
 	 * A simple configuration for a flow with one input and one output port
-	 * @param inputChannelName
-	 * @param outputChannelName
+	 * @param inputChannelName the input channel name.
+	 * @param outputChannelName the output channel name.
 	 */
 	public ChannelNamePortConfiguration(String inputChannelName, String outputChannelName) {
 		this.inputPortMetadata = new PortMetadata("input", inputChannelName);

src/main/java/org/springframework/integration/flow/Flow.java

@@ -46,7 +46,8 @@ import org.springframework.util.StringUtils;
  * @author David Turanski
  *
  */
-public class Flow implements InitializingBean, BeanNameAware, DestinationResolver, ApplicationContextAware {
+public class Flow
+		implements InitializingBean, BeanNameAware, DestinationResolver<MessageChannel>, ApplicationContextAware {
 
 	private static Log logger = LogFactory.getLog(Flow.class);
 
@@ -216,7 +217,7 @@ public class Flow implements InitializingBean, BeanNameAware, DestinationResolve
 	/**
 	 * All flow outputs defined in the {@link PortConfiguration} are bridged to
 	 * a single PublishSubscribeChannel
-	 * @param the publish-subscribe channel
+	 * @param flowOutputChannel the publish-subscribe channel
 	 */
 	public void setFlowOutputChannel(SubscribableChannel flowOutputChannel) {
 		this.flowOutputChannel = flowOutputChannel;

src/main/java/org/springframework/integration/flow/FlowConfiguration.java

@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2011 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. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -18,28 +18,24 @@ package org.springframework.integration.flow;
 import java.util.List;
 
 /**
- * A container holding a {@link Flow} configuration. A flow configuration 
+ * A container holding a {@link Flow} configuration. A flow configuration
  * may contain multiple {@link PortConfiguration}s
- * 
+ *
  * @author David Turanski
- * 
+ *
  */
 public class FlowConfiguration {
 
 	private final List<PortConfiguration> portConfigurations;
-	
-	/**
-	 * 
-	 * @param portConfigurations  
-	 */ 
+
 	public FlowConfiguration(List<PortConfiguration> portConfigurations) {
 		this.portConfigurations = portConfigurations;
 	}
 
 	/**
-	 * Get the configuration by input port name
-	 * @param inputPortName
-	 * @return
+	 * Get the configuration by input port name.
+	 * @param inputPortName the input port name.
+	 * @return the configuration.
 	 */
 	public PortConfiguration getConfigurationForInputPort(String inputPortName) {
 		for (PortConfiguration pc : portConfigurations) {

src/main/java/org/springframework/integration/flow/config/FlowMessageHandlerFactoryBean.java

@@ -31,7 +31,7 @@ import org.springframework.util.Assert;
  * @author David Turanski
  *
  */
-public class FlowMessageHandlerFactoryBean extends AbstractSimpleMessageHandlerFactoryBean
+public class FlowMessageHandlerFactoryBean extends AbstractSimpleMessageHandlerFactoryBean<FlowMessageHandler>
 		implements InitializingBean {
 
 	@SuppressWarnings("unused")
@@ -88,10 +88,6 @@ public class FlowMessageHandlerFactoryBean extends AbstractSimpleMessageHandlerF
 		this.timeout = timeout;
 	}
 
-	/**
-	 *
-	 * @param errorChannel
-	 */
 	public void setErrorChannel(MessageChannel errorChannel) {
 		this.errorChannel = errorChannel;
 	}

src/main/java/org/springframework/integration/flow/config/FlowUtils.java

@@ -1,11 +1,11 @@
 /*
  * Copyright 2002-2011 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. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
@@ -33,35 +33,21 @@ import org.springframework.util.ResourceUtils;
 
 /**
  * Utility functions used by the flow parsers
- * 
+ *
  * @author David Turanski
- * 
+ *
  */
 public class FlowUtils {
 
 	private FlowUtils() {
 	}
 
-	/**
-	 * Create a bridge
-	 * 
-	 * @param inputChannel
-	 * @param outputChannel
-	 */
-
 	public static void bridgeChannels(SubscribableChannel inputChannel, MessageChannel outputChannel) {
 		BridgeHandler bridgeHandler = new BridgeHandler();
 		bridgeHandler.setOutputChannel(outputChannel);
 		inputChannel.subscribe(bridgeHandler);
 	}
 
-	/**
-	 * Register a bean with "flow" prefix
-	 * 
-	 * @param beanDefinition
-	 * @param registry
-	 * @return
-	 */
 	public static String registerBeanDefinition(BeanDefinition beanDefinition, BeanDefinitionRegistry registry) {
 		String beanName = BeanDefinitionReaderUtils.generateBeanName(beanDefinition, registry);
 		beanName = "flow." + beanName;
@@ -116,20 +102,20 @@ public class FlowUtils {
 	}
 
 	private static void _displayDependencies(ConfigurableListableBeanFactory beanFactory, String[] beans, int level) {
-		for (int i = 0; i < beans.length; i++) {
+		for (String bean : beans) {
 
-			System.out.println(indent(level) + beans[i]);
+			System.out.println(indent(level) + bean);
 
-			String[] dependencies = beanFactory.getDependenciesForBean(beans[i]);
+			String[] dependencies = beanFactory.getDependenciesForBean(bean);
 			String[] depsArray = new String[dependencies.length];
 			int index = 0;
 			for (String dependency : dependencies) {
-				if (!dependency.equals(beans[i])) {
+				if (!dependency.equals(bean)) {
 
 					depsArray[index++] = dependency;
 				}
 				else {
-					System.out.println(indent(level + 1) + beans[i]);
+					System.out.println(indent(level + 1) + bean);
 				}
 			}
 			if (depsArray.length > 0) {