홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Ray Milkey
Committed by Gerrit Code Review
46b67ae6 1 parent 28e039b2

Remove methods deprecated in Drake from TrafficSelector API 

Change-Id: I0b4919361615175391ab497a16e539f3205fada2
Inline Side-by-side
Showing 2 changed files with 0 additions and 114 deletions
...@@ -238,85 +238,31 @@ public final class DefaultTrafficSelector implements TrafficSelector { ...@@ -238,85 +238,31 @@ public final class DefaultTrafficSelector implements TrafficSelector {
238 return add(Criteria.matchIPDst(ip)); 238 return add(Criteria.matchIPDst(ip));
239 } 239 }
240 240
241 - /**
242 - * @deprecated 1.3.0 Drake Release
243 - */
244 - @Deprecated
245 - @Override
246 - public Builder matchTcpSrc(short tcpPort) {
247 - return matchTcpSrc(TpPort.tpPort(tcpPort));
248 - }
249 -
250 @Override 241 @Override
251 public Builder matchTcpSrc(TpPort tcpPort) { 242 public Builder matchTcpSrc(TpPort tcpPort) {
252 return add(Criteria.matchTcpSrc(tcpPort)); 243 return add(Criteria.matchTcpSrc(tcpPort));
253 } 244 }
254 245
255 - /**
256 - * @deprecated 1.3.0 Drake Release
257 - */
258 - @Deprecated
259 - @Override
260 - public Builder matchTcpDst(short tcpPort) {
261 - return matchTcpDst(TpPort.tpPort(tcpPort));
262 - }
263 -
264 @Override 246 @Override
265 public Builder matchTcpDst(TpPort tcpPort) { 247 public Builder matchTcpDst(TpPort tcpPort) {
266 return add(Criteria.matchTcpDst(tcpPort)); 248 return add(Criteria.matchTcpDst(tcpPort));
267 } 249 }
268 250
269 - /**
270 - * @deprecated 1.3.0 Drake Release
271 - */
272 - @Deprecated
273 - @Override
274 - public Builder matchUdpSrc(short udpPort) {
275 - return matchUdpSrc(TpPort.tpPort(udpPort));
276 - }
277 -
278 @Override 251 @Override
279 public Builder matchUdpSrc(TpPort udpPort) { 252 public Builder matchUdpSrc(TpPort udpPort) {
280 return add(Criteria.matchUdpSrc(udpPort)); 253 return add(Criteria.matchUdpSrc(udpPort));
281 } 254 }
282 255
283 - /**
284 - * @deprecated 1.3.0 Drake Release
285 - */
286 - @Deprecated
287 - @Override
288 - public Builder matchUdpDst(short udpPort) {
289 - return matchUdpDst(TpPort.tpPort(udpPort));
290 - }
291 -
292 @Override 256 @Override
293 public Builder matchUdpDst(TpPort udpPort) { 257 public Builder matchUdpDst(TpPort udpPort) {
294 return add(Criteria.matchUdpDst(udpPort)); 258 return add(Criteria.matchUdpDst(udpPort));
295 } 259 }
296 260
297 - /**
298 - * @deprecated 1.3.0 Drake Release
299 - */
300 - @Deprecated
301 - @Override
302 - public Builder matchSctpSrc(short sctpPort) {
303 - return matchSctpSrc(TpPort.tpPort(sctpPort));
304 - }
305 -
306 @Override 261 @Override
307 public Builder matchSctpSrc(TpPort sctpPort) { 262 public Builder matchSctpSrc(TpPort sctpPort) {
308 return add(Criteria.matchSctpSrc(sctpPort)); 263 return add(Criteria.matchSctpSrc(sctpPort));
309 } 264 }
310 265
311 - /**
312 - * @deprecated 1.3.0 Drake Release
313 - */
314 - @Deprecated
315 - @Override
316 - public Builder matchSctpDst(short sctpPort) {
317 - return matchSctpDst(TpPort.tpPort(sctpPort));
318 - }
319 -
320 @Override 266 @Override
321 public Builder matchSctpDst(TpPort sctpPort) { 267 public Builder matchSctpDst(TpPort sctpPort) {
322 return add(Criteria.matchSctpDst(sctpPort)); 268 return add(Criteria.matchSctpDst(sctpPort));
......
...@@ -207,16 +207,6 @@ public interface TrafficSelector { ...@@ -207,16 +207,6 @@ public interface TrafficSelector {
207 * 207 *
208 * @param tcpPort a TCP source port number 208 * @param tcpPort a TCP source port number
209 * @return a selection builder 209 * @return a selection builder
210 - * @deprecated in Drake release
211 - */
212 - @Deprecated
213 - Builder matchTcpSrc(short tcpPort);
214 -
215 - /**
216 - * Matches a TCP source port number.
217 - *
218 - * @param tcpPort a TCP source port number
219 - * @return a selection builder
220 */ 210 */
221 Builder matchTcpSrc(TpPort tcpPort); 211 Builder matchTcpSrc(TpPort tcpPort);
222 212
...@@ -225,16 +215,6 @@ public interface TrafficSelector { ...@@ -225,16 +215,6 @@ public interface TrafficSelector {
225 * 215 *
226 * @param tcpPort a TCP destination port number 216 * @param tcpPort a TCP destination port number
227 * @return a selection builder 217 * @return a selection builder
228 - * @deprecated in Drake release
229 - */
230 - @Deprecated
231 - Builder matchTcpDst(short tcpPort);
232 -
233 - /**
234 - * Matches a TCP destination port number.
235 - *
236 - * @param tcpPort a TCP destination port number
237 - * @return a selection builder
238 */ 218 */
239 Builder matchTcpDst(TpPort tcpPort); 219 Builder matchTcpDst(TpPort tcpPort);
240 220
...@@ -243,16 +223,6 @@ public interface TrafficSelector { ...@@ -243,16 +223,6 @@ public interface TrafficSelector {
243 * 223 *
244 * @param udpPort an UDP source port number 224 * @param udpPort an UDP source port number
245 * @return a selection builder 225 * @return a selection builder
246 - * @deprecated in Drake release
247 - */
248 - @Deprecated
249 - Builder matchUdpSrc(short udpPort);
250 -
251 - /**
252 - * Matches an UDP source port number.
253 - *
254 - * @param udpPort an UDP source port number
255 - * @return a selection builder
256 */ 226 */
257 Builder matchUdpSrc(TpPort udpPort); 227 Builder matchUdpSrc(TpPort udpPort);
258 228
...@@ -261,16 +231,6 @@ public interface TrafficSelector { ...@@ -261,16 +231,6 @@ public interface TrafficSelector {
261 * 231 *
262 * @param udpPort an UDP destination port number 232 * @param udpPort an UDP destination port number
263 * @return a selection builder 233 * @return a selection builder
264 - * @deprecated in Drake release
265 - */
266 - @Deprecated
267 - Builder matchUdpDst(short udpPort);
268 -
269 - /**
270 - * Matches an UDP destination port number.
271 - *
272 - * @param udpPort an UDP destination port number
273 - * @return a selection builder
274 */ 234 */
275 Builder matchUdpDst(TpPort udpPort); 235 Builder matchUdpDst(TpPort udpPort);
276 236
...@@ -279,16 +239,6 @@ public interface TrafficSelector { ...@@ -279,16 +239,6 @@ public interface TrafficSelector {
279 * 239 *
280 * @param sctpPort a SCTP source port number 240 * @param sctpPort a SCTP source port number
281 * @return a selection builder 241 * @return a selection builder
282 - * @deprecated in Drake release
283 - */
284 - @Deprecated
285 - Builder matchSctpSrc(short sctpPort);
286 -
287 - /**
288 - * Matches a SCTP source port number.
289 - *
290 - * @param sctpPort a SCTP source port number
291 - * @return a selection builder
292 */ 242 */
293 Builder matchSctpSrc(TpPort sctpPort); 243 Builder matchSctpSrc(TpPort sctpPort);
294 244
...@@ -297,16 +247,6 @@ public interface TrafficSelector { ...@@ -297,16 +247,6 @@ public interface TrafficSelector {
297 * 247 *
298 * @param sctpPort a SCTP destination port number 248 * @param sctpPort a SCTP destination port number
299 * @return a selection builder 249 * @return a selection builder
300 - * @deprecated in Drake release
301 - */
302 - @Deprecated
303 - Builder matchSctpDst(short sctpPort);
304 -
305 - /**
306 - * Matches a SCTP destination port number.
307 - *
308 - * @param sctpPort a SCTP destination port number
309 - * @return a selection builder
310 */ 250 */
311 Builder matchSctpDst(TpPort sctpPort); 251 Builder matchSctpDst(TpPort sctpPort);
312 252
......