commit a0c9db25e5f607fd7d6d7ab855fc80c95f6e167a
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Mon Feb 22 14:51:40 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Mon Feb 22 23:49:06 2016 +0000
tree 81014c782bf5cb31e8ae898885277dec512d89ba
parent 7266738e70bed4ce462bfeb20c41b4ffb81967e9

Remove methods deprecated in Drake from Instructions

Change-Id: I69ffc7fc30f20e0d968fe95b0cfcf609a0c7cc29

core/api/src/main/java/org/onosproject/net/flow/instructions/Instructions.java

diff --git a/core/api/src/main/java/org/onosproject/net/flow/instructions/Instructions.java b/core/api/src/main/java/org/onosproject/net/flow/instructions/Instructions.java
index 4d0256f..878d654 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/instructions/Instructions.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/instructions/Instructions.java
@@ -430,19 +430,6 @@
      *
      * @param port the TCP port number to modify to
      * @return a L4 modification
-     * @deprecated in Drake release
-     */
-    @Deprecated
-    public static L4ModificationInstruction modTcpSrc(short port) {
-       checkNotNull(port, "Src TCP port cannot be null");
-       return new ModTransportPortInstruction(L4SubType.TCP_SRC, TpPort.tpPort(port));
-    }
-
-    /**
-     * Creates a TCP src modification.
-     *
-     * @param port the TCP port number to modify to
-     * @return a L4 modification
      */
     public static L4ModificationInstruction modTcpSrc(TpPort port) {
        checkNotNull(port, "Src TCP port cannot be null");
@@ -454,19 +441,6 @@
      *
      * @param port the TCP port number to modify to
      * @return a L4 modification
-     * @deprecated in Drake release
-     */
-    @Deprecated
-    public static L4ModificationInstruction modTcpDst(short port) {
-        checkNotNull(port, "Dst TCP port cannot be null");
-        return new ModTransportPortInstruction(L4SubType.TCP_DST, TpPort.tpPort(port));
-    }
-
-    /**
-     * Creates a TCP dst modification.
-     *
-     * @param port the TCP port number to modify to
-     * @return a L4 modification
      */
     public static L4ModificationInstruction modTcpDst(TpPort port) {
         checkNotNull(port, "Dst TCP port cannot be null");
@@ -478,19 +452,6 @@
      *
      * @param port the UDP port number to modify to
      * @return a L4 modification
-     * @deprecated in Drake release
-     */
-    @Deprecated
-    public static L4ModificationInstruction modUdpSrc(short port) {
-        checkNotNull(port, "Src UDP port cannot be null");
-        return new ModTransportPortInstruction(L4SubType.UDP_SRC, TpPort.tpPort(port));
-    }
-
-    /**
-     * Creates a UDP src modification.
-     *
-     * @param port the UDP port number to modify to
-     * @return a L4 modification
      */
     public static L4ModificationInstruction modUdpSrc(TpPort port) {
         checkNotNull(port, "Src UDP port cannot be null");
@@ -502,19 +463,6 @@
      *
      * @param port the UDP port number to modify to
      * @return a L4 modification
-     * @deprecated in Drake release
-     */
-    @Deprecated
-    public static L4ModificationInstruction modUdpDst(short port) {
-        checkNotNull(port, "Dst UDP port cannot be null");
-        return new ModTransportPortInstruction(L4SubType.UDP_DST, TpPort.tpPort(port));
-    }
-
-    /**
-     * Creates a UDP dst modification.
-     *
-     * @param port the UDP port number to modify to
-     * @return a L4 modification
      */
     public static L4ModificationInstruction modUdpDst(TpPort port) {
         checkNotNull(port, "Dst UDP port cannot be null");