Second set of after review changes

Change-Id: I34769d9c7423b5cc2eceaf0ff8814c86bdd48e78
Signed-off-by: Jozef Bacigal <jbacigal@cisco.com>

diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/DeviceManager.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/DeviceManager.java
index d138cbfc630b0007a11e24beaaa79d7039ce7469..55f68da8b7efe3689563127cd383cae4a10ff3a8 100644 (file)
--- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/DeviceManager.java
+++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/DeviceManager.java
@@ -50,7 +50,7 @@ public interface DeviceManager extends DeviceConnectedHandler, DeviceDisconnecte
      * Register device synchronize listeners
      * @param deviceSynchronizeListener are notified if device is synchronized or not
      */
-    void registerDeviceSynchronizeListeners(final DeviceSynchronizeListener deviceSynchronizeListener);
+    void addDeviceSynchronizeListener(final DeviceSynchronizeListener deviceSynchronizeListener);
 
     /**
      * Notify all registered listeners about synchronized status
@@ -63,7 +63,7 @@ public interface DeviceManager extends DeviceConnectedHandler, DeviceDisconnecte
      * Register device valid listeners
      * @param deviceValidListener are notified if device is valid or not
      */
-    void registerDeviceValidListeners(final DeviceValidListener deviceValidListener);
+    void addDeviceValidListener(final DeviceValidListener deviceValidListener);
 
     /**
      * Notify all registered listeners about valid status

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/LifecycleConductorImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/LifecycleConductorImpl.java
index bf57e63e16f32729b6ad62bcc6c8060c3114c34a..74c7f39d5422164f6d6ae66e08746da9bd8cb7d8 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/LifecycleConductorImpl.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/LifecycleConductorImpl.java
@@ -197,7 +197,7 @@ final class LifecycleConductorImpl implements LifecycleConductor, RoleChangeList
 
                 @Override
                 public void onFailure(final Throwable throwable) {
-                    LOG.warn("ing services for node {} was NOT successful, closing connection", logText, deviceInfo);
+                    LOG.warn("{}ing services for node {} was NOT successful, closing connection", logText, deviceInfo);
                     closeConnection(deviceInfo);
                 }
             });

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceManagerImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceManagerImpl.java
index a19efba66b48b6f5d093522f97b93d7f8ef2c7d1..fce73471c7327f91a309f3c8ebe97ead412a4911 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceManagerImpl.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceManagerImpl.java
@@ -17,10 +17,10 @@ import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import io.netty.util.TimerTask;
-import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.Iterator;
-import java.util.List;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ExecutionException;
@@ -83,8 +83,8 @@ public class DeviceManagerImpl implements DeviceManager, ExtensionConverterProvi
     private final int barrierCountLimit;
     private ExtensionConverterProvider extensionConverterProvider;
     private ScheduledThreadPoolExecutor spyPool;
-    private List<DeviceSynchronizeListener> deviceSynchronizedListeners;
-    private List<DeviceValidListener> deviceValidListeners;
+    private Set<DeviceSynchronizeListener> deviceSynchronizedListeners;
+    private Set<DeviceValidListener> deviceValidListeners;
 
     private final LifecycleConductor conductor;
 
@@ -113,8 +113,8 @@ public class DeviceManagerImpl implements DeviceManager, ExtensionConverterProvi
 
         this.conductor = lifecycleConductor;
         spyPool = new ScheduledThreadPoolExecutor(1);
-        this.deviceSynchronizedListeners = new ArrayList<>();
-        this.deviceValidListeners = new ArrayList<>();
+        this.deviceSynchronizedListeners = new HashSet<>();
+        this.deviceValidListeners = new HashSet<>();
     }
 
 
@@ -166,8 +166,8 @@ public class DeviceManagerImpl implements DeviceManager, ExtensionConverterProvi
         connectionContext.setOutboundQueueHandleRegistration(outboundQueueHandlerRegistration);
 
         final DeviceState deviceState = new DeviceStateImpl(deviceInfo);
-        this.registerDeviceSynchronizeListeners(deviceState);
-        this.registerDeviceValidListeners(deviceState);
+        this.addDeviceSynchronizeListener(deviceState);
+        this.addDeviceValidListener(deviceState);
 
         final DeviceContext deviceContext = new DeviceContextImpl(connectionContext,
                 deviceState,
@@ -328,7 +328,7 @@ public class DeviceManagerImpl implements DeviceManager, ExtensionConverterProvi
     }
 
     @Override
-    public void registerDeviceSynchronizeListeners(final DeviceSynchronizeListener deviceSynchronizeListener) {
+    public void addDeviceSynchronizeListener(final DeviceSynchronizeListener deviceSynchronizeListener) {
         this.deviceSynchronizedListeners.add(deviceSynchronizeListener);
     }
 
@@ -340,7 +340,7 @@ public class DeviceManagerImpl implements DeviceManager, ExtensionConverterProvi
     }
 
     @Override
-    public void registerDeviceValidListeners(final DeviceValidListener deviceValidListener) {
+    public void addDeviceValidListener(final DeviceValidListener deviceValidListener) {
         this.deviceValidListeners.add(deviceValidListener);
     }
 

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/role/RoleManagerImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/role/RoleManagerImpl.java
index b33b80249b1b26e7c1e04b970a4249da72436e26..d40bfa935609552453b555c732d8f8f2e2c60f13 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/role/RoleManagerImpl.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/role/RoleManagerImpl.java
@@ -325,7 +325,6 @@ public class RoleManagerImpl implements RoleManager, EntityOwnershipListener, Se
             @Override
             public void onFailure(@Nonnull final Throwable t) {
                 LOG.warn("Delete Node {} failed. {}", deviceInfo, t);
-                contexts.remove(deviceInfo);
                 final RoleContext roleContext = contexts.remove(deviceInfo);
                 if (roleContext != null) {
                     roleContext.close();

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/role/RoleManagerImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/role/RoleManagerImplTest.java
index 8d5415943a48e05806d9d8fb3f29bd53bbc6dfaf..95c0a550e5421eaf4c6f2743339c6ba5f03388c1 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/role/RoleManagerImplTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/role/RoleManagerImplTest.java
@@ -160,7 +160,6 @@ public class RoleManagerImplTest {
         roleContextSpy = Mockito.spy(roleManager.getRoleContext(deviceInfo));
         Mockito.when(roleContextSpy.getDeviceInfo()).thenReturn(deviceInfo);
         Mockito.when(roleContextSpy.getDeviceInfo().getNodeId()).thenReturn(nodeId);
-//        Mockito.when(roleManagerSpy.sendRoleChangeToDevice(Mockito.<OfpRole>any(), Mockito.<RoleContext>any())).thenReturn(rpcFuture);
         inOrder = Mockito.inOrder(entityOwnershipListenerRegistration, roleManagerSpy, roleContextSpy);
     }