Revert "Polish some joining collectors"

snicoll · snicoll · commit f9081a2c23c6 · 2018-08-29T17:37:33.000+02:00
See gh-14221
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/annotation/DiscoveredWebOperation.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/annotation/DiscoveredWebOperation.java
@@ -61,8 +61,8 @@ class DiscoveredWebOperation extends AbstractDiscoveredOperation implements WebO
 	}
 
 	private String getId(String endpointId, Method method) {
-		return Stream.of(method.getParameters()).filter(this::hasSelector)
-				.map(this::dashName).collect(Collectors.joining("", endpointId, ""));
+		return endpointId + Stream.of(method.getParameters()).filter(this::hasSelector)
+				.map(this::dashName).collect(Collectors.joining());
 	}
 
 	private boolean hasSelector(Parameter parameter) {
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/annotation/RequestPredicateFactory.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/annotation/RequestPredicateFactory.java
@@ -62,8 +62,8 @@ public WebOperationRequestPredicate getRequestPredicate(String endpointId,
 	}
 
 	private String getPath(String rootPath, Method method) {
-		return Stream.of(method.getParameters()).filter(this::hasSelector)
-				.map(this::slashName).collect(Collectors.joining("", rootPath, ""));
+		return rootPath + Stream.of(method.getParameters()).filter(this::hasSelector)
+				.map(this::slashName).collect(Collectors.joining());
 	}
 
 	private boolean hasSelector(Parameter parameter) {

Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,8 @@ class DiscoveredWebOperation extends AbstractDiscoveredOperation implements WebO`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`private String getId(String endpointId, Method method) {`
`64`		`- return Stream.of(method.getParameters()).filter(this::hasSelector)`
`65`		`- .map(this::dashName).collect(Collectors.joining("", endpointId, ""));`
	`64`	`+ return endpointId + Stream.of(method.getParameters()).filter(this::hasSelector)`
	`65`	`+ .map(this::dashName).collect(Collectors.joining());`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`private boolean hasSelector(Parameter parameter) {`
Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,8 @@ public WebOperationRequestPredicate getRequestPredicate(String endpointId,`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`private String getPath(String rootPath, Method method) {`
`65`		`- return Stream.of(method.getParameters()).filter(this::hasSelector)`
`66`		`- .map(this::slashName).collect(Collectors.joining("", rootPath, ""));`
	`65`	`+ return rootPath + Stream.of(method.getParameters()).filter(this::hasSelector)`
	`66`	`+ .map(this::slashName).collect(Collectors.joining());`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`private boolean hasSelector(Parameter parameter) {`