From f9e506c710159f7889e18d4697984b33c47a6783 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 13 Nov 2018 16:55:19 +0100
Subject: [PATCH 1/1] Fix raw types in NodeConfiguratorImpl

This patch fixes raw type warnings in NodeConfiguratorImpl and inlines
FutureCallback class, as it is a very simple dispatch.

JIRA: OPNFLWPLUG-1047
Change-Id: Iac60a0782f210eb34944688fbf225159cbb50030
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../NodeConfiguratorImpl.java                 | 53 +++++++------------
 1 file changed, 20 insertions(+), 33 deletions(-)

diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/nodeconfigurator/NodeConfiguratorImpl.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/nodeconfigurator/NodeConfiguratorImpl.java
index e9e1dbd382..bfcc37e910 100644
--- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/nodeconfigurator/NodeConfiguratorImpl.java
+++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/nodeconfigurator/NodeConfiguratorImpl.java
@@ -59,9 +59,9 @@ public class NodeConfiguratorImpl implements NodeConfigurator {
     }
 
     @Override
-    public <T> ListenableFuture<T> enqueueJob(String key, Callable<ListenableFuture<T>> mainWorker) {
+    public <T> ListenableFuture<T> enqueueJob(final String key, final Callable<ListenableFuture<T>> mainWorker) {
 
-        JobEntry jobEntry = new JobEntry(key, mainWorker);
+        JobEntry<T> jobEntry = new JobEntry<>(key, mainWorker);
         JobQueue jobQueue = jobQueueMap.computeIfAbsent(key, mapKey -> new JobQueue());
         jobQueue.addEntry(jobEntry);
         signalForNextJob();
@@ -99,13 +99,13 @@ public class NodeConfiguratorImpl implements NodeConfigurator {
                         if (jobQueue.getExecutingEntry() != null) {
                             continue;
                         }
-                        JobEntry jobEntry = jobQueue.poll();
+                        JobEntry<?> jobEntry = jobQueue.poll();
                         if (jobEntry == null) {
                             // job queue is empty. so continue with next job queue entry
                             continue;
                         }
                         jobQueue.setExecutingEntry(jobEntry);
-                        MainTask worker = new MainTask(jobEntry);
+                        MainTask<?> worker = new MainTask<>(jobEntry);
                         LOG.trace("Executing job with key: {}", jobEntry.getKey());
                         executeTask(worker) ;
                     }
@@ -118,9 +118,9 @@ public class NodeConfiguratorImpl implements NodeConfigurator {
     }
 
     private class MainTask<T> extends LoggingUncaughtThreadDeathContextRunnable {
-        private final JobEntry jobEntry;
+        private final JobEntry<T> jobEntry;
 
-        MainTask(JobEntry jobEntry) {
+        MainTask(final JobEntry<T> jobEntry) {
             super(LOG, jobEntry::toString);
             this.jobEntry = jobEntry;
         }
@@ -149,36 +149,23 @@ public class NodeConfiguratorImpl implements NodeConfigurator {
                 return;
             }
             clearJob(jobEntry);
-            Futures.addCallback(future, new JobCallback(jobEntry), MoreExecutors.directExecutor());
-
-        }
-
-        private class JobCallback<T> implements FutureCallback<T> {
-            private final JobEntry jobEntry;
-
-            JobCallback(JobEntry jobEntry) {
-                this.jobEntry = jobEntry;
-            }
-
-            /**
-             * This implies that all the future instances have returned success. --
-             * TODO: Confirm this
-             */
-            @Override
-            public void onSuccess(T result) {
-                LOG.trace("Job completed successfully: {}", jobEntry.getKey());
-                jobEntry.setResultFuture(result);
-                clearJob(jobEntry);
-            }
+            Futures.addCallback(future, new FutureCallback<T>() {
+                @Override
+                public void onSuccess(final T result) {
+                    LOG.trace("Job completed successfully: {}", jobEntry.getKey());
+                    jobEntry.setResultFuture(result);
+                    clearJob(jobEntry);
+                }
 
-            @Override
-            public void onFailure(Throwable throwable) {
-                clearJob(jobEntry);
-            }
+                @Override
+                public void onFailure(final Throwable cause) {
+                    clearJob(jobEntry);
+                }
+            }, MoreExecutors.directExecutor());
         }
     }
 
-    private void clearJob(JobEntry jobEntry) {
+    private void clearJob(final JobEntry<?> jobEntry) {
         String jobKey = jobEntry.getKey();
         LOG.trace("About to clear jobKey: {}", jobKey);
         JobQueue jobQueue = jobQueueMap.get(jobKey);
@@ -189,7 +176,7 @@ public class NodeConfiguratorImpl implements NodeConfigurator {
         }
     }
 
-    private void executeTask(Runnable task) {
+    private void executeTask(final Runnable task) {
         try {
             syncThreadPool.submit(task);
         } catch (RejectedExecutionException e) {
-- 
2.36.6