Bump MRI upstreams

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / lifecycle / ContextChainImpl.java

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/lifecycle/ContextChainImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/lifecycle/ContextChainImpl.java
index acd5e548e6bc1e87e0f81c61000ed807c627b76e..2cc9aea0527234c53984ea71ca81fbe37cbb4e08 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/lifecycle/ContextChainImpl.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/lifecycle/ContextChainImpl.java
@@ -13,11 +13,11 @@ import com.google.common.util.concurrent.ListenableFuture;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
 import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier;
 import org.opendaylight.openflowplugin.api.openflow.OFPContext;
@@ -45,7 +45,7 @@ public class ContextChainImpl implements ContextChain {
     private final List<DeviceRemovedHandler> deviceRemovedHandlers = new CopyOnWriteArrayList<>();
     private final List<GuardedContext> contexts = new CopyOnWriteArrayList<>();
     private final List<ConnectionContext> auxiliaryConnections = new CopyOnWriteArrayList<>();
-    private final ExecutorService executorService;
+    private final Executor executor;
     private final ContextChainMastershipWatcher contextChainMastershipWatcher;
     private final DeviceInfo deviceInfo;
     private final ConnectionContext primaryConnection;
@@ -53,17 +53,17 @@ public class ContextChainImpl implements ContextChain {
             new AtomicReference<>(ContextChainState.UNDEFINED);
     private AutoCloseable registration;
 
-    ContextChainImpl(@Nonnull final ContextChainMastershipWatcher contextChainMastershipWatcher,
-                     @Nonnull final ConnectionContext connectionContext,
-                     @Nonnull final ExecutorService executorService) {
+    ContextChainImpl(@NonNull final ContextChainMastershipWatcher contextChainMastershipWatcher,
+                     @NonNull final ConnectionContext connectionContext,
+                     @NonNull final Executor executor) {
         this.contextChainMastershipWatcher = contextChainMastershipWatcher;
         this.primaryConnection = connectionContext;
         this.deviceInfo = connectionContext.getDeviceInfo();
-        this.executorService = executorService;
+        this.executor = executor;
     }
 
     @Override
-    public <T extends OFPContext> void addContext(@Nonnull final T context) {
+    public <T extends OFPContext> void addContext(@NonNull final T context) {
         contexts.add(new GuardedContextImpl(context));
     }
 
@@ -75,8 +75,8 @@ public class ContextChainImpl implements ContextChain {
             contexts.forEach(OFPContext::instantiateServiceInstance);
             LOG.info("Started clustering services for node {}", deviceInfo);
         } catch (final Exception ex) {
-            LOG.warn("Not able to start clustering services for node {}", deviceInfo);
-            executorService.execute(() -> contextChainMastershipWatcher
+            LOG.error("Not able to start clustering services for node {}", deviceInfo);
+            executor.execute(() -> contextChainMastershipWatcher
                     .onNotAbleToStartMastershipMandatory(deviceInfo, ex.toString()));
         }
     }
@@ -90,14 +90,14 @@ public class ContextChainImpl implements ContextChain {
             .map(OFPContext::closeServiceInstance)
             .collect(Collectors.toList()));
 
-        return Futures.transform(servicesToBeClosed, (input) -> {
+        return Futures.transform(servicesToBeClosed, input -> {
             OF_EVENT_LOG.debug("Closing clustering Services, Node: {}", deviceInfo);
             LOG.info("Closed clustering services for node {}", deviceInfo);
             return null;
-        }, executorService);
+        }, executor);
     }
 
-    @Nonnull
+    @NonNull
     @Override
     public ServiceGroupIdentifier getIdentifier() {
         return deviceInfo.getServiceIdentifier();
@@ -159,7 +159,7 @@ public class ContextChainImpl implements ContextChain {
     }
 
     @Override
-    public boolean isMastered(@Nonnull final ContextChainMastershipState mastershipState,
+    public boolean isMastered(@NonNull final ContextChainMastershipState mastershipState,
                               final boolean inReconciliationFrameworkStep) {
         switch (mastershipState) {
             case INITIAL_SUBMIT:
@@ -220,19 +220,19 @@ public class ContextChainImpl implements ContextChain {
     }
 
     @Override
-    public boolean addAuxiliaryConnection(@Nonnull final ConnectionContext connectionContext) {
+    public boolean addAuxiliaryConnection(@NonNull final ConnectionContext connectionContext) {
         return connectionContext.getFeatures().getAuxiliaryId().toJava() != 0
                 && !ConnectionContext.CONNECTION_STATE.RIP.equals(primaryConnection.getConnectionState())
                 && auxiliaryConnections.add(connectionContext);
     }
 
     @Override
-    public boolean auxiliaryConnectionDropped(@Nonnull final ConnectionContext connectionContext) {
+    public boolean auxiliaryConnectionDropped(@NonNull final ConnectionContext connectionContext) {
         return auxiliaryConnections.remove(connectionContext);
     }
 
     @Override
-    public void registerDeviceRemovedHandler(@Nonnull final DeviceRemovedHandler deviceRemovedHandler) {
+    public void registerDeviceRemovedHandler(@NonNull final DeviceRemovedHandler deviceRemovedHandler) {
         deviceRemovedHandlers.add(deviceRemovedHandler);
     }