From 84b2e8c308d4748b3e9d6d90c538d5d6cfbaa179 Mon Sep 17 00:00:00 2001 From: Madhura Bhave Date: Mon, 16 Mar 2020 16:03:29 -0700 Subject: [PATCH] Rename classes package to application Closes gh-20526 --- .../boot/gradle/tasks/bundling/LayerConfiguration.java | 8 ++++---- .../boot/gradle/tasks/bundling/BootJarTests.java | 4 ++-- .../boot/loader/tools/layer/CustomLayers.java | 2 +- .../{classes => application}/AbstractResourceFilter.java | 2 +- .../FilteredResourceStrategy.java | 2 +- .../layer/{classes => application}/LocationFilter.java | 2 +- .../layer/{classes => application}/ResourceFilter.java | 2 +- .../layer/{classes => application}/ResourceStrategy.java | 2 +- .../boot/loader/tools/layer/CustomLayersTests.java | 4 ++-- .../FilteredResourceStrategyTests.java | 2 +- .../{classes => application}/LocationFilterTests.java | 2 +- .../springframework/boot/maven/CustomLayersProvider.java | 8 ++++---- 12 files changed, 20 insertions(+), 20 deletions(-) rename spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/{classes => application}/AbstractResourceFilter.java (95%) rename spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/{classes => application}/FilteredResourceStrategy.java (96%) rename spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/{classes => application}/LocationFilter.java (95%) rename spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/{classes => application}/ResourceFilter.java (95%) rename spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/{classes => application}/ResourceStrategy.java (94%) rename spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/layer/{classes => application}/FilteredResourceStrategyTests.java (97%) rename spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/layer/{classes => application}/LocationFilterTests.java (96%) 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 38eb7a8af2..efdabf8a2c 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 @@ -23,10 +23,10 @@ import java.util.List; import org.gradle.api.Action; import org.gradle.api.tasks.Input; -import org.springframework.boot.loader.tools.layer.classes.FilteredResourceStrategy; -import org.springframework.boot.loader.tools.layer.classes.LocationFilter; -import org.springframework.boot.loader.tools.layer.classes.ResourceFilter; -import org.springframework.boot.loader.tools.layer.classes.ResourceStrategy; +import org.springframework.boot.loader.tools.layer.application.FilteredResourceStrategy; +import org.springframework.boot.loader.tools.layer.application.LocationFilter; +import org.springframework.boot.loader.tools.layer.application.ResourceFilter; +import org.springframework.boot.loader.tools.layer.application.ResourceStrategy; import org.springframework.boot.loader.tools.layer.library.CoordinateFilter; import org.springframework.boot.loader.tools.layer.library.FilteredLibraryStrategy; import org.springframework.boot.loader.tools.layer.library.LibraryFilter; 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 b6bfbaa33b..2b585f2bce 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 @@ -37,8 +37,8 @@ import org.gradle.api.artifacts.component.ComponentIdentifier; import org.gradle.api.artifacts.result.ResolvedArtifactResult; import org.junit.jupiter.api.Test; -import org.springframework.boot.loader.tools.layer.classes.FilteredResourceStrategy; -import org.springframework.boot.loader.tools.layer.classes.LocationFilter; +import org.springframework.boot.loader.tools.layer.application.FilteredResourceStrategy; +import org.springframework.boot.loader.tools.layer.application.LocationFilter; import org.springframework.boot.loader.tools.layer.library.CoordinateFilter; import org.springframework.boot.loader.tools.layer.library.FilteredLibraryStrategy; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/CustomLayers.java b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/CustomLayers.java index 963de32dbf..a365a4370c 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/CustomLayers.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/CustomLayers.java @@ -23,7 +23,7 @@ import java.util.List; import org.springframework.boot.loader.tools.Layer; import org.springframework.boot.loader.tools.Layers; import org.springframework.boot.loader.tools.Library; -import org.springframework.boot.loader.tools.layer.classes.ResourceStrategy; +import org.springframework.boot.loader.tools.layer.application.ResourceStrategy; import org.springframework.boot.loader.tools.layer.library.LibraryStrategy; /** diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/classes/AbstractResourceFilter.java b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/application/AbstractResourceFilter.java similarity index 95% rename from spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/classes/AbstractResourceFilter.java rename to spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/application/AbstractResourceFilter.java index 80387279ef..0f9040ee89 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/classes/AbstractResourceFilter.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/application/AbstractResourceFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.loader.tools.layer.classes; +package org.springframework.boot.loader.tools.layer.application; import java.util.ArrayList; import java.util.List; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/classes/FilteredResourceStrategy.java b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/application/FilteredResourceStrategy.java similarity index 96% rename from spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/classes/FilteredResourceStrategy.java rename to spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/application/FilteredResourceStrategy.java index cbbae4699e..f63d16491b 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/classes/FilteredResourceStrategy.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/application/FilteredResourceStrategy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.loader.tools.layer.classes; +package org.springframework.boot.loader.tools.layer.application; import java.util.ArrayList; import java.util.List; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/classes/LocationFilter.java b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/application/LocationFilter.java similarity index 95% rename from spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/classes/LocationFilter.java rename to spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/application/LocationFilter.java index 6a9dbb1f38..d76b3d8188 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/classes/LocationFilter.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/application/LocationFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.loader.tools.layer.classes; +package org.springframework.boot.loader.tools.layer.application; import java.util.List; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/classes/ResourceFilter.java b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/application/ResourceFilter.java similarity index 95% rename from spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/classes/ResourceFilter.java rename to spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/application/ResourceFilter.java index 2ad4cc85b8..2047af2cc3 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/classes/ResourceFilter.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/application/ResourceFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.loader.tools.layer.classes; +package org.springframework.boot.loader.tools.layer.application; import java.io.Serializable; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/classes/ResourceStrategy.java b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/application/ResourceStrategy.java similarity index 94% rename from spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/classes/ResourceStrategy.java rename to spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/application/ResourceStrategy.java index 40efc33fdd..ef4d97662a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/classes/ResourceStrategy.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/layer/application/ResourceStrategy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.loader.tools.layer.classes; +package org.springframework.boot.loader.tools.layer.application; import java.io.Serializable; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/layer/CustomLayersTests.java b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/layer/CustomLayersTests.java index 37a2f6f33c..1393fe0914 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/layer/CustomLayersTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/layer/CustomLayersTests.java @@ -26,8 +26,8 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.loader.tools.Layer; import org.springframework.boot.loader.tools.Library; import org.springframework.boot.loader.tools.LibraryCoordinates; -import org.springframework.boot.loader.tools.layer.classes.FilteredResourceStrategy; -import org.springframework.boot.loader.tools.layer.classes.LocationFilter; +import org.springframework.boot.loader.tools.layer.application.FilteredResourceStrategy; +import org.springframework.boot.loader.tools.layer.application.LocationFilter; import org.springframework.boot.loader.tools.layer.library.CoordinateFilter; import org.springframework.boot.loader.tools.layer.library.FilteredLibraryStrategy; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/layer/classes/FilteredResourceStrategyTests.java b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/layer/application/FilteredResourceStrategyTests.java similarity index 97% rename from spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/layer/classes/FilteredResourceStrategyTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/layer/application/FilteredResourceStrategyTests.java index 3689e78f53..7b91c6aa3b 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/layer/classes/FilteredResourceStrategyTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/layer/application/FilteredResourceStrategyTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.loader.tools.layer.classes; +package org.springframework.boot.loader.tools.layer.application; import java.util.ArrayList; import java.util.Collections; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/layer/classes/LocationFilterTests.java b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/layer/application/LocationFilterTests.java similarity index 96% rename from spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/layer/classes/LocationFilterTests.java rename to spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/layer/application/LocationFilterTests.java index 805906c7a3..01f4d01cda 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/layer/classes/LocationFilterTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/layer/application/LocationFilterTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.loader.tools.layer.classes; +package org.springframework.boot.loader.tools.layer.application; import java.util.Collections; 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 9bda953915..44c8ffe893 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 @@ -26,9 +26,9 @@ import org.w3c.dom.NodeList; import org.springframework.boot.loader.tools.Layer; import org.springframework.boot.loader.tools.layer.CustomLayers; -import org.springframework.boot.loader.tools.layer.classes.FilteredResourceStrategy; -import org.springframework.boot.loader.tools.layer.classes.ResourceFilter; -import org.springframework.boot.loader.tools.layer.classes.ResourceStrategy; +import org.springframework.boot.loader.tools.layer.application.FilteredResourceStrategy; +import org.springframework.boot.loader.tools.layer.application.ResourceFilter; +import org.springframework.boot.loader.tools.layer.application.ResourceStrategy; import org.springframework.boot.loader.tools.layer.library.CoordinateFilter; import org.springframework.boot.loader.tools.layer.library.FilteredLibraryStrategy; import org.springframework.boot.loader.tools.layer.library.LibraryFilter; @@ -134,7 +134,7 @@ public class CustomLayersProvider { List excludeList) { if ("locations".equals(filter.getNodeName())) { filters.add( - new org.springframework.boot.loader.tools.layer.classes.LocationFilter(includeList, excludeList)); + new org.springframework.boot.loader.tools.layer.application.LocationFilter(includeList, excludeList)); } }