Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-5950: Remove ecj hacks no longer necessary with current ecj settings 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1640843 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Ryan Ernst 2014-11-21 00:34:48 +00:00
parent 1a880507c6
commit 8a24e56be5
5 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lucene/core/src/java/org/apache/lucene/search/LiveFieldValues.java
View File

@ -101,7 +101,7 @@ public abstract class LiveFieldValues<S,T> implements ReferenceManager.RefreshLi
if (value == missingValue) { if (value == missingValue) {
// Deleted but the deletion is not yet reflected in // Deleted but the deletion is not yet reflected in
// the reader: // the reader:
return (T)null; return null;
} else if (value != null) { } else if (value != null) {
return value; return value;
} else { } else {

4
lucene/core/src/test/org/apache/lucene/index/TestPrefixCodedTerms.java
View File

@ -113,9 +113,7 @@ public class TestPrefixCodedTerms extends LuceneTestCase {
} }
Iterator<Term> expected = superSet.iterator(); Iterator<Term> expected = superSet.iterator();
// NOTE: currenlty using diamond operator on MergedIterator (without explicit Term class) causes Iterator<Term> actual = new MergedIterator<>(subs.toArray(new Iterator[0]));
// errors on ecj used for javadoc lint
Iterator<Term> actual = new MergedIterator<Term>(subs.toArray(new Iterator[0]));
while (actual.hasNext()) { while (actual.hasNext()) {
assertTrue(expected.hasNext()); assertTrue(expected.hasNext());
assertEquals(expected.next(), actual.next()); assertEquals(expected.next(), actual.next());

4
lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
View File

@ -315,9 +315,7 @@ public class TestGrouping extends LuceneTestCase {
BytesRef groupValue = mvalGd.groupValue.exists() ? ((MutableValueStr) mvalGd.groupValue).value.get() : null; BytesRef groupValue = mvalGd.groupValue.exists() ? ((MutableValueStr) mvalGd.groupValue).value.get() : null;
groups.add(new GroupDocs<>(Float.NaN, mvalGd.maxScore, mvalGd.totalHits, mvalGd.scoreDocs, groupValue, mvalGd.groupSortValues)); groups.add(new GroupDocs<>(Float.NaN, mvalGd.maxScore, mvalGd.totalHits, mvalGd.scoreDocs, groupValue, mvalGd.groupSortValues));
} }
// NOTE: currenlty using diamond operator on TopGroups (without explicit Term class) causes return new TopGroups<>(mvalTopGroups.groupSort, mvalTopGroups.withinGroupSort, mvalTopGroups.totalHitCount, mvalTopGroups.totalGroupedHitCount, groups.toArray(new GroupDocs[groups.size()]), Float.NaN);
// errors on ecj used for javadoc lint
return new TopGroups<BytesRef>(mvalTopGroups.groupSort, mvalTopGroups.withinGroupSort, mvalTopGroups.totalHitCount, mvalTopGroups.totalGroupedHitCount, groups.toArray(new GroupDocs[groups.size()]), Float.NaN);
} }
fail(); fail();
return null; return null;

4
solr/core/src/java/org/apache/solr/update/processor/MaxFieldValueUpdateProcessorFactory.java
View File

@ -59,9 +59,7 @@ public final class MaxFieldValueUpdateProcessorFactory extends FieldValueSubsetU
public Collection pickSubset(Collection values) { public Collection pickSubset(Collection values) {
Collection result = values; Collection result = values;
try { try {
// NOTE: max must be put into a temp local in order to avoid ecj errors for javadoc lint result = Collections.singletonList(Collections.max(values));
Object max = Collections.max(values);
result = Collections.singletonList(max);
} catch (ClassCastException e) { } catch (ClassCastException e) {
throw new SolrException throw new SolrException
(BAD_REQUEST, (BAD_REQUEST,

4
solr/core/src/java/org/apache/solr/update/processor/MinFieldValueUpdateProcessorFactory.java
View File

@ -59,9 +59,7 @@ public final class MinFieldValueUpdateProcessorFactory extends FieldValueSubsetU
public Collection pickSubset(Collection values) { public Collection pickSubset(Collection values) {
Collection result = values; Collection result = values;
try { try {
// NOTE: min must be put into a temp local in order to avoid ecj errors for javadoc lint result = Collections.singletonList(Collections.min(values));
Object min = Collections.min(values);
result = Collections.singletonList(min);
} catch (ClassCastException e) { } catch (ClassCastException e) {
throw new SolrException throw new SolrException
(BAD_REQUEST, (BAD_REQUEST,