commit 84d5a29b29b703768bd04baa4b50375e79ecfebf
author Ray Milkey <ray@onlab.us> Mon Feb 22 14:04:01 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Tue Feb 23 00:33:51 2016 +0000
tree ccd610f644ecd0fc5343de95f78c7e8eabd9dc91
parent 2be39edc6d145f7243a53513b2f9c66a72425ce7

Remove methods deprecated in Drake from TrafficTreatment API

Change-Id: I9de9331611c79ae60195c738ee1d3912f4081e3d

core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficTreatment.java

diff --git a/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficTreatment.java b/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficTreatment.java
index b490f85..6adf615 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficTreatment.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficTreatment.java
@@ -15,8 +15,6 @@
  */
 package org.onosproject.net.flow;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import java.util.List;
 import java.util.Objects;
 
@@ -28,7 +26,6 @@
 import org.onlab.packet.VlanId;
 import org.onosproject.core.GroupId;
 import org.onosproject.net.DeviceId;
-import org.onosproject.net.IndexedLambda;
 import org.onosproject.net.PortNumber;
 import org.onosproject.net.flow.instructions.ExtensionTreatment;
 import org.onosproject.net.flow.instructions.Instruction;
@@ -39,6 +36,8 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Default traffic treatment implementation.
  */
@@ -351,11 +350,6 @@
         }
 
         @Override
-        public Builder popMpls(int etherType) {
-            return add(Instructions.popMpls(new EthType(etherType)));
-        }
-
-        @Override
         public Builder popMpls(EthType etherType) {
             return add(Instructions.popMpls(etherType));
         }
@@ -375,14 +369,6 @@
             return add(Instructions.decMplsTtl());
         }
 
-        @Deprecated
-        @Override
-        /**
-         * @deprecated 1.3.0 Drake Release
-         */
-        public Builder setLambda(short lambda) {
-            return add(Instructions.modL0Lambda(new IndexedLambda(lambda)));
-        }
 
         @Override
         public Builder group(GroupId groupId) {
@@ -447,57 +433,21 @@
             return add(Instructions.modTunnelId(tunnelId));
         }
 
-        @Deprecated
-        @Override
-        /**
-         * @deprecated 1.3.0 Drake Release
-         */
-        public TrafficTreatment.Builder setTcpSrc(short port) {
-            return setTcpSrc(TpPort.tpPort(port));
-        }
-
         @Override
         public TrafficTreatment.Builder setTcpSrc(TpPort port) {
             return add(Instructions.modTcpSrc(port));
         }
 
-        @Deprecated
-        @Override
-        /**
-         * @deprecated 1.3.0 Drake Release
-         */
-        public TrafficTreatment.Builder setTcpDst(short port) {
-            return setTcpDst(TpPort.tpPort(port));
-        }
-
         @Override
         public TrafficTreatment.Builder setTcpDst(TpPort port) {
             return add(Instructions.modTcpDst(port));
         }
 
-        @Deprecated
-        @Override
-        /**
-         * @deprecated 1.3.0 Drake Release
-         */
-        public TrafficTreatment.Builder setUdpSrc(short port) {
-            return setUdpSrc(TpPort.tpPort(port));
-        }
-
         @Override
         public TrafficTreatment.Builder setUdpSrc(TpPort port) {
             return add(Instructions.modUdpSrc(port));
         }
 
-        @Deprecated
-        @Override
-        /**
-         * @deprecated 1.3.0 Drake Release
-         */
-        public TrafficTreatment.Builder setUdpDst(short port) {
-            return setUdpDst(TpPort.tpPort(port));
-        }
-
         @Override
         public TrafficTreatment.Builder setUdpDst(TpPort port) {
             return add(Instructions.modUdpDst(port));