Update MRI projects for Aluminium

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / protocol / serialization / multipart / MultipartRequestTableFeaturesSerializer.java

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestTableFeaturesSerializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestTableFeaturesSerializer.java
index 5fb6f5b73d85c2eefe2e610f00ac998b95bce7f9..66b4c50322f663e9130a37d46238b22a4cab8132 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestTableFeaturesSerializer.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestTableFeaturesSerializer.java
@@ -8,7 +8,9 @@
 
 package org.opendaylight.openflowplugin.impl.protocol.serialization.multipart;
 
+import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
+import java.nio.charset.StandardCharsets;
 import java.util.Objects;
 import java.util.Optional;
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFSerializer;
@@ -17,25 +19,21 @@ import org.opendaylight.openflowjava.protocol.api.extensibility.SerializerRegist
 import org.opendaylight.openflowjava.protocol.api.keys.MessageTypeKey;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowjava.util.ByteBufUtils;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.multipart.types.rev170112.multipart.request.MultipartRequestBody;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.multipart.request.multipart.request.body.MultipartRequestTableFeatures;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.TableFeaturePropType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.features.table.features.TableProperties;
 
-public class MultipartRequestTableFeaturesSerializer implements OFSerializer<MultipartRequestBody>, SerializerRegistryInjector {
+public class MultipartRequestTableFeaturesSerializer implements OFSerializer<MultipartRequestTableFeatures>,
+        SerializerRegistryInjector {
 
     private static final byte PADDING_IN_MULTIPART_REQUEST_TABLE_FEATURES_BODY = 5;
     private SerializerRegistry registry;
 
     @Override
-    public void serialize(final MultipartRequestBody multipartRequestBody, final ByteBuf byteBuf) {
-        final MultipartRequestTableFeatures multipartRequestTableFeatures = MultipartRequestTableFeatures
-            .class
-            .cast(multipartRequestBody);
-
+    public void serialize(final MultipartRequestTableFeatures multipartRequestTableFeatures, final ByteBuf byteBuf) {
         Optional
-            .ofNullable(multipartRequestTableFeatures.getTableFeatures())
-            .ifPresent(tableFeatures -> tableFeatures
+            .ofNullable(multipartRequestTableFeatures.nonnullTableFeatures())
+            .ifPresent(tableFeatures -> tableFeatures.values()
                 .stream()
                 .filter(Objects::nonNull)
                 .forEach(tableFeature -> {
@@ -43,8 +41,8 @@ public class MultipartRequestTableFeaturesSerializer implements OFSerializer<Mul
                     byteBuf.writeShort(EncodeConstants.EMPTY_LENGTH);
                     byteBuf.writeByte(tableFeature.getTableId().byteValue());
                     byteBuf.writeZero(PADDING_IN_MULTIPART_REQUEST_TABLE_FEATURES_BODY);
-                    byteBuf.writeBytes(tableFeature.getName().getBytes());
-                    byteBuf.writeZero(32 - tableFeature.getName().getBytes().length);
+                    byteBuf.writeBytes(tableFeature.getName().getBytes(StandardCharsets.UTF_8));
+                    byteBuf.writeZero(32 - tableFeature.getName().getBytes(StandardCharsets.UTF_8).length);
                     byteBuf.writeLong(tableFeature.getMetadataMatch().longValue());
                     byteBuf.writeLong(tableFeature.getMetadataWrite().longValue());
                     byteBuf.writeInt(ByteBufUtils.fillBitMask(0, tableFeature.getConfig().isDEPRECATEDMASK()));
@@ -58,19 +56,19 @@ public class MultipartRequestTableFeaturesSerializer implements OFSerializer<Mul
     private void serializeProperties(final TableProperties tableProperties, final ByteBuf byteBuf) {
         Optional
             .ofNullable(tableProperties)
-            .flatMap(properties -> Optional.ofNullable(properties.getTableFeatureProperties()))
-            .ifPresent(properties -> properties
+            .flatMap(properties -> Optional.ofNullable(properties.nonnullTableFeatureProperties()))
+            .ifPresent(properties -> properties.values()
                 .stream()
                 .filter(Objects::nonNull)
                 .forEach(property -> {
                     final Class<? extends TableFeaturePropType> clazz = (Class<? extends TableFeaturePropType>) property
                         .getTableFeaturePropType()
-                        .getImplementedInterface();
+                        .implementedInterface();
 
-                    registry.
-                        <TableFeaturePropType, OFSerializer<TableFeaturePropType>>getSerializer(
+                    Preconditions.checkNotNull(registry)
+                        .<TableFeaturePropType, OFSerializer<TableFeaturePropType>>getSerializer(
                             new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, clazz))
-                        .serialize(property.getTableFeaturePropType(), byteBuf);
+                                .serialize(property.getTableFeaturePropType(), byteBuf);
                 }));
     }