Skip to content

S
spring-boot
Commit a0fb1387 authored by Johnny Lim's avatar Johnny Lim Committed by Stephane Nicoll
Browse files
Options

Fix to assert parameter names in EndpointServlet.withInitParameters() 

See gh-11809
parent 6830ad78
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/EndpointServlet.java
View file @ a0fb1387
...@@ -61,9 +61,9 @@ public final class EndpointServlet { ...@@ -61,9 +61,9 @@ public final class EndpointServlet {
public EndpointServlet withInitParameters(Map<String, String> initParameters) { public EndpointServlet withInitParameters(Map<String, String> initParameters) {
Assert.notNull(initParameters, "InitParameters must not be null"); Assert.notNull(initParameters, "InitParameters must not be null");
boolean hasEmptyKey = initParameters.values().stream() boolean hasEmptyName = initParameters.keySet().stream()
.anyMatch((key) -> !StringUtils.hasText(key)); .anyMatch((name) -> !StringUtils.hasText(name));
Assert.isTrue(!hasEmptyKey, "InitParameters must not contain empty keys"); Assert.isTrue(!hasEmptyName, "InitParameters must not contain empty names");
Map<String, String> mergedInitParameters = new LinkedHashMap<>( Map<String, String> mergedInitParameters = new LinkedHashMap<>(
this.initParameters); this.initParameters);
mergedInitParameters.putAll(initParameters); mergedInitParameters.putAll(initParameters);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment