Merge branch '1.3.x'

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/BeanTypeRegistry.java

@@ -138,13 +138,17 @@ abstract class BeanTypeRegistry {
 				.getBeanDefinition(definition.getFactoryBeanName());
 		Class<?> factoryClass = ClassUtils.forName(factoryDefinition.getBeanClassName(),
 				beanFactory.getBeanClassLoader());
+		return getFactoryMethod(definition, factoryClass);
+	}
+
+	private Method getFactoryMethod(BeanDefinition definition, Class<?> factoryClass) {
 		Method uniqueMethod = null;
 		for (Method candidate : getCandidateFactoryMethods(definition, factoryClass)) {
 			if (candidate.getName().equals(definition.getFactoryMethodName())) {
 				if (uniqueMethod == null) {
 					uniqueMethod = candidate;
 				}
-				else if (!matchingArguments(candidate, uniqueMethod)) {
+				else if (!hasMatchingParameterTypes(candidate, uniqueMethod)) {
 					return null;
 				}
 			}
@@ -164,7 +168,7 @@ abstract class BeanTypeRegistry {
 				&& ((AbstractBeanDefinition) definition).isNonPublicAccessAllowed();
 	}
 
-	private boolean matchingArguments(Method candidate, Method current) {
+	private boolean hasMatchingParameterTypes(Method candidate, Method current) {
 		return Arrays.equals(candidate.getParameterTypes(), current.getParameterTypes());
 	}
 

spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessDataFile.java

@@ -246,8 +246,10 @@ public class RandomAccessDataFile implements RandomAccessData {
 		public RandomAccessFile acquire() throws IOException {
 			this.available.acquireUninterruptibly();
 			RandomAccessFile file = this.files.poll();
-			return (file == null
-					? new RandomAccessFile(RandomAccessDataFile.this.file, "r") : file);
+			if (file != null) {
+				return file;
+			}
+			return new RandomAccessFile(RandomAccessDataFile.this.file, "r");
 		}
 
 		public void release(RandomAccessFile file) {

spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java

@@ -90,8 +90,8 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
 	/**
 	 * JVM arguments that should be associated with the forked process used to run the
 	 * application. On command line, make sure to wrap multiple values between quotes.
-	 * NOTE: the use of JVM arguments means that processes will be started by forking
-	 * a new JVM.
+	 * NOTE: the use of JVM arguments means that processes will be started by forking a
+	 * new JVM.
 	 * @since 1.1
 	 */
 	@Parameter(property = "run.jvmArguments")
@@ -214,10 +214,10 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
 	private void run(String startClassName)
 			throws MojoExecutionException, MojoFailureException {
 		findAgent();
-		boolean forkEnabled = isFork();
+		boolean fork = isFork();
 		this.project.getProperties().setProperty("_spring.boot.fork.enabled",
-				Boolean.toString(forkEnabled));
-		if (forkEnabled) {
+				Boolean.toString(fork));
+		if (fork) {
 			doRunWithForkedJvm(startClassName);
 		}
 		else {

spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/StopMojo.java

@@ -103,7 +103,8 @@ public class StopMojo extends AbstractMojo {
 		if (this.fork != null) {
 			return this.fork;
 		}
-		String property = this.project.getProperties().getProperty("_spring.boot.fork.enabled");
+		String property = this.project.getProperties()
+				.getProperty("_spring.boot.fork.enabled");
 		return Boolean.valueOf(property);
 	}