From 952e5297872a5ca182f126e7f07dd3b67ce5eff5 Mon Sep 17 00:00:00 2001
From: Madhura Bhave <mbhave@pivotal.io>
Date: Mon, 23 Mar 2020 09:08:18 -0700
Subject: [PATCH] Rename "classes" to "application" in custom layer
 configuration

Closes gh-20539
---
 .../gradle/packaging/boot-jar-layered-custom.gradle  |  2 +-
 .../packaging/boot-jar-layered-custom.gradle.kts     |  2 +-
 .../boot/gradle/tasks/bundling/BootJar.java          |  2 +-
 .../gradle/tasks/bundling/LayerConfiguration.java    |  9 +++++----
 .../boot/gradle/tasks/bundling/BootJarTests.java     |  2 +-
 .../BootJarIntegrationTests-customLayers.gradle      |  2 +-
 .../src/docs/asciidoc/packaging.adoc                 |  8 ++++----
 .../projects/jar-layered-custom/jar/src/layers.xml   |  4 ++--
 .../boot/maven/CustomLayersProvider.java             |  2 +-
 .../src/main/xsd/layers-configuration.xsd            | 12 ++++++------
 .../src/test/resources/layers.xml                    |  4 ++--
 .../src/test/resources/resource-layer-no-filter.xml  |  4 ++--
 12 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-layered-custom.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-layered-custom.gradle
index 23e203b184a..cd0ffa6c61c 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-layered-custom.gradle
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-layered-custom.gradle
@@ -23,7 +23,7 @@ bootJar {
 				}
 			}
 		}
