Clean up in module reconciliation-framework

- Remove some deprecated
- Make some variables final
- Other minor clean up

Change-Id: Ib87f59bf31009d5222c7512fa5d2d29a14454fef
Signed-off-by: David Suarez <david.suarez.fuentes@gmail.com>

diff --git a/applications/reconciliation-framework/src/main/java/org/opendaylight/openflowplugin/applications/reconciliation/cli/GetRegisteredServices.java b/applications/reconciliation-framework/src/main/java/org/opendaylight/openflowplugin/applications/reconciliation/cli/GetRegisteredServices.java
index cea096e8157c65087b6a9cd86fc5dd05f146d569..e0fdc2afa61e0b47add1e688747a6271d01fa2be 100644 (file)
--- a/applications/reconciliation-framework/src/main/java/org/opendaylight/openflowplugin/applications/reconciliation/cli/GetRegisteredServices.java
+++ b/applications/reconciliation-framework/src/main/java/org/opendaylight/openflowplugin/applications/reconciliation/cli/GetRegisteredServices.java
@@ -25,7 +25,7 @@ import org.slf4j.LoggerFactory;
  */
 public class GetRegisteredServices extends OsgiCommandSupport {
     private static final Logger LOG = LoggerFactory.getLogger(GetRegisteredServices.class);
-    public static final String CLI_FORMAT = "%d %-20s ";
+    private static final String CLI_FORMAT = "%d %-20s ";
 
     private ReconciliationManager reconciliationManager;
 

diff --git a/applications/reconciliation-framework/src/main/java/org/opendaylight/openflowplugin/applications/reconciliation/impl/ReconciliationManagerImpl.java b/applications/reconciliation-framework/src/main/java/org/opendaylight/openflowplugin/applications/reconciliation/impl/ReconciliationManagerImpl.java
index cc61cdaa339ce000feec77819ed583dd029a7a51..913ca092cc603908501a254b1816acf43f9d4a03 100644 (file)
--- a/applications/reconciliation-framework/src/main/java/org/opendaylight/openflowplugin/applications/reconciliation/impl/ReconciliationManagerImpl.java
+++ b/applications/reconciliation-framework/src/main/java/org/opendaylight/openflowplugin/applications/reconciliation/impl/ReconciliationManagerImpl.java
@@ -12,6 +12,7 @@ import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -34,11 +35,12 @@ import org.slf4j.LoggerFactory;
 public class ReconciliationManagerImpl implements ReconciliationManager, ReconciliationFrameworkEvent {
     private static final Logger LOG = LoggerFactory.getLogger(ReconciliationManagerImpl.class);
 
-    private MastershipChangeServiceManager mastershipChangeServiceManager;
-    private Map<Integer, List<ReconciliationNotificationListener>> registeredServices = new ConcurrentSkipListMap<>();
-    private Map<DeviceInfo, ListenableFuture<ResultState>> futureMap = new ConcurrentHashMap<>();
-    private Map<ResultState, Integer> resultStateMap = new ConcurrentHashMap<>();
-    private AtomicReference<ResultState> decidedResultState = new AtomicReference<>(ResultState.DONOTHING);
+    private final MastershipChangeServiceManager mastershipChangeServiceManager;
+    private final Map<Integer, List<ReconciliationNotificationListener>> registeredServices =
+            new ConcurrentSkipListMap<>();
+    private final Map<DeviceInfo, ListenableFuture<ResultState>> futureMap = new ConcurrentHashMap<>();
+    private final Map<ResultState, Integer> resultStateMap = new ConcurrentHashMap<>();
+    private final AtomicReference<ResultState> decidedResultState = new AtomicReference<>(ResultState.DONOTHING);
 
     public ReconciliationManagerImpl(MastershipChangeServiceManager mastershipChangeServiceManager) {
         this.mastershipChangeServiceManager = Preconditions
@@ -116,11 +118,11 @@ public class ReconciliationManagerImpl implements ReconciliationManager, Reconci
                                                             List<ReconciliationNotificationListener>
                                                                     servicesForPriority,
                                                             DeviceInfo node) {
-        return Futures.transformAsync(prevFuture, prevResult -> {
-            return Futures.transform(Futures.allAsList(
-                    servicesForPriority.stream().map(service -> service.startReconciliation(node))
-                            .collect(Collectors.toList())), results -> decidedResultState.get());
-        });
+        return Futures.transformAsync(prevFuture, prevResult -> Futures.transform(Futures.allAsList(
+                servicesForPriority.stream().map(service -> service.startReconciliation(node))
+                        .collect(Collectors.toList())), results -> decidedResultState.get(),
+                                                                                  MoreExecutors.directExecutor()),
+                                      MoreExecutors.directExecutor());
     }
 
     private ListenableFuture<Void> cancelNodeReconciliation(DeviceInfo node) {
@@ -137,10 +139,9 @@ public class ReconciliationManagerImpl implements ReconciliationManager, Reconci
                                                                List<ReconciliationNotificationListener>
                                                                        servicesForPriority,
                                                                DeviceInfo node) {
-        return Futures.transformAsync(prevFuture, prevResult -> {
-            return Futures.transform(Futures.allAsList(
-                    servicesForPriority.stream().map(service -> service.endReconciliation(node))
-                            .collect(Collectors.toList())), results -> null);
-        });
+        return Futures.transformAsync(prevFuture, prevResult -> Futures.transform(Futures.allAsList(
+                servicesForPriority.stream().map(service -> service.endReconciliation(node))
+                        .collect(Collectors.toList())), results -> null, MoreExecutors.directExecutor()),
+                                      MoreExecutors.directExecutor());
     }
 }
\ No newline at end of file

diff --git a/applications/reconciliation-framework/src/main/java/org/opendaylight/openflowplugin/applications/reconciliation/impl/ReconciliationServiceDelegate.java b/applications/reconciliation-framework/src/main/java/org/opendaylight/openflowplugin/applications/reconciliation/impl/ReconciliationServiceDelegate.java
index bae0d71421296b37d1896cf4cbf639ccd8eba68b..fb499c76722de14aed713dbec9f6c67c668c845f 100644 (file)
--- a/applications/reconciliation-framework/src/main/java/org/opendaylight/openflowplugin/applications/reconciliation/impl/ReconciliationServiceDelegate.java
+++ b/applications/reconciliation-framework/src/main/java/org/opendaylight/openflowplugin/applications/reconciliation/impl/ReconciliationServiceDelegate.java
@@ -14,8 +14,8 @@ import org.opendaylight.openflowplugin.applications.reconciliation.Reconciliatio
 
 public class ReconciliationServiceDelegate implements NotificationRegistration {
 
-    private ReconciliationNotificationListener reconciliationNotificationListener;
-    private AutoCloseable unregisterService;
+    private final ReconciliationNotificationListener reconciliationNotificationListener;
+    private final AutoCloseable unregisterService;
 
     public ReconciliationServiceDelegate(ReconciliationNotificationListener reconciliationNotificationListener,
                                          AutoCloseable unregisterService) {