Replace Empty.getInstance() with Empty.value()

Empty.getInstance() is deprecated, use Empty.value() instead.

JIRA: OPNFLWPLUG-1123
Change-Id: I7aac7b757867879093b48d5f22788063b196ab18
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>

diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/FieldChoiceResolver.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/FieldChoiceResolver.java
index 3d79e9f23c1902fde01d181cf8cbb455bb73facb..e749d19efd5f1bd40b64232de5d4b82f7905f8ce 100644 (file)
--- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/FieldChoiceResolver.java
+++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/FieldChoiceResolver.java
@@ -105,61 +105,61 @@ public final class FieldChoiceResolver {
     static {
         final ImmutableMap<SrcChoice, NxmHeader> srcChoiceToNxmheader =
                 new ImmutableMap.Builder<SrcChoice, NxmHeader>()
-                        .put(new SrcNxTunIdCaseBuilder().setNxTunId(Empty.getInstance()).build(),
+                        .put(new SrcNxTunIdCaseBuilder().setNxTunId(Empty.value()).build(),
                                 NiciraMatchCodecs.TUN_ID_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcNxArpShaCaseBuilder().setNxArpSha(Empty.getInstance()).build(),
+                        .put(new SrcNxArpShaCaseBuilder().setNxArpSha(Empty.value()).build(),
                                 NiciraMatchCodecs.ARP_SHA_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcNxArpThaCaseBuilder().setNxArpTha(Empty.getInstance()).build(),
+                        .put(new SrcNxArpThaCaseBuilder().setNxArpTha(Empty.value()).build(),
                                 NiciraMatchCodecs.ARP_THA_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcOfArpOpCaseBuilder().setOfArpOp(Empty.getInstance()).build(),
+                        .put(new SrcOfArpOpCaseBuilder().setOfArpOp(Empty.value()).build(),
                                 NiciraMatchCodecs.ARP_OP_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcOfArpSpaCaseBuilder().setOfArpSpa(Empty.getInstance()).build(),
+                        .put(new SrcOfArpSpaCaseBuilder().setOfArpSpa(Empty.value()).build(),
                                 NiciraMatchCodecs.ARP_SPA_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcOfArpTpaCaseBuilder().setOfArpTpa(Empty.getInstance()).build(),
+                        .put(new SrcOfArpTpaCaseBuilder().setOfArpTpa(Empty.value()).build(),
                                 NiciraMatchCodecs.ARP_TPA_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcNxOfInPortCaseBuilder().setOfInPort(Empty.getInstance()).build(),
+                        .put(new SrcNxOfInPortCaseBuilder().setOfInPort(Empty.value()).build(),
                                 NiciraMatchCodecs.NXM_OF_IN_PORT_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcNxOfMetadataCaseBuilder().setOfMetadata(Empty.getInstance()).build(),
+                        .put(new SrcNxOfMetadataCaseBuilder().setOfMetadata(Empty.value()).build(),
                                 NiciraMatchCodecs.OXM_OF_METADATA_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcOfEthDstCaseBuilder().setOfEthDst(Empty.getInstance()).build(),
+                        .put(new SrcOfEthDstCaseBuilder().setOfEthDst(Empty.value()).build(),
                                 NiciraMatchCodecs.ETH_DST_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcOfEthSrcCaseBuilder().setOfEthSrc(Empty.getInstance()).build(),
+                        .put(new SrcOfEthSrcCaseBuilder().setOfEthSrc(Empty.value()).build(),
                                 NiciraMatchCodecs.ETH_SRC_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcOfEthTypeCaseBuilder().setOfEthType(Empty.getInstance()).build(),
+                        .put(new SrcOfEthTypeCaseBuilder().setOfEthType(Empty.value()).build(),
                                 NiciraMatchCodecs.ETH_TYPE_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcNxTunIpv4DstCaseBuilder().setNxTunIpv4Dst(Empty.getInstance()).build(),
+                        .put(new SrcNxTunIpv4DstCaseBuilder().setNxTunIpv4Dst(Empty.value()).build(),
                                 NiciraMatchCodecs.TUN_IPV4_DST_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcNxTunIpv4SrcCaseBuilder().setNxTunIpv4Src(Empty.getInstance()).build(),
+                        .put(new SrcNxTunIpv4SrcCaseBuilder().setNxTunIpv4Src(Empty.value()).build(),
                                 NiciraMatchCodecs.TUN_IPV4_SRC_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcNxNspCaseBuilder().setNxNspDst(Empty.getInstance()).build(),
+                        .put(new SrcNxNspCaseBuilder().setNxNspDst(Empty.value()).build(),
                                 NiciraMatchCodecs.NSP_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcNxNsiCaseBuilder().setNxNsiDst(Empty.getInstance()).build(),
+                        .put(new SrcNxNsiCaseBuilder().setNxNsiDst(Empty.value()).build(),
                                 NiciraMatchCodecs.NSI_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcNxNshc1CaseBuilder().setNxNshc1Dst(Empty.getInstance()).build(),
+                        .put(new SrcNxNshc1CaseBuilder().setNxNshc1Dst(Empty.value()).build(),
                                 NiciraMatchCodecs.NSC1_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcNxNshc2CaseBuilder().setNxNshc2Dst(Empty.getInstance()).build(),
+                        .put(new SrcNxNshc2CaseBuilder().setNxNshc2Dst(Empty.value()).build(),
                                 NiciraMatchCodecs.NSC2_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcNxNshc3CaseBuilder().setNxNshc3Dst(Empty.getInstance()).build(),
+                        .put(new SrcNxNshc3CaseBuilder().setNxNshc3Dst(Empty.value()).build(),
                                 NiciraMatchCodecs.NSC3_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcNxNshc4CaseBuilder().setNxNshc4Dst(Empty.getInstance()).build(),
+                        .put(new SrcNxNshc4CaseBuilder().setNxNshc4Dst(Empty.value()).build(),
                                 NiciraMatchCodecs.NSC4_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcNxNshFlagsCaseBuilder().setNxNshFlags(Empty.getInstance()).build(),
+                        .put(new SrcNxNshFlagsCaseBuilder().setNxNshFlags(Empty.value()).build(),
                                 NiciraMatchCodecs.NSH_FLAGS_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcNxNshTtlCaseBuilder().setNxNshTtl(Empty.getInstance()).build(),
+                        .put(new SrcNxNshTtlCaseBuilder().setNxNshTtl(Empty.value()).build(),
                                 NiciraMatchCodecs.NSH_TTL_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcNxNshMdtypeCaseBuilder().setNxNshMdtype(Empty.getInstance()).build(),
+                        .put(new SrcNxNshMdtypeCaseBuilder().setNxNshMdtype(Empty.value()).build(),
                                 NiciraMatchCodecs.NSH_MDTYPE_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcNxNshNpCaseBuilder().setNxNshNp(Empty.getInstance()).build(),
+                        .put(new SrcNxNshNpCaseBuilder().setNxNshNp(Empty.value()).build(),
                                 NiciraMatchCodecs.NSH_NP_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcOfIpDstCaseBuilder().setOfIpDst(Empty.getInstance()).build(),
+                        .put(new SrcOfIpDstCaseBuilder().setOfIpDst(Empty.value()).build(),
                                 NiciraMatchCodecs.IP_DST_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcOfIpSrcCaseBuilder().setOfIpSrc(Empty.getInstance()).build(),
+                        .put(new SrcOfIpSrcCaseBuilder().setOfIpSrc(Empty.value()).build(),
                                 NiciraMatchCodecs.IP_SRC_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcNxIpv6SrcCaseBuilder().setNxIpv6Src(Empty.getInstance()).build(),
+                        .put(new SrcNxIpv6SrcCaseBuilder().setNxIpv6Src(Empty.value()).build(),
                                 NiciraMatchCodecs.IPV6_SRC_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcNxIpv6DstCaseBuilder().setNxIpv6Dst(Empty.getInstance()).build(),
+                        .put(new SrcNxIpv6DstCaseBuilder().setNxIpv6Dst(Empty.value()).build(),
                                 NiciraMatchCodecs.IPV6_DST_CODEC.getHeaderWithoutHasMask())
-                        .put(new SrcNxOfMplsLabelCaseBuilder().setOfMplsLabel(Empty.getInstance()).build(),
+                        .put(new SrcNxOfMplsLabelCaseBuilder().setOfMplsLabel(Empty.value()).build(),
                                 NiciraMatchCodecs.OXM_OF_MPLS_LABEL.getHeaderWithoutHasMask())
                         .put(new SrcNxRegCaseBuilder().setNxReg(NxmNxReg0.class).build(),
                                 NiciraMatchCodecs.REG0_CODEC.getHeaderWithoutHasMask())
@@ -181,57 +181,57 @@ public final class FieldChoiceResolver {
 
         final ImmutableMap<DstChoice, NxmHeader> dstChoiceToNxmheader =
                 new ImmutableMap.Builder<DstChoice, NxmHeader>()
-                        .put(new DstNxTunIdCaseBuilder().setNxTunId(Empty.getInstance()).build(),
+                        .put(new DstNxTunIdCaseBuilder().setNxTunId(Empty.value()).build(),
                                 NiciraMatchCodecs.TUN_ID_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstNxArpShaCaseBuilder().setNxArpSha(Empty.getInstance()).build(),
+                        .put(new DstNxArpShaCaseBuilder().setNxArpSha(Empty.value()).build(),
                                 NiciraMatchCodecs.ARP_SHA_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstNxArpThaCaseBuilder().setNxArpTha(Empty.getInstance()).build(),
+                        .put(new DstNxArpThaCaseBuilder().setNxArpTha(Empty.value()).build(),
                                 NiciraMatchCodecs.ARP_THA_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstOfArpOpCaseBuilder().setOfArpOp(Empty.getInstance()).build(),
+                        .put(new DstOfArpOpCaseBuilder().setOfArpOp(Empty.value()).build(),
                                 NiciraMatchCodecs.ARP_OP_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstOfArpSpaCaseBuilder().setOfArpSpa(Empty.getInstance()).build(),
+                        .put(new DstOfArpSpaCaseBuilder().setOfArpSpa(Empty.value()).build(),
                                 NiciraMatchCodecs.ARP_SPA_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstOfArpTpaCaseBuilder().setOfArpTpa(Empty.getInstance()).build(),
+                        .put(new DstOfArpTpaCaseBuilder().setOfArpTpa(Empty.value()).build(),
                                 NiciraMatchCodecs.ARP_TPA_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstNxOfInPortCaseBuilder().setOfInPort(Empty.getInstance()).build(),
+                        .put(new DstNxOfInPortCaseBuilder().setOfInPort(Empty.value()).build(),
                                 NiciraMatchCodecs.NXM_OF_IN_PORT_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstOfMetadataCaseBuilder().setOfMetadata(Empty.getInstance()).build(),
+                        .put(new DstOfMetadataCaseBuilder().setOfMetadata(Empty.value()).build(),
                                 NiciraMatchCodecs.OXM_OF_METADATA_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstOfEthSrcCaseBuilder().setOfEthSrc(Empty.getInstance()).build(),
+                        .put(new DstOfEthSrcCaseBuilder().setOfEthSrc(Empty.value()).build(),
                                 NiciraMatchCodecs.ETH_SRC_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstOfEthDstCaseBuilder().setOfEthDst(Empty.getInstance()).build(),
+                        .put(new DstOfEthDstCaseBuilder().setOfEthDst(Empty.value()).build(),
                                 NiciraMatchCodecs.ETH_DST_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstNxTunIpv4DstCaseBuilder().setNxTunIpv4Dst(Empty.getInstance()).build(),
+                        .put(new DstNxTunIpv4DstCaseBuilder().setNxTunIpv4Dst(Empty.value()).build(),
                                 NiciraMatchCodecs.TUN_IPV4_DST_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstNxTunIpv4SrcCaseBuilder().setNxTunIpv4Src(Empty.getInstance()).build(),
+                        .put(new DstNxTunIpv4SrcCaseBuilder().setNxTunIpv4Src(Empty.value()).build(),
                                 NiciraMatchCodecs.TUN_IPV4_SRC_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstNxNspCaseBuilder().setNxNspDst(Empty.getInstance()).build(),
+                        .put(new DstNxNspCaseBuilder().setNxNspDst(Empty.value()).build(),
                                 NiciraMatchCodecs.NSP_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstNxNsiCaseBuilder().setNxNsiDst(Empty.getInstance()).build(),
+                        .put(new DstNxNsiCaseBuilder().setNxNsiDst(Empty.value()).build(),
                                 NiciraMatchCodecs.NSI_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstNxNshc1CaseBuilder().setNxNshc1Dst(Empty.getInstance()).build(),
+                        .put(new DstNxNshc1CaseBuilder().setNxNshc1Dst(Empty.value()).build(),
                                 NiciraMatchCodecs.NSC1_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstNxNshc2CaseBuilder().setNxNshc2Dst(Empty.getInstance()).build(),
+                        .put(new DstNxNshc2CaseBuilder().setNxNshc2Dst(Empty.value()).build(),
                                 NiciraMatchCodecs.NSC2_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstNxNshc3CaseBuilder().setNxNshc3Dst(Empty.getInstance()).build(),
+                        .put(new DstNxNshc3CaseBuilder().setNxNshc3Dst(Empty.value()).build(),
                                 NiciraMatchCodecs.NSC3_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstNxNshc4CaseBuilder().setNxNshc4Dst(Empty.getInstance()).build(),
+                        .put(new DstNxNshc4CaseBuilder().setNxNshc4Dst(Empty.value()).build(),
                                 NiciraMatchCodecs.NSC4_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstNxNshFlagsCaseBuilder().setNxNshFlags(Empty.getInstance()).build(),
+                        .put(new DstNxNshFlagsCaseBuilder().setNxNshFlags(Empty.value()).build(),
                                 NiciraMatchCodecs.NSH_FLAGS_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstNxNshTtlCaseBuilder().setNxNshTtl(Empty.getInstance()).build(),
+                        .put(new DstNxNshTtlCaseBuilder().setNxNshTtl(Empty.value()).build(),
                                 NiciraMatchCodecs.NSH_TTL_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstOfIpDstCaseBuilder().setOfIpDst(Empty.getInstance()).build(),
+                        .put(new DstOfIpDstCaseBuilder().setOfIpDst(Empty.value()).build(),
                                 NiciraMatchCodecs.IP_DST_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstOfIpSrcCaseBuilder().setOfIpSrc(Empty.getInstance()).build(),
+                        .put(new DstOfIpSrcCaseBuilder().setOfIpSrc(Empty.value()).build(),
                                 NiciraMatchCodecs.IP_SRC_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstNxIpv6SrcCaseBuilder().setNxIpv6Src(Empty.getInstance()).build(),
+                        .put(new DstNxIpv6SrcCaseBuilder().setNxIpv6Src(Empty.value()).build(),
                                 NiciraMatchCodecs.IPV6_SRC_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstNxIpv6DstCaseBuilder().setNxIpv6Dst(Empty.getInstance()).build(),
+                        .put(new DstNxIpv6DstCaseBuilder().setNxIpv6Dst(Empty.value()).build(),
                                 NiciraMatchCodecs.IPV6_DST_CODEC.getHeaderWithoutHasMask())
-                        .put(new DstOfMplsLabelCaseBuilder().setOfMplsLabel(Empty.getInstance()).build(),
+                        .put(new DstOfMplsLabelCaseBuilder().setOfMplsLabel(Empty.value()).build(),
                                 NiciraMatchCodecs.OXM_OF_MPLS_LABEL.getHeaderWithoutHasMask())
-                        .put(new DstOfIcmpTypeCaseBuilder().setOfIcmpType(Empty.getInstance()).build(),
+                        .put(new DstOfIcmpTypeCaseBuilder().setOfIcmpType(Empty.value()).build(),
                                 NiciraMatchCodecs.ICMP_TYPE_CODEC.getHeaderWithoutHasMask())
                         .put(new DstNxRegCaseBuilder().setNxReg(NxmNxReg0.class).build(),
                                 NiciraMatchCodecs.REG0_CODEC.getHeaderWithoutHasMask())

diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/RegLoad2Convertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/RegLoad2Convertor.java
index 29e6cb65fb385f47b68571b9272c7f5e97bb6b93..1cabb66eed5a6327eaa499e4b8c4ecd8310af490 100644 (file)
--- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/RegLoad2Convertor.java
+++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/RegLoad2Convertor.java
@@ -173,49 +173,49 @@ public class RegLoad2Convertor implements
 
         if (NxmNxNshFlags.class.equals(oxmMatchField)) {
             int valueLength = NiciraMatchCodecs.NSH_FLAGS_CODEC.getValueLength();
-            dstBuilder.setDstChoice(new DstNxNshFlagsCaseBuilder().setNxNshFlags(Empty.getInstance()).build());
+            dstBuilder.setDstChoice(new DstNxNshFlagsCaseBuilder().setNxNshFlags(Empty.value()).build());
             NshFlagsValues nshFlagsValues = ((NshFlagsCaseValue) value).getNshFlagsValues();
             return resolveRegLoad(nshFlagsValues.getNshFlags(), nshFlagsValues.getMask(), valueLength, dstBuilder);
         }
         if (NxmNxNsp.class.equals(oxmMatchField)) {
             int valueLength = NiciraMatchCodecs.NSP_CODEC.getValueLength();
-            dstBuilder.setDstChoice(new DstNxNspCaseBuilder().setNxNspDst(Empty.getInstance()).build());
+            dstBuilder.setDstChoice(new DstNxNspCaseBuilder().setNxNspDst(Empty.value()).build());
             NspValues nspValues = ((NspCaseValue) value).getNspValues();
             return resolveRegLoad(nspValues.getNsp(), nspValues.getMask(), valueLength, dstBuilder);
         }
         if (NxmNxNsi.class.equals(oxmMatchField)) {
             int valueLength = NiciraMatchCodecs.NSI_CODEC.getValueLength();
-            dstBuilder.setDstChoice(new DstNxNsiCaseBuilder().setNxNsiDst(Empty.getInstance()).build());
+            dstBuilder.setDstChoice(new DstNxNsiCaseBuilder().setNxNsiDst(Empty.value()).build());
             NsiValues nsiValues = ((NsiCaseValue) value).getNsiValues();
             return resolveRegLoad(nsiValues.getNsi(), nsiValues.getMask(), valueLength, dstBuilder);
         }
         if (NxmNxNshc1.class.equals(oxmMatchField)) {
             int valueLength = NiciraMatchCodecs.NSC1_CODEC.getValueLength();
-            dstBuilder.setDstChoice(new DstNxNshc1CaseBuilder().setNxNshc1Dst(Empty.getInstance()).build());
+            dstBuilder.setDstChoice(new DstNxNshc1CaseBuilder().setNxNshc1Dst(Empty.value()).build());
             NshcCaseValue nshcCaseValue = (NshcCaseValue) value;
             return resolveRegLoad(nshcCaseValue.getNshc(), nshcCaseValue.getMask(), valueLength, dstBuilder);
         }
         if (NxmNxNshc2.class.equals(oxmMatchField)) {
             int valueLength = NiciraMatchCodecs.NSC2_CODEC.getValueLength();
-            dstBuilder.setDstChoice(new DstNxNshc2CaseBuilder().setNxNshc2Dst(Empty.getInstance()).build());
+            dstBuilder.setDstChoice(new DstNxNshc2CaseBuilder().setNxNshc2Dst(Empty.value()).build());
             NshcCaseValue nshcCaseValue = (NshcCaseValue) value;
             return resolveRegLoad(nshcCaseValue.getNshc(), nshcCaseValue.getMask(), valueLength, dstBuilder);
         }
         if (NxmNxNshc3.class.equals(oxmMatchField)) {
             int valueLength = NiciraMatchCodecs.NSC3_CODEC.getValueLength();
-            dstBuilder.setDstChoice(new DstNxNshc3CaseBuilder().setNxNshc3Dst(Empty.getInstance()).build());
+            dstBuilder.setDstChoice(new DstNxNshc3CaseBuilder().setNxNshc3Dst(Empty.value()).build());
             NshcCaseValue nshcCaseValue = (NshcCaseValue) value;
             return resolveRegLoad(nshcCaseValue.getNshc(), nshcCaseValue.getMask(), valueLength, dstBuilder);
         }
         if (NxmNxNshc4.class.equals(oxmMatchField)) {
             int valueLength = NiciraMatchCodecs.NSC4_CODEC.getValueLength();
-            dstBuilder.setDstChoice(new DstNxNshc4CaseBuilder().setNxNshc4Dst(Empty.getInstance()).build());
+            dstBuilder.setDstChoice(new DstNxNshc4CaseBuilder().setNxNshc4Dst(Empty.value()).build());
             NshcCaseValue nshcCaseValue = (NshcCaseValue) value;
             return resolveRegLoad(nshcCaseValue.getNshc(), nshcCaseValue.getMask(), valueLength, dstBuilder);
         }
         if (NxmNxNshTtl.class.equals(oxmMatchField)) {
             int valueLength = NiciraMatchCodecs.NSH_TTL_CODEC.getValueLength();
-            dstBuilder.setDstChoice(new DstNxNshTtlCaseBuilder().setNxNshTtl(Empty.getInstance()).build());
+            dstBuilder.setDstChoice(new DstNxNshTtlCaseBuilder().setNxNshTtl(Empty.value()).build());
             NshTtlValues nshTtlValues = ((NshTtlCaseValue) value).getNshTtlValues();
             return resolveRegLoad(nshTtlValues.getNshTtl(), nshTtlValues.getMask(), valueLength, dstBuilder);
         }

diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/FieldChoiceResolverTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/FieldChoiceResolverTest.java
index 1b9b39ff57c0df7bd4b9b4d47e0fd96184d948ce..d0a623a5d9ebce5054a829518f6c932b4a448a61 100644 (file)
--- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/FieldChoiceResolverTest.java
+++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/FieldChoiceResolverTest.java
@@ -144,210 +144,210 @@ public class FieldChoiceResolverTest {
             {
                 NiciraMatchCodecs.TUN_ID_CODEC.getHeaderWithoutHasMask(),
                 new DstNxTunIdCaseBuilder().build(),
-                new DstNxTunIdCaseBuilder().setNxTunId(Empty.getInstance()).build(),
+                new DstNxTunIdCaseBuilder().setNxTunId(Empty.value()).build(),
                 new SrcNxTunIdCaseBuilder().build(),
-                new SrcNxTunIdCaseBuilder().setNxTunId(Empty.getInstance()).build()
+                new SrcNxTunIdCaseBuilder().setNxTunId(Empty.value()).build()
             },
             {
                 NiciraMatchCodecs.ARP_SHA_CODEC.getHeaderWithoutHasMask(),
                 new DstNxArpShaCaseBuilder().build(),
-                new DstNxArpShaCaseBuilder().setNxArpSha(Empty.getInstance()).build(),
+                new DstNxArpShaCaseBuilder().setNxArpSha(Empty.value()).build(),
                 new SrcNxArpShaCaseBuilder().build(),
-                new SrcNxArpShaCaseBuilder().setNxArpSha(Empty.getInstance()).build(),
+                new SrcNxArpShaCaseBuilder().setNxArpSha(Empty.value()).build(),
             },
             {
                 NiciraMatchCodecs.ARP_SHA_CODEC.getHeaderWithoutHasMask(),
                 new DstNxArpShaCaseBuilder().build(),
-                new DstNxArpShaCaseBuilder().setNxArpSha(Empty.getInstance()).build(),
+                new DstNxArpShaCaseBuilder().setNxArpSha(Empty.value()).build(),
                 new SrcNxArpShaCaseBuilder().build(),
-                new SrcNxArpShaCaseBuilder().setNxArpSha(Empty.getInstance()).build(),
+                new SrcNxArpShaCaseBuilder().setNxArpSha(Empty.value()).build(),
             },
             {
                 NiciraMatchCodecs.ARP_THA_CODEC.getHeaderWithoutHasMask(),
                 new DstNxArpThaCaseBuilder().build(),
-                new DstNxArpThaCaseBuilder().setNxArpTha(Empty.getInstance()).build(),
+                new DstNxArpThaCaseBuilder().setNxArpTha(Empty.value()).build(),
                 new SrcNxArpThaCaseBuilder().build(),
-                new SrcNxArpThaCaseBuilder().setNxArpTha(Empty.getInstance()).build(),
+                new SrcNxArpThaCaseBuilder().setNxArpTha(Empty.value()).build(),
             },
             {
                 NiciraMatchCodecs.ARP_OP_CODEC.getHeaderWithoutHasMask(),
                 new DstOfArpOpCaseBuilder().build(),
-                new DstOfArpOpCaseBuilder().setOfArpOp(Empty.getInstance()).build(),
+                new DstOfArpOpCaseBuilder().setOfArpOp(Empty.value()).build(),
                 new SrcOfArpOpCaseBuilder().build(),
-                new SrcOfArpOpCaseBuilder().setOfArpOp(Empty.getInstance()).build(),
+                new SrcOfArpOpCaseBuilder().setOfArpOp(Empty.value()).build(),
             },
             {
                 NiciraMatchCodecs.ARP_SPA_CODEC.getHeaderWithoutHasMask(),
                 new DstOfArpSpaCaseBuilder().build(),
-                new DstOfArpSpaCaseBuilder().setOfArpSpa(Empty.getInstance()).build(),
+                new DstOfArpSpaCaseBuilder().setOfArpSpa(Empty.value()).build(),
                 new SrcOfArpSpaCaseBuilder().build(),
-                new SrcOfArpSpaCaseBuilder().setOfArpSpa(Empty.getInstance()).build(),
+                new SrcOfArpSpaCaseBuilder().setOfArpSpa(Empty.value()).build(),
             },
             {
                 NiciraMatchCodecs.ARP_TPA_CODEC.getHeaderWithoutHasMask(),
                 new DstOfArpTpaCaseBuilder().build(),
-                new DstOfArpTpaCaseBuilder().setOfArpTpa(Empty.getInstance()).build(),
+                new DstOfArpTpaCaseBuilder().setOfArpTpa(Empty.value()).build(),
                 new SrcOfArpTpaCaseBuilder().build(),
-                new SrcOfArpTpaCaseBuilder().setOfArpTpa(Empty.getInstance()).build(),
+                new SrcOfArpTpaCaseBuilder().setOfArpTpa(Empty.value()).build(),
             },
             {
                 NiciraMatchCodecs.NXM_OF_IN_PORT_CODEC.getHeaderWithoutHasMask(),
                 new DstNxOfInPortCaseBuilder().build(),
-                new DstNxOfInPortCaseBuilder().setOfInPort(Empty.getInstance()).build(),
+                new DstNxOfInPortCaseBuilder().setOfInPort(Empty.value()).build(),
                 new SrcNxOfInPortCaseBuilder().build(),
-                new SrcNxOfInPortCaseBuilder().setOfInPort(Empty.getInstance()).build(),
+                new SrcNxOfInPortCaseBuilder().setOfInPort(Empty.value()).build(),
             },
             {
                 NiciraMatchCodecs.OXM_OF_METADATA_CODEC.getHeaderWithoutHasMask(),
                 new DstOfMetadataCaseBuilder().build(),
-                new DstOfMetadataCaseBuilder().setOfMetadata(Empty.getInstance()).build(),
+                new DstOfMetadataCaseBuilder().setOfMetadata(Empty.value()).build(),
                 new SrcNxOfMetadataCaseBuilder().build(),
-                new SrcNxOfMetadataCaseBuilder().setOfMetadata(Empty.getInstance()).build(),
+                new SrcNxOfMetadataCaseBuilder().setOfMetadata(Empty.value()).build(),
             },
             {
                 NiciraMatchCodecs.OXM_OF_MPLS_LABEL.getHeaderWithoutHasMask(),
                 new DstOfMplsLabelCaseBuilder().build(),
-                new DstOfMplsLabelCaseBuilder().setOfMplsLabel(Empty.getInstance()).build(),
+                new DstOfMplsLabelCaseBuilder().setOfMplsLabel(Empty.value()).build(),
                 new SrcNxOfMplsLabelCaseBuilder().build(),
-                new SrcNxOfMplsLabelCaseBuilder().setOfMplsLabel(Empty.getInstance()).build(),
+                new SrcNxOfMplsLabelCaseBuilder().setOfMplsLabel(Empty.value()).build(),
             },
             {
                 NiciraMatchCodecs.ETH_DST_CODEC.getHeaderWithoutHasMask(),
                 new DstOfEthDstCaseBuilder().build(),
-                new DstOfEthDstCaseBuilder().setOfEthDst(Empty.getInstance()).build(),
+                new DstOfEthDstCaseBuilder().setOfEthDst(Empty.value()).build(),
                 new SrcOfEthDstCaseBuilder().build(),
-                new SrcOfEthDstCaseBuilder().setOfEthDst(Empty.getInstance()).build(),
+                new SrcOfEthDstCaseBuilder().setOfEthDst(Empty.value()).build(),
             },
             {
                 NiciraMatchCodecs.ETH_SRC_CODEC.getHeaderWithoutHasMask(),
                 new DstOfEthSrcCaseBuilder().build(),
-                new DstOfEthSrcCaseBuilder().setOfEthSrc(Empty.getInstance()).build(),
+                new DstOfEthSrcCaseBuilder().setOfEthSrc(Empty.value()).build(),
                 new SrcOfEthSrcCaseBuilder().build(),
-                new SrcOfEthSrcCaseBuilder().setOfEthSrc(Empty.getInstance()).build(),
+                new SrcOfEthSrcCaseBuilder().setOfEthSrc(Empty.value()).build(),
             },
             {
                 NiciraMatchCodecs.ETH_TYPE_CODEC.getHeaderWithoutHasMask(),
                 null,
                 null,
                 new SrcOfEthTypeCaseBuilder().build(),
-                new SrcOfEthTypeCaseBuilder().setOfEthType(Empty.getInstance()).build()
+                new SrcOfEthTypeCaseBuilder().setOfEthType(Empty.value()).build()
             },
             {
                 NiciraMatchCodecs.TUN_IPV4_DST_CODEC.getHeaderWithoutHasMask(),
                 new DstNxTunIpv4DstCaseBuilder().build(),
-                new DstNxTunIpv4DstCaseBuilder().setNxTunIpv4Dst(Empty.getInstance()).build(),
+                new DstNxTunIpv4DstCaseBuilder().setNxTunIpv4Dst(Empty.value()).build(),
                 new SrcNxTunIpv4DstCaseBuilder().build(),
-                new SrcNxTunIpv4DstCaseBuilder().setNxTunIpv4Dst(Empty.getInstance()).build(),
+                new SrcNxTunIpv4DstCaseBuilder().setNxTunIpv4Dst(Empty.value()).build(),
             },
             {
                 NiciraMatchCodecs.TUN_IPV4_SRC_CODEC.getHeaderWithoutHasMask(),
                 new DstNxTunIpv4SrcCaseBuilder().build(),
-                new DstNxTunIpv4SrcCaseBuilder().setNxTunIpv4Src(Empty.getInstance()).build(),
+                new DstNxTunIpv4SrcCaseBuilder().setNxTunIpv4Src(Empty.value()).build(),
                 new SrcNxTunIpv4SrcCaseBuilder().build(),
-                new SrcNxTunIpv4SrcCaseBuilder().setNxTunIpv4Src(Empty.getInstance()).build(),
+                new SrcNxTunIpv4SrcCaseBuilder().setNxTunIpv4Src(Empty.value()).build(),
             },
             {
                 NiciraMatchCodecs.NSP_CODEC.getHeaderWithoutHasMask(),
                 new DstNxNspCaseBuilder().build(),
-                new DstNxNspCaseBuilder().setNxNspDst(Empty.getInstance()).build(),
+                new DstNxNspCaseBuilder().setNxNspDst(Empty.value()).build(),
                 new SrcNxNspCaseBuilder().build(),
-                new SrcNxNspCaseBuilder().setNxNspDst(Empty.getInstance()).build(),
+                new SrcNxNspCaseBuilder().setNxNspDst(Empty.value()).build(),
             },
             {
                 NiciraMatchCodecs.NSI_CODEC.getHeaderWithoutHasMask(),
                 new DstNxNsiCaseBuilder().build(),
-                new DstNxNsiCaseBuilder().setNxNsiDst(Empty.getInstance()).build(),
+                new DstNxNsiCaseBuilder().setNxNsiDst(Empty.value()).build(),
                 new SrcNxNsiCaseBuilder().build(),
-                new SrcNxNsiCaseBuilder().setNxNsiDst(Empty.getInstance()).build(),
+                new SrcNxNsiCaseBuilder().setNxNsiDst(Empty.value()).build(),
             },
             {
                 NiciraMatchCodecs.NSC1_CODEC.getHeaderWithoutHasMask(),
                 new DstNxNshc1CaseBuilder().build(),
-                new DstNxNshc1CaseBuilder().setNxNshc1Dst(Empty.getInstance()).build(),
+                new DstNxNshc1CaseBuilder().setNxNshc1Dst(Empty.value()).build(),
                 new SrcNxNshc1CaseBuilder().build(),
-                new SrcNxNshc1CaseBuilder().setNxNshc1Dst(Empty.getInstance()).build(),
+                new SrcNxNshc1CaseBuilder().setNxNshc1Dst(Empty.value()).build(),
             },
             {
                 NiciraMatchCodecs.NSC2_CODEC.getHeaderWithoutHasMask(),
                 new DstNxNshc2CaseBuilder().build(),
-                new DstNxNshc2CaseBuilder().setNxNshc2Dst(Empty.getInstance()).build(),
+                new DstNxNshc2CaseBuilder().setNxNshc2Dst(Empty.value()).build(),
                 new SrcNxNshc2CaseBuilder().build(),
-                new SrcNxNshc2CaseBuilder().setNxNshc2Dst(Empty.getInstance()).build(),
+                new SrcNxNshc2CaseBuilder().setNxNshc2Dst(Empty.value()).build(),
             },
             {
                 NiciraMatchCodecs.NSC3_CODEC.getHeaderWithoutHasMask(),
                 new DstNxNshc3CaseBuilder().build(),
-                new DstNxNshc3CaseBuilder().setNxNshc3Dst(Empty.getInstance()).build(),
+                new DstNxNshc3CaseBuilder().setNxNshc3Dst(Empty.value()).build(),
                 new SrcNxNshc3CaseBuilder().build(),
-                new SrcNxNshc3CaseBuilder().setNxNshc3Dst(Empty.getInstance()).build(),
+                new SrcNxNshc3CaseBuilder().setNxNshc3Dst(Empty.value()).build(),
             },
             {
                 NiciraMatchCodecs.NSC4_CODEC.getHeaderWithoutHasMask(),
                 new DstNxNshc4CaseBuilder().build(),
-                new DstNxNshc4CaseBuilder().setNxNshc4Dst(Empty.getInstance()).build(),
+                new DstNxNshc4CaseBuilder().setNxNshc4Dst(Empty.value()).build(),
                 new SrcNxNshc4CaseBuilder().build(),
-                new SrcNxNshc4CaseBuilder().setNxNshc4Dst(Empty.getInstance()).build(),
+                new SrcNxNshc4CaseBuilder().setNxNshc4Dst(Empty.value()).build(),
             },
             {
                 NiciraMatchCodecs.NSH_FLAGS_CODEC.getHeaderWithoutHasMask(),
                 new DstNxNshFlagsCaseBuilder().build(),
-                new DstNxNshFlagsCaseBuilder().setNxNshFlags(Empty.getInstance()).build(),
+                new DstNxNshFlagsCaseBuilder().setNxNshFlags(Empty.value()).build(),
                 new SrcNxNshFlagsCaseBuilder().build(),
-                new SrcNxNshFlagsCaseBuilder().setNxNshFlags(Empty.getInstance()).build(),
+                new SrcNxNshFlagsCaseBuilder().setNxNshFlags(Empty.value()).build(),
             },
             {
                 NiciraMatchCodecs.NSH_TTL_CODEC.getHeaderWithoutHasMask(),
                 new DstNxNshTtlCaseBuilder().build(),
-                new DstNxNshTtlCaseBuilder().setNxNshTtl(Empty.getInstance()).build(),
+                new DstNxNshTtlCaseBuilder().setNxNshTtl(Empty.value()).build(),
                 new SrcNxNshTtlCaseBuilder().build(),
-                new SrcNxNshTtlCaseBuilder().setNxNshTtl(Empty.getInstance()).build(),
+                new SrcNxNshTtlCaseBuilder().setNxNshTtl(Empty.value()).build(),
             },
             {
                 NiciraMatchCodecs.NSH_MDTYPE_CODEC.getHeaderWithoutHasMask(),
                 null,
                 null,
                 new SrcNxNshMdtypeCaseBuilder().build(),
-                new SrcNxNshMdtypeCaseBuilder().setNxNshMdtype(Empty.getInstance()).build(),
+                new SrcNxNshMdtypeCaseBuilder().setNxNshMdtype(Empty.value()).build(),
             },
             {
                 NiciraMatchCodecs.NSH_NP_CODEC.getHeaderWithoutHasMask(),
                 null,
                 null,
                 new SrcNxNshNpCaseBuilder().build(),
-                new SrcNxNshNpCaseBuilder().setNxNshNp(Empty.getInstance()).build(),
+                new SrcNxNshNpCaseBuilder().setNxNshNp(Empty.value()).build(),
             },
             {
                 NiciraMatchCodecs.IP_SRC_CODEC.getHeaderWithoutHasMask(),
                 new DstOfIpSrcCaseBuilder().build(),
-                new DstOfIpSrcCaseBuilder().setOfIpSrc(Empty.getInstance()).build(),
+                new DstOfIpSrcCaseBuilder().setOfIpSrc(Empty.value()).build(),
                 new SrcOfIpSrcCaseBuilder().build(),
-                new SrcOfIpSrcCaseBuilder().setOfIpSrc(Empty.getInstance()).build(),
+                new SrcOfIpSrcCaseBuilder().setOfIpSrc(Empty.value()).build(),
             },
             {
                 NiciraMatchCodecs.IP_DST_CODEC.getHeaderWithoutHasMask(),
                 new DstOfIpDstCaseBuilder().build(),
-                new DstOfIpDstCaseBuilder().setOfIpDst(Empty.getInstance()).build(),
+                new DstOfIpDstCaseBuilder().setOfIpDst(Empty.value()).build(),
                 new SrcOfIpDstCaseBuilder().build(),
-                new SrcOfIpDstCaseBuilder().setOfIpDst(Empty.getInstance()).build(),
+                new SrcOfIpDstCaseBuilder().setOfIpDst(Empty.value()).build(),
             },
             {
                 NiciraMatchCodecs.IPV6_SRC_CODEC.getHeaderWithoutHasMask(),
                 new DstNxIpv6SrcCaseBuilder().build(),
-                new DstNxIpv6SrcCaseBuilder().setNxIpv6Src(Empty.getInstance()).build(),
+                new DstNxIpv6SrcCaseBuilder().setNxIpv6Src(Empty.value()).build(),
                 new SrcNxIpv6SrcCaseBuilder().build(),
-                new SrcNxIpv6SrcCaseBuilder().setNxIpv6Src(Empty.getInstance()).build(),
+                new SrcNxIpv6SrcCaseBuilder().setNxIpv6Src(Empty.value()).build(),
             },
             {
                 NiciraMatchCodecs.IPV6_DST_CODEC.getHeaderWithoutHasMask(),
                 new DstNxIpv6DstCaseBuilder().build(),
-                new DstNxIpv6DstCaseBuilder().setNxIpv6Dst(Empty.getInstance()).build(),
+                new DstNxIpv6DstCaseBuilder().setNxIpv6Dst(Empty.value()).build(),
                 new SrcNxIpv6DstCaseBuilder().build(),
-                new SrcNxIpv6DstCaseBuilder().setNxIpv6Dst(Empty.getInstance()).build(),
+                new SrcNxIpv6DstCaseBuilder().setNxIpv6Dst(Empty.value()).build(),
             },
             {
                 NiciraMatchCodecs.ICMP_TYPE_CODEC.getHeaderWithoutHasMask(),
                 new DstOfIcmpTypeCaseBuilder().build(),
-                new DstOfIcmpTypeCaseBuilder().setOfIcmpType(Empty.getInstance()).build(),
+                new DstOfIcmpTypeCaseBuilder().setOfIcmpType(Empty.value()).build(),
                 null,
                 null
             },

diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/OutputReg2ConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/OutputReg2ConvertorTest.java
index 867d12af4fa09aabbb0432250ade47a8fcdd08e7..a5792d5feb6d81034dadf1c028c8ca0d008a30b3 100644 (file)
--- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/OutputReg2ConvertorTest.java
+++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/OutputReg2ConvertorTest.java
@@ -41,7 +41,7 @@ public class OutputReg2ConvertorTest {
     private static final Uint16 OFS_N_BITS = Uint16.ONE;
     private static final Uint16 MAX_LEN = Uint16.valueOf(2);
     private static final SrcNxTunIdCase SRC_NX_TUN_ID_CASE = new SrcNxTunIdCaseBuilder()
-        .setNxTunId(Empty.getInstance()).build();
+        .setNxTunId(Empty.value()).build();
 
     @Mock
     private NxActionOutputRegNodesNodeGroupBucketsBucketActionsCase actionsCase;

diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestInputMessageFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestInputMessageFactory.java
index 0a375b62fcd3d534a17a850cad5cdc58f7caaceb..89d9a25fcbb5513c3ab43bd8729a4e93032ae379 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestInputMessageFactory.java
+++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestInputMessageFactory.java
@@ -295,7 +295,7 @@ public class MultipartRequestInputMessageFactory
     private static MultipartRequestDescCase setDesc(final ByteBuf input) {
         MultipartRequestDescCaseBuilder caseBuilder = new MultipartRequestDescCaseBuilder();
         MultipartRequestDescBuilder descBuilder = new MultipartRequestDescBuilder();
-        descBuilder.setEmpty(Empty.getInstance());
+        descBuilder.setEmpty(Empty.value());
         caseBuilder.setMultipartRequestDesc(descBuilder.build());
         return caseBuilder.build();
     }
@@ -337,7 +337,7 @@ public class MultipartRequestInputMessageFactory
     private static MultipartRequestPortDescCase setPortDesc(final ByteBuf input) {
         MultipartRequestPortDescCaseBuilder caseBuilder = new MultipartRequestPortDescCaseBuilder();
         MultipartRequestPortDescBuilder portBuilder = new MultipartRequestPortDescBuilder();
-        portBuilder.setEmpty(Empty.getInstance());
+        portBuilder.setEmpty(Empty.value());
         caseBuilder.setMultipartRequestPortDesc(portBuilder.build());
         return caseBuilder.build();
     }
@@ -370,7 +370,7 @@ public class MultipartRequestInputMessageFactory
     private static MultipartRequestGroupDescCase setGroupDesc(final ByteBuf input) {
         MultipartRequestGroupDescCaseBuilder caseBuilder = new MultipartRequestGroupDescCaseBuilder();
         MultipartRequestGroupDescBuilder groupBuilder = new MultipartRequestGroupDescBuilder();
-        groupBuilder.setEmpty(Empty.getInstance());
+        groupBuilder.setEmpty(Empty.value());
         caseBuilder.setMultipartRequestGroupDesc(groupBuilder.build());
         return caseBuilder.build();
     }
@@ -378,7 +378,7 @@ public class MultipartRequestInputMessageFactory
     private static MultipartRequestGroupFeaturesCase setGroupFeatures(final ByteBuf input) {
         MultipartRequestGroupFeaturesCaseBuilder caseBuilder = new MultipartRequestGroupFeaturesCaseBuilder();
         MultipartRequestGroupFeaturesBuilder groupBuilder = new MultipartRequestGroupFeaturesBuilder();
-        groupBuilder.setEmpty(Empty.getInstance());
+        groupBuilder.setEmpty(Empty.value());
         caseBuilder.setMultipartRequestGroupFeatures(groupBuilder.build());
         return caseBuilder.build();
     }
@@ -402,7 +402,7 @@ public class MultipartRequestInputMessageFactory
     private static MultipartRequestMeterFeaturesCase setMeterFeatures(final ByteBuf input) {
         MultipartRequestMeterFeaturesCaseBuilder caseBuilder = new MultipartRequestMeterFeaturesCaseBuilder();
         MultipartRequestMeterFeaturesBuilder meterBuilder = new MultipartRequestMeterFeaturesBuilder();
-        meterBuilder.setEmpty(Empty.getInstance());
+        meterBuilder.setEmpty(Empty.value());
         caseBuilder.setMultipartRequestMeterFeatures(meterBuilder.build());
         return caseBuilder.build();
     }
@@ -410,7 +410,7 @@ public class MultipartRequestInputMessageFactory
     private static MultipartRequestTableCase setTable(final ByteBuf input) {
         MultipartRequestTableCaseBuilder caseBuilder = new MultipartRequestTableCaseBuilder();
         MultipartRequestTableBuilder tableBuilder = new MultipartRequestTableBuilder();
-        tableBuilder.setEmpty(Empty.getInstance());
+        tableBuilder.setEmpty(Empty.value());
         caseBuilder.setMultipartRequestTable(tableBuilder.build());
         return caseBuilder.build();
     }

diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputFactory.java
index 352f6403a2d15455880c71ea41ee8bf7959450b4..e756e031c38282be98226135b90f230a0e347ac5 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputFactory.java
+++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputFactory.java
@@ -126,7 +126,7 @@ public class OF10StatsRequestInputFactory
     private static MultipartRequestTableCase setTable(final ByteBuf input) {
         MultipartRequestTableCaseBuilder caseBuilder = new MultipartRequestTableCaseBuilder();
         MultipartRequestTableBuilder tableBuilder = new MultipartRequestTableBuilder();
-        tableBuilder.setEmpty(Empty.getInstance());
+        tableBuilder.setEmpty(Empty.value());
         caseBuilder.setMultipartRequestTable(tableBuilder.build());
         return caseBuilder.build();
     }
@@ -160,7 +160,7 @@ public class OF10StatsRequestInputFactory
     private static MultipartRequestDescCase setDesc(final ByteBuf input) {
         MultipartRequestDescCaseBuilder caseBuilder = new MultipartRequestDescCaseBuilder();
         MultipartRequestDescBuilder descBuilder = new MultipartRequestDescBuilder();
-        descBuilder.setEmpty(Empty.getInstance());
+        descBuilder.setEmpty(Empty.value());
         caseBuilder.setMultipartRequestDesc(descBuilder.build());
         return caseBuilder.build();
     }

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestDescInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestDescInputMessageFactoryTest.java
index 1b3dae9ac26e6c09153ae759b63885d718372946..f15c6f04520b5d58feec17ba5fc73f47c465f5fe 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestDescInputMessageFactoryTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartRequestDescInputMessageFactoryTest.java
@@ -56,7 +56,7 @@ public class MultipartRequestDescInputMessageFactoryTest {
     private static MultipartRequestDescCase createRequestDesc() {
         MultipartRequestDescCaseBuilder caseBuilder = new MultipartRequestDescCaseBuilder();
         MultipartRequestDescBuilder builder = new MultipartRequestDescBuilder();
-        builder.setEmpty(Empty.getInstance());
+        builder.setEmpty(Empty.value());
         caseBuilder.setMultipartRequestDesc(builder.build());
         return caseBuilder.build();
     }

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputDescFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputDescFactoryTest.java
index a1d609b97d305478b436f0afed92aed98b9fc77d..95ee70b47caa64d4d4f7ebd235f7507b3742cfd2 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputDescFactoryTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputDescFactoryTest.java
@@ -54,7 +54,7 @@ public class OF10StatsRequestInputDescFactoryTest {
     private static MultipartRequestBody createMultipartRequestBody() {
         MultipartRequestDescCaseBuilder caseBuilder = new MultipartRequestDescCaseBuilder();
         MultipartRequestDescBuilder descBuilder = new MultipartRequestDescBuilder();
-        descBuilder.setEmpty(Empty.getInstance());
+        descBuilder.setEmpty(Empty.value());
         caseBuilder.setMultipartRequestDesc(descBuilder.build());
         return caseBuilder.build();
     }

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputTableFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputTableFactoryTest.java
index a65ea4b824a087002d21fa10f12cd0bf5001dc78..4179c1c31edf52745116c455892ea0024c443a6f 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputTableFactoryTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsRequestInputTableFactoryTest.java
@@ -54,7 +54,7 @@ public class OF10StatsRequestInputTableFactoryTest {
     private static MultipartRequestBody createMultipartRequestBody() {
         MultipartRequestTableCaseBuilder caseBuilder = new MultipartRequestTableCaseBuilder();
         MultipartRequestTableBuilder tableBuilder = new MultipartRequestTableBuilder();
-        tableBuilder.setEmpty(Empty.getInstance());
+        tableBuilder.setEmpty(Empty.value());
         caseBuilder.setMultipartRequestTable(tableBuilder.build());
         return caseBuilder.build();
     }

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestGroupDescTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestGroupDescTest.java
index b43359c06ca19e62ee7f9ca372cb89cdd6b6b2bf..ad370e29778772601f2a5568f85f8a4ff9927835 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestGroupDescTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestGroupDescTest.java
@@ -59,7 +59,7 @@ public class MultipartRequestGroupDescTest {
         builder.setFlags(new MultipartRequestFlags(false));
         MultipartRequestGroupDescCaseBuilder caseBuilder = new MultipartRequestGroupDescCaseBuilder();
         MultipartRequestGroupDescBuilder descBuilder = new MultipartRequestGroupDescBuilder();
-        descBuilder.setEmpty(Empty.getInstance());
+        descBuilder.setEmpty(Empty.value());
         caseBuilder.setMultipartRequestGroupDesc(descBuilder.build());
         builder.setMultipartRequestBody(caseBuilder.build());
         MultipartRequestInput message = builder.build();

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestGroupFeaturesTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestGroupFeaturesTest.java
index f7ae42eb979bb02eaa710dbcf39fc95463e845aa..6cfc1b15942852b678ecedd507ef1a8d3f1b553b 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestGroupFeaturesTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestGroupFeaturesTest.java
@@ -59,7 +59,7 @@ public class MultipartRequestGroupFeaturesTest {
         builder.setFlags(new MultipartRequestFlags(false));
         MultipartRequestGroupFeaturesCaseBuilder caseBuilder = new MultipartRequestGroupFeaturesCaseBuilder();
         MultipartRequestGroupFeaturesBuilder featuresBuilder = new MultipartRequestGroupFeaturesBuilder();
-        featuresBuilder.setEmpty(Empty.getInstance());
+        featuresBuilder.setEmpty(Empty.value());
         caseBuilder.setMultipartRequestGroupFeatures(featuresBuilder.build());
         builder.setMultipartRequestBody(caseBuilder.build());
         MultipartRequestInput message = builder.build();

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestMeterFeaturesTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestMeterFeaturesTest.java
index 0088798884e97ed790fc59279b0736a76d0595ff..53665cadaa9e6e86c3a2103d42187ccc503e2659 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestMeterFeaturesTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestMeterFeaturesTest.java
@@ -59,7 +59,7 @@ public class MultipartRequestMeterFeaturesTest {
         builder.setFlags(new MultipartRequestFlags(false));
         MultipartRequestMeterFeaturesCaseBuilder caseBuilder = new MultipartRequestMeterFeaturesCaseBuilder();
         MultipartRequestMeterFeaturesBuilder featuresBuilder = new MultipartRequestMeterFeaturesBuilder();
-        featuresBuilder.setEmpty(Empty.getInstance());
+        featuresBuilder.setEmpty(Empty.value());
         caseBuilder.setMultipartRequestMeterFeatures(featuresBuilder.build());
         builder.setMultipartRequestBody(caseBuilder.build());
         MultipartRequestInput message = builder.build();

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestPortDescTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestPortDescTest.java
index bb1cf33f535480dd3f61cc21f75dc5be3a4bf08f..f7062adbf6dc8ee08916eee973ec9cadffdcba95 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestPortDescTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestPortDescTest.java
@@ -59,7 +59,7 @@ public class MultipartRequestPortDescTest {
         builder.setFlags(new MultipartRequestFlags(false));
         MultipartRequestPortDescCaseBuilder caseBuilder = new MultipartRequestPortDescCaseBuilder();
         MultipartRequestPortDescBuilder descBuilder = new MultipartRequestPortDescBuilder();
-        descBuilder.setEmpty(Empty.getInstance());
+        descBuilder.setEmpty(Empty.value());
         caseBuilder.setMultipartRequestPortDesc(descBuilder.build());
         builder.setMultipartRequestBody(caseBuilder.build());
         MultipartRequestInput message = builder.build();

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestTableTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestTableTest.java
index 34ee0991a12a775aad0885d228f467ea4b3f349a..945e88c04d18b7b35903e3b51f62127d3cfa06bd 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestTableTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestTableTest.java
@@ -59,7 +59,7 @@ public class MultipartRequestTableTest {
         builder.setFlags(new MultipartRequestFlags(false));
         MultipartRequestTableCaseBuilder caseBuilder = new MultipartRequestTableCaseBuilder();
         MultipartRequestTableBuilder tablesBuilder = new MultipartRequestTableBuilder();
-        tablesBuilder.setEmpty(Empty.getInstance());
+        tablesBuilder.setEmpty(Empty.value());
         caseBuilder.setMultipartRequestTable(tablesBuilder.build());
         builder.setMultipartRequestBody(caseBuilder.build());
         MultipartRequestInput message = builder.build();

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/VlanVidEntrySerializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/VlanVidEntrySerializer.java
index dd5c754cdde1fb30da57882198e643268fe83bd2..5638a2a95d8928228879d19645721e7552f84466 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/VlanVidEntrySerializer.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/VlanVidEntrySerializer.java
@@ -30,7 +30,7 @@ public class VlanVidEntrySerializer extends AbstractMatchEntrySerializer<VlanId,
     @Override
     protected Empty extractEntryMask(final VlanId entry) {
         return Boolean.TRUE.equals(entry.getVlanIdPresent())
-                && (entry.getVlanId() == null || entry.getVlanId().getValue().shortValue() == 0) ? Empty.getInstance()
+                && (entry.getVlanId() == null || entry.getVlanId().getValue().shortValue() == 0) ? Empty.value()
                         : null;
     }
 

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightFlowTableStatisticsServiceImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightFlowTableStatisticsServiceImpl.java
index dca8421c1679c98c4795ab7035979934265b4490..fbd7825ed0dea5f210df69fb757ced9fa0694fbb 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightFlowTableStatisticsServiceImpl.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightFlowTableStatisticsServiceImpl.java
@@ -70,7 +70,7 @@ public final class OpendaylightFlowTableStatisticsServiceImpl extends
         final MultipartRequestTableCaseBuilder multipartRequestTableCaseBuilder =
                 new MultipartRequestTableCaseBuilder();
         final MultipartRequestTableBuilder multipartRequestTableBuilder = new MultipartRequestTableBuilder();
-        multipartRequestTableBuilder.setEmpty(Empty.getInstance());
+        multipartRequestTableBuilder.setEmpty(Empty.value());
         multipartRequestTableCaseBuilder.setMultipartRequestTable(multipartRequestTableBuilder.build());
 
         // Set request body to main multipart request