From 7b379ea65b9756e975816fb1660dd8b60601b174 Mon Sep 17 00:00:00 2001
From: Martijn van Groningen <mvg@apache.org>
Date: Thu, 8 Mar 2012 11:20:50 +0000
Subject: [PATCH] LUCENE-3850: Removed some of the rawtypes compiler warnings

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1298363 13f79535-47bb-0310-9956-ffa450edef68
---
 .../join/ToParentBlockJoinCollector.java      | 27 ++++----------
 .../lucene/search/join/TestBlockJoin.java     | 36 +++++++------------
 2 files changed, 18 insertions(+), 45 deletions(-)

diff --git a/modules/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java b/modules/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java
index 0bc310d0f12..63d4af322b7 100644
--- a/modules/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java
+++ b/modules/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java
@@ -17,33 +17,17 @@ package org.apache.lucene.search.join;
  * limitations under the License.
  */
 
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.Queue;
-
 import org.apache.lucene.index.AtomicReaderContext;
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexWriter;       // javadocs
-import org.apache.lucene.search.Collector;
-import org.apache.lucene.search.FieldComparator;
-import org.apache.lucene.search.FieldValueHitQueue;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.ScoreCachingWrappingScorer;
-import org.apache.lucene.search.Scorer;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.search.*;
 import org.apache.lucene.search.Scorer.ChildScorer;
-import org.apache.lucene.search.Sort;
-import org.apache.lucene.search.TopDocs;
-import org.apache.lucene.search.TopDocsCollector;
-import org.apache.lucene.search.TopFieldCollector;
-import org.apache.lucene.search.TopScoreDocCollector;
-import org.apache.lucene.search.Weight;
 import org.apache.lucene.search.grouping.GroupDocs;
 import org.apache.lucene.search.grouping.TopGroups;
 import org.apache.lucene.util.ArrayUtil;
 
+import java.io.IOException;
+import java.util.*;
+
 
 /** Collects parent document hits for a Query containing one more more
  *  BlockJoinQuery clauses, sorted by the
@@ -399,6 +383,7 @@ public class ToParentBlockJoinCollector extends Collector {
 
     final FakeScorer fakeScorer = new FakeScorer();
 
+    @SuppressWarnings({"unchecked","rawtypes"})
     final GroupDocs<Integer>[] groups = new GroupDocs[sortedGroups.length - offset];
 
     for(int groupIDX=offset;groupIDX<sortedGroups.length;groupIDX++) {
diff --git a/modules/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java b/modules/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
index b5f4dc1e969..076c0ba7ffe 100644
--- a/modules/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
+++ b/modules/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
@@ -17,32 +17,20 @@ package org.apache.lucene.search.join;
  * limitations under the License.
  */
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
 import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.IntField;
-import org.apache.lucene.document.StoredField;
-import org.apache.lucene.document.StringField;
-import org.apache.lucene.index.AtomicReaderContext;
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.LogDocMergePolicy;
-import org.apache.lucene.index.RandomIndexWriter;
-import org.apache.lucene.index.Term;
+import org.apache.lucene.document.*;
+import org.apache.lucene.index.*;
 import org.apache.lucene.search.*;
 import org.apache.lucene.search.BooleanClause.Occur;
 import org.apache.lucene.search.grouping.GroupDocs;
 import org.apache.lucene.search.grouping.TopGroups;
 import org.apache.lucene.store.Directory;
-import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.FixedBitSet;
-import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.ReaderUtil;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.*;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 public class TestBlockJoin extends LuceneTestCase {
 
@@ -149,7 +137,7 @@ public class TestBlockJoin extends LuceneTestCase {
     childDoc = s.doc(hits.scoreDocs[0].doc);
     //System.out.println("CHILD = " + childDoc + " docID=" + hits.scoreDocs[0].doc);
     assertEquals("java", childDoc.get("skill"));
-    assertEquals(2007, ((StoredField) childDoc.getField("year")).numericValue());
+    assertEquals(2007, (childDoc.getField("year")).numericValue());
     assertEquals("Lisa", getParentDoc(r, parentsFilter, hits.scoreDocs[0].doc).get("name"));
 
     // Test with filter on child docs:
@@ -338,7 +326,7 @@ public class TestBlockJoin extends LuceneTestCase {
 
       if (VERBOSE) {
         StringBuilder sb = new StringBuilder();
-        sb.append("parentID=" + parentDoc.get("parentID"));
+        sb.append("parentID=").append(parentDoc.get("parentID"));
         for(int fieldID=0;fieldID<parentFields.length;fieldID++) {
           String s = parentDoc.get("parent" + fieldID);
           if (s != null) {
@@ -371,7 +359,7 @@ public class TestBlockJoin extends LuceneTestCase {
 
         if (VERBOSE) {
           StringBuilder sb = new StringBuilder();
-          sb.append("childID=" + joinChildDoc.get("childID"));
+          sb.append("childID=").append(joinChildDoc.get("childID"));
           for(int fieldID=0;fieldID<childFields.length;fieldID++) {
             String s = joinChildDoc.get("child" + fieldID);
             if (s != null) {
@@ -755,7 +743,7 @@ public class TestBlockJoin extends LuceneTestCase {
 
       FieldDoc hit0 = (FieldDoc) hit;
       FieldDoc joinHit0 = (FieldDoc) joinHit;
-      assertEquals(hit0.fields, joinHit0.fields);
+      assertArrayEquals(hit0.fields, joinHit0.fields);
     }
   }