Use ByteBuf.readRetainedSlice()

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

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/initialization/AbstractDeviceInitializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/initialization/AbstractDeviceInitializer.java
index 7fad99e45ef0d18e8f8be3af7ff45b2aca1b6984..f6c458968042e4b6a0e48a29c0bebb2546ba355e 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/initialization/AbstractDeviceInitializer.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/initialization/AbstractDeviceInitializer.java
@@ -5,16 +5,16 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.openflowplugin.impl.device.initialization;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.util.concurrent.Futures;
 import java.util.Collections;
 import java.util.concurrent.Future;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.openflowplugin.api.ConnectionException;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
 import org.opendaylight.openflowplugin.impl.datastore.MultipartWriterProvider;
@@ -24,7 +24,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public abstract class AbstractDeviceInitializer {
-
     private static final Logger LOG = LoggerFactory.getLogger(AbstractDeviceInitializer.class);
 
     /**
@@ -37,22 +36,22 @@ public abstract class AbstractDeviceInitializer {
      * @param convertorExecutor convertor executor
      */
     @SuppressWarnings("checkstyle:IllegalCatch")
-    public Future<Void> initialize(@Nonnull final DeviceContext deviceContext,
+    public Future<Void> initialize(@NonNull final DeviceContext deviceContext,
                                    final boolean switchFeaturesMandatory,
                                    final boolean skipTableFeatures,
                                    @Nullable final MultipartWriterProvider multipartWriterProvider,
                                    @Nullable final ConvertorExecutor convertorExecutor) {
-        Preconditions.checkNotNull(deviceContext);
+        requireNonNull(deviceContext);
 
         // Write node to datastore
-        LOG.debug("Initializing node information for node {}", deviceContext.getDeviceInfo().getLOGValue());
+        LOG.debug("Initializing node information for node {}", deviceContext.getDeviceInfo());
         try {
             deviceContext.writeToTransaction(LogicalDatastoreType.OPERATIONAL, deviceContext
                     .getDeviceInfo()
                     .getNodeInstanceIdentifier(),
                 new NodeBuilder()
                     .setId(deviceContext.getDeviceInfo().getNodeId())
-                    .setNodeConnector(Collections.emptyList())
+                    .setNodeConnector(Collections.emptyMap())
                     .build());
         } catch (final Exception e) {
             LOG.warn("Failed to write node {} to DS ", deviceContext.getDeviceInfo().getNodeId(), e);
@@ -65,7 +64,7 @@ public abstract class AbstractDeviceInitializer {
                 multipartWriterProvider, convertorExecutor);
     }
 
-    protected abstract Future<Void> initializeNodeInformation(@Nonnull DeviceContext deviceContext,
+    protected abstract Future<Void> initializeNodeInformation(@NonNull DeviceContext deviceContext,
                                                               boolean switchFeaturesMandatory,
                                                               boolean skipTableFeatures,
                                                               @Nullable MultipartWriterProvider multipartWriterProvider,