Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-15 01:07:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0.x' into 2.1.x

Browse Source 
Closes gh-17334
This commit is contained in:
Andy Wilkinson 2019-06-27 11:39:17 +01:00
commit 91786bc712
5 changed files with 64 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eclipse/spring-boot-project.setup
View File

@ -59,7 +59,7 @@
<requirement <requirement
name="org.eclipse.jdt.feature.group"/> name="org.eclipse.jdt.feature.group"/>
<requirement <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 <requirement
name="org.eclipse.jst.server_adapters.feature.feature.group"/> name="org.eclipse.jst.server_adapters.feature.feature.group"/>
<requirement <requirement

4
pom.xml
View File

@ -24,7 +24,7 @@
</property> </property>
</activation> </activation>
<properties> <properties>
<spring-javaformat.version>0.0.11</spring-javaformat.version> <spring-javaformat.version>0.0.14</spring-javaformat.version>
<nohttp-checkstyle.version>0.0.1.RELEASE</nohttp-checkstyle.version> <nohttp-checkstyle.version>0.0.1.RELEASE</nohttp-checkstyle.version>
</properties> </properties>
<build> <build>
@ -37,7 +37,7 @@
<dependency> <dependency>
<groupId>com.puppycrawl.tools</groupId> <groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId> <artifactId>checkstyle</artifactId>
<version>8.18</version> <version>8.22</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.spring.javaformat</groupId> <groupId>io.spring.javaformat</groupId>

14
spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitCommandTests.java
View File

@ -359,12 +359,14 @@ public class InitCommandTests extends AbstractHttpClientMockTests {
} }
private byte[] createFakeZipArchive(String fileName, String content) throws IOException { private byte[] createFakeZipArchive(String fileName, String content) throws IOException {
try (ByteArrayOutputStream bos = new ByteArrayOutputStream(); ZipOutputStream zos = new ZipOutputStream(bos)) { try (ByteArrayOutputStream bos = new ByteArrayOutputStream()) {
ZipEntry entry = new ZipEntry(fileName); try (ZipOutputStream zos = new ZipOutputStream(bos)) {
zos.putNextEntry(entry); ZipEntry entry = new ZipEntry(fileName);
zos.write(content.getBytes()); zos.putNextEntry(entry);
zos.closeEntry(); zos.write(content.getBytes());
return bos.toByteArray(); zos.closeEntry();
return bos.toByteArray();
}
} }
} }

92
spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataRepositoryJsonBuilderTests.java
View File

