Skip to content

Commit bd3666a

Browse files
committed
Remove redundant toResponse in service call
1 parent 12a1861 commit bd3666a

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

services-api/src/main/java/io/scalecube/services/ServiceCall.java

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -476,18 +476,13 @@ private Optional<Object> toStringOrEqualsOrHashCode(
476476
}
477477

478478
private Function<Flux<ServiceMessage>, Flux<Object>> asFlux(boolean isReturnTypeServiceMessage) {
479-
return flux -> isReturnTypeServiceMessage ? flux.cast(Object.class) : flux.map(toResponse());
479+
return flux ->
480+
isReturnTypeServiceMessage ? flux.cast(Object.class) : flux.map(ServiceMessage::data);
480481
}
481482

482483
private Function<Mono<ServiceMessage>, Mono<Object>> asMono(boolean isReturnTypeServiceMessage) {
483-
return mono -> isReturnTypeServiceMessage ? mono.cast(Object.class) : mono.map(toResponse());
484-
}
485-
486-
private Function<ServiceMessage, Object> toResponse() {
487-
return message ->
488-
message.hasData()
489-
? message.data()
490-
: ServiceMessage.error(message.qualifier(), 503, 503, "Unexpected empty response");
484+
return mono ->
485+
isReturnTypeServiceMessage ? mono.cast(Object.class) : mono.map(ServiceMessage::data);
491486
}
492487

493488
private ServiceMessage throwIfError(ServiceMessage message) {

0 commit comments

Comments
 (0)