Merge branch '2.1.x'

wilkinsona · wilkinsona · commit 66f1344f7ce2 · 2019-06-27T12:00:34.000+01:00
Closes gh-17335 Closes gh-17292
diff --git a/eclipse/spring-boot-project.setup b/eclipse/spring-boot-project.setup
@@ -59,7 +59,7 @@
     <requirement
         name="org.eclipse.jdt.feature.group"/>
     <requirement
-        name="io.spring.javaformat.eclipse.feature.feature.group"/>
+        name="io.spring.javaformat.eclipse.feature.feature.group" versionRange="[0.0.14,0.0.15)"/>
     <requirement
         name="org.eclipse.jst.server_adapters.feature.feature.group"/>
     <requirement
diff --git a/pom.xml b/pom.xml
@@ -24,7 +24,7 @@
 				</property>
 			</activation>
 			<properties>
-				<spring-javaformat.version>0.0.12</spring-javaformat.version>
+				<spring-javaformat.version>0.0.14</spring-javaformat.version>
 				<nohttp-checkstyle.version>0.0.1.RELEASE</nohttp-checkstyle.version>
 			</properties>
 			<build>
@@ -37,7 +37,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>8.18</version>
+								<version>8.22</version>
 							</dependency>
 							<dependency>
 								<groupId>io.spring.javaformat</groupId>
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationClientTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationClientTests.java
@@ -50,12 +50,12 @@ class HazelcastAutoConfigurationClientTests {
 	private static HazelcastInstance hazelcastServer;
 
 	@BeforeAll
-	public static void init() {
+	static void init() {
 		hazelcastServer = Hazelcast.newHazelcastInstance();
 	}
 
 	@AfterAll
-	public static void close() {
+	static void close() {
 		if (hazelcastServer != null) {
 			hazelcastServer.shutdown();
 		}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationIntegrationTests.java
@@ -58,7 +58,7 @@ class KafkaAutoConfigurationIntegrationTests {
 	private AnnotationConfigApplicationContext context;
 
 	@BeforeAll
-	public static void setUp() {
+	static void setUp() {
 		embeddedKafka.afterPropertiesSet();
 	}
 
@@ -70,7 +70,7 @@ void close() {
 	}
 
 	@AfterAll
-	public static void tearDown() {
+	static void tearDown() {
 		embeddedKafka.destroy();
 	}
 
diff --git a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitCommandTests.java b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitCommandTests.java
@@ -350,12 +350,14 @@ void userAgent() throws Exception {
 	}
 
 	private byte[] createFakeZipArchive(String fileName, String content) throws IOException {
-		try (ByteArrayOutputStream bos = new ByteArrayOutputStream(); ZipOutputStream zos = new ZipOutputStream(bos)) {
-			ZipEntry entry = new ZipEntry(fileName);
-			zos.putNextEntry(entry);
-			zos.write(content.getBytes());
-			zos.closeEntry();
-			return bos.toByteArray();
+		try (ByteArrayOutputStream bos = new ByteArrayOutputStream()) {
+			try (ZipOutputStream zos = new ZipOutputStream(bos)) {
+				ZipEntry entry = new ZipEntry(fileName);
+				zos.putNextEntry(entry);
+				zos.write(content.getBytes());
+				zos.closeEntry();
+				return bos.toByteArray();
+			}
 		}
 	}
 
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataRepositoryJsonBuilderTests.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataRepositoryJsonBuilderTests.java
@@ -63,44 +63,53 @@ void hintsOnMaps() throws IOException {
 
 	@Test
 	void severalRepositoriesNoConflict() throws IOException {
-		try (InputStream foo = getInputStreamFor("foo"); InputStream bar = getInputStreamFor("bar")) {
-			ConfigurationMetadataRepository repo = ConfigurationMetadataRepositoryJsonBuilder.create(foo, bar).build();
-			validateFoo(repo);
-			validateBar(repo);
-			assertThat(repo.getAllGroups()).hasSize(2);
-			contains(repo.getAllProperties(), "spring.foo.name", "spring.foo.description", "spring.foo.counter",
-					"spring.bar.name", "spring.bar.description", "spring.bar.counter");
-			assertThat(repo.getAllProperties()).hasSize(6);
+		try (InputStream foo = getInputStreamFor("foo")) {
+			try (InputStream bar = getInputStreamFor("bar")) {
+				ConfigurationMetadataRepository repo = ConfigurationMetadataRepositoryJsonBuilder.create(foo, bar)
+						.build();
+				validateFoo(repo);
+				validateBar(repo);
+				assertThat(repo.getAllGroups()).hasSize(2);
+				contains(repo.getAllProperties(), "spring.foo.name", "spring.foo.description", "spring.foo.counter",
+						"spring.bar.name", "spring.bar.description", "spring.bar.counter");
+				assertThat(repo.getAllProperties()).hasSize(6);
+			}
 		}
 	}
 
 	@Test
 	void repositoryWithRoot() throws IOException {
-		try (InputStream foo = getInputStreamFor("foo"); InputStream root = getInputStreamFor("root")) {
-			ConfigurationMetadataRepository repo = ConfigurationMetadataRepositoryJsonBuilder.create(foo, root).build();
-			validateFoo(repo);
-			assertThat(repo.getAllGroups()).hasSize(2);
-
-			contains(repo.getAllProperties(), "spring.foo.name", "spring.foo.description", "spring.foo.counter",
-					"spring.root.name", "spring.root2.name");
-			assertThat(repo.getAllProperties()).hasSize(5);
+		try (InputStream foo = getInputStreamFor("foo")) {
+			try (InputStream root = getInputStreamFor("root")) {
+				ConfigurationMetadataRepository repo = ConfigurationMetadataRepositoryJsonBuilder.create(foo, root)
+						.build();
+				validateFoo(repo);
+				assertThat(repo.getAllGroups()).hasSize(2);
+
+				contains(repo.getAllProperties(), "spring.foo.name", "spring.foo.description", "spring.foo.counter",
+						"spring.root.name", "spring.root2.name");
+				assertThat(repo.getAllProperties()).hasSize(5);
+			}
 		}
 	}
 
 	@Test
 	void severalRepositoriesIdenticalGroups() throws IOException {
-		try (InputStream foo = getInputStreamFor("foo"); InputStream foo2 = getInputStreamFor("foo2")) {
-			ConfigurationMetadataRepository repo = ConfigurationMetadataRepositoryJsonBuilder.create(foo, foo2).build();
-			assertThat(repo.getAllGroups()).hasSize(1);
-			ConfigurationMetadataGroup group = repo.getAllGroups().get("spring.foo");
-			contains(group.getSources(), "org.acme.Foo", "org.acme.Foo2", "org.springframework.boot.FooProperties");
-			assertThat(group.getSources()).hasSize(3);
-			contains(group.getProperties(), "spring.foo.name", "spring.foo.description", "spring.foo.counter",
-					"spring.foo.enabled", "spring.foo.type");
-			assertThat(group.getProperties()).hasSize(5);
-			contains(repo.getAllProperties(), "spring.foo.name", "spring.foo.description", "spring.foo.counter",
-					"spring.foo.enabled", "spring.foo.type");
-			assertThat(repo.getAllProperties()).hasSize(5);
+		try (InputStream foo = getInputStreamFor("foo")) {
+			try (InputStream foo2 = getInputStreamFor("foo2")) {
+				ConfigurationMetadataRepository repo = ConfigurationMetadataRepositoryJsonBuilder.create(foo, foo2)
+						.build();
+				assertThat(repo.getAllGroups()).hasSize(1);
+				ConfigurationMetadataGroup group = repo.getAllGroups().get("spring.foo");
+				contains(group.getSources(), "org.acme.Foo", "org.acme.Foo2", "org.springframework.boot.FooProperties");
+				assertThat(group.getSources()).hasSize(3);
+				contains(group.getProperties(), "spring.foo.name", "spring.foo.description", "spring.foo.counter",
+						"spring.foo.enabled", "spring.foo.type");
+				assertThat(group.getProperties()).hasSize(5);
+				contains(repo.getAllProperties(), "spring.foo.name", "spring.foo.description", "spring.foo.counter",
+						"spring.foo.enabled", "spring.foo.type");
+				assertThat(repo.getAllProperties()).hasSize(5);
+			}
 		}
 	}
 
@@ -135,19 +144,22 @@ void multiGroups() throws IOException {
 
 	@Test
 	void builderInstancesAreIsolated() throws IOException {
-		try (InputStream foo = getInputStreamFor("foo"); InputStream bar = getInputStreamFor("bar")) {
-			ConfigurationMetadataRepositoryJsonBuilder builder = ConfigurationMetadataRepositoryJsonBuilder.create();
-			ConfigurationMetadataRepository firstRepo = builder.withJsonResource(foo).build();
-			validateFoo(firstRepo);
-			ConfigurationMetadataRepository secondRepo = builder.withJsonResource(bar).build();
-			validateFoo(secondRepo);
-			validateBar(secondRepo);
-			// first repo not impacted by second build
-			assertThat(secondRepo).isNotEqualTo(firstRepo);
-			assertThat(firstRepo.getAllGroups()).hasSize(1);
-			assertThat(firstRepo.getAllProperties()).hasSize(3);
-			assertThat(secondRepo.getAllGroups()).hasSize(2);
-			assertThat(secondRepo.getAllProperties()).hasSize(6);
+		try (InputStream foo = getInputStreamFor("foo")) {
+			try (InputStream bar = getInputStreamFor("bar")) {
+				ConfigurationMetadataRepositoryJsonBuilder builder = ConfigurationMetadataRepositoryJsonBuilder
+						.create();
+				ConfigurationMetadataRepository firstRepo = builder.withJsonResource(foo).build();
+				validateFoo(firstRepo);
+				ConfigurationMetadataRepository secondRepo = builder.withJsonResource(bar).build();
+				validateFoo(secondRepo);
+				validateBar(secondRepo);
+				// first repo not impacted by second build
+				assertThat(secondRepo).isNotEqualTo(firstRepo);
+				assertThat(firstRepo.getAllGroups()).hasSize(1);
+				assertThat(firstRepo.getAllProperties()).hasSize(3);
+				assertThat(secondRepo.getAllGroups()).hasSize(2);
+				assertThat(secondRepo.getAllProperties()).hasSize(6);
+			}
 		}
 	}
 
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle
@@ -4,7 +4,7 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath("io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.11")
+		classpath("io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.14")
 	}
 }
 
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ansi/AnsiOutputTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ansi/AnsiOutputTests.java
@@ -32,12 +32,12 @@
 class AnsiOutputTests {
 
 	@BeforeAll
-	public static void enable() {
+	static void enable() {
 		AnsiOutput.setEnabled(Enabled.ALWAYS);
 	}
 
 	@AfterAll
-	public static void reset() {
+	static void reset() {
 		AnsiOutput.setEnabled(Enabled.DETECT);
 	}
 
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/ColorConverterTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/ColorConverterTests.java
@@ -42,12 +42,12 @@ class ColorConverterTests {
 	private final String in = "in";
 
 	@BeforeAll
-	public static void setupAnsi() {
+	static void setupAnsi() {
 		AnsiOutput.setEnabled(AnsiOutput.Enabled.ALWAYS);
 	}
 
 	@AfterAll
-	public static void resetAnsi() {
+	static void resetAnsi() {
 		AnsiOutput.setEnabled(AnsiOutput.Enabled.DETECT);
 	}
 
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RootUriTemplateHandlerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RootUriTemplateHandlerTests.java
@@ -52,7 +52,7 @@ class RootUriTemplateHandlerTests {
 
 	@BeforeEach
 	@SuppressWarnings("unchecked")
-	public void setup() throws URISyntaxException {
+	void setup() throws URISyntaxException {
 		MockitoAnnotations.initMocks(this);
 		this.uri = new URI("https://example.com/hello");
 		this.handler = new RootUriTemplateHandler("https://example.com", this.delegate);
diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-configuration-processor-tests/src/test/java/org/springframework/boot/configurationprocessor/tests/ConfigurationProcessorIntegrationTests.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-configuration-processor-tests/src/test/java/org/springframework/boot/configurationprocessor/tests/ConfigurationProcessorIntegrationTests.java
@@ -39,7 +39,7 @@ class ConfigurationProcessorIntegrationTests {
 	private static ConfigurationMetadataRepository repository;
 
 	@BeforeAll
-	public static void readMetadata() throws IOException {
+	static void readMetadata() throws IOException {
 		Resource resource = new ClassPathResource("META-INF/spring-configuration-metadata.json");
 		assertThat(resource.exists()).isTrue();
 		// Make sure the right file is detected

Original file line number	Diff line number	Diff line change
`@@ -50,12 +50,12 @@ class HazelcastAutoConfigurationClientTests {`
`50`	`50`	`private static HazelcastInstance hazelcastServer;`
`51`	`51`
`52`	`52`	`@BeforeAll`
`53`		`- public static void init() {`
	`53`	`+ static void init() {`
`54`	`54`	`hazelcastServer = Hazelcast.newHazelcastInstance();`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`@AfterAll`
`58`		`- public static void close() {`
	`58`	`+ static void close() {`
`59`	`59`	`if (hazelcastServer != null) {`
`60`	`60`	`hazelcastServer.shutdown();`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ class KafkaAutoConfigurationIntegrationTests {`
`58`	`58`	`private AnnotationConfigApplicationContext context;`
`59`	`59`
`60`	`60`	`@BeforeAll`
`61`		`- public static void setUp() {`
	`61`	`+ static void setUp() {`
`62`	`62`	`embeddedKafka.afterPropertiesSet();`
`63`	`63`	`}`
`64`	`64`
`@@ -70,7 +70,7 @@ void close() {`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`@AfterAll`
`73`		`- public static void tearDown() {`
	`73`	`+ static void tearDown() {`
`74`	`74`	`embeddedKafka.destroy();`
`75`	`75`	`}`
`76`	`76`
Original file line number	Diff line number	Diff line change
`@@ -350,12 +350,14 @@ void userAgent() throws Exception {`
`350`	`350`	`}`
`351`	`351`
`352`	`352`	`private byte[] createFakeZipArchive(String fileName, String content) throws IOException {`
`353`		`- try (ByteArrayOutputStream bos = new ByteArrayOutputStream(); ZipOutputStream zos = new ZipOutputStream(bos)) {`
`354`		`- ZipEntry entry = new ZipEntry(fileName);`
`355`		`- zos.putNextEntry(entry);`
`356`		`- zos.write(content.getBytes());`
`357`		`- zos.closeEntry();`
`358`		`- return bos.toByteArray();`
	`353`	`+ try (ByteArrayOutputStream bos = new ByteArrayOutputStream()) {`
	`354`	`+ try (ZipOutputStream zos = new ZipOutputStream(bos)) {`
	`355`	`+ ZipEntry entry = new ZipEntry(fileName);`
	`356`	`+ zos.putNextEntry(entry);`
	`357`	`+ zos.write(content.getBytes());`
	`358`	`+ zos.closeEntry();`
	`359`	`+ return bos.toByteArray();`
	`360`	`+ }`
`359`	`361`	`}`
`360`	`362`	`}`
`361`	`363`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ buildscript {`
`4`	`4`	`mavenCentral()`
`5`	`5`	`}`
`6`	`6`	`dependencies {`
`7`		`- classpath("io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.11")`
	`7`	`+ classpath("io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.14")`
`8`	`8`	`}`
`9`	`9`	`}`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -32,12 +32,12 @@`
`32`	`32`	`class AnsiOutputTests {`
`33`	`33`
`34`	`34`	`@BeforeAll`
`35`		`- public static void enable() {`
	`35`	`+ static void enable() {`
`36`	`36`	`AnsiOutput.setEnabled(Enabled.ALWAYS);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`@AfterAll`
`40`		`- public static void reset() {`
	`40`	`+ static void reset() {`
`41`	`41`	`AnsiOutput.setEnabled(Enabled.DETECT);`
`42`	`42`	`}`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -42,12 +42,12 @@ class ColorConverterTests {`
`42`	`42`	`private final String in = "in";`
`43`	`43`
`44`	`44`	`@BeforeAll`
`45`		`- public static void setupAnsi() {`
	`45`	`+ static void setupAnsi() {`
`46`	`46`	`AnsiOutput.setEnabled(AnsiOutput.Enabled.ALWAYS);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`@AfterAll`
`50`		`- public static void resetAnsi() {`
	`50`	`+ static void resetAnsi() {`
`51`	`51`	`AnsiOutput.setEnabled(AnsiOutput.Enabled.DETECT);`
`52`	`52`	`}`
`53`	`53`