Merge "Optional fields - reverted"

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/FlowModInputMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/FlowModInputMessageFactory.java
index 8889339a2e45d767fbd32f23a0870492b9a02993..511f1622a31d7e490de7916b88533c95d1923c57 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/FlowModInputMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/FlowModInputMessageFactory.java
@@ -49,18 +49,12 @@ public class FlowModInputMessageFactory implements OFSerializer<FlowModInput> {
         out.writeShort(message.getHardTimeout().intValue());\r
         out.writeShort(message.getPriority());\r
         out.writeInt(message.getBufferId().intValue());\r
-        if (message.getOutPort() != null) {\r
-            out.writeInt(message.getOutPort().getValue().intValue());\r
-        }\r
-        \r
-        if (message.getOutGroup() != null) {\r
-            out.writeInt(message.getOutGroup().intValue());\r
-        }\r
+        out.writeInt(message.getOutPort().getValue().intValue());\r
+        out.writeInt(message.getOutGroup().intValue());\r
         out.writeShort(createFlowModFlagsBitmask(message.getFlags()));\r
         ByteBufUtils.padBuffer(PADDING_IN_FLOW_MOD_MESSAGE, out);\r
         MatchSerializer.encodeMatch(message.getMatch(), out);\r
         InstructionsSerializer.encodeInstructions(message.getInstructions(), out);\r
-        \r
     }\r
 \r
     @Override\r

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GroupModInputMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GroupModInputMessageFactory.java
index 26ca0d46b688cb3c25eed29ab2a4c336bb0e4822..b60a7c29327e6b53389f0d6e8e0aa7d6da152caf 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GroupModInputMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GroupModInputMessageFactory.java
@@ -63,18 +63,9 @@ public class GroupModInputMessageFactory implements OFSerializer<GroupModInput>
         if (buckets != null) {\r
             for (BucketsList currentBucket : buckets) {\r
                 outBuffer.writeShort(computeLengthOfBucket(currentBucket));\r
-                \r
-                if (null != currentBucket.getWeight()) {\r
-                    outBuffer.writeShort(currentBucket.getWeight().shortValue());\r
-                }\r
-                \r
-                if (null != currentBucket.getWatchPort()) {\r
-                    outBuffer.writeInt(currentBucket.getWatchPort().getValue().intValue());\r
-                }\r
-                \r
-                if (null != currentBucket.getWatchGroup()) {\r
-                    outBuffer.writeInt(currentBucket.getWatchGroup().intValue());\r
-                }\r
+                outBuffer.writeShort(currentBucket.getWeight().shortValue());\r
+                outBuffer.writeInt(currentBucket.getWatchPort().getValue().intValue());\r
+                outBuffer.writeInt(currentBucket.getWatchGroup().intValue());\r
                 ByteBufUtils.padBuffer(PADDING_IN_BUCKET, outBuffer);\r
                 ActionsSerializer.encodeActions(currentBucket.getActionsList(), outBuffer);\r
             }\r

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10FlowModInputMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10FlowModInputMessageFactory.java
index f0858af0009660be4563d00a2bcee2d9eaa65e66..7821cd4979ad354993b1c37f63fd822c8a1da9a4 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10FlowModInputMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10FlowModInputMessageFactory.java
@@ -48,9 +48,7 @@ public class OF10FlowModInputMessageFactory implements OFSerializer<FlowModInput
         out.writeShort(message.getHardTimeout().intValue());\r
         out.writeShort(message.getPriority());\r
         out.writeInt(message.getBufferId().intValue());\r
-        if (null != message.getOutPort()) {\r
-            out.writeShort(message.getOutPort().getValue().intValue());\r
-        }\r
+        out.writeShort(message.getOutPort().getValue().intValue());\r
         out.writeShort(createFlowModFlagsBitmask(message.getFlagsV10()));\r
         OF10ActionsSerializer.encodeActionsV10(out, message.getActionsList());\r
     }\r

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/ActionsSerializer.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/ActionsSerializer.java
index e99d204cb929558794d11a0f62ad60b857d690a1..7adcf552c5f697d30dbcf40ce9b4e638c67bf1f8 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/ActionsSerializer.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/ActionsSerializer.java
@@ -239,13 +239,9 @@ public abstract class ActionsSerializer {
         final byte LENGTH_OF_ETHERTYPE_ACTION = 8;\r
         final byte ETHERTYPE_ACTION_PADDING = 2;        \r
         EthertypeAction ethertype = action.getAugmentation(EthertypeAction.class);\r
-        \r
-        if (null != ethertype && null != ethertype.getEthertype()) {\r
-            outBuffer.writeShort(LENGTH_OF_ETHERTYPE_ACTION);\r
-            \r
-            outBuffer.writeShort(ethertype.getEthertype().getValue());\r
-            ByteBufUtils.padBuffer(ETHERTYPE_ACTION_PADDING, outBuffer);\r
-        }\r
+        outBuffer.writeShort(LENGTH_OF_ETHERTYPE_ACTION);\r
+        outBuffer.writeShort(ethertype.getEthertype().getValue());\r
+        ByteBufUtils.padBuffer(ETHERTYPE_ACTION_PADDING, outBuffer);\r
     }\r
     \r
     /**\r