@ -63,44 +63,53 @@ public class ConfigurationMetadataRepositoryJsonBuilderTests extends AbstractCon
@Test @Test
public void severalRepositoriesNoConflict() throws IOException { public void severalRepositoriesNoConflict() throws IOException {
try (InputStream foo = getInputStreamFor("foo"); InputStream bar = getInputStreamFor("bar")) { try (InputStream foo = getInputStreamFor("foo")) {
ConfigurationMetadataRepository repo = ConfigurationMetadataRepositoryJsonBuilder.create(foo, bar).build(); try (InputStream bar = getInputStreamFor("bar")) {
validateFoo(repo); ConfigurationMetadataRepository repo = ConfigurationMetadataRepositoryJsonBuilder.create(foo, bar)
validateBar(repo); .build();
assertThat(repo.getAllGroups()).hasSize(2); validateFoo(repo);
contains(repo.getAllProperties(), "spring.foo.name", "spring.foo.description", "spring.foo.counter", validateBar(repo);
"spring.bar.name", "spring.bar.description", "spring.bar.counter"); assertThat(repo.getAllGroups()).hasSize(2);
assertThat(repo.getAllProperties()).hasSize(6); 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 @Test
public void repositoryWithRoot() throws IOException { public void repositoryWithRoot() throws IOException {
try (InputStream foo = getInputStreamFor("foo"); InputStream root = getInputStreamFor("root")) { try (InputStream foo = getInputStreamFor("foo")) {
ConfigurationMetadataRepository repo = ConfigurationMetadataRepositoryJsonBuilder.create(foo, root).build(); try (InputStream root = getInputStreamFor("root")) {
validateFoo(repo); ConfigurationMetadataRepository repo = ConfigurationMetadataRepositoryJsonBuilder.create(foo, root)
assertThat(repo.getAllGroups()).hasSize(2); .build();
validateFoo(repo);
assertThat(repo.getAllGroups()).hasSize(2);
contains(repo.getAllProperties(), "spring.foo.name", "spring.foo.description", "spring.foo.counter", contains(repo.getAllProperties(), "spring.foo.name", "spring.foo.description", "spring.foo.counter",
"spring.root.name", "spring.root2.name"); "spring.root.name", "spring.root2.name");
assertThat(repo.getAllProperties()).hasSize(5); assertThat(repo.getAllProperties()).hasSize(5);
}
} }
} }
@Test @Test
public void severalRepositoriesIdenticalGroups() throws IOException { public void severalRepositoriesIdenticalGroups() throws IOException {
try (InputStream foo = getInputStreamFor("foo"); InputStream foo2 = getInputStreamFor("foo2")) { try (InputStream foo = getInputStreamFor("foo")) {
ConfigurationMetadataRepository repo = ConfigurationMetadataRepositoryJsonBuilder.create(foo, foo2).build(); try (InputStream foo2 = getInputStreamFor("foo2")) {
assertThat(repo.getAllGroups()).hasSize(1); ConfigurationMetadataRepository repo = ConfigurationMetadataRepositoryJsonBuilder.create(foo, foo2)
ConfigurationMetadataGroup group = repo.getAllGroups().get("spring.foo"); .build();
contains(group.getSources(), "org.acme.Foo", "org.acme.Foo2", "org.springframework.boot.FooProperties"); assertThat(repo.getAllGroups()).hasSize(1);
assertThat(group.getSources()).hasSize(3); ConfigurationMetadataGroup group = repo.getAllGroups().get("spring.foo");
contains(group.getProperties(), "spring.foo.name", "spring.foo.description", "spring.foo.counter", contains(group.getSources(), "org.acme.Foo", "org.acme.Foo2", "org.springframework.boot.FooProperties");
"spring.foo.enabled", "spring.foo.type"); assertThat(group.getSources()).hasSize(3);
assertThat(group.getProperties()).hasSize(5); contains(group.getProperties(), "spring.foo.name", "spring.foo.description", "spring.foo.counter",
contains(repo.getAllProperties(), "spring.foo.name", "spring.foo.description", "spring.foo.counter", "spring.foo.enabled", "spring.foo.type");
"spring.foo.enabled", "spring.foo.type"); assertThat(group.getProperties()).hasSize(5);
assertThat(repo.getAllProperties()).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 @@ public class ConfigurationMetadataRepositoryJsonBuilderTests extends AbstractCon
@Test @Test
public void builderInstancesAreIsolated() throws IOException { public void builderInstancesAreIsolated() throws IOException {
try (InputStream foo = getInputStreamFor("foo"); InputStream bar = getInputStreamFor("bar")) { try (InputStream foo = getInputStreamFor("foo")) {
ConfigurationMetadataRepositoryJsonBuilder builder = ConfigurationMetadataRepositoryJsonBuilder.create(); try (InputStream bar = getInputStreamFor("bar")) {
ConfigurationMetadataRepository firstRepo = builder.withJsonResource(foo).build(); ConfigurationMetadataRepositoryJsonBuilder builder = ConfigurationMetadataRepositoryJsonBuilder
validateFoo(firstRepo); .create();
ConfigurationMetadataRepository secondRepo = builder.withJsonResource(bar).build(); ConfigurationMetadataRepository firstRepo = builder.withJsonResource(foo).build();
validateFoo(secondRepo); validateFoo(firstRepo);
validateBar(secondRepo); ConfigurationMetadataRepository secondRepo = builder.withJsonResource(bar).build();
// first repo not impacted by second build validateFoo(secondRepo);
assertThat(secondRepo).isNotEqualTo(firstRepo); validateBar(secondRepo);
assertThat(firstRepo.getAllGroups()).hasSize(1); // first repo not impacted by second build
assertThat(firstRepo.getAllProperties()).hasSize(3); assertThat(secondRepo).isNotEqualTo(firstRepo);
assertThat(secondRepo.getAllGroups()).hasSize(2); assertThat(firstRepo.getAllGroups()).hasSize(1);
assertThat(secondRepo.getAllProperties()).hasSize(6); assertThat(firstRepo.getAllProperties()).hasSize(3);
assertThat(secondRepo.getAllGroups()).hasSize(2);
assertThat(secondRepo.getAllProperties()).hasSize(6);
}
} }
} }

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle
View File

@ -4,7 +4,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath("io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.11") classpath("io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.14")
} }
} }