Merge branch '1.2.x'

spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokExplicitProperties.java

@@ -19,11 +19,11 @@ package org.springframework.boot.configurationsample.lombok;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.springframework.boot.configurationsample.ConfigurationProperties;
+
 import lombok.Getter;
 import lombok.Setter;
 
-import org.springframework.boot.configurationsample.ConfigurationProperties;
-
 /**
  * Configuration properties using lombok @Getter/@Setter at field level.
  *

spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokSimpleDataProperties.java

@@ -19,10 +19,10 @@ package org.springframework.boot.configurationsample.lombok;
 import java.util.ArrayList;
 import java.util.List;
 
-import lombok.Data;
-
 import org.springframework.boot.configurationsample.ConfigurationProperties;
 
+import lombok.Data;
+
 /**
  * Configuration properties using lombok @Data.
  *

spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokSimpleProperties.java

@@ -19,11 +19,11 @@ package org.springframework.boot.configurationsample.lombok;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.springframework.boot.configurationsample.ConfigurationProperties;
+
 import lombok.Getter;
 import lombok.Setter;
 
-import org.springframework.boot.configurationsample.ConfigurationProperties;
-
 /**
  * Configuration properties using lombok @Getter/@Setter at class level.
  *

spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/NotAnnotated.java

@@ -16,7 +16,6 @@
 
 package org.springframework.boot.configurationsample.simple;
 
-
 /**
  * This has no annotation on purpose to check that no meta-data is generated.
  *