Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
adfbbcc0
Commit
adfbbcc0
authored
Jan 08, 2020
by
Matthias Stock
Committed by
Stephane Nicoll
Jan 09, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simplify validation pattern of EndpointId
See gh-19584
parent
bdffa860
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
4 deletions
+10
-4
EndpointId.java
...org/springframework/boot/actuate/endpoint/EndpointId.java
+3
-3
EndpointIdTests.java
...pringframework/boot/actuate/endpoint/EndpointIdTests.java
+7
-1
No files found.
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/EndpointId.java
View file @
adfbbcc0
/*
* Copyright 2012-20
19
the original author or authors.
* Copyright 2012-20
20
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
;
...
...
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/EndpointIdTests.java
View file @
adfbbcc0
/*
* Copyright 2012-20
19
the original author or authors.
* Copyright 2012-20
20
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"
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment