mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '2.0.x' into 2.1.x
Closes gh-17334
This commit is contained in:
commit
91786bc712
@ -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
4
pom.xml
@ -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>
|
||||||
|
@ -359,7 +359,8 @@ 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()) {
|
||||||
|
try (ZipOutputStream zos = new ZipOutputStream(bos)) {
|
||||||
ZipEntry entry = new ZipEntry(fileName);
|
ZipEntry entry = new ZipEntry(fileName);
|
||||||
zos.putNextEntry(entry);
|
zos.putNextEntry(entry);
|
||||||
zos.write(content.getBytes());
|
zos.write(content.getBytes());
|
||||||
@ -367,6 +368,7 @@ public class InitCommandTests extends AbstractHttpClientMockTests {
|
|||||||
return bos.toByteArray();
|
return bos.toByteArray();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private static class TestableInitCommandOptionHandler extends InitCommand.InitOptionHandler {
|
private static class TestableInitCommandOptionHandler extends InitCommand.InitOptionHandler {
|
||||||
|
|
||||||
|
@ -63,8 +63,10 @@ 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")) {
|
||||||
|
ConfigurationMetadataRepository repo = ConfigurationMetadataRepositoryJsonBuilder.create(foo, bar)
|
||||||
|
.build();
|
||||||
validateFoo(repo);
|
validateFoo(repo);
|
||||||
validateBar(repo);
|
validateBar(repo);
|
||||||
assertThat(repo.getAllGroups()).hasSize(2);
|
assertThat(repo.getAllGroups()).hasSize(2);
|
||||||
@ -73,11 +75,14 @@ public class ConfigurationMetadataRepositoryJsonBuilderTests extends AbstractCon
|
|||||||
assertThat(repo.getAllProperties()).hasSize(6);
|
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")) {
|
||||||
|
ConfigurationMetadataRepository repo = ConfigurationMetadataRepositoryJsonBuilder.create(foo, root)
|
||||||
|
.build();
|
||||||
validateFoo(repo);
|
validateFoo(repo);
|
||||||
assertThat(repo.getAllGroups()).hasSize(2);
|
assertThat(repo.getAllGroups()).hasSize(2);
|
||||||
|
|
||||||
@ -86,11 +91,14 @@ public class ConfigurationMetadataRepositoryJsonBuilderTests extends AbstractCon
|
|||||||
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")) {
|
||||||
|
ConfigurationMetadataRepository repo = ConfigurationMetadataRepositoryJsonBuilder.create(foo, foo2)
|
||||||
|
.build();
|
||||||
assertThat(repo.getAllGroups()).hasSize(1);
|
assertThat(repo.getAllGroups()).hasSize(1);
|
||||||
ConfigurationMetadataGroup group = repo.getAllGroups().get("spring.foo");
|
ConfigurationMetadataGroup group = repo.getAllGroups().get("spring.foo");
|
||||||
contains(group.getSources(), "org.acme.Foo", "org.acme.Foo2", "org.springframework.boot.FooProperties");
|
contains(group.getSources(), "org.acme.Foo", "org.acme.Foo2", "org.springframework.boot.FooProperties");
|
||||||
@ -103,6 +111,7 @@ public class ConfigurationMetadataRepositoryJsonBuilderTests extends AbstractCon
|
|||||||
assertThat(repo.getAllProperties()).hasSize(5);
|
assertThat(repo.getAllProperties()).hasSize(5);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void emptyGroups() throws IOException {
|
public void emptyGroups() throws IOException {
|
||||||
@ -135,8 +144,10 @@ 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")) {
|
||||||
|
ConfigurationMetadataRepositoryJsonBuilder builder = ConfigurationMetadataRepositoryJsonBuilder
|
||||||
|
.create();
|
||||||
ConfigurationMetadataRepository firstRepo = builder.withJsonResource(foo).build();
|
ConfigurationMetadataRepository firstRepo = builder.withJsonResource(foo).build();
|
||||||
validateFoo(firstRepo);
|
validateFoo(firstRepo);
|
||||||
ConfigurationMetadataRepository secondRepo = builder.withJsonResource(bar).build();
|
ConfigurationMetadataRepository secondRepo = builder.withJsonResource(bar).build();
|
||||||
@ -150,6 +161,7 @@ public class ConfigurationMetadataRepositoryJsonBuilderTests extends AbstractCon
|
|||||||
assertThat(secondRepo.getAllProperties()).hasSize(6);
|
assertThat(secondRepo.getAllProperties()).hasSize(6);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void validateFoo(ConfigurationMetadataRepository repo) {
|
private void validateFoo(ConfigurationMetadataRepository repo) {
|
||||||
ConfigurationMetadataGroup group = repo.getAllGroups().get("spring.foo");
|
ConfigurationMetadataGroup group = repo.getAllGroups().get("spring.foo");
|
||||||
|
@ -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")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user