Merge "Introducing the Modification classses"

[controller.git] / opendaylight / sal / api / src / main / java / org / opendaylight / controller / sal / packet / UDP.java

diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/UDP.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/UDP.java
index 52827d55c6bf7430c96f0ce38e9f65ad42f0da7f..069a277f89d9ee44df2e4ca22d9783fb9b9a6404 100644 (file)
--- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/UDP.java
+++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/UDP.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright (c) 2013-2014 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@ -13,15 +13,13 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
+import org.opendaylight.controller.sal.match.Match;
+import org.opendaylight.controller.sal.match.MatchType;
 
 /**
  * Class that represents the UDP datagram objects
- *
- *
  */
 
 public class UDP extends Packet {
@@ -67,7 +65,7 @@ public class UDP extends Packet {
         setChecksum((short) 0);
     }
 
-    private Map<String, byte[]> fieldValues;
+    private final Map<String, byte[]> fieldValues;
 
     /* public static Map<Short, Class<? extends Packet>> decodeMap;
 
@@ -113,9 +111,6 @@ public class UDP extends Packet {
      * Store the value read from data stream in hdrFieldMap
      */
     public void setHeaderField(String headerField, byte[] readValue) {
-        /*if (headerField.equals("Protocol")) {
-               payloadClass = decodeMap.get(readValue);
-        }*/
         hdrFieldsMap.put(headerField, readValue);
     }
 
@@ -165,12 +160,8 @@ public class UDP extends Packet {
     }
 
     @Override
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return EqualsBuilder.reflectionEquals(this, obj);
+    public void populateMatch(Match match) {
+        match.setField(MatchType.TP_SRC, this.getSourcePort());
+        match.setField(MatchType.TP_DST, this.getDestinationPort());
     }
 }