From ca0b5c323802f0b9d9f88c3df8b648f6e444c605 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 2 Dec 2019 02:09:25 +0100
Subject: [PATCH] Eliminate OvsdbClientImpl duplication

CPD is pointing out a trivial duplication of monitor(). Fix that
by properly reusing the more flexible version().

Change-Id: I6bfd80ada7d8d2b1fe3f20007d933dd9be9c03b5
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../ovsdb/lib/impl/OvsdbClientImpl.java       | 33 ++++---------------
 1 file changed, 6 insertions(+), 27 deletions(-)

diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbClientImpl.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbClientImpl.java
index 083bd0120..f656ca2d7 100644
--- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbClientImpl.java
+++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbClientImpl.java
@@ -192,30 +192,10 @@ public class OvsdbClientImpl implements OvsdbClient {
 
     @Override
     public <E extends TableSchema<E>> TableUpdates monitor(final DatabaseSchema dbSchema,
-                                                            final List<MonitorRequest> monitorRequest,
-                                                            final MonitorCallBack callback,
-                                                            final int timeout) {
-
-        final ImmutableMap<String, MonitorRequest> reqMap = Maps.uniqueIndex(monitorRequest,
-                MonitorRequest::getTableName);
-
-        final MonitorHandle monitorHandle = new MonitorHandle(UUID.randomUUID().toString());
-        registerCallback(monitorHandle, callback, dbSchema);
-
-        ListenableFuture<JsonNode> monitor = rpc.monitor(
-            () -> Arrays.asList(dbSchema.getName(), monitorHandle.getId(), reqMap));
-        JsonNode result;
-        try {
-            if (timeout == NO_TIMEOUT) {
-                result = monitor.get();
-            } else {
-                result = monitor.get(timeout, TimeUnit.SECONDS);
-            }
-        } catch (InterruptedException | ExecutionException | TimeoutException e) {
-            LOG.warn("Failed to monitor {}", dbSchema, e);
-            return null;
-        }
-        return transformingCallback(result, dbSchema);
+                                                           final List<MonitorRequest> monitorRequest,
+                                                           final MonitorCallBack callback,
+                                                           final int timeout) {
+        return monitor(dbSchema, monitorRequest, new MonitorHandle(UUID.randomUUID().toString()), callback, timeout);
     }
 
     @Override
@@ -232,15 +212,14 @@ public class OvsdbClientImpl implements OvsdbClient {
                                                            final MonitorHandle monitorHandle,
                                                            final MonitorCallBack callback,
                                                            final int timeout) {
-
         final ImmutableMap<String, MonitorRequest> reqMap = Maps.uniqueIndex(monitorRequest,
                 MonitorRequest::getTableName);
 
         registerCallback(monitorHandle, callback, dbSchema);
 
-        ListenableFuture<JsonNode> monitor = rpc.monitor(
+        final ListenableFuture<JsonNode> monitor = rpc.monitor(
             () -> Arrays.asList(dbSchema.getName(), monitorHandle.getId(), reqMap));
-        JsonNode result;
+        final JsonNode result;
         try {
             if (timeout == NO_TIMEOUT) {
                 result = monitor.get();
-- 
2.36.6