Add equals and cleanup

3 files changed, 15 insertions, 10 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/Freshness.java b/container-search/src/main/java/com/yahoo/prelude/Freshness.java
index 11f6bb4bd50..84f65f8bdc7 100644
--- a/container-search/src/main/java/com/yahoo/prelude/Freshness.java
+++ b/container-search/src/main/java/com/yahoo/prelude/Freshness.java
@@ -13,7 +13,7 @@ import static com.yahoo.text.Lowercase.toLowerCase;
  * <p>
  * This is a value object
  *
- * @author <a href="mailto:pauran@yahoo-inc.com">Per G. Auran</a>
+ * @author Per G. Auran
  */
 public class Freshness {
 
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/GroupingListHit.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/GroupingListHit.java
index e57fe3a200e..e0d569c6ae1 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/GroupingListHit.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/GroupingListHit.java
@@ -9,8 +9,6 @@ import com.yahoo.searchlib.aggregation.Grouping;
 
 public class GroupingListHit extends Hit {
 
-    private static final long serialVersionUID = -6645125887873082234L;
-
     /** for unit tests only, may give problems if grouping contains docsums */
     public GroupingListHit(List<Grouping> groupingList) {
         this(groupingList, null);
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/SpecialTokens.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/SpecialTokens.java
index 30c20ddb0ee..c206ff7567e 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/parser/SpecialTokens.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/SpecialTokens.java
@@ -142,16 +142,23 @@ public class SpecialTokens {
             return replace;
         }
 
+        @Override
         public int compareTo(SpecialToken other) {
-            if (this.token().length() < other.token().length()) {
-                return 1;
-            } else if (this.token().length() == other.token().length()) {
-                return 0;
-            } else {
-                return -1;
-            }
+            if (this.token().length() < other.token().length()) return 1;
+            if (this.token().length() == other.token().length()) return 0;
+            return -1;
         }
 
+        @Override
+        public boolean equals(Object other) {
+            if (other == this) return true;
+            if ( ! (other instanceof SpecialToken)) return false;
+            return Objects.equals(this.token, ((SpecialToken)other).token);
+        }
+
+        @Override
+        public int hashCode() { return token.hashCode(); }
+
         public Token toToken(int start,String rawSource) {
             return new Token(Token.Kind.WORD, replace(), true, new Substring(start, start + token.length(), rawSource)); // XXX: Unsafe?
         }