You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2011/12/14 20:15:48 UTC
svn commit: r1214413 - in /lucene/dev/trunk:
lucene/src/test/org/apache/lucene/ lucene/src/test/org/apache/lucene/search/
lucene/src/test/org/apache/lucene/util/
modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/
modules/facet/s...
Author: sarowe
Date: Wed Dec 14 19:15:47 2011
New Revision: 1214413
URL: http://svn.apache.org/viewvc?rev=1214413&view=rev
Log:
LUCENE-3645: Remove unnecessary array wrapping when calling varargs methods
Modified:
lucene/dev/trunk/lucene/src/test/org/apache/lucene/TestSearch.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/TestSearchForDuplicates.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSort.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestCollectionUtil.java
lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilter.java
lucene/dev/trunk/modules/facet/src/test/org/apache/lucene/facet/search/BaseTestTopK.java
lucene/dev/trunk/modules/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
lucene/dev/trunk/modules/suggest/src/test/org/apache/lucene/search/suggest/fst/FloatMagicTest.java
lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHCacheTestCase.java
lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestTemplateTransformer.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/spelling/SpellCheckCollator.java
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/TestSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/TestSearch.java?rev=1214413&r1=1214412&r2=1214413&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/TestSearch.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/TestSearch.java Wed Dec 14 19:15:47 2011
@@ -104,9 +104,8 @@ public class TestSearch extends LuceneTe
ScoreDoc[] hits = null;
- Sort sort = new Sort(new SortField[] {
- SortField.FIELD_SCORE,
- new SortField("id", SortField.Type.INT)});
+ Sort sort = new Sort(SortField.FIELD_SCORE,
+ new SortField("id", SortField.Type.INT));
for (Query query : buildQueries()) {
out.println("Query: " + query.toString("contents"));
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/TestSearchForDuplicates.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/TestSearchForDuplicates.java?rev=1214413&r1=1214412&r2=1214413&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/TestSearchForDuplicates.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/TestSearchForDuplicates.java Wed Dec 14 19:15:47 2011
@@ -107,9 +107,8 @@ public class TestSearchForDuplicates ext
System.out.println("TEST: search query=" + query);
}
- final Sort sort = new Sort(new SortField[] {
- SortField.FIELD_SCORE,
- new SortField(ID_FIELD, SortField.Type.INT)});
+ final Sort sort = new Sort(SortField.FIELD_SCORE,
+ new SortField(ID_FIELD, SortField.Type.INT));
ScoreDoc[] hits = searcher.search(query, null, MAX_DOCS, sort).scoreDocs;
printHits(out, hits, searcher);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSort.java?rev=1214413&r1=1214412&r2=1214413&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSort.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSort.java Wed Dec 14 19:15:47 2011
@@ -846,9 +846,8 @@ public class TestSort extends LuceneTest
public void testParallelMultiSort() throws Exception {
ExecutorService exec = Executors.newFixedThreadPool(_TestUtil.nextInt(random, 2, 8));
IndexSearcher searcher = new IndexSearcher(
- new MultiReader(
- new IndexReader[] {searchX.getIndexReader(),
- searchY.getIndexReader()}), exec);
+ new MultiReader(searchX.getIndexReader(),
+ searchY.getIndexReader()), exec);
runMultiSorts(searcher, false);
exec.shutdown();
exec.awaitTermination(1000, TimeUnit.MILLISECONDS);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestCollectionUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestCollectionUtil.java?rev=1214413&r1=1214412&r2=1214413&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestCollectionUtil.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestCollectionUtil.java Wed Dec 14 19:15:47 2011
@@ -92,7 +92,7 @@ public class TestCollectionUtil extends
public void testEmptyListSort() {
// should produce no exceptions
- List<Integer> list = Arrays.asList(new Integer[0]);
+ List<Integer> list = Arrays.asList(new Integer[0]); // LUCENE-2989
CollectionUtil.quickSort(list);
CollectionUtil.mergeSort(list);
CollectionUtil.insertionSort(list);
Modified: lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilter.java?rev=1214413&r1=1214412&r2=1214413&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilter.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilter.java Wed Dec 14 19:15:47 2011
@@ -64,8 +64,8 @@ public class TestKeywordMarkerFilter ext
new KeywordMarkerFilter(
new KeywordMarkerFilter(
new MockTokenizer(new StringReader("Dogs Trees Birds Houses"), MockTokenizer.WHITESPACE, false),
- new HashSet<String>(Arrays.asList(new String[] { "Birds", "Houses" }))),
- new HashSet<String>(Arrays.asList(new String[] { "Dogs", "Trees" }))));
+ new HashSet<String>(Arrays.asList("Birds", "Houses"))),
+ new HashSet<String>(Arrays.asList("Dogs", "Trees"))));
assertTokenStreamContents(ts, new String[] { "Dogs", "Trees", "Birds", "Houses" });
}
Modified: lucene/dev/trunk/modules/facet/src/test/org/apache/lucene/facet/search/BaseTestTopK.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/facet/src/test/org/apache/lucene/facet/search/BaseTestTopK.java?rev=1214413&r1=1214412&r2=1214413&view=diff
==============================================================================
--- lucene/dev/trunk/modules/facet/src/test/org/apache/lucene/facet/search/BaseTestTopK.java (original)
+++ lucene/dev/trunk/modules/facet/src/test/org/apache/lucene/facet/search/BaseTestTopK.java Wed Dec 14 19:15:47 2011
@@ -86,7 +86,7 @@ public abstract class BaseTestTopK exten
if (VERBOSE) {
System.out.println("Adding CP: " + cp.toString());
}
- return Arrays.asList(new CategoryPath[] { cp });
+ return Arrays.asList(cp);
}
protected FacetSearchParams searchParamsWithRequests(int numResults) {
Modified: lucene/dev/trunk/modules/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java?rev=1214413&r1=1214412&r2=1214413&view=diff
==============================================================================
--- lucene/dev/trunk/modules/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java (original)
+++ lucene/dev/trunk/modules/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java Wed Dec 14 19:15:47 2011
@@ -601,7 +601,7 @@ public class TestBlockJoin extends Lucen
childDoc.add(newField("child", "1", StringField.TYPE_UNSTORED));
Document parentDoc = new Document();
parentDoc.add(newField("parent", "1", StringField.TYPE_UNSTORED));
- w.addDocuments(Arrays.asList(new Document[] {childDoc, parentDoc}));
+ w.addDocuments(Arrays.asList(childDoc, parentDoc));
IndexReader r = w.getReader();
w.close();
IndexSearcher s = newSearcher(r);
@@ -624,7 +624,7 @@ public class TestBlockJoin extends Lucen
Document parentDoc = new Document();
parentDoc.add(newField("parent", "1", StringField.TYPE_UNSTORED));
parentDoc.add(newField("isparent", "yes", StringField.TYPE_UNSTORED));
- w.addDocuments(Arrays.asList(new Document[] {parentDoc}));
+ w.addDocuments(Arrays.asList(parentDoc));
// Add another doc so scorer is not null
parentDoc = new Document();
@@ -632,7 +632,7 @@ public class TestBlockJoin extends Lucen
parentDoc.add(newField("isparent", "yes", StringField.TYPE_UNSTORED));
Document childDoc = new Document();
childDoc.add(newField("child", "2", StringField.TYPE_UNSTORED));
- w.addDocuments(Arrays.asList(new Document[] {childDoc, parentDoc}));
+ w.addDocuments(Arrays.asList(childDoc, parentDoc));
// Need single seg:
w.forceMerge(1);
Modified: lucene/dev/trunk/modules/suggest/src/test/org/apache/lucene/search/suggest/fst/FloatMagicTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/suggest/src/test/org/apache/lucene/search/suggest/fst/FloatMagicTest.java?rev=1214413&r1=1214412&r2=1214413&view=diff
==============================================================================
--- lucene/dev/trunk/modules/suggest/src/test/org/apache/lucene/search/suggest/fst/FloatMagicTest.java (original)
+++ lucene/dev/trunk/modules/suggest/src/test/org/apache/lucene/search/suggest/fst/FloatMagicTest.java Wed Dec 14 19:15:47 2011
@@ -9,7 +9,7 @@ import org.junit.Test;
public class FloatMagicTest extends LuceneTestCase {
public void testFloatMagic() {
- ArrayList<Float> floats = new ArrayList<Float>(Arrays.asList(new Float [] {
+ ArrayList<Float> floats = new ArrayList<Float>(Arrays.asList(
Float.intBitsToFloat(0x7f800001), // NaN (invalid combination).
Float.intBitsToFloat(0x7fffffff), // NaN (invalid combination).
Float.intBitsToFloat(0xff800001), // NaN (invalid combination).
@@ -26,7 +26,7 @@ public class FloatMagicTest extends Luce
-0.1f,
-1f,
-10f,
- Float.NEGATIVE_INFINITY }));
+ Float.NEGATIVE_INFINITY));
// Sort them using juc.
Collections.sort(floats);
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHCacheTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHCacheTestCase.java?rev=1214413&r1=1214412&r2=1214413&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHCacheTestCase.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHCacheTestCase.java Wed Dec 14 19:15:47 2011
@@ -46,7 +46,7 @@ public class AbstractDIHCacheTestCase {
data.add(new ControlData(new Object[] { new Integer(4), new BigDecimal(Math.PI), "D", "Daisy", new Float(4.44), Feb21_2011, null }));
data.add(new ControlData(new Object[] { new Integer(4), new BigDecimal(Math.PI), "D", "Drawing", new Float(4.44), Feb21_2011, null }));
data.add(new ControlData(new Object[] { new Integer(5), new BigDecimal(Math.PI), "E",
- Arrays.asList(new String[] { "Eggplant", "Ear", "Elephant", "Engine" }), new Float(5.55), Feb21_2011, null }));
+ Arrays.asList("Eggplant", "Ear", "Elephant", "Engine"), new Float(5.55), Feb21_2011, null }));
}
@After
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestTemplateTransformer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestTemplateTransformer.java?rev=1214413&r1=1214412&r2=1214413&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestTemplateTransformer.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestTemplateTransformer.java Wed Dec 14 19:15:47 2011
@@ -51,7 +51,7 @@ public class TestTemplateTransformer ext
fields.add(createMap("column", "mrname",
TemplateTransformer.TEMPLATE,"Mr ${e.name}"));
- List<String> mails = Arrays.asList(new String[]{"a@b.com", "c@d.com"});
+ List<String> mails = Arrays.asList("a@b.com", "c@d.com");
Map row = createMap(
"firstName", "Shalin",
"middleName", "Shekhar",
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java?rev=1214413&r1=1214412&r2=1214413&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java Wed Dec 14 19:15:47 2011
@@ -388,10 +388,9 @@ public class QueryElevationComponent ext
// insert documents in their proper place
SortSpec sortSpec = rb.getSortSpec();
if( sortSpec.getSort() == null ) {
- sortSpec.setSort( new Sort( new SortField[] {
+ sortSpec.setSort( new Sort(
new SortField(idField, booster.comparatorSource, false ),
- new SortField(null, SortField.Type.SCORE, false)
- }));
+ new SortField(null, SortField.Type.SCORE, false)));
}
else {
// Check if the sort is based on score
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java?rev=1214413&r1=1214412&r2=1214413&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java Wed Dec 14 19:15:47 2011
@@ -148,7 +148,7 @@ public class HaversineConstFunction exte
} catch (InvalidGeoException e) {
throw new ParseException("Bad spatial pt:" + pt);
}
- return new VectorValueSource(Arrays.asList(new ValueSource[] {new DoubleConstValueSource(point[0]),new DoubleConstValueSource(point[1])}));
+ return new VectorValueSource(Arrays.<ValueSource>asList(new DoubleConstValueSource(point[0]),new DoubleConstValueSource(point[1])));
}
private static double[] getConstants(MultiValueSource vs) {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/spelling/SpellCheckCollator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/spelling/SpellCheckCollator.java?rev=1214413&r1=1214412&r2=1214413&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/spelling/SpellCheckCollator.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/spelling/SpellCheckCollator.java Wed Dec 14 19:15:47 2011
@@ -81,11 +81,11 @@ public class SpellCheckCollator {
params.remove(GroupParams.GROUP);
// creating a request here... make sure to close it!
- ResponseBuilder checkResponse = new ResponseBuilder(new LocalSolrQueryRequest(ultimateResponse.req.getCore(), params),new SolrQueryResponse(), Arrays.asList(new SearchComponent[] { queryComponent }));
+ ResponseBuilder checkResponse = new ResponseBuilder(new LocalSolrQueryRequest(ultimateResponse.req.getCore(), params),new SolrQueryResponse(), Arrays.<SearchComponent>asList(queryComponent));
checkResponse.setQparser(ultimateResponse.getQparser());
checkResponse.setFilters(ultimateResponse.getFilters());
checkResponse.setQueryString(collationQueryStr);
- checkResponse.components = Arrays.asList(new SearchComponent[] { queryComponent });
+ checkResponse.components = Arrays.<SearchComponent>asList(queryComponent);
try {
queryComponent.prepare(checkResponse);