Skip to content

Refactor to move duplicate code to method #429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
artursouza merged 2 commits into from
Dec 29, 2020
Merged

Refactor to move duplicate code to method #429

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56d8532
refactor to move duplicate code to method
arghya88 Dec 23, 2020
84f1850
Merge branch 'master' into refactor
artursouza Dec 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 14 additions & 23 deletions sdk/src/main/java/io/dapr/client/DaprClientHttp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,18 +190,20 @@ public <T> Mono<Response<T>> invokeMethod(InvokeServiceRequest invokeServiceRequ
byte[] serializedRequestBody = objectSerializer.serialize(request);
Mono<DaprHttp.Response> response = this.client.invokeApi(httMethod, path,
httpExtension.getQueryString(), serializedRequestBody, metadata, context);
return response.flatMap(r -> {
try {
T object = objectSerializer.deserialize(r.getBody(), type);
if (object == null) {
return Mono.empty();
}
return response.flatMap(r -> getMono(type, r)).map(r -> new Response<>(context, r));
} catch (Exception ex) {
return DaprException.wrapMono(ex);
}
}

return Mono.just(object);
} catch (Exception ex) {
return DaprException.wrapMono(ex);
}
}).map(r -> new Response<>(context, r));
private <T> Mono<T> getMono(TypeRef<T> type, DaprHttp.Response r) {
try {
T object = objectSerializer.deserialize(r.getBody(), type);
if (object == null) {
return Mono.empty();
}

return Mono.just(object);
} catch (Exception ex) {
return DaprException.wrapMono(ex);
}
Expand Down Expand Up @@ -258,18 +260,7 @@ public <T> Mono<Response<T>> invokeBinding(InvokeBindingRequest request, TypeRef
String httpMethod = DaprHttp.HttpMethods.POST.name();
Mono<DaprHttp.Response> response = this.client.invokeApi(
httpMethod, url.toString(), null, payload, null, context);
return response.flatMap(r -> {
try {
T object = objectSerializer.deserialize(r.getBody(), type);
if (object == null) {
return Mono.empty();
}

return Mono.just(object);
} catch (Exception ex) {
return DaprException.wrapMono(ex);
}
}).map(r -> new Response<>(context, r));
return response.flatMap(r -> getMono(type, r)).map(r -> new Response<>(context, r));
} catch (Exception ex) {
return DaprException.wrapMono(ex);
}
Expand Down