-		classes {
+		application {
 			layerContent("resources") {
 				locations {
 					include "META-INF/resources/**", "resources/**"
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-layered-custom.gradle.kts b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-layered-custom.gradle.kts
index b9c7d200efc..62fd3118ae8 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-layered-custom.gradle.kts
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-layered-custom.gradle.kts
@@ -21,7 +21,7 @@ tasks.getByName<BootJar>("bootJar") {
 				}
 			}
 		}
-		classes {
+		application {
 			layerContent("resources") {
 				locations {
 					include("META-INF/resources/**", "resources/**")
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java
index baf8ba7fd0f..54281aa84cd 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java
@@ -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());
 		}
 
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/LayerConfiguration.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/LayerConfiguration.java
index 6adcbc9baae..8afcfa8fbd3 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/LayerConfiguration.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/LayerConfiguration.java
@@ -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
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootJarTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootJarTests.java
index c6be4244ab6..3228909c31a 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootJarTests.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/BootJarTests.java
@@ -126,7 +126,7 @@ class BootJarTests extends AbstractBootArchiveTests<BootJar> {
 			configuration.libraries(createLibraryStrategy("my-snapshot-deps", "com.example:*:*.SNAPSHOT"),
 					createLibraryStrategy("my-internal-deps", "com.example:*:*"),
 					createLibraryStrategy("my-deps", "*:*"));
-			configuration.classes(createResourceStrategy("resources", "static/**"),
+			configuration.application(createResourceStrategy("resources", "static/**"),
 					createResourceStrategy("application", "**"));
 		});
 		List<String> entryNames = getEntryNames(jar);
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-customLayers.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-customLayers.gradle
index 42353c3ea91..a516b29765e 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-customLayers.gradle
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-customLayers.gradle
@@ -12,7 +12,7 @@ bootJar {
 			layerContent("commons-dependencies") { coordinates { include "org.apache.commons:*" } }
 			layerContent("dependencies") { coordinates { include "*:*" } }
 		}
-		classes {
+		application {
 			layerContent("static") {
 				locations {
 					include "META-INF/resources/**", "resources/**"
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/packaging.adoc b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/packaging.adoc
index d7d637470e3..7d35ce54ccc 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/packaging.adoc
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/packaging.adoc
@@ -164,7 +164,7 @@ The following example shows what the implicit layer configuration described abov
 			</coordinates>
 		</layer-content>
 	</libraries>
-	<classes>
+	<application>
 		<layer-content layer="resources">
 			<locations>
 				<include>META-INF/resources/**</include>
@@ -178,7 +178,7 @@ The following example shows what the implicit layer configuration described abov
 				<include>**</include>
 			</locations>
 		</layer-content>
-	</classes>
+	</application>
 </layers-configuration>
 ----
 
@@ -589,9 +589,9 @@ This allows to reuse the cache for external dependencies when an internal depend
 				</coordinates>
 			</layer-content>
 		</libraries>
-		<classes>
+		<application>
 			...
-		</classes>
+		</application>
 	</layers-configuration>
 ----
 
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/jar-layered-custom/jar/src/layers.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/jar-layered-custom/jar/src/layers.xml
index b47c40590a3..8253c18ea23 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/jar-layered-custom/jar/src/layers.xml
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/jar-layered-custom/jar/src/layers.xml
@@ -20,7 +20,7 @@
 			</coordinates>
 		</layer-content>
 	</libraries>
-	<classes>
+	<application>
 		<layer-content layer="configuration">
 			<locations>
 				<include>**/application*.*</include>
@@ -31,5 +31,5 @@
 				<include>**</include>
 			</locations>
 		</layer-content>
-	</classes>
+	</application>
 </layers-configuration>
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/CustomLayersProvider.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/CustomLayersProvider.java
index 5e7042cc3b8..40e4ba55f15 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/CustomLayersProvider.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/CustomLayersProvider.java
@@ -71,7 +71,7 @@ public class CustomLayersProvider {
 					(StrategyFactory<LibraryFilter, LibraryStrategy>) FilteredLibraryStrategy::new,
 					CoordinateFilter::new, "coordinates"::equals));
 		}
-		if ("classes".equals(nodeName)) {
+		if ("application".equals(nodeName)) {
 			resourceStrategies.addAll(getStrategies(contents,
 					(StrategyFactory<ResourceFilter, ResourceStrategy>) FilteredResourceStrategy::new,
 					LocationFilter::new, "locations"::equals));
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/xsd/layers-configuration.xsd b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/xsd/layers-configuration.xsd
index 94862ba7c6b..95c8c352c1f 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/xsd/layers-configuration.xsd
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/xsd/layers-configuration.xsd
@@ -8,7 +8,7 @@
 		<xsd:sequence>
 			<xsd:element type="layersType" name="layers"/>
 			<xsd:element type="librariesType" name="libraries" minOccurs="0"/>
-			<xsd:element type="classesType" name="classes" minOccurs="0"/>
+			<xsd:element type="applicationType" name="application" minOccurs="0"/>
 		</xsd:sequence>
 	</xsd:complexType>
 	<xsd:complexType name="layersType">
@@ -48,25 +48,25 @@
 		</xsd:sequence>
 		<xsd:attribute type="xsd:string" name="layer" use="required"/>
 	</xsd:complexType>
-	<xsd:complexType name="classesType">
+	<xsd:complexType name="applicationType">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
-	Strategies that should be applied to classes. If no strategies are defined, a single
+	Strategies that should be applied to application classes and resources. If no strategies are defined, a single
 	"application" layer is created out-of-the-box.
 				]]></xsd:documentation>
 		</xsd:annotation>
 		<xsd:choice maxOccurs="unbounded">
-			<xsd:element type="classesLayerContentType" name="layer-content" maxOccurs="unbounded"
+			<xsd:element type="applicationLayerContentType" name="layer-content" maxOccurs="unbounded"
 						 minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
-	Strategy to apply on classes.
+	Strategy to apply on application classes and resources.
 				]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 		</xsd:choice>
 	</xsd:complexType>
-	<xsd:complexType name="classesLayerContentType" mixed="true">
+	<xsd:complexType name="applicationLayerContentType" mixed="true">
 		<xsd:sequence>
 			<xsd:element type="filterType" name="locations" minOccurs="0"/>
 		</xsd:sequence>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/layers.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/layers.xml
index 732fbbafceb..344e5b7f30d 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/layers.xml
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/layers.xml
@@ -27,7 +27,7 @@
 			</coordinates>
 		</layer-content>
 	</libraries>
-	<classes>
+	<application>
 		<layer-content layer="my-resources">
 			<locations>
 				<include>META-INF/resources/**</include>
@@ -43,5 +43,5 @@
 				<include>**</include>
 			</locations>
 		</layer-content>
-	</classes>
+	</application>
 </layers-configuration>
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/resource-layer-no-filter.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/resource-layer-no-filter.xml
index d0e3c63c683..14a95b0280e 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/resource-layer-no-filter.xml
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/resource-layer-no-filter.xml
@@ -5,7 +5,7 @@
 	<layers>
 		<layer>my-layer</layer>
 	</layers>
-	<classes>
+	<application>
 		<layer-content layer="my-layer"/>
-	</classes>
+	</application>
 </layers-configuration>
\ No newline at end of file