Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish

Browse Source
This commit is contained in:
Phillip Webb
2018-01-03 11:41:27 -08:00
parent 6bac365a72
commit bee5fa7fc6
24 changed files with 334 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-cli/src/it/java/org/springframework/boot/cli/infrastructure/CommandLineInvoker.java
View File

@@ -160,8 +160,7 @@ public final class CommandLineInvoker {
private List<String> getLines(StringBuffer buffer) {
BufferedReader reader = new BufferedReader(
new StringReader(buffer.toString()));
return reader.lines()
.filter((line) -> !line.startsWith("Picked up "))
return reader.lines().filter((line) -> !line.startsWith("Picked up "))
.collect(Collectors.toList());
}

50
spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactoryTests.java
View File

@@ -50,11 +50,12 @@ public class RepositoryConfigurationFactoryTests {
public void snapshotRepositoriesDisabled() {
TestPropertyValues.of("user.home:src/test/resources/maven-settings/basic",
"disableSpringSnapshotRepos:true").applyToSystemProperties(() -> {
List<RepositoryConfiguration> repositoryConfiguration = RepositoryConfigurationFactory
.createDefaultRepositoryConfiguration();
assertRepositoryConfiguration(repositoryConfiguration, "central", "local");
return null;
});
List<RepositoryConfiguration> repositoryConfiguration = RepositoryConfigurationFactory
.createDefaultRepositoryConfiguration();
assertRepositoryConfiguration(repositoryConfiguration, "central",
"local");
return null;
});
}
@Test
@@ -73,27 +74,32 @@ public class RepositoryConfigurationFactoryTests {
@Test
public void activeByPropertyProfileRepositories() {
TestPropertyValues.of("user.home:src/test/resources/maven-settings/active-profile-repositories",
"foo:bar").applyToSystemProperties(() -> {
List<RepositoryConfiguration> repositoryConfiguration = RepositoryConfigurationFactory
.createDefaultRepositoryConfiguration();
assertRepositoryConfiguration(repositoryConfiguration, "central", "local",
"spring-snapshot", "spring-milestone", "active-by-property");
return null;
});
TestPropertyValues
.of("user.home:src/test/resources/maven-settings/active-profile-repositories",
"foo:bar")
.applyToSystemProperties(() -> {
List<RepositoryConfiguration> repositoryConfiguration = RepositoryConfigurationFactory
.createDefaultRepositoryConfiguration();
assertRepositoryConfiguration(repositoryConfiguration, "central",
"local", "spring-snapshot", "spring-milestone",
"active-by-property");
return null;
});
}
@Test
public void interpolationProfileRepositories() {
TestPropertyValues.of("user.home:src/test/resources/maven-settings/active-profile-repositories",
"interpolate:true").applyToSystemProperties(() -> {
List<RepositoryConfiguration> repositoryConfiguration = RepositoryConfigurationFactory
.createDefaultRepositoryConfiguration();
assertRepositoryConfiguration(repositoryConfiguration, "central", "local",
"spring-snapshot", "spring-milestone", "interpolate-releases",
"interpolate-snapshots");
return null;
});
TestPropertyValues
.of("user.home:src/test/resources/maven-settings/active-profile-repositories",
"interpolate:true")
.applyToSystemProperties(() -> {
List<RepositoryConfiguration> repositoryConfiguration = RepositoryConfigurationFactory
.createDefaultRepositoryConfiguration();
assertRepositoryConfiguration(repositoryConfiguration, "central",
"local", "spring-snapshot", "spring-milestone",
"interpolate-releases", "interpolate-snapshots");
return null;
});
}
private void assertRepositoryConfiguration(

15
spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/SettingsXmlRepositorySystemSessionAutoConfigurationTests.java
View File

@@ -74,8 +74,10 @@ public class SettingsXmlRepositorySystemSessionAutoConfigurationTests {
return new SimpleLocalRepositoryManagerFactory().newInstance(session,
localRepository);
});
TestPropertyValues.of("user.home:src/test/resources/maven-settings/property-interpolation",
"foo:bar").applyToSystemProperties(() -> {
TestPropertyValues
.of("user.home:src/test/resources/maven-settings/property-interpolation",
"foo:bar")
.applyToSystemProperties(() -> {
new SettingsXmlRepositorySystemSessionAutoConfiguration().apply(
session,
SettingsXmlRepositorySystemSessionAutoConfigurationTests.this.repositorySystem);
@@ -89,11 +91,10 @@ public class SettingsXmlRepositorySystemSessionAutoConfigurationTests {
final DefaultRepositorySystemSession session = MavenRepositorySystemUtils
.newSession();
TestPropertyValues.of("user.home:" + userHome).applyToSystemProperties(() -> {
new SettingsXmlRepositorySystemSessionAutoConfiguration().apply(
session,
SettingsXmlRepositorySystemSessionAutoConfigurationTests.this.repositorySystem);
return null;
});
new SettingsXmlRepositorySystemSessionAutoConfiguration().apply(session,
SettingsXmlRepositorySystemSessionAutoConfigurationTests.this.repositorySystem);
return null;
});
RemoteRepository repository = new RemoteRepository.Builder("my-server", "default",
"http://maven.example.com").build();
assertMirrorSelectorConfiguration(session, repository);