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

Merge branch '2.1.x' into 2.2.x

Browse Source 
Closes gh-19589
This commit is contained in:
Stephane Nicoll
2020-01-09 09:51:45 +01:00
parent 437941cc51 ae52f2ad43
commit 99c64b7cdf
2 changed files with 10 additions and 4 deletions
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.
@@ -41,9 +41,9 @@ public final class EndpointId {
private static final 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 static final String MIGRATE_LEGACY_NAMES_PROPERTY = "management.endpoints.migrate-legacy-ids";

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 @@ class EndpointIdTests {
.withMessage("Value must only contain valid chars");
}
@Test
void ofWhenContainsBackslashThrowsException() {
assertThatIllegalArgumentException().isThrownBy(() -> EndpointId.of("foo\\bar"))
.withMessage("Value must only contain valid chars");
}
@Test
void ofWhenHasBadCharThrowsException() {
assertThatIllegalArgumentException().isThrownBy(() -> EndpointId.of("foo!bar"))