홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Ray Milkey
28e039b2 1 parent dc08344b

Remove methods deprecated in Drake from Criteria API 

Change-Id: I9711e34421f6e5106f7c1872b23e24977b852939
Inline Side-by-side
Showing 1 changed file with 0 additions and 73 deletions
...@@ -233,18 +233,6 @@ public final class Criteria { ...@@ -233,18 +233,6 @@ public final class Criteria {
233 * 233 *
234 * @param tcpPort TCP source port 234 * @param tcpPort TCP source port
235 * @return match criterion 235 * @return match criterion
236 - * @deprecated in Drake release
237 - */
238 - @Deprecated
239 - public static Criterion matchTcpSrc(short tcpPort) {
240 - return new TcpPortCriterion(TpPort.tpPort(tcpPort), Type.TCP_SRC);
241 - }
242 -
243 - /**
244 - * Creates a match on TCP source port field using the specified value.
245 - *
246 - * @param tcpPort TCP source port
247 - * @return match criterion
248 */ 236 */
249 public static Criterion matchTcpSrc(TpPort tcpPort) { 237 public static Criterion matchTcpSrc(TpPort tcpPort) {
250 return new TcpPortCriterion(tcpPort, Type.TCP_SRC); 238 return new TcpPortCriterion(tcpPort, Type.TCP_SRC);
...@@ -255,18 +243,6 @@ public final class Criteria { ...@@ -255,18 +243,6 @@ public final class Criteria {
255 * 243 *
256 * @param tcpPort TCP destination port 244 * @param tcpPort TCP destination port
257 * @return match criterion 245 * @return match criterion
258 - * @deprecated in Drake release
259 - */
260 - @Deprecated
261 - public static Criterion matchTcpDst(short tcpPort) {
262 - return new TcpPortCriterion(TpPort.tpPort(tcpPort), Type.TCP_DST);
263 - }
264 -
265 - /**
266 - * Creates a match on TCP destination port field using the specified value.
267 - *
268 - * @param tcpPort TCP destination port
269 - * @return match criterion
270 */ 246 */
271 public static Criterion matchTcpDst(TpPort tcpPort) { 247 public static Criterion matchTcpDst(TpPort tcpPort) {
272 return new TcpPortCriterion(tcpPort, Type.TCP_DST); 248 return new TcpPortCriterion(tcpPort, Type.TCP_DST);
...@@ -287,18 +263,6 @@ public final class Criteria { ...@@ -287,18 +263,6 @@ public final class Criteria {
287 * 263 *
288 * @param udpPort UDP source port 264 * @param udpPort UDP source port
289 * @return match criterion 265 * @return match criterion
290 - * @deprecated in Drake release
291 - */
292 - @Deprecated
293 - public static Criterion matchUdpSrc(short udpPort) {
294 - return new UdpPortCriterion(TpPort.tpPort(udpPort), Type.UDP_SRC);
295 - }
296 -
297 - /**
298 - * Creates a match on UDP source port field using the specified value.
299 - *
300 - * @param udpPort UDP source port
301 - * @return match criterion
302 */ 266 */
303 public static Criterion matchUdpSrc(TpPort udpPort) { 267 public static Criterion matchUdpSrc(TpPort udpPort) {
304 return new UdpPortCriterion(udpPort, Type.UDP_SRC); 268 return new UdpPortCriterion(udpPort, Type.UDP_SRC);
...@@ -309,18 +273,6 @@ public final class Criteria { ...@@ -309,18 +273,6 @@ public final class Criteria {
309 * 273 *
310 * @param udpPort UDP destination port 274 * @param udpPort UDP destination port
311 * @return match criterion 275 * @return match criterion
312 - * @deprecated in Drake release
313 - */
314 - @Deprecated
315 - public static Criterion matchUdpDst(short udpPort) {
316 - return new UdpPortCriterion(TpPort.tpPort(udpPort), Type.UDP_DST);
317 - }
318 -
319 - /**
320 - * Creates a match on UDP destination port field using the specified value.
321 - *
322 - * @param udpPort UDP destination port
323 - * @return match criterion
324 */ 276 */
325 public static Criterion matchUdpDst(TpPort udpPort) { 277 public static Criterion matchUdpDst(TpPort udpPort) {
326 return new UdpPortCriterion(udpPort, Type.UDP_DST); 278 return new UdpPortCriterion(udpPort, Type.UDP_DST);
...@@ -331,18 +283,6 @@ public final class Criteria { ...@@ -331,18 +283,6 @@ public final class Criteria {
331 * 283 *
332 * @param sctpPort SCTP source port 284 * @param sctpPort SCTP source port
333 * @return match criterion 285 * @return match criterion
334 - * @deprecated in Drake release
335 - */
336 - @Deprecated
337 - public static Criterion matchSctpSrc(short sctpPort) {
338 - return new SctpPortCriterion(TpPort.tpPort(sctpPort), Type.SCTP_SRC);
339 - }
340 -
341 - /**
342 - * Creates a match on SCTP source port field using the specified value.
343 - *
344 - * @param sctpPort SCTP source port
345 - * @return match criterion
346 */ 286 */
347 public static Criterion matchSctpSrc(TpPort sctpPort) { 287 public static Criterion matchSctpSrc(TpPort sctpPort) {
348 return new SctpPortCriterion(sctpPort, Type.SCTP_SRC); 288 return new SctpPortCriterion(sctpPort, Type.SCTP_SRC);
...@@ -354,19 +294,6 @@ public final class Criteria { ...@@ -354,19 +294,6 @@ public final class Criteria {
354 * 294 *
355 * @param sctpPort SCTP destination port 295 * @param sctpPort SCTP destination port
356 * @return match criterion 296 * @return match criterion
357 - * @deprecated in Drake release
358 - */
359 - @Deprecated
360 - public static Criterion matchSctpDst(short sctpPort) {
361 - return new SctpPortCriterion(TpPort.tpPort(sctpPort), Type.SCTP_DST);
362 - }
363 -
364 - /**
365 - * Creates a match on SCTP destination port field using the specified
366 - * value.
367 - *
368 - * @param sctpPort SCTP destination port
369 - * @return match criterion
370 */ 297 */
371 public static Criterion matchSctpDst(TpPort sctpPort) { 298 public static Criterion matchSctpDst(TpPort sctpPort) {
372 return new SctpPortCriterion(sctpPort, Type.SCTP_DST); 299 return new SctpPortCriterion(sctpPort, Type.SCTP_DST);
......