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

Reserve layer names for future use

Browse Source 
Update layered jar support so that the name `ext` and any name
starting `springboot` are reserved.

See gh-19767
This commit is contained in:
Phillip Webb
2020-01-22 01:07:41 -08:00
parent 3af4930f75
commit d5a70688cb
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layer.java
View File

@@ -41,6 +41,8 @@ public class Layer {
public Layer(String name) {
Assert.hasText(name, "Name must not be empty");
Assert.isTrue(PATTERN.matcher(name).matches(), "Malformed layer name '" + name + "'");
Assert.isTrue(!name.equalsIgnoreCase("ext") && !name.toLowerCase().startsWith("springboot"),
"Layer name '" + name + "' is reserved");
this.name = name;
}

10
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/LayerTests.java
View File

@@ -59,4 +59,14 @@ class LayerTests {
assertThat(new Layer("test")).hasToString("test");
}
@Test
void createWhenUsingReservedNameThrowsException() {
assertThatIllegalArgumentException().isThrownBy(() -> new Layer("ext"))
.withMessage("Layer name 'ext' is reserved");
assertThatIllegalArgumentException().isThrownBy(() -> new Layer("ExT"))
.withMessage("Layer name 'ExT' is reserved");
assertThatIllegalArgumentException().isThrownBy(() -> new Layer("springbootloader"))
.withMessage("Layer name 'springbootloader' is reserved");
}
}