Merge branch '2.0.x' into 2.1.x

Closes gh-17078
2019-06-07 10:50:34 +01:00
parent 857b96b77d c6c139d980
commit 24925c3dae
2691 changed files with 27746 additions and 46049 deletions
--- a/spring-boot-project/spring-boot-tools/spring-boot-autoconfigure-processor/src/main/java/org/springframework/boot/autoconfigureprocessor/AutoConfigureAnnotationProcessor.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-autoconfigure-processor/src/main/java/org/springframework/boot/autoconfigureprocessor/AutoConfigureAnnotationProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -60,8 +60,7 @@ import javax.tools.StandardLocation;
 		"org.springframework.boot.autoconfigure.AutoConfigureOrder" })
 public class AutoConfigureAnnotationProcessor extends AbstractProcessor {

-	protected static final String PROPERTIES_PATH = "META-INF/"
-			+ "spring-autoconfigure-metadata.properties";
+	protected static final String PROPERTIES_PATH = "META-INF/" + "spring-autoconfigure-metadata.properties";

 	private final Map<String, String> annotations;

@@ -79,30 +78,23 @@ public class AutoConfigureAnnotationProcessor extends AbstractProcessor {
 	}

 	protected void addAnnotations(Map<String, String> annotations) {
-		annotations.put("Configuration",
-				"org.springframework.context.annotation.Configuration");
-		annotations.put("ConditionalOnClass",
-				"org.springframework.boot.autoconfigure.condition.ConditionalOnClass");
-		annotations.put("ConditionalOnBean",
-				"org.springframework.boot.autoconfigure.condition.ConditionalOnBean");
+		annotations.put("Configuration", "org.springframework.context.annotation.Configuration");
+		annotations.put("ConditionalOnClass", "org.springframework.boot.autoconfigure.condition.ConditionalOnClass");
+		annotations.put("ConditionalOnBean", "org.springframework.boot.autoconfigure.condition.ConditionalOnBean");
 		annotations.put("ConditionalOnSingleCandidate",
 				"org.springframework.boot.autoconfigure.condition.ConditionalOnSingleCandidate");
 		annotations.put("ConditionalOnWebApplication",
 				"org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication");
-		annotations.put("AutoConfigureBefore",
-				"org.springframework.boot.autoconfigure.AutoConfigureBefore");
-		annotations.put("AutoConfigureAfter",
-				"org.springframework.boot.autoconfigure.AutoConfigureAfter");
-		annotations.put("AutoConfigureOrder",
-				"org.springframework.boot.autoconfigure.AutoConfigureOrder");
+		annotations.put("AutoConfigureBefore", "org.springframework.boot.autoconfigure.AutoConfigureBefore");
+		annotations.put("AutoConfigureAfter", "org.springframework.boot.autoconfigure.AutoConfigureAfter");
+		annotations.put("AutoConfigureOrder", "org.springframework.boot.autoconfigure.AutoConfigureOrder");
 	}

 	private void addValueExtractors(Map<String, ValueExtractor> attributes) {
 		attributes.put("Configuration", ValueExtractor.allFrom("value"));
 		attributes.put("ConditionalOnClass", new OnClassConditionValueExtractor());
 		attributes.put("ConditionalOnBean", new OnBeanConditionValueExtractor());
-		attributes.put("ConditionalOnSingleCandidate",
-				new OnBeanConditionValueExtractor());
+		attributes.put("ConditionalOnSingleCandidate", new OnBeanConditionValueExtractor());
 		attributes.put("ConditionalOnWebApplication", ValueExtractor.allFrom("type"));
 		attributes.put("AutoConfigureBefore", ValueExtractor.allFrom("value", "name"));
 		attributes.put("AutoConfigureAfter", ValueExtractor.allFrom("value", "name"));
@@ -115,8 +107,7 @@ public class AutoConfigureAnnotationProcessor extends AbstractProcessor {
 	}

 	@Override
-	public boolean process(Set<? extends TypeElement> annotations,
-			RoundEnvironment roundEnv) {
+	public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
 		for (Map.Entry<String, String> entry : this.annotations.entrySet()) {
 			process(roundEnv, entry.getKey(), entry.getValue());
 		}
@@ -131,36 +122,30 @@ public class AutoConfigureAnnotationProcessor extends AbstractProcessor {
 		return false;
 	}

-	private void process(RoundEnvironment roundEnv, String propertyKey,
-			String annotationName) {
-		TypeElement annotationType = this.processingEnv.getElementUtils()
-				.getTypeElement(annotationName);
+	private void process(RoundEnvironment roundEnv, String propertyKey, String annotationName) {
+		TypeElement annotationType = this.processingEnv.getElementUtils().getTypeElement(annotationName);
 		if (annotationType != null) {
 			for (Element element : roundEnv.getElementsAnnotatedWith(annotationType)) {
 				Element enclosingElement = element.getEnclosingElement();
-				if (enclosingElement != null
-						&& enclosingElement.getKind() == ElementKind.PACKAGE) {
+				if (enclosingElement != null && enclosingElement.getKind() == ElementKind.PACKAGE) {
 					processElement(element, propertyKey, annotationName);
 				}
 			}
 		}
 	}

-	private void processElement(Element element, String propertyKey,
-			String annotationName) {
+	private void processElement(Element element, String propertyKey, String annotationName) {
 		try {
 			String qualifiedName = Elements.getQualifiedName(element);
 			AnnotationMirror annotation = getAnnotation(element, annotationName);
 			if (qualifiedName != null && annotation != null) {
 				List<Object> values = getValues(propertyKey, annotation);
-				this.properties.put(qualifiedName + "." + propertyKey,
-						toCommaDelimitedString(values));
+				this.properties.put(qualifiedName + "." + propertyKey, toCommaDelimitedString(values));
 				this.properties.put(qualifiedName, "");
 			}
 		}
 		catch (Exception ex) {
-			throw new IllegalStateException(
-					"Error processing configuration meta-data on " + element, ex);
+			throw new IllegalStateException("Error processing configuration meta-data on " + element, ex);
 		}
 	}

@@ -194,8 +179,8 @@ public class AutoConfigureAnnotationProcessor extends AbstractProcessor {

 	private void writeProperties() throws IOException {
 		if (!this.properties.isEmpty()) {
-			FileObject file = this.processingEnv.getFiler()
-					.createResource(StandardLocation.CLASS_OUTPUT, "", PROPERTIES_PATH);
+			FileObject file = this.processingEnv.getFiler().createResource(StandardLocation.CLASS_OUTPUT, "",
+					PROPERTIES_PATH);
 			try (OutputStream outputStream = file.openOutputStream()) {
 				this.properties.store(outputStream, null);
 			}
@@ -263,8 +248,8 @@ public class AutoConfigureAnnotationProcessor extends AbstractProcessor {
 		@Override
 		public List<Object> getValues(AnnotationMirror annotation) {
 			Map<String, AnnotationValue> attributes = new LinkedHashMap<>();
-			annotation.getElementValues().forEach((key, value) -> attributes
-					.put(key.getSimpleName().toString(), value));
+			annotation.getElementValues()
+					.forEach((key, value) -> attributes.put(key.getSimpleName().toString(), value));
 			if (attributes.containsKey("name")) {
 				return Collections.emptyList();
 			}
@@ -290,8 +275,7 @@ public class AutoConfigureAnnotationProcessor extends AbstractProcessor {
 		}

 		private int compare(Object o1, Object o2) {
-			return Comparator.comparing(this::isSpringClass)
-					.thenComparing(String.CASE_INSENSITIVE_ORDER)
+			return Comparator.comparing(this::isSpringClass).thenComparing(String.CASE_INSENSITIVE_ORDER)
 					.compare(o1.toString(), o2.toString());
 		}

--- a/spring-boot-project/spring-boot-tools/spring-boot-autoconfigure-processor/src/main/java/org/springframework/boot/autoconfigureprocessor/Elements.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-autoconfigure-processor/src/main/java/org/springframework/boot/autoconfigureprocessor/Elements.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -36,8 +36,7 @@ final class Elements {
 			TypeElement enclosingElement = getEnclosingTypeElement(element.asType());
 			if (enclosingElement != null) {
 				return getQualifiedName(enclosingElement) + "$"
-						+ ((DeclaredType) element.asType()).asElement().getSimpleName()
-								.toString();
+						+ ((DeclaredType) element.asType()).asElement().getSimpleName().toString();
 			}
 			if (element instanceof TypeElement) {
 				return ((TypeElement) element).getQualifiedName().toString();
--- a/spring-boot-project/spring-boot-tools/spring-boot-autoconfigure-processor/src/test/java/org/springframework/boot/autoconfigureprocessor/AutoConfigureAnnotationProcessorTests.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-autoconfigure-processor/src/test/java/org/springframework/boot/autoconfigureprocessor/AutoConfigureAnnotationProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -52,31 +52,22 @@ public class AutoConfigureAnnotationProcessorTests {
 		Properties properties = compile(TestClassConfiguration.class);
 		assertThat(properties).hasSize(6);
 		assertThat(properties).containsEntry(
-				"org.springframework.boot.autoconfigureprocessor."
-						+ "TestClassConfiguration.ConditionalOnClass",
+				"org.springframework.boot.autoconfigureprocessor." + "TestClassConfiguration.ConditionalOnClass",
 				"java.io.InputStream,org.springframework.boot.autoconfigureprocessor."
 						+ "TestClassConfiguration$Nested,org.springframework.foo");
 		assertThat(properties)
-				.containsKey("org.springframework.boot.autoconfigureprocessor."
-						+ "TestClassConfiguration");
-		assertThat(properties)
-				.containsKey("org.springframework.boot.autoconfigureprocessor."
-						+ "TestClassConfiguration.Configuration");
-		assertThat(properties)
-				.doesNotContainKey("org.springframework.boot.autoconfigureprocessor."
-						+ "TestClassConfiguration$Nested");
+				.containsKey("org.springframework.boot.autoconfigureprocessor." + "TestClassConfiguration");
+		assertThat(properties).containsKey(
+				"org.springframework.boot.autoconfigureprocessor." + "TestClassConfiguration.Configuration");
+		assertThat(properties).doesNotContainKey(
+				"org.springframework.boot.autoconfigureprocessor." + "TestClassConfiguration$Nested");
 		assertThat(properties).containsEntry(
-				"org.springframework.boot.autoconfigureprocessor."
-						+ "TestClassConfiguration.ConditionalOnBean",
+				"org.springframework.boot.autoconfigureprocessor." + "TestClassConfiguration.ConditionalOnBean",
 				"java.io.OutputStream");
-		assertThat(properties).containsEntry(
-				"org.springframework.boot.autoconfigureprocessor."
-						+ "TestClassConfiguration.ConditionalOnSingleCandidate",
-				"java.io.OutputStream");
-		assertThat(properties).containsEntry(
-				"org.springframework.boot.autoconfigureprocessor."
-						+ "TestClassConfiguration.ConditionalOnWebApplication",
-				"SERVLET");
+		assertThat(properties).containsEntry("org.springframework.boot.autoconfigureprocessor."
+				+ "TestClassConfiguration.ConditionalOnSingleCandidate", "java.io.OutputStream");
+		assertThat(properties).containsEntry("org.springframework.boot.autoconfigureprocessor."
+				+ "TestClassConfiguration.ConditionalOnWebApplication", "SERVLET");
 	}

 	@Test
@@ -93,38 +84,29 @@ public class AutoConfigureAnnotationProcessorTests {
 		Properties properties = compile(TestMethodConfiguration.class);
 		List<String> matching = new ArrayList<>();
 		for (Object key : properties.keySet()) {
-			if (key.toString().startsWith(
-					"org.springframework.boot.autoconfigureprocessor.TestMethodConfiguration")) {
+			if (key.toString().startsWith("org.springframework.boot.autoconfigureprocessor.TestMethodConfiguration")) {
 				matching.add(key.toString());
 			}
 		}
 		assertThat(matching).hasSize(2)
-				.contains("org.springframework.boot.autoconfigureprocessor."
-						+ "TestMethodConfiguration")
-				.contains("org.springframework.boot.autoconfigureprocessor."
-						+ "TestMethodConfiguration.Configuration");
+				.contains("org.springframework.boot.autoconfigureprocessor." + "TestMethodConfiguration")
+				.contains("org.springframework.boot.autoconfigureprocessor." + "TestMethodConfiguration.Configuration");
 	}

 	@Test
 	public void annotatedClassWithOrder() throws Exception {
 		Properties properties = compile(TestOrderedClassConfiguration.class);
 		assertThat(properties).containsEntry(
-				"org.springframework.boot.autoconfigureprocessor."
-						+ "TestOrderedClassConfiguration.ConditionalOnClass",
+				"org.springframework.boot.autoconfigureprocessor." + "TestOrderedClassConfiguration.ConditionalOnClass",
 				"java.io.InputStream,java.io.OutputStream");
+		assertThat(properties).containsEntry("org.springframework.boot.autoconfigureprocessor."
+				+ "TestOrderedClassConfiguration.AutoConfigureBefore", "test.before1,test.before2");
 		assertThat(properties).containsEntry(
-				"org.springframework.boot.autoconfigureprocessor."
-						+ "TestOrderedClassConfiguration.AutoConfigureBefore",
-				"test.before1,test.before2");
-		assertThat(properties).containsEntry(
-				"org.springframework.boot.autoconfigureprocessor."
-						+ "TestOrderedClassConfiguration.AutoConfigureAfter",
+				"org.springframework.boot.autoconfigureprocessor." + "TestOrderedClassConfiguration.AutoConfigureAfter",
 				"java.io.ObjectInputStream");
-		assertThat(properties)
-				.containsEntry(
-						"org.springframework.boot.autoconfigureprocessor."
-								+ "TestOrderedClassConfiguration.AutoConfigureOrder",
-						"123");
+		assertThat(properties).containsEntry(
+				"org.springframework.boot.autoconfigureprocessor." + "TestOrderedClassConfiguration.AutoConfigureOrder",
+				"123");
 	}

 	private Properties compile(Class<?>... types) throws IOException {
--- a/spring-boot-project/spring-boot-tools/spring-boot-autoconfigure-processor/src/test/java/org/springframework/boot/autoconfigureprocessor/TestAutoConfigureAnnotationProcessor.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-autoconfigure-processor/src/test/java/org/springframework/boot/autoconfigureprocessor/TestAutoConfigureAnnotationProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -29,8 +29,7 @@ import javax.annotation.processing.SupportedAnnotationTypes;
 *
 * @author Madhura Bhave
 */
-@SupportedAnnotationTypes({
-		"org.springframework.boot.autoconfigureprocessor.TestConfiguration",
+@SupportedAnnotationTypes({ "org.springframework.boot.autoconfigureprocessor.TestConfiguration",
 		"org.springframework.boot.autoconfigureprocessor.TestConditionalOnClass",
 		"org.springframework.boot.autoconfigure.condition.TestConditionalOnBean",
 		"org.springframework.boot.autoconfigure.condition.TestConditionalOnSingleCandidate",
@@ -38,8 +37,7 @@ import javax.annotation.processing.SupportedAnnotationTypes;
 		"org.springframework.boot.autoconfigureprocessor.TestAutoConfigureBefore",
 		"org.springframework.boot.autoconfigureprocessor.TestAutoConfigureAfter",
 		"org.springframework.boot.autoconfigureprocessor.TestAutoConfigureOrder" })
-public class TestAutoConfigureAnnotationProcessor
-		extends AutoConfigureAnnotationProcessor {
+public class TestAutoConfigureAnnotationProcessor extends AutoConfigureAnnotationProcessor {

 	private final File outputLocation;

@@ -52,10 +50,8 @@ public class TestAutoConfigureAnnotationProcessor
 		put(annotations, "Configuration", TestConfiguration.class);
 		put(annotations, "ConditionalOnClass", TestConditionalOnClass.class);
 		put(annotations, "ConditionalOnBean", TestConditionalOnBean.class);
-		put(annotations, "ConditionalOnSingleCandidate",
-				TestConditionalOnSingleCandidate.class);
-		put(annotations, "ConditionalOnWebApplication",
-				TestConditionalOnWebApplication.class);
+		put(annotations, "ConditionalOnSingleCandidate", TestConditionalOnSingleCandidate.class);
+		put(annotations, "ConditionalOnWebApplication", TestConditionalOnWebApplication.class);
 		put(annotations, "AutoConfigureBefore", TestAutoConfigureBefore.class);
 		put(annotations, "AutoConfigureAfter", TestAutoConfigureAfter.class);
 		put(annotations, "AutoConfigureOrder", TestAutoConfigureOrder.class);