Merge "Remove unused interface"

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / device / initialization / OF13DeviceInitializer.java

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/initialization/OF13DeviceInitializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/initialization/OF13DeviceInitializer.java
index 3d5b60b4074b906beb666a24d0894d0d7e7f78bc..cb4f08f33884872752d10bc070ca68f1158ee99e 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/initialization/OF13DeviceInitializer.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/initialization/OF13DeviceInitializer.java
@@ -14,6 +14,7 @@ import com.google.common.util.concurrent.AsyncFunction;
 import com.google.common.util.concurrent.FutureCallback;
 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.Objects;
@@ -58,7 +59,7 @@ public class OF13DeviceInitializer extends AbstractDeviceInitializer {
         final DeviceState deviceState = Preconditions.checkNotNull(deviceContext.getDeviceState());
         final DeviceInfo deviceInfo = Preconditions.checkNotNull(deviceContext.getDeviceInfo());
         final Capabilities capabilities = connectionContext.getFeatures().getCapabilities();
-        LOG.debug("Setting capabilities for device {}", deviceInfo.getLOGValue());
+        LOG.debug("Setting capabilities for device {}", deviceInfo);
         DeviceStateUtil.setDeviceStateBasedOnV13Capabilities(deviceState, capabilities);
 
         // First process description reply, write data to DS and write consequent data if successful
@@ -89,11 +90,11 @@ public class OF13DeviceInitializer extends AbstractDeviceInitializer {
                         @Override
                         public Void apply(@Nullable final List<RpcResult<List<OfHeader>>> input) {
                             LOG.info("Static node {} successfully finished collecting",
-                                    deviceContext.getDeviceInfo().getLOGValue());
+                                    deviceContext.getDeviceInfo());
                             return null;
                         }
                     });
-            });
+            }, MoreExecutors.directExecutor());
 
     }
 
@@ -140,7 +141,7 @@ public class OF13DeviceInitializer extends AbstractDeviceInitializer {
             @Override
             public void onSuccess(final RpcResult<List<OfHeader>> result) {
                 if (Objects.nonNull(result.getResult())) {
-                    LOG.info("Static node {} info: {} collected", deviceContext.getDeviceInfo().getLOGValue(), type);
+                    LOG.info("Static node {} info: {} collected", deviceContext.getDeviceInfo(), type);
                     translateAndWriteResult(
                         type,
                         result.getResult(),
@@ -169,9 +170,9 @@ public class OF13DeviceInitializer extends AbstractDeviceInitializer {
             @Override
             public void onFailure(@Nonnull final Throwable throwable) {
                 LOG.warn("Request of type {} for static info of node {} failed.",
-                        type, deviceContext.getDeviceInfo().getLOGValue());
+                        type, deviceContext.getDeviceInfo());
             }
-        });
+        }, MoreExecutors.directExecutor());
     }
 
     /**
@@ -218,11 +219,11 @@ public class OF13DeviceInitializer extends AbstractDeviceInitializer {
                         });
                 });
             } catch (final Exception e) {
-                LOG.warn("Failed to write node {} to DS ", deviceContext.getDeviceInfo().getLOGValue(), e);
+                LOG.warn("Failed to write node {} to DS ", deviceContext.getDeviceInfo(), e);
             }
         } else {
             LOG.warn("Failed to write node {} to DS because we failed to gather device info.",
-                deviceContext.getDeviceInfo().getLOGValue());
+                deviceContext.getDeviceInfo());
         }
     }