mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-22 21:01:00 +02:00
Code Issues Projects Releases Wiki Activity

Remove methods deprecated in Drake from TrafficSelector API

Browse Source 
Change-Id: I0b4919361615175391ab497a16e539f3205fada2
This commit is contained in:
Ray Milkey 2016-02-22 14:20:48 -08:00 committed by Gerrit Code Review
parent 28e039b20a
commit 46b67ae6d3
2 changed files with 0 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficSelector.java
View File

@ -238,85 +238,31 @@ public final class DefaultTrafficSelector implements TrafficSelector {
return add(Criteria.matchIPDst(ip)); return add(Criteria.matchIPDst(ip));
} }
/**
* @deprecated 1.3.0 Drake Release
*/
@Deprecated
@Override
public Builder matchTcpSrc(short tcpPort) {
return matchTcpSrc(TpPort.tpPort(tcpPort));
}
@Override @Override
public Builder matchTcpSrc(TpPort tcpPort) { public Builder matchTcpSrc(TpPort tcpPort) {
return add(Criteria.matchTcpSrc(tcpPort)); return add(Criteria.matchTcpSrc(tcpPort));
} }
/**
* @deprecated 1.3.0 Drake Release
*/
@Deprecated
@Override
public Builder matchTcpDst(short tcpPort) {
return matchTcpDst(TpPort.tpPort(tcpPort));
}
@Override @Override
public Builder matchTcpDst(TpPort tcpPort) { public Builder matchTcpDst(TpPort tcpPort) {
return add(Criteria.matchTcpDst(tcpPort)); return add(Criteria.matchTcpDst(tcpPort));
} }
/**
* @deprecated 1.3.0 Drake Release
*/
@Deprecated
@Override
public Builder matchUdpSrc(short udpPort) {
return matchUdpSrc(TpPort.tpPort(udpPort));
}
@Override @Override
public Builder matchUdpSrc(TpPort udpPort) { public Builder matchUdpSrc(TpPort udpPort) {
return add(Criteria.matchUdpSrc(udpPort)); return add(Criteria.matchUdpSrc(udpPort));
} }
/**
* @deprecated 1.3.0 Drake Release
*/
@Deprecated
@Override
public Builder matchUdpDst(short udpPort) {
return matchUdpDst(TpPort.tpPort(udpPort));
}
@Override @Override
public Builder matchUdpDst(TpPort udpPort) { public Builder matchUdpDst(TpPort udpPort) {
return add(Criteria.matchUdpDst(udpPort)); return add(Criteria.matchUdpDst(udpPort));
} }
/**
* @deprecated 1.3.0 Drake Release
*/
@Deprecated
@Override
public Builder matchSctpSrc(short sctpPort) {
return matchSctpSrc(TpPort.tpPort(sctpPort));
}
@Override @Override
public Builder matchSctpSrc(TpPort sctpPort) { public Builder matchSctpSrc(TpPort sctpPort) {
return add(Criteria.matchSctpSrc(sctpPort)); return add(Criteria.matchSctpSrc(sctpPort));
} }
/**
* @deprecated 1.3.0 Drake Release
*/
@Deprecated
@Override
public Builder matchSctpDst(short sctpPort) {
return matchSctpDst(TpPort.tpPort(sctpPort));
}
@Override @Override
public Builder matchSctpDst(TpPort sctpPort) { public Builder matchSctpDst(TpPort sctpPort) {
return add(Criteria.matchSctpDst(sctpPort)); return add(Criteria.matchSctpDst(sctpPort));

60
core/api/src/main/java/org/onosproject/net/flow/TrafficSelector.java
View File

@ -202,16 +202,6 @@ public interface TrafficSelector {
*/ */
Builder matchIPDst(IpPrefix ip); Builder matchIPDst(IpPrefix ip);
/**
* Matches a TCP source port number.
*
* @param tcpPort a TCP source port number
* @return a selection builder
* @deprecated in Drake release
*/
@Deprecated
Builder matchTcpSrc(short tcpPort);
/** /**
* Matches a TCP source port number. * Matches a TCP source port number.
* *
@ -220,16 +210,6 @@ public interface TrafficSelector {
*/ */
Builder matchTcpSrc(TpPort tcpPort); Builder matchTcpSrc(TpPort tcpPort);
/**
* Matches a TCP destination port number.
*
* @param tcpPort a TCP destination port number
* @return a selection builder
* @deprecated in Drake release
*/
@Deprecated
Builder matchTcpDst(short tcpPort);
/** /**
* Matches a TCP destination port number. * Matches a TCP destination port number.
* *
@ -238,16 +218,6 @@ public interface TrafficSelector {
*/ */
Builder matchTcpDst(TpPort tcpPort); Builder matchTcpDst(TpPort tcpPort);
/**
* Matches an UDP source port number.
*
* @param udpPort an UDP source port number
* @return a selection builder
* @deprecated in Drake release
*/
@Deprecated
Builder matchUdpSrc(short udpPort);
/** /**
* Matches an UDP source port number. * Matches an UDP source port number.
* *
@ -256,16 +226,6 @@ public interface TrafficSelector {
*/ */
Builder matchUdpSrc(TpPort udpPort); Builder matchUdpSrc(TpPort udpPort);
/**
* Matches an UDP destination port number.
*
* @param udpPort an UDP destination port number
* @return a selection builder
* @deprecated in Drake release
*/
@Deprecated
Builder matchUdpDst(short udpPort);
/** /**
* Matches an UDP destination port number. * Matches an UDP destination port number.
* *
@ -274,16 +234,6 @@ public interface TrafficSelector {
*/ */
Builder matchUdpDst(TpPort udpPort); Builder matchUdpDst(TpPort udpPort);
/**
* Matches a SCTP source port number.
*
* @param sctpPort a SCTP source port number
* @return a selection builder
* @deprecated in Drake release
*/
@Deprecated
Builder matchSctpSrc(short sctpPort);
/** /**
* Matches a SCTP source port number. * Matches a SCTP source port number.
* *
@ -292,16 +242,6 @@ public interface TrafficSelector {
*/ */
Builder matchSctpSrc(TpPort sctpPort); Builder matchSctpSrc(TpPort sctpPort);
/**
* Matches a SCTP destination port number.
*
* @param sctpPort a SCTP destination port number
* @return a selection builder
* @deprecated in Drake release
*/
@Deprecated
Builder matchSctpDst(short sctpPort);
/** /**
* Matches a SCTP destination port number. * Matches a SCTP destination port number.
* *