svn commit: r1035194 - /lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/ScoringRewrite.java

[us...@apache.org]

Author: uschindler
Date: Mon Nov 15 09:14:39 2010
New Revision: 1035194

URL: http://svn.apache.org/viewvc?rev=1035194&view=rev
Log:
LUCENE-2757: Remove unneeded casts

Modified:
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/ScoringRewrite.java

Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/ScoringRewrite.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/ScoringRewrite.java?rev=1035194&r1=1035193&r2=1035194&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/ScoringRewrite.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/ScoringRewrite.java Mon Nov 15 09:14:39 2010
@@ -55,7 +55,7 @@ public abstract class ScoringRewrite<Q e
    *  exceeds {@link BooleanQuery#getMaxClauseCount}.
    *
    *  @see #setRewriteMethod */
-  public final static RewriteMethod SCORING_BOOLEAN_QUERY_REWRITE = new ScoringRewrite<BooleanQuery>() {
+  public final static ScoringRewrite<BooleanQuery> SCORING_BOOLEAN_QUERY_REWRITE = new ScoringRewrite<BooleanQuery>() {
     @Override
     protected BooleanQuery getTopLevelQuery() {
       return new BooleanQuery(true);
@@ -93,14 +93,13 @@ public abstract class ScoringRewrite<Q e
   public final static RewriteMethod CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE = new RewriteMethod() {
     @Override
     public Query rewrite(IndexReader reader, MultiTermQuery query) throws IOException {
-      Query result = SCORING_BOOLEAN_QUERY_REWRITE.rewrite(reader, query);
-      assert result instanceof BooleanQuery;
+      final BooleanQuery bq = SCORING_BOOLEAN_QUERY_REWRITE.rewrite(reader, query);
       // TODO: if empty boolean query return NullQuery?
-      if (!((BooleanQuery) result).clauses().isEmpty()) {
-        // strip the scores off
-        result = new ConstantScoreQuery(new QueryWrapperFilter(result));
-        result.setBoost(query.getBoost());
-      }
+      if (bq.clauses().isEmpty())
+        return bq;
+      // strip the scores off
+      final Query result = new ConstantScoreQuery(new QueryWrapperFilter(bq));
+      result.setBoost(query.getBoost());
       return result;
     }