Remove usage of JSR305 annotations (@Nullable) and no-op override of #equals(Object)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/51d88673 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/51d88673 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/51d88673 Branch: refs/heads/master Commit: 51d88673a7c67de5270ff3a8fe14f70691bf89fa Parents: 93ce371 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Thu Mar 6 09:59:23 2014 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Thu Mar 6 09:59:23 2014 +0200 ---------------------------------------------------------------------- .../java/org/apache/wicket/atmosphere/EventFilter.java | 10 +--------- .../org/apache/wicket/atmosphere/NoFilterPredicate.java | 11 +---------- 2 files changed, 2 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/51d88673/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventFilter.java ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventFilter.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventFilter.java index 76f6085..7bbb62e 100644 --- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventFilter.java +++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventFilter.java @@ -16,8 +16,6 @@ */ package org.apache.wicket.atmosphere; -import javax.annotation.Nullable; - import com.google.common.base.Predicate; /** @@ -41,14 +39,8 @@ public class EventFilter implements Predicate<EventSubscription> } @Override - public boolean apply(@Nullable EventSubscription input) + public boolean apply(EventSubscription input) { return input.getFilter().apply(event); } - - @Override - public boolean equals(@Nullable Object other) - { - return super.equals(other); - } } http://git-wip-us.apache.org/repos/asf/wicket/blob/51d88673/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/NoFilterPredicate.java ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/NoFilterPredicate.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/NoFilterPredicate.java index ec17fd0..cce9420 100644 --- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/NoFilterPredicate.java +++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/NoFilterPredicate.java @@ -16,8 +16,6 @@ */ package org.apache.wicket.atmosphere; -import javax.annotation.Nullable; - import com.google.common.base.Predicate; /** @@ -28,15 +26,8 @@ import com.google.common.base.Predicate; public class NoFilterPredicate implements Predicate<AtmosphereEvent> { @Override - public boolean apply(@Nullable AtmosphereEvent input) + public boolean apply(AtmosphereEvent input) { return true; } - - @Override - public boolean equals(@Nullable Object other) - { - return super.equals(other); - } - }
