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

Merge branch '2.1.x'

Browse Source
This commit is contained in:
Andy Wilkinson
2019-02-21 08:19:43 +00:00
parent 3d03c01bfc 53326695ea
commit f2e3e274a8
18 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot-tools/spring-boot-configuration-docs/src/main/java/org/springframework/boot/configurationdocs/ConfigurationMetadataDocumentWriter.java
View File

@@ -92,9 +92,8 @@ public class ConfigurationMetadataDocumentWriter {
List<String> matchingOverrides = overrides.keySet().stream()
.filter((overrideKey) -> overrideKey.startsWith(keyPrefix))
.collect(Collectors.toList());
matchingOverrides.forEach((match) -> {
table.addEntry(overrides.remove(match));
});
matchingOverrides.forEach((match) ->
table.addEntry(overrides.remove(match)));
}
List<String> matchingKeys = unmappedKeys.stream()
.filter((key) -> keyPrefixes.stream().anyMatch(key::startsWith))

3
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/AbstractGenericProperties.java
View File

@@ -22,6 +22,9 @@ import java.util.Map;
/**
* A base properties class with generics.
*
* @param <A> name type
* @param <B> mapping key type
* @param <C> mapping value type
* @author Stephane Nicoll
*/
public class AbstractGenericProperties<A, B, C> {

1
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/AbstractIntermediateGenericProperties.java
View File

@@ -19,6 +19,7 @@ package org.springframework.boot.configurationsample.generic;
/**
* An intermediate layer that resolves some of the generics from the parent but not all.
*
* @param <C> mapping value type
* @author Stephane Nicoll
*/
public abstract class AbstractIntermediateGenericProperties<C>

2
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/UnresolvedGenericProperties.java
View File

@@ -21,6 +21,8 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
/**
* Properties with unresolved generic information.
*
* @param <B> mapping key type
* @param <C> mapping value type
* @author Stephane Nicoll
*/
@ConfigurationProperties("generic")

5
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java
View File

@@ -55,9 +55,8 @@ public class BootJar extends Jar implements BootArchive {
getMainSpec().with(this.bootInf);
this.bootInf.into("classes", classpathFiles(File::isDirectory));
this.bootInf.into("lib", classpathFiles(File::isFile));
this.bootInf.filesMatching("module-info.class", (details) -> {
details.setRelativePath(details.getRelativeSourcePath());
});
this.bootInf.filesMatching("module-info.class",
(details) -> details.setRelativePath(details.getRelativeSourcePath()));
getRootSpec().eachFile((details) -> {
String pathString = details.getRelativePath().getPathString();
if (pathString.startsWith("BOOT-INF/lib/")

5
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootWar.java
View File

@@ -54,9 +54,8 @@ public class BootWar extends War implements BootArchive {
(copySpec) -> copySpec.from(
(Callable<Iterable<File>>) () -> (this.providedClasspath != null)
? this.providedClasspath : Collections.emptyList()));
getRootSpec().filesMatching("module-info.class", (details) -> {
details.setRelativePath(details.getRelativeSourcePath());
});
getRootSpec().filesMatching("module-info.class",
(details) -> details.setRelativePath(details.getRelativeSourcePath()));
getRootSpec().eachFile((details) -> {
String pathString = details.getRelativePath().getPathString();
if ((pathString.startsWith("WEB-INF/lib/")

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java
View File

@@ -80,6 +80,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
* @since 1.0
* @deprecated since version 2.2. Use agents instead.
*/
@Deprecated
@Parameter(property = "spring-boot.run.agent")
private File[] agent;
@@ -384,7 +385,6 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
}
}
@SuppressWarnings("deprecation")
private File[] determineAgents() {
return (this.agents != null) ? this.agents : this.agent;
}