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

Rename "classes" to "application" in custom layer configuration

Browse Source 
Closes gh-20539
This commit is contained in:
Madhura Bhave
2020-03-23 09:08:18 -07:00
parent 29c89f3c27
commit 952e529787
12 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -214,7 +214,7 @@ public class BootJar extends Jar implements BootArchive {
else {
List<Layer> customLayers = this.layerConfiguration.getLayersOrder().stream().map(Layer::new)
.collect(Collectors.toList());
this.layers = new CustomLayers(customLayers, this.layerConfiguration.getClasses(),
this.layers = new CustomLayers(customLayers, this.layerConfiguration.getApplication(),
this.layerConfiguration.getLibraries());
}

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

@@ -79,16 +79,16 @@ public class LayerConfiguration {
}
@Input
public List<ResourceStrategy> getClasses() {
public List<ResourceStrategy> getApplication() {
return this.resourceStrategies;
}
public void classes(ResourceStrategy... resourceStrategies) {
public void application(ResourceStrategy... resourceStrategies) {
assertLayersOrderConfigured();
this.resourceStrategies = Arrays.asList(resourceStrategies);
}
public void classes(Action<LayerConfiguration> config) {
public void application(Action<LayerConfiguration> config) {
assertLayersOrderConfigured();
this.strategySpec = StrategySpec.forResources();
config.execute(this);
@@ -135,7 +135,8 @@ public class LayerConfiguration {
}
public void locations(Action<LayerConfiguration> config) {
Assert.state(this.strategySpec.isResourcesStrategy(), "The 'locations' filter must be used only with classes");
Assert.state(this.strategySpec.isResourcesStrategy(),
"The 'locations' filter must be used only with application");
this.strategySpec.newFilter();
config.execute(this);
this.strategySpec