Merge "Removed useless method"

diff --combined openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImpl.java
index 8fc0181030d0ab018669a8cebe9fbdc90d2bb53f,7a7f87454f1e5d08a2423836bd2d9f380fc00eae..352aa6cc0c94a805de2cf338feac7dc6442f943f
--- 1/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImpl.java
--- 2/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImpl.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImpl.java
@@@ -10,13 -10,12 +10,13 @@@ package org.opendaylight.openflowplugin
  
  import static org.opendaylight.openflowjava.util.ByteBufUtils.macAddressToString;
  
 +import com.google.common.base.Optional;
  import java.math.BigInteger;
  import java.nio.ByteBuffer;
  import java.util.ArrayList;
  import java.util.Iterator;
  import java.util.List;
 -
 +import javax.annotation.Nonnull;
  import org.opendaylight.openflowjava.util.ByteBufUtils;
  import org.opendaylight.openflowplugin.api.OFConstants;
  import org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion;
@@@ -37,6 -36,7 +37,6 @@@ import org.opendaylight.yang.gen.v1.urn
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.MacAddress;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.field._case.SetField;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.field._case.SetFieldBuilder;
 -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.Match;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.MatchBuilder;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.arp.match.fields.ArpSourceHardwareAddress;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.arp.match.fields.ArpSourceHardwareAddressBuilder;
@@@ -264,6 -264,8 +264,6 @@@ import org.opendaylight.yang.gen.v1.urn
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
 -import com.google.common.base.Optional;
 -
  /**
   * Utility class for converting a MD-SAL Flow into the OF flow mod
   */
@@@ -916,7 -918,7 +916,7 @@@ public class MatchConvertorImpl impleme
       * @return
       * @author avishnoi@in.ibm.com
       */
 -    public static Match fromOFMatchV10ToSALMatch(final MatchV10 swMatch, final BigInteger datapathid, final OpenflowVersion ofVersion) {
 +    public static MatchBuilder fromOFMatchV10ToSALMatch(@Nonnull final MatchV10 swMatch, @Nonnull final BigInteger datapathid, @Nonnull final OpenflowVersion ofVersion) {
          MatchBuilder matchBuilder = new MatchBuilder();
          EthernetMatchBuilder ethMatchBuilder = new EthernetMatchBuilder();
          VlanMatchBuilder vlanMatchBuilder = new VlanMatchBuilder();
@@@ -1066,7 -1068,7 +1066,7 @@@
              matchBuilder.setIpMatch(ipMatchBuilder.build());
          }
  
 -        return matchBuilder.build();
 +        return matchBuilder;
      }
  
      /**
@@@ -1081,8 -1083,8 +1081,8 @@@
       * @author avishnoi@in.ibm.com
       */
      public static MatchBuilder fromOFMatchToSALMatch(
 -            final org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match swMatch,
 -            final BigInteger datapathid, final OpenflowVersion ofVersion) {
 +            @Nonnull final org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match swMatch,
 +            @Nonnull final BigInteger datapathid, @Nonnull final OpenflowVersion ofVersion) {
          return OfMatchToSALMatchConvertor(swMatch.getMatchEntry(), datapathid, ofVersion);
      }
  
@@@ -1764,33 -1766,6 +1764,6 @@@
          return matchEntryBuilder.build();
      }
  
-     private static MatchEntry toOfVlanVid(final VlanId vlanId) {
-         // TODO: verify
-         boolean hasmask = false;
-         boolean setCfiBit = false;
-         Integer vidEntryValue = 0;
-         MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
-         matchEntryBuilder.setOxmClass(OpenflowBasicClass.class);
-         matchEntryBuilder.setOxmMatchField(VlanVid.class);
-         VlanVidCaseBuilder vlanVidCaseBuilder = new VlanVidCaseBuilder();
-         VlanVidBuilder vlanVidBuilder = new VlanVidBuilder();
-         if (Boolean.TRUE.equals(vlanId.isVlanIdPresent())) {
-             setCfiBit = true;
-             if (vlanId.getVlanId() != null) {
-                 vidEntryValue = vlanId.getVlanId().getValue();
-             }
-             hasmask = (vidEntryValue == 0);
-         }
-         vlanVidBuilder.setCfiBit(setCfiBit);
-         vlanVidBuilder.setVlanVid(vidEntryValue);
-         if (hasmask) {
-             vlanVidBuilder.setMask(VLAN_VID_MASK);
-         }
-         vlanVidCaseBuilder.setVlanVid(vlanVidBuilder.build());
-         matchEntryBuilder.setMatchEntryValue(vlanVidCaseBuilder.build());
-         matchEntryBuilder.setHasMask(hasmask);
-         return matchEntryBuilder.build();
-     }
  
      private static MatchEntry toOfIpProto(final Short ipProtocol) {
          MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();