Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll
2017-01-24 13:23:06 +01:00
7 changed files with 9 additions and 10 deletions

View File

@@ -108,7 +108,7 @@ public class AutoConfigureAnnotationProcessorTests {
}
private Properties compile(Class<?>... types) throws IOException {
TestConditionMetdataAnnotationProcessor processor = new TestConditionMetdataAnnotationProcessor(
TestConditionMetadataAnnotationProcessor processor = new TestConditionMetadataAnnotationProcessor(
this.compiler.getOutputLocation());
this.compiler.getTask(types).call(processor);
return processor.getWrittenProperties();

View File

@@ -35,12 +35,12 @@ import javax.annotation.processing.SupportedAnnotationTypes;
"org.springframework.boot.autoconfigureprocessor.TestAutoConfigureBefore",
"org.springframework.boot.autoconfigureprocessor.TestAutoConfigureAfter",
"org.springframework.boot.autoconfigureprocessor.TestAutoConfigureOrder" })
public class TestConditionMetdataAnnotationProcessor
public class TestConditionMetadataAnnotationProcessor
extends AutoConfigureAnnotationProcessor {
private final File outputLocation;
public TestConditionMetdataAnnotationProcessor(File outputLocation) {
public TestConditionMetadataAnnotationProcessor(File outputLocation) {
this.outputLocation = outputLocation;
}

View File

@@ -19,7 +19,7 @@ package org.springframework.boot.autoconfigureprocessor;
import java.io.OutputStream;
/**
* Test configuration with an annoated method.
* Test configuration with an annotated method.
*
* @author Madhura Bhave
*/