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

Merge branch '2.0.x'

This commit is contained in:
Stephane Nicoll 2018-08-29 17:38:15 +02:00
parent cfd0ab7646 f9081a2c23
commit 0590c4de32
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/annotation/DiscoveredWebOperation.java
View File

@ -61,8 +61,8 @@ class DiscoveredWebOperation extends AbstractDiscoveredOperation implements WebO
} }
private String getId(String endpointId, Method method) { private String getId(String endpointId, Method method) {
return Stream.of(method.getParameters()).filter(this::hasSelector) return endpointId + Stream.of(method.getParameters()).filter(this::hasSelector)
.map(this::dashName).collect(Collectors.joining("", endpointId, "")); .map(this::dashName).collect(Collectors.joining());
} }
private boolean hasSelector(Parameter parameter) { private boolean hasSelector(Parameter parameter) {

4
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/annotation/RequestPredicateFactory.java
View File

@ -62,8 +62,8 @@ class RequestPredicateFactory {
} }
private String getPath(String rootPath, Method method) { private String getPath(String rootPath, Method method) {
return Stream.of(method.getParameters()).filter(this::hasSelector) return rootPath + Stream.of(method.getParameters()).filter(this::hasSelector)
.map(this::slashName).collect(Collectors.joining("", rootPath, "")); .map(this::slashName).collect(Collectors.joining());
} }
private boolean hasSelector(Parameter parameter) { private boolean hasSelector(Parameter parameter) {