Skip to content

Commit e0bb9e7

Browse files
committed
Tidy up generics in WebFluxEndpointHandlerMapping
Closes gh-10113
1 parent 975c005 commit e0bb9e7

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/reactive/WebFluxEndpointHandlerMapping.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,8 @@ abstract class AbstractOperationHandler {
202202
this.operationInvoker = operationInvoker;
203203
}
204204

205-
@SuppressWarnings({ "unchecked", "rawtypes" })
206-
Publisher<ResponseEntity<? extends Object>> doHandle(ServerWebExchange exchange,
205+
@SuppressWarnings({ "unchecked" })
206+
Publisher<ResponseEntity<Object>> doHandle(ServerWebExchange exchange,
207207
Map<String, String> body) {
208208
Map<String, Object> arguments = new HashMap<>((Map<String, String>) exchange
209209
.getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE));
@@ -212,8 +212,7 @@ Publisher<ResponseEntity<? extends Object>> doHandle(ServerWebExchange exchange,
212212
}
213213
exchange.getRequest().getQueryParams().forEach((name, values) -> arguments
214214
.put(name, values.size() == 1 ? values.get(0) : values));
215-
return (Publisher) handleResult(
216-
(Publisher<?>) this.operationInvoker.invoke(arguments),
215+
return handleResult((Publisher<?>) this.operationInvoker.invoke(arguments),
217216
exchange.getRequest().getMethod());
218217
}
219218

@@ -247,7 +246,7 @@ final class WriteOperationHandler extends AbstractOperationHandler {
247246
}
248247

249248
@ResponseBody
250-
public Publisher<ResponseEntity<?>> handle(ServerWebExchange exchange,
249+
public Publisher<ResponseEntity<Object>> handle(ServerWebExchange exchange,
251250
@RequestBody(required = false) Map<String, String> body) {
252251
return doHandle(exchange, body);
253252
}
@@ -264,7 +263,7 @@ final class ReadOperationHandler extends AbstractOperationHandler {
264263
}
265264

266265
@ResponseBody
267-
public Publisher<ResponseEntity<?>> handle(ServerWebExchange exchange) {
266+
public Publisher<ResponseEntity<Object>> handle(ServerWebExchange exchange) {
268267
return doHandle(exchange, null);
269268
}
270269

0 commit comments

Comments
 (0)