Remove use of deprecated methods regarding TCP/UDP/SCTP ports

Change-Id: I165b3b765ca6b712684604399976f6987ce83291

@@ -212,7 +212,7 @@ public final class DefaultTrafficSelector implements TrafficSelector {
         @Deprecated
         @Deprecated
         @Override
         @Override
         public Builder matchTcpSrc(short tcpPort) {
         public Builder matchTcpSrc(short tcpPort) {
-            return add(Criteria.matchTcpSrc(tcpPort));
+            return matchTcpSrc(TpPort.tpPort(tcpPort));
         }
         }
 
 
         @Override
         @Override
@@ -223,7 +223,7 @@ public final class DefaultTrafficSelector implements TrafficSelector {
         @Deprecated
         @Deprecated
         @Override
         @Override
         public Builder matchTcpDst(short tcpPort) {
         public Builder matchTcpDst(short tcpPort) {
-            return add(Criteria.matchTcpDst(tcpPort));
+            return matchTcpDst(TpPort.tpPort(tcpPort));
         }
         }
 
 
         @Override
         @Override
@@ -234,7 +234,7 @@ public final class DefaultTrafficSelector implements TrafficSelector {
         @Deprecated
         @Deprecated
         @Override
         @Override
         public Builder matchUdpSrc(short udpPort) {
         public Builder matchUdpSrc(short udpPort) {
-            return add(Criteria.matchUdpSrc(udpPort));
+            return matchUdpSrc(TpPort.tpPort(udpPort));
         }
         }
 
 
         @Override
         @Override
@@ -245,7 +245,7 @@ public final class DefaultTrafficSelector implements TrafficSelector {
         @Deprecated
         @Deprecated
         @Override
         @Override
         public Builder matchUdpDst(short udpPort) {
         public Builder matchUdpDst(short udpPort) {
-            return add(Criteria.matchUdpDst(udpPort));
+            return matchUdpDst(TpPort.tpPort(udpPort));
         }
         }
 
 
         @Override
         @Override
@@ -256,7 +256,7 @@ public final class DefaultTrafficSelector implements TrafficSelector {
         @Deprecated
         @Deprecated
         @Override
         @Override
         public Builder matchSctpSrc(short sctpPort) {
         public Builder matchSctpSrc(short sctpPort) {
-            return add(Criteria.matchSctpSrc(sctpPort));
+            return matchSctpSrc(TpPort.tpPort(sctpPort));
         }
         }
 
 
         @Override
         @Override
@@ -267,7 +267,7 @@ public final class DefaultTrafficSelector implements TrafficSelector {
         @Deprecated
         @Deprecated
         @Override
         @Override
         public Builder matchSctpDst(short sctpPort) {
         public Builder matchSctpDst(short sctpPort) {
-            return add(Criteria.matchSctpDst(sctpPort));
+            return matchSctpDst(TpPort.tpPort(sctpPort));
         }
         }
 
 
         @Override
         @Override

@@ -420,7 +420,7 @@ public final class DefaultTrafficTreatment implements TrafficTreatment {
         @Deprecated
         @Deprecated
         @Override
         @Override
         public TrafficTreatment.Builder setTcpSrc(short port) {
         public TrafficTreatment.Builder setTcpSrc(short port) {
-            return add(Instructions.modTcpSrc(port));
+            return setTcpSrc(TpPort.tpPort(port));
         }
         }
 
 
         @Override
         @Override
@@ -431,7 +431,7 @@ public final class DefaultTrafficTreatment implements TrafficTreatment {
         @Deprecated
         @Deprecated
         @Override
         @Override
         public TrafficTreatment.Builder setTcpDst(short port) {
         public TrafficTreatment.Builder setTcpDst(short port) {
-            return add(Instructions.modTcpDst(port));
+            return setTcpDst(TpPort.tpPort(port));
         }
         }
 
 
         @Override
         @Override
@@ -442,7 +442,7 @@ public final class DefaultTrafficTreatment implements TrafficTreatment {
         @Deprecated
         @Deprecated
         @Override
         @Override
         public TrafficTreatment.Builder setUdpSrc(short port) {
         public TrafficTreatment.Builder setUdpSrc(short port) {
-            return add(Instructions.modUdpSrc(port));
+            return setUdpSrc(TpPort.tpPort(port));
         }
         }
 
 
         @Override
         @Override
@@ -453,7 +453,7 @@ public final class DefaultTrafficTreatment implements TrafficTreatment {
         @Deprecated
         @Deprecated
         @Override
         @Override
         public TrafficTreatment.Builder setUdpDst(short port) {
         public TrafficTreatment.Builder setUdpDst(short port) {
-            return add(Instructions.modUdpDst(port));
+            return setUdpDst(TpPort.tpPort(port));
         }
         }
 
 
         @Override
         @Override