From 56d853230bc892050b7f5ad4bd8fcc5a73871cdb Mon Sep 17 00:00:00 2001
From: Arghya Sadhu <arghya88@gmail.com>
Date: Wed, 23 Dec 2020 18:18:36 +0530
Subject: [PATCH] refactor to move duplicate code to method

Signed-off-by: Arghya Sadhu <arghya88@gmail.com>
---
 .../java/io/dapr/client/DaprClientHttp.java   | 37 +++++++------------
 1 file changed, 14 insertions(+), 23 deletions(-)

diff --git a/sdk/src/main/java/io/dapr/client/DaprClientHttp.java b/sdk/src/main/java/io/dapr/client/DaprClientHttp.java
index 5d130dae11..5e644520c6 100644
--- a/sdk/src/main/java/io/dapr/client/DaprClientHttp.java
+++ b/sdk/src/main/java/io/dapr/client/DaprClientHttp.java
@@ -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);
     }
@@ -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);
     }