X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflowplugin-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fopenflowplugin%2Fimpl%2Fdevice%2Finitialization%2FOF10DeviceInitializer.java;h=5f2b1c266448de24910218840b29a92a90129538;hb=refs%2Fchanges%2F77%2F100077%2F17;hp=69b88f24a9bbcd55ffa40618f9e7032f4085a261;hpb=e24d613b2b6f151c424750e062215baab60880f1;p=openflowplugin.git

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/initialization/OF10DeviceInitializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/initialization/OF10DeviceInitializer.java
index 69b88f24a9..5f2b1c2664 100644
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/initialization/OF10DeviceInitializer.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/initialization/OF10DeviceInitializer.java
@@ -12,9 +12,8 @@ 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 edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.openflowplugin.api.openflow.connection.ConnectionContext;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
@@ -41,7 +40,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.No
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.CapabilitiesV10;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MultipartType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PortGrouping;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.FlowCapableNodeConnectorStatisticsData;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.FlowCapableNodeConnectorStatisticsDataBuilder;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.slf4j.Logger;
@@ -52,7 +50,7 @@ public class OF10DeviceInitializer extends AbstractDeviceInitializer {
     private static final Logger LOG = LoggerFactory.getLogger(OF10DeviceInitializer.class);
 
     @Override
-    protected ListenableFuture<Void> initializeNodeInformation(@Nonnull final DeviceContext deviceContext,
+    protected ListenableFuture<Void> initializeNodeInformation(@NonNull final DeviceContext deviceContext,
                                                      final boolean switchFeaturesMandatory,
                                                      final boolean skipTableFeatures,
                                                      @Nullable final MultipartWriterProvider multipartWriterProvider,
@@ -111,20 +109,20 @@ public class OF10DeviceInitializer extends AbstractDeviceInitializer {
                 port.getPortNo(),
                 OpenflowVersion.get(deviceInfo.getVersion()));
 
+            final NodeConnectorBuilder connectorBuilder = new NodeConnectorBuilder()
+                    .setId(nodeConnectorId)
+                    .addAugmentation(new FlowCapableNodeConnectorStatisticsDataBuilder().build());
+            final FlowCapableNodeConnector augment = translator.translate(port, deviceInfo, null);
+            if (augment != null) {
+                connectorBuilder.addAugmentation(augment);
+            }
+
             try {
                 deviceContext.writeToTransaction(LogicalDatastoreType.OPERATIONAL,
                     deviceInfo
                         .getNodeInstanceIdentifier()
                         .child(NodeConnector.class, new NodeConnectorKey(nodeConnectorId)),
-                    new NodeConnectorBuilder()
-                        .setId(nodeConnectorId)
-                        .addAugmentation(
-                            FlowCapableNodeConnector.class,
-                            translator.translate(port, deviceInfo, null))
-                        .addAugmentation(
-                            FlowCapableNodeConnectorStatisticsData.class,
-                            new FlowCapableNodeConnectorStatisticsDataBuilder().build())
-                        .build());
+                        connectorBuilder.build());
             } catch (final Exception e) {
                 LOG.debug("Failed to write node {} to DS ", deviceInfo, e);
             }
@@ -132,8 +130,6 @@ public class OF10DeviceInitializer extends AbstractDeviceInitializer {
     }
 
     @SuppressWarnings("checkstyle:IllegalCatch")
-    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
-            justification = "https://github.com/spotbugs/spotbugs/issues/811")
     private static void makeEmptyFlowCapableNode(final TxFacade txFacade, final DeviceInfo deviceInfo) {
         try {
             txFacade.writeToTransaction(LogicalDatastoreType.OPERATIONAL,