root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Simplify validation pattern of EndpointId 

See gh-19584
This commit is contained in:
Matthias Stock 2020-01-08 22:46:08 +01:00 committed by Stephane Nicoll
parent bdffa860d9
commit adfbbcc0f6
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/EndpointId.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -40,9 +40,9 @@ public final class EndpointId {
private static Set<String> loggedWarnings = new HashSet<>();
private static final Pattern VALID_PATTERN = Pattern.compile("[a-zA-Z0-9\\.\\-]+");
private static final Pattern VALID_PATTERN = Pattern.compile("[a-zA-Z0-9.-]+");
private static final Pattern WARNING_PATTERN = Pattern.compile("[\\.\\-]+");
private static final Pattern WARNING_PATTERN = Pattern.compile("[.-]+");
private final String value;

8
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/EndpointIdTests.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -51,6 +51,12 @@ public class EndpointIdTests {
.withMessage("Value must only contain valid chars");
}
@Test
public void ofWhenContainsBackslashThrowsException() {
assertThatIllegalArgumentException().isThrownBy(() -> EndpointId.of("foo\\bar"))
.withMessage("Value must only contain valid chars");
}
@Test
public void ofWhenHasBadCharThrowsException() {
assertThatIllegalArgumentException().isThrownBy(() -> EndpointId.of("foo!bar"))