You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2015/01/10 14:16:06 UTC

svn commit: r1650739 - in /lucene/dev/trunk/lucene: core/src/java/org/apache/lucene/analysis/NumericTokenStream.java spatial/src/java/org/apache/lucene/spatial/prefix/CellTokenStream.java

Author: uschindler
Date: Sat Jan 10 13:16:06 2015
New Revision: 1650739

URL: http://svn.apache.org/r1650739
Log:
LUCENE-6173: Use Objects.hash() for simplicty. Also unbreak branch_5x

Modified:
    lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/analysis/NumericTokenStream.java
    lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/CellTokenStream.java

Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/analysis/NumericTokenStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/analysis/NumericTokenStream.java?rev=1650739&r1=1650738&r2=1650739&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/analysis/NumericTokenStream.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/analysis/NumericTokenStream.java Sat Jan 10 13:16:06 2015
@@ -17,6 +17,8 @@ package org.apache.lucene.analysis;
  * limitations under the License.
  */
 
+import java.util.Objects;
+
 import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
 import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
 import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute;
@@ -224,13 +226,7 @@ public final class NumericTokenStream ex
 
     @Override
     public int hashCode() {
-      final int prime = 31;
-      int result = 1;
-      result = prime * result + precisionStep;
-      result = prime * result + shift;
-      result = prime * result + Long.hashCode(value);
-      result = prime * result + valueSize;
-      return result;
+      return Objects.hash(precisionStep, shift, value, valueSize);
     }
 
     @Override

Modified: lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/CellTokenStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/CellTokenStream.java?rev=1650739&r1=1650738&r2=1650739&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/CellTokenStream.java (original)
+++ lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/CellTokenStream.java Sat Jan 10 13:16:06 2015
@@ -29,6 +29,7 @@ import org.apache.lucene.util.BytesRef;
 
 import java.io.IOException;
 import java.util.Iterator;
+import java.util.Objects;
 
 /**
  * A TokenStream used internally by {@link org.apache.lucene.spatial.prefix.PrefixTreeStrategy}.
@@ -134,11 +135,7 @@ class CellTokenStream extends TokenStrea
 
     @Override
     public int hashCode() {
-      final int prime = 31;
-      int result = 1;
-      result = prime * result + ((cell == null) ? 0 : cell.hashCode());
-      result = prime * result + Boolean.hashCode(omitLeafByte);
-      return result;
+      return Objects.hash(cell, omitLeafByte);
     }
 
     @Override