You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2014/03/12 15:39:39 UTC
svn commit: r1576755 [11/27] - in /lucene/dev/trunk: lucene/
lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/
lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/
lucene/analysis/common/src/java/org/apache/lucene/a...
Modified: lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldFragList.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldFragList.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldFragList.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldFragList.java Wed Mar 12 14:39:17 2014
@@ -29,7 +29,7 @@ import java.util.List;
*/
public abstract class FieldFragList {
- private List<WeightedFragInfo> fragInfos = new ArrayList<WeightedFragInfo>();
+ private List<WeightedFragInfo> fragInfos = new ArrayList<>();
/**
* a constructor.
Modified: lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldPhraseList.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldPhraseList.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldPhraseList.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldPhraseList.java Wed Mar 12 14:39:17 2014
@@ -34,7 +34,7 @@ public class FieldPhraseList {
/**
* List of non-overlapping WeightedPhraseInfo objects.
*/
- LinkedList<WeightedPhraseInfo> phraseList = new LinkedList<WeightedPhraseInfo>();
+ LinkedList<WeightedPhraseInfo> phraseList = new LinkedList<>();
/**
* create a FieldPhraseList that has no limit on the number of phrases to analyze
@@ -65,7 +65,7 @@ public class FieldPhraseList {
public FieldPhraseList( FieldTermStack fieldTermStack, FieldQuery fieldQuery, int phraseLimit ){
final String field = fieldTermStack.getFieldName();
- LinkedList<TermInfo> phraseCandidate = new LinkedList<TermInfo>();
+ LinkedList<TermInfo> phraseCandidate = new LinkedList<>();
QueryPhraseMap currMap = null;
QueryPhraseMap nextMap = null;
while( !fieldTermStack.isEmpty() && (phraseList.size() < phraseLimit) )
@@ -125,13 +125,13 @@ public class FieldPhraseList {
for ( FieldPhraseList fplToMerge : toMerge ) {
allInfos[ index++ ] = fplToMerge.phraseList.iterator();
}
- MergedIterator< WeightedPhraseInfo > itr = new MergedIterator< WeightedPhraseInfo >( false, allInfos );
+ MergedIterator< WeightedPhraseInfo > itr = new MergedIterator<>( false, allInfos );
// Step 2. Walk the sorted list merging infos that overlap
- phraseList = new LinkedList< WeightedPhraseInfo >();
+ phraseList = new LinkedList<>();
if ( !itr.hasNext() ) {
return;
}
- List< WeightedPhraseInfo > work = new ArrayList< WeightedPhraseInfo >();
+ List< WeightedPhraseInfo > work = new ArrayList<>();
WeightedPhraseInfo first = itr.next();
work.add( first );
int workEndOffset = first.getEndOffset();
@@ -225,9 +225,9 @@ public class FieldPhraseList {
this.seqnum = seqnum;
// We keep TermInfos for further operations
- termsInfos = new ArrayList<TermInfo>( terms );
+ termsInfos = new ArrayList<>( terms );
- termsOffsets = new ArrayList<Toffs>( terms.size() );
+ termsOffsets = new ArrayList<>( terms.size() );
TermInfo ti = terms.get( 0 );
termsOffsets.add( new Toffs( ti.getStartOffset(), ti.getEndOffset() ) );
if( terms.size() == 1 ){
@@ -261,7 +261,7 @@ public class FieldPhraseList {
WeightedPhraseInfo first = toMergeItr.next();
@SuppressWarnings( { "rawtypes", "unchecked" } )
Iterator< Toffs >[] allToffs = new Iterator[ toMerge.size() ];
- termsInfos = new ArrayList< TermInfo >();
+ termsInfos = new ArrayList<>();
seqnum = first.seqnum;
boost = first.boost;
allToffs[ 0 ] = first.termsOffsets.iterator();
@@ -273,8 +273,8 @@ public class FieldPhraseList {
allToffs[ index++ ] = info.termsOffsets.iterator();
}
// Step 2. Walk the sorted list merging overlaps
- MergedIterator< Toffs > itr = new MergedIterator< Toffs >( false, allToffs );
- termsOffsets = new ArrayList< Toffs >();
+ MergedIterator< Toffs > itr = new MergedIterator<>( false, allToffs );
+ termsOffsets = new ArrayList<>();
if ( !itr.hasNext() ) {
return;
}
Modified: lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldQuery.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldQuery.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldQuery.java Wed Mar 12 14:39:17 2014
@@ -50,11 +50,11 @@ public class FieldQuery {
// fieldMatch==true, Map<fieldName,QueryPhraseMap>
// fieldMatch==false, Map<null,QueryPhraseMap>
- Map<String, QueryPhraseMap> rootMaps = new HashMap<String, QueryPhraseMap>();
+ Map<String, QueryPhraseMap> rootMaps = new HashMap<>();
// fieldMatch==true, Map<fieldName,setOfTermsInQueries>
// fieldMatch==false, Map<null,setOfTermsInQueries>
- Map<String, Set<String>> termSetMap = new HashMap<String, Set<String>>();
+ Map<String, Set<String>> termSetMap = new HashMap<>();
int termOrPhraseNumber; // used for colored tag support
@@ -63,7 +63,7 @@ public class FieldQuery {
FieldQuery( Query query, IndexReader reader, boolean phraseHighlight, boolean fieldMatch ) throws IOException {
this.fieldMatch = fieldMatch;
- Set<Query> flatQueries = new LinkedHashSet<Query>();
+ Set<Query> flatQueries = new LinkedHashSet<>();
flatten( query, reader, flatQueries );
saveTerms( flatQueries, reader );
Collection<Query> expandQueries = expand( flatQueries );
@@ -169,7 +169,7 @@ public class FieldQuery {
* => expandQueries={a,"b c","c d","b c d"}
*/
Collection<Query> expand( Collection<Query> flatQueries ){
- Set<Query> expandQueries = new LinkedHashSet<Query>();
+ Set<Query> expandQueries = new LinkedHashSet<>();
for( Iterator<Query> i = flatQueries.iterator(); i.hasNext(); ){
Query query = i.next();
i.remove();
@@ -316,7 +316,7 @@ public class FieldQuery {
String key = getKey( query );
Set<String> set = termSetMap.get( key );
if( set == null ){
- set = new HashSet<String>();
+ set = new HashSet<>();
termSetMap.put( key, set );
}
return set;
@@ -364,7 +364,7 @@ public class FieldQuery {
float boost; // valid if terminal == true
int termOrPhraseNumber; // valid if terminal == true
FieldQuery fieldQuery;
- Map<String, QueryPhraseMap> subMap = new HashMap<String, QueryPhraseMap>();
+ Map<String, QueryPhraseMap> subMap = new HashMap<>();
public QueryPhraseMap( FieldQuery fieldQuery ){
this.fieldQuery = fieldQuery;
Modified: lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java Wed Mar 12 14:39:17 2014
@@ -38,7 +38,7 @@ import org.apache.lucene.util.UnicodeUti
public class FieldTermStack {
private final String fieldName;
- LinkedList<TermInfo> termList = new LinkedList<TermInfo>();
+ LinkedList<TermInfo> termList = new LinkedList<>();
//public static void main( String[] args ) throws Exception {
// Analyzer analyzer = new WhitespaceAnalyzer(Version.LUCENE_CURRENT);
Modified: lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleBoundaryScanner.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleBoundaryScanner.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleBoundaryScanner.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleBoundaryScanner.java Wed Mar 12 14:39:17 2014
@@ -47,7 +47,7 @@ public class SimpleBoundaryScanner imple
public SimpleBoundaryScanner( int maxScan, Character[] boundaryChars ){
this.maxScan = maxScan;
- this.boundaryChars = new HashSet<Character>();
+ this.boundaryChars = new HashSet<>();
this.boundaryChars.addAll(Arrays.asList(boundaryChars));
}
Modified: lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleFieldFragList.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleFieldFragList.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleFieldFragList.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleFieldFragList.java Wed Mar 12 14:39:17 2014
@@ -43,7 +43,7 @@ public class SimpleFieldFragList extends
@Override
public void add( int startOffset, int endOffset, List<WeightedPhraseInfo> phraseInfoList ) {
float totalBoost = 0;
- List<SubInfo> subInfos = new ArrayList<SubInfo>();
+ List<SubInfo> subInfos = new ArrayList<>();
for( WeightedPhraseInfo phraseInfo : phraseInfoList ){
subInfos.add( new SubInfo( phraseInfo.getText(), phraseInfo.getTermsOffsets(), phraseInfo.getSeqnum(), phraseInfo.getBoost() ) );
totalBoost += phraseInfo.getBoost();
Modified: lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SingleFragListBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SingleFragListBuilder.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SingleFragListBuilder.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SingleFragListBuilder.java Wed Mar 12 14:39:17 2014
@@ -41,7 +41,7 @@ public class SingleFragListBuilder imple
FieldFragList ffl = new SimpleFieldFragList( fragCharSize );
- List<WeightedPhraseInfo> wpil = new ArrayList<WeightedPhraseInfo>();
+ List<WeightedPhraseInfo> wpil = new ArrayList<>();
Iterator<WeightedPhraseInfo> ite = fieldPhraseList.phraseList.iterator();
WeightedPhraseInfo phraseInfo = null;
while( true ){
Modified: lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/WeightedFieldFragList.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/WeightedFieldFragList.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/WeightedFieldFragList.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/WeightedFieldFragList.java Wed Mar 12 14:39:17 2014
@@ -44,9 +44,9 @@ public class WeightedFieldFragList exten
*/
@Override
public void add( int startOffset, int endOffset, List<WeightedPhraseInfo> phraseInfoList ) {
- List<SubInfo> tempSubInfos = new ArrayList<SubInfo>();
- List<SubInfo> realSubInfos = new ArrayList<SubInfo>();
- HashSet<String> distinctTerms = new HashSet<String>();
+ List<SubInfo> tempSubInfos = new ArrayList<>();
+ List<SubInfo> realSubInfos = new ArrayList<>();
+ HashSet<String> distinctTerms = new HashSet<>();
int length = 0;
for( WeightedPhraseInfo phraseInfo : phraseInfoList ){
Modified: lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java Wed Mar 12 14:39:17 2014
@@ -419,7 +419,7 @@ public class HighlighterTest extends Bas
}
public void testSpanRegexQuery() throws Exception {
- query = new SpanOrQuery(new SpanMultiTermQueryWrapper<RegexpQuery>(new RegexpQuery(new Term(FIELD_NAME, "ken.*"))));
+ query = new SpanOrQuery(new SpanMultiTermQueryWrapper<>(new RegexpQuery(new Term(FIELD_NAME, "ken.*"))));
searcher = newSearcher(reader);
hits = searcher.search(query, 100);
int maxNumFragmentsRequired = 2;
@@ -1173,12 +1173,12 @@ public class HighlighterTest extends Bas
WeightedSpanTerm[] wTerms = new WeightedSpanTerm[2];
wTerms[0] = new WeightedSpanTerm(10f, "hello");
- List<PositionSpan> positionSpans = new ArrayList<PositionSpan>();
+ List<PositionSpan> positionSpans = new ArrayList<>();
positionSpans.add(new PositionSpan(0, 0));
wTerms[0].addPositionSpans(positionSpans);
wTerms[1] = new WeightedSpanTerm(1f, "kennedy");
- positionSpans = new ArrayList<PositionSpan>();
+ positionSpans = new ArrayList<>();
positionSpans.add(new PositionSpan(14, 14));
wTerms[1].addPositionSpans(positionSpans);
@@ -1216,7 +1216,7 @@ public class HighlighterTest extends Bas
@Override
public void run() throws Exception {
- HashMap<String,String> synonyms = new HashMap<String,String>();
+ HashMap<String,String> synonyms = new HashMap<>();
synonyms.put("football", "soccer,footie");
Analyzer analyzer = new SynonymAnalyzer(synonyms);
@@ -1578,7 +1578,7 @@ public class HighlighterTest extends Bas
private final PositionIncrementAttribute posIncrAtt = addAttribute(PositionIncrementAttribute.class);
private final OffsetAttribute offsetAtt = addAttribute(OffsetAttribute.class);
{
- lst = new ArrayList<Token>();
+ lst = new ArrayList<>();
Token t;
t = createToken("hi", 0, 2);
t.setPositionIncrement(1);
@@ -1629,7 +1629,7 @@ public class HighlighterTest extends Bas
private final PositionIncrementAttribute posIncrAtt = addAttribute(PositionIncrementAttribute.class);
private final OffsetAttribute offsetAtt = addAttribute(OffsetAttribute.class);
{
- lst = new ArrayList<Token>();
+ lst = new ArrayList<>();
Token t;
t = createToken("hispeed", 0, 8);
t.setPositionIncrement(1);
Modified: lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestMultiTermHighlighting.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestMultiTermHighlighting.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestMultiTermHighlighting.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestMultiTermHighlighting.java Wed Mar 12 14:39:17 2014
@@ -511,7 +511,7 @@ public class TestMultiTermHighlighting e
return analyzer;
}
};
- Query query = new SpanMultiTermQueryWrapper<WildcardQuery>(new WildcardQuery(new Term("body", "te*")));
+ Query query = new SpanMultiTermQueryWrapper<>(new WildcardQuery(new Term("body", "te*")));
TopDocs topDocs = searcher.search(query, null, 10, Sort.INDEXORDER);
assertEquals(2, topDocs.totalHits);
String snippets[] = highlighter.highlight("body", query, searcher, topDocs);
@@ -552,7 +552,7 @@ public class TestMultiTermHighlighting e
return analyzer;
}
};
- SpanQuery childQuery = new SpanMultiTermQueryWrapper<WildcardQuery>(new WildcardQuery(new Term("body", "te*")));
+ SpanQuery childQuery = new SpanMultiTermQueryWrapper<>(new WildcardQuery(new Term("body", "te*")));
Query query = new SpanOrQuery(new SpanQuery[] { childQuery });
TopDocs topDocs = searcher.search(query, null, 10, Sort.INDEXORDER);
assertEquals(2, topDocs.totalHits);
@@ -594,7 +594,7 @@ public class TestMultiTermHighlighting e
return analyzer;
}
};
- SpanQuery childQuery = new SpanMultiTermQueryWrapper<WildcardQuery>(new WildcardQuery(new Term("body", "te*")));
+ SpanQuery childQuery = new SpanMultiTermQueryWrapper<>(new WildcardQuery(new Term("body", "te*")));
Query query = new SpanNearQuery(new SpanQuery[] { childQuery }, 0, true);
TopDocs topDocs = searcher.search(query, null, 10, Sort.INDEXORDER);
assertEquals(2, topDocs.totalHits);
@@ -636,7 +636,7 @@ public class TestMultiTermHighlighting e
return analyzer;
}
};
- SpanQuery include = new SpanMultiTermQueryWrapper<WildcardQuery>(new WildcardQuery(new Term("body", "te*")));
+ SpanQuery include = new SpanMultiTermQueryWrapper<>(new WildcardQuery(new Term("body", "te*")));
SpanQuery exclude = new SpanTermQuery(new Term("body", "bogus"));
Query query = new SpanNotQuery(include, exclude);
TopDocs topDocs = searcher.search(query, null, 10, Sort.INDEXORDER);
@@ -679,7 +679,7 @@ public class TestMultiTermHighlighting e
return analyzer;
}
};
- SpanQuery childQuery = new SpanMultiTermQueryWrapper<WildcardQuery>(new WildcardQuery(new Term("body", "te*")));
+ SpanQuery childQuery = new SpanMultiTermQueryWrapper<>(new WildcardQuery(new Term("body", "te*")));
Query query = new SpanFirstQuery(childQuery, 1000000);
TopDocs topDocs = searcher.search(query, null, 10, Sort.INDEXORDER);
assertEquals(2, topDocs.totalHits);
Modified: lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestPostingsHighlighterRanking.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestPostingsHighlighterRanking.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestPostingsHighlighterRanking.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestPostingsHighlighterRanking.java Wed Mar 12 14:39:17 2014
@@ -163,7 +163,7 @@ public class TestPostingsHighlighterRank
* instead it just collects them for asserts!
*/
static class FakePassageFormatter extends PassageFormatter {
- HashSet<Pair> seen = new HashSet<Pair>();
+ HashSet<Pair> seen = new HashSet<>();
@Override
public String format(Passage passages[], String content) {
Modified: lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java Wed Mar 12 14:39:17 2014
@@ -168,7 +168,7 @@ public abstract class AbstractTestCase e
}
protected List<BytesRef> analyze(String text, String field, Analyzer analyzer) throws IOException {
- List<BytesRef> bytesRefs = new ArrayList<BytesRef>();
+ List<BytesRef> bytesRefs = new ArrayList<>();
try (TokenStream tokenStream = analyzer.tokenStream(field, text)) {
TermToBytesRefAttribute termAttribute = tokenStream.getAttribute(TermToBytesRefAttribute.class);
Modified: lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FastVectorHighlighterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FastVectorHighlighterTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FastVectorHighlighterTest.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FastVectorHighlighterTest.java Wed Mar 12 14:39:17 2014
@@ -533,7 +533,7 @@ public class FastVectorHighlighterTest e
token( "red", 0, 0, 3 )
), matched ) );
- final Map<String, Analyzer> fieldAnalyzers = new TreeMap<String, Analyzer>();
+ final Map<String, Analyzer> fieldAnalyzers = new TreeMap<>();
fieldAnalyzers.put( "field", new MockAnalyzer( random(), MockTokenizer.WHITESPACE, true, MockTokenFilter.ENGLISH_STOPSET ) );
fieldAnalyzers.put( "field_exact", new MockAnalyzer( random() ) );
fieldAnalyzers.put( "field_super_exact", new MockAnalyzer( random(), MockTokenizer.WHITESPACE, false ) );
@@ -566,7 +566,7 @@ public class FastVectorHighlighterTest e
FieldQuery fieldQuery = new FieldQuery( query, reader, true, fieldMatch );
String[] bestFragments;
if ( useMatchedFields ) {
- Set< String > matchedFields = new HashSet< String >();
+ Set< String > matchedFields = new HashSet<>();
matchedFields.add( "field" );
matchedFields.add( "field_exact" );
matchedFields.add( "field_super_exact" );
Modified: lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldPhraseListTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldPhraseListTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldPhraseListTest.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldPhraseListTest.java Wed Mar 12 14:39:17 2014
@@ -269,7 +269,7 @@ public class FieldPhraseListTest extends
}
private WeightedPhraseInfo newInfo( int startOffset, int endOffset, float boost ) {
- LinkedList< TermInfo > infos = new LinkedList< TermInfo >();
+ LinkedList< TermInfo > infos = new LinkedList<>();
infos.add( new TermInfo( TestUtil.randomUnicodeString(random()), startOffset, endOffset, 0, 0 ) );
return new WeightedPhraseInfo( infos, boost );
}
Modified: lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldQueryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldQueryTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldQueryTest.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldQueryTest.java Wed Mar 12 14:39:17 2014
@@ -67,7 +67,7 @@ public class FieldQueryTest extends Abst
booleanQuery.add(innerQuery, Occur.MUST_NOT);
FieldQuery fq = new FieldQuery(booleanQuery, true, true );
- Set<Query> flatQueries = new HashSet<Query>();
+ Set<Query> flatQueries = new HashSet<>();
fq.flatten(booleanQuery, reader, flatQueries);
assertCollectionQueries( flatQueries, tq( boost, "A" ), tq( boost, "B" ), tq( boost, "C" ) );
}
@@ -77,7 +77,7 @@ public class FieldQueryTest extends Abst
Query query = dmq( tq( "A" ), tq( "B" ), pqF( "C", "D" ) );
query.setBoost( boost );
FieldQuery fq = new FieldQuery( query, true, true );
- Set<Query> flatQueries = new HashSet<Query>();
+ Set<Query> flatQueries = new HashSet<>();
fq.flatten( query, reader, flatQueries );
assertCollectionQueries( flatQueries, tq( boost, "A" ), tq( boost, "B" ), pqF( boost, "C", "D" ) );
}
@@ -90,7 +90,7 @@ public class FieldQueryTest extends Abst
booleanQuery.add(pqF("B", "C"), Occur.MUST);
FieldQuery fq = new FieldQuery(booleanQuery, true, true );
- Set<Query> flatQueries = new HashSet<Query>();
+ Set<Query> flatQueries = new HashSet<>();
fq.flatten(booleanQuery, reader, flatQueries);
assertCollectionQueries( flatQueries, tq( boost, "A" ), pqF( boost, "B", "C" ) );
}
@@ -102,7 +102,7 @@ public class FieldQueryTest extends Abst
query.add(toPhraseQuery(analyze("EFGH", F, analyzerB), F), Occur.SHOULD);
FieldQuery fq = new FieldQuery( query, true, true );
- Set<Query> flatQueries = new HashSet<Query>();
+ Set<Query> flatQueries = new HashSet<>();
fq.flatten( query, reader, flatQueries );
assertCollectionQueries( flatQueries, tq( "AA" ), pqF( "BC", "CD" ), pqF( "EF", "FG", "GH" ) );
}
@@ -110,7 +110,7 @@ public class FieldQueryTest extends Abst
public void testFlatten1TermPhrase() throws Exception {
Query query = pqF( "A" );
FieldQuery fq = new FieldQuery( query, true, true );
- Set<Query> flatQueries = new HashSet<Query>();
+ Set<Query> flatQueries = new HashSet<>();
fq.flatten( query, reader, flatQueries );
assertCollectionQueries( flatQueries, tq( "A" ) );
}
@@ -120,56 +120,56 @@ public class FieldQueryTest extends Abst
FieldQuery fq = new FieldQuery( dummy, true, true );
// "a b","b c" => "a b","b c","a b c"
- Set<Query> flatQueries = new HashSet<Query>();
+ Set<Query> flatQueries = new HashSet<>();
flatQueries.add( pqF( "a", "b" ) );
flatQueries.add( pqF( "b", "c" ) );
assertCollectionQueries( fq.expand( flatQueries ),
pqF( "a", "b" ), pqF( "b", "c" ), pqF( "a", "b", "c" ) );
// "a b","b c d" => "a b","b c d","a b c d"
- flatQueries = new HashSet<Query>();
+ flatQueries = new HashSet<>();
flatQueries.add( pqF( "a", "b" ) );
flatQueries.add( pqF( "b", "c", "d" ) );
assertCollectionQueries( fq.expand( flatQueries ),
pqF( "a", "b" ), pqF( "b", "c", "d" ), pqF( "a", "b", "c", "d" ) );
// "a b c","b c d" => "a b c","b c d","a b c d"
- flatQueries = new HashSet<Query>();
+ flatQueries = new HashSet<>();
flatQueries.add( pqF( "a", "b", "c" ) );
flatQueries.add( pqF( "b", "c", "d" ) );
assertCollectionQueries( fq.expand( flatQueries ),
pqF( "a", "b", "c" ), pqF( "b", "c", "d" ), pqF( "a", "b", "c", "d" ) );
// "a b c","c d e" => "a b c","c d e","a b c d e"
- flatQueries = new HashSet<Query>();
+ flatQueries = new HashSet<>();
flatQueries.add( pqF( "a", "b", "c" ) );
flatQueries.add( pqF( "c", "d", "e" ) );
assertCollectionQueries( fq.expand( flatQueries ),
pqF( "a", "b", "c" ), pqF( "c", "d", "e" ), pqF( "a", "b", "c", "d", "e" ) );
// "a b c d","b c" => "a b c d","b c"
- flatQueries = new HashSet<Query>();
+ flatQueries = new HashSet<>();
flatQueries.add( pqF( "a", "b", "c", "d" ) );
flatQueries.add( pqF( "b", "c" ) );
assertCollectionQueries( fq.expand( flatQueries ),
pqF( "a", "b", "c", "d" ), pqF( "b", "c" ) );
// "a b b","b c" => "a b b","b c","a b b c"
- flatQueries = new HashSet<Query>();
+ flatQueries = new HashSet<>();
flatQueries.add( pqF( "a", "b", "b" ) );
flatQueries.add( pqF( "b", "c" ) );
assertCollectionQueries( fq.expand( flatQueries ),
pqF( "a", "b", "b" ), pqF( "b", "c" ), pqF( "a", "b", "b", "c" ) );
// "a b","b a" => "a b","b a","a b a", "b a b"
- flatQueries = new HashSet<Query>();
+ flatQueries = new HashSet<>();
flatQueries.add( pqF( "a", "b" ) );
flatQueries.add( pqF( "b", "a" ) );
assertCollectionQueries( fq.expand( flatQueries ),
pqF( "a", "b" ), pqF( "b", "a" ), pqF( "a", "b", "a" ), pqF( "b", "a", "b" ) );
// "a b","a b c" => "a b","a b c"
- flatQueries = new HashSet<Query>();
+ flatQueries = new HashSet<>();
flatQueries.add( pqF( "a", "b" ) );
flatQueries.add( pqF( "a", "b", "c" ) );
assertCollectionQueries( fq.expand( flatQueries ),
@@ -181,42 +181,42 @@ public class FieldQueryTest extends Abst
FieldQuery fq = new FieldQuery( dummy, true, true );
// "a b","c d" => "a b","c d"
- Set<Query> flatQueries = new HashSet<Query>();
+ Set<Query> flatQueries = new HashSet<>();
flatQueries.add( pqF( "a", "b" ) );
flatQueries.add( pqF( "c", "d" ) );
assertCollectionQueries( fq.expand( flatQueries ),
pqF( "a", "b" ), pqF( "c", "d" ) );
// "a","a b" => "a", "a b"
- flatQueries = new HashSet<Query>();
+ flatQueries = new HashSet<>();
flatQueries.add( tq( "a" ) );
flatQueries.add( pqF( "a", "b" ) );
assertCollectionQueries( fq.expand( flatQueries ),
tq( "a" ), pqF( "a", "b" ) );
// "a b","b" => "a b", "b"
- flatQueries = new HashSet<Query>();
+ flatQueries = new HashSet<>();
flatQueries.add( pqF( "a", "b" ) );
flatQueries.add( tq( "b" ) );
assertCollectionQueries( fq.expand( flatQueries ),
pqF( "a", "b" ), tq( "b" ) );
// "a b c","b c" => "a b c","b c"
- flatQueries = new HashSet<Query>();
+ flatQueries = new HashSet<>();
flatQueries.add( pqF( "a", "b", "c" ) );
flatQueries.add( pqF( "b", "c" ) );
assertCollectionQueries( fq.expand( flatQueries ),
pqF( "a", "b", "c" ), pqF( "b", "c" ) );
// "a b","a b c" => "a b","a b c"
- flatQueries = new HashSet<Query>();
+ flatQueries = new HashSet<>();
flatQueries.add( pqF( "a", "b" ) );
flatQueries.add( pqF( "a", "b", "c" ) );
assertCollectionQueries( fq.expand( flatQueries ),
pqF( "a", "b" ), pqF( "a", "b", "c" ) );
// "a b c","b d e" => "a b c","b d e"
- flatQueries = new HashSet<Query>();
+ flatQueries = new HashSet<>();
flatQueries.add( pqF( "a", "b", "c" ) );
flatQueries.add( pqF( "b", "d", "e" ) );
assertCollectionQueries( fq.expand( flatQueries ),
@@ -228,7 +228,7 @@ public class FieldQueryTest extends Abst
FieldQuery fq = new FieldQuery( dummy, true, false );
// f1:"a b",f2:"b c" => f1:"a b",f2:"b c",f1:"a b c"
- Set<Query> flatQueries = new HashSet<Query>();
+ Set<Query> flatQueries = new HashSet<>();
flatQueries.add( pq( F1, "a", "b" ) );
flatQueries.add( pq( F2, "b", "c" ) );
assertCollectionQueries( fq.expand( flatQueries ),
@@ -826,7 +826,7 @@ public class FieldQueryTest extends Abst
FieldQuery fq = new FieldQuery( query, true, true );
// "a"
- List<TermInfo> phraseCandidate = new ArrayList<TermInfo>();
+ List<TermInfo> phraseCandidate = new ArrayList<>();
phraseCandidate.add( new TermInfo( "a", 0, 1, 0, 1 ) );
assertNull( fq.searchPhrase( F, phraseCandidate ) );
// "a b"
@@ -868,7 +868,7 @@ public class FieldQueryTest extends Abst
FieldQuery fq = new FieldQuery( query, true, true );
// "a b c" w/ position-gap = 2
- List<TermInfo> phraseCandidate = new ArrayList<TermInfo>();
+ List<TermInfo> phraseCandidate = new ArrayList<>();
phraseCandidate.add( new TermInfo( "a", 0, 1, 0, 1 ) );
phraseCandidate.add( new TermInfo( "b", 2, 3, 2, 1 ) );
phraseCandidate.add( new TermInfo( "c", 4, 5, 4, 1 ) );
@@ -917,7 +917,7 @@ public class FieldQueryTest extends Abst
QueryPhraseMap qpm = fq.getFieldTermMap(F, "defg");
assertNotNull (qpm);
assertNull (fq.getFieldTermMap(F, "dog"));
- List<TermInfo> phraseCandidate = new ArrayList<TermInfo>();
+ List<TermInfo> phraseCandidate = new ArrayList<>();
phraseCandidate.add( new TermInfo( "defg", 0, 12, 0, 1 ) );
assertNotNull (fq.searchPhrase(F, phraseCandidate));
}
@@ -947,7 +947,7 @@ public class FieldQueryTest extends Abst
});
query.setBoost(boost);
FieldQuery fq = new FieldQuery( query, true, true );
- Set<Query> flatQueries = new HashSet<Query>();
+ Set<Query> flatQueries = new HashSet<>();
fq.flatten( query, reader, flatQueries );
assertCollectionQueries( flatQueries, tq( boost, "A" ) );
}
@@ -957,7 +957,7 @@ public class FieldQueryTest extends Abst
Query query = new ConstantScoreQuery(pqF( "A" ));
query.setBoost(boost);
FieldQuery fq = new FieldQuery( query, true, true );
- Set<Query> flatQueries = new HashSet<Query>();
+ Set<Query> flatQueries = new HashSet<>();
fq.flatten( query, reader, flatQueries );
assertCollectionQueries( flatQueries, tq( boost, "A" ) );
}
Modified: lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/IndexTimeSynonymTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/IndexTimeSynonymTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/IndexTimeSynonymTest.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/IndexTimeSynonymTest.java Wed Mar 12 14:39:17 2014
@@ -48,7 +48,7 @@ public class IndexTimeSynonymTest extend
FieldQuery fq = new FieldQuery( bq, true, true );
FieldTermStack stack = new FieldTermStack( reader, 0, F, fq );
assertEquals( 2, stack.termList.size() );
- Set<String> expectedSet = new HashSet<String>();
+ Set<String> expectedSet = new HashSet<>();
expectedSet.add( "Mac(11,20,3)" );
expectedSet.add( "MacBook(11,20,3)" );
assertTrue( expectedSet.contains( stack.pop().toString() ) );
@@ -92,7 +92,7 @@ public class IndexTimeSynonymTest extend
FieldQuery fq = new FieldQuery( bq, true, true );
FieldTermStack stack = new FieldTermStack( reader, 0, F, fq );
assertEquals( 3, stack.termList.size() );
- Set<String> expectedSet = new HashSet<String>();
+ Set<String> expectedSet = new HashSet<>();
expectedSet.add( "pc(3,5,1)" );
expectedSet.add( "personal(3,5,1)" );
assertTrue( expectedSet.contains( stack.pop().toString() ) );
@@ -137,7 +137,7 @@ public class IndexTimeSynonymTest extend
FieldQuery fq = new FieldQuery( bq, true, true );
FieldTermStack stack = new FieldTermStack( reader, 0, F, fq );
assertEquals( 3, stack.termList.size() );
- Set<String> expectedSet = new HashSet<String>();
+ Set<String> expectedSet = new HashSet<>();
expectedSet.add( "pc(3,20,1)" );
expectedSet.add( "personal(3,20,1)" );
assertTrue( expectedSet.contains( stack.pop().toString() ) );
Modified: lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java Wed Mar 12 14:39:17 2014
@@ -248,9 +248,9 @@ public class SimpleFragmentsBuilderTest
int numDocs = randomValues.length * 5;
int numFields = 2 + random().nextInt(5);
int numTerms = 2 + random().nextInt(3);
- List<Doc> docs = new ArrayList<Doc>(numDocs);
- List<Document> documents = new ArrayList<Document>(numDocs);
- Map<String, Set<Integer>> valueToDocId = new HashMap<String, Set<Integer>>();
+ List<Doc> docs = new ArrayList<>(numDocs);
+ List<Document> documents = new ArrayList<>(numDocs);
+ Map<String, Set<Integer>> valueToDocId = new HashMap<>();
for (int i = 0; i < numDocs; i++) {
Document document = new Document();
String[][] fields = new String[numFields][numTerms];
@@ -277,7 +277,7 @@ public class SimpleFragmentsBuilderTest
for (int highlightIter = 0; highlightIter < highlightIters; highlightIter++) {
String queryTerm = randomValues[random().nextInt(randomValues.length)];
int randomHit = valueToDocId.get(queryTerm).iterator().next();
- List<StringBuilder> builders = new ArrayList<StringBuilder>();
+ List<StringBuilder> builders = new ArrayList<>();
for (String[] fieldValues : docs.get(randomHit).fieldValues) {
StringBuilder builder = new StringBuilder();
boolean hit = false;
Modified: lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java (original)
+++ lucene/dev/trunk/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java Wed Mar 12 14:39:17 2014
@@ -309,7 +309,7 @@ public class ToParentBlockJoinCollector
}
Arrays.fill(joinScorers, null);
- Queue<Scorer> queue = new LinkedList<Scorer>();
+ Queue<Scorer> queue = new LinkedList<>();
//System.out.println("\nqueue: add top scorer=" + scorer);
queue.add(scorer);
while ((scorer = queue.poll()) != null) {
Modified: lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java (original)
+++ lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java Wed Mar 12 14:39:17 2014
@@ -69,7 +69,7 @@ public class TestBlockJoin extends Lucen
// we don't want to merge - since we rely on certain segment setup
final IndexWriter w = new IndexWriter(dir, config);
- final List<Document> docs = new ArrayList<Document>();
+ final List<Document> docs = new ArrayList<>();
docs.add(makeJob("java", 2007));
docs.add(makeJob("python", 2010));
@@ -127,7 +127,7 @@ public class TestBlockJoin extends Lucen
final Directory dir = newDirectory();
final RandomIndexWriter w = new RandomIndexWriter(random(), dir);
- final List<Document> docs = new ArrayList<Document>();
+ final List<Document> docs = new ArrayList<>();
docs.add(makeJob("java", 2007));
docs.add(makeJob("python", 2010));
@@ -217,7 +217,7 @@ public class TestBlockJoin extends Lucen
final Directory dir = newDirectory();
final RandomIndexWriter w = new RandomIndexWriter(random(), dir);
- final List<Document> docs = new ArrayList<Document>();
+ final List<Document> docs = new ArrayList<>();
for (int i=0;i<10;i++) {
docs.clear();
@@ -1264,7 +1264,7 @@ public class TestBlockJoin extends Lucen
parent.add(newTextField("parentText", "text", Field.Store.NO));
parent.add(newStringField("isParent", "yes", Field.Store.NO));
- List<Document> docs = new ArrayList<Document>();
+ List<Document> docs = new ArrayList<>();
Document child = new Document();
docs.add(child);
@@ -1328,7 +1328,7 @@ public class TestBlockJoin extends Lucen
parent.add(newTextField("parentText", "text", Field.Store.NO));
parent.add(newStringField("isParent", "yes", Field.Store.NO));
- List<Document> docs = new ArrayList<Document>();
+ List<Document> docs = new ArrayList<>();
Document child = new Document();
docs.add(child);
@@ -1393,7 +1393,7 @@ public class TestBlockJoin extends Lucen
parent.add(newTextField("parentText", "text", Field.Store.NO));
parent.add(newStringField("isParent", "yes", Field.Store.NO));
- List<Document> docs = new ArrayList<Document>();
+ List<Document> docs = new ArrayList<>();
Document child = new Document();
docs.add(child);
Modified: lucene/dev/trunk/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java (original)
+++ lucene/dev/trunk/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java Wed Mar 12 14:39:17 2014
@@ -195,7 +195,7 @@ import org.apache.lucene.util.RecyclingI
public class MemoryIndex {
/** info for each field: Map<String fieldName, Info field> */
- private final HashMap<String,Info> fields = new HashMap<String,Info>();
+ private final HashMap<String,Info> fields = new HashMap<>();
/** fields sorted ascending by fieldName; lazily computed on demand */
private transient Map.Entry<String,Info>[] sortedFields;
@@ -209,7 +209,7 @@ public class MemoryIndex {
// private final IntBlockPool.SliceReader postingsReader;
private final IntBlockPool.SliceWriter postingsWriter;
- private HashMap<String,FieldInfo> fieldInfos = new HashMap<String,FieldInfo>();
+ private HashMap<String,FieldInfo> fieldInfos = new HashMap<>();
private Counter bytesUsed;
Modified: lucene/dev/trunk/lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java (original)
+++ lucene/dev/trunk/lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java Wed Mar 12 14:39:17 2014
@@ -83,7 +83,7 @@ import static org.hamcrest.CoreMatchers.
* returning the same results for queries on some randomish indexes.
*/
public class MemoryIndexTest extends BaseTokenStreamTestCase {
- private Set<String> queries = new HashSet<String>();
+ private Set<String> queries = new HashSet<>();
public static final int ITERATIONS = 100 * RANDOM_MULTIPLIER;
@@ -98,7 +98,7 @@ public class MemoryIndexTest extends Bas
* read a set of queries from a resource file
*/
private Set<String> readQueries(String resource) throws IOException {
- Set<String> queries = new HashSet<String>();
+ Set<String> queries = new HashSet<>();
InputStream stream = getClass().getResourceAsStream(resource);
BufferedReader reader = new BufferedReader(new InputStreamReader(stream, "UTF-8"));
String line = null;
@@ -376,7 +376,7 @@ public class MemoryIndexTest extends Bas
// LUCENE-3831
public void testNullPointerException() throws IOException {
RegexpQuery regex = new RegexpQuery(new Term("field", "worl."));
- SpanQuery wrappedquery = new SpanMultiTermQueryWrapper<RegexpQuery>(regex);
+ SpanQuery wrappedquery = new SpanMultiTermQueryWrapper<>(regex);
MemoryIndex mindex = new MemoryIndex(random().nextBoolean(), random().nextInt(50) * 1024 * 1024);
mindex.addField("field", new MockAnalyzer(random()).tokenStream("field", "hello there"));
@@ -388,7 +388,7 @@ public class MemoryIndexTest extends Bas
// LUCENE-3831
public void testPassesIfWrapped() throws IOException {
RegexpQuery regex = new RegexpQuery(new Term("field", "worl."));
- SpanQuery wrappedquery = new SpanOrQuery(new SpanMultiTermQueryWrapper<RegexpQuery>(regex));
+ SpanQuery wrappedquery = new SpanOrQuery(new SpanMultiTermQueryWrapper<>(regex));
MemoryIndex mindex = new MemoryIndex(random().nextBoolean(), random().nextInt(50) * 1024 * 1024);
mindex.addField("field", new MockAnalyzer(random()).tokenStream("field", "hello there"));
Modified: lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/document/LazyDocument.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/document/LazyDocument.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/document/LazyDocument.java (original)
+++ lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/document/LazyDocument.java Wed Mar 12 14:39:17 2014
@@ -45,8 +45,8 @@ public class LazyDocument {
// null until first field is loaded
private StoredDocument doc;
- private Map<Integer,List<LazyField>> fields = new HashMap<Integer,List<LazyField>>();
- private Set<String> fieldNames = new HashSet<String>();
+ private Map<Integer,List<LazyField>> fields = new HashMap<>();
+ private Set<String> fieldNames = new HashSet<>();
public LazyDocument(IndexReader reader, int docID) {
this.reader = reader;
@@ -73,7 +73,7 @@ public class LazyDocument {
fieldNames.add(fieldInfo.name);
List<LazyField> values = fields.get(fieldInfo.number);
if (null == values) {
- values = new ArrayList<LazyField>();
+ values = new ArrayList<>();
fields.put(fieldInfo.number, values);
}
Modified: lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/IndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/IndexSplitter.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/IndexSplitter.java (original)
+++ lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/IndexSplitter.java Wed Mar 12 14:39:17 2014
@@ -73,14 +73,14 @@ public class IndexSplitter {
if (args[1].equals("-l")) {
is.listSegments();
} else if (args[1].equals("-d")) {
- List<String> segs = new ArrayList<String>();
+ List<String> segs = new ArrayList<>();
for (int x = 2; x < args.length; x++) {
segs.add(args[x]);
}
is.remove(segs.toArray(new String[0]));
} else {
File targetDir = new File(args[1]);
- List<String> segs = new ArrayList<String>();
+ List<String> segs = new ArrayList<>();
for (int x = 2; x < args.length; x++) {
segs.add(args[x]);
}
Modified: lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java (original)
+++ lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java Wed Mar 12 14:39:17 2014
@@ -118,7 +118,7 @@ public class MultiPassIndexSplitter {
System.err.println("\t-seq\tsequential docid-range split (default is round-robin)");
System.exit(-1);
}
- ArrayList<IndexReader> indexes = new ArrayList<IndexReader>();
+ ArrayList<IndexReader> indexes = new ArrayList<>();
String outDir = null;
int numParts = -1;
boolean seq = false;
Modified: lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/util/fst/ListOfOutputs.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/util/fst/ListOfOutputs.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/util/fst/ListOfOutputs.java (original)
+++ lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/util/fst/ListOfOutputs.java Wed Mar 12 14:39:17 2014
@@ -90,7 +90,7 @@ public final class ListOfOutputs<T> exte
return outputs.add((T) prefix, (T) output);
} else {
List<T> outputList = (List<T>) output;
- List<T> addedList = new ArrayList<T>(outputList.size());
+ List<T> addedList = new ArrayList<>(outputList.size());
for(T _output : outputList) {
addedList.add(outputs.add((T) prefix, _output));
}
@@ -129,7 +129,7 @@ public final class ListOfOutputs<T> exte
if (count == 1) {
return outputs.read(in);
} else {
- List<T> outputList = new ArrayList<T>(count);
+ List<T> outputList = new ArrayList<>(count);
for(int i=0;i<count;i++) {
outputList.add(outputs.read(in));
}
@@ -165,7 +165,7 @@ public final class ListOfOutputs<T> exte
@Override
public Object merge(Object first, Object second) {
- List<T> outputList = new ArrayList<T>();
+ List<T> outputList = new ArrayList<>();
if (!(first instanceof List)) {
outputList.add((T) first);
} else {
@@ -188,7 +188,7 @@ public final class ListOfOutputs<T> exte
public List<T> asList(Object output) {
if (!(output instanceof List)) {
- List<T> result = new ArrayList<T>(1);
+ List<T> result = new ArrayList<>(1);
result.add((T) output);
return result;
} else {
Modified: lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/document/TestLazyDocument.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/document/TestLazyDocument.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/document/TestLazyDocument.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/document/TestLazyDocument.java Wed Mar 12 14:39:17 2014
@@ -94,7 +94,7 @@ public class TestLazyDocument extends Lu
StoredDocument d = visitor.doc;
int numFieldValues = 0;
- Map<String,Integer> fieldValueCounts = new HashMap<String,Integer>();
+ Map<String,Integer> fieldValueCounts = new HashMap<>();
// at this point, all FIELDS should be Lazy and unrealized
for (StorableField f : d) {
@@ -195,7 +195,7 @@ public class TestLazyDocument extends Lu
LazyTestingStoredFieldVisitor(LazyDocument l, String... fields) {
lazyDoc = l;
- lazyFieldNames = new HashSet<String>(Arrays.asList(fields));
+ lazyFieldNames = new HashSet<>(Arrays.asList(fields));
}
@Override
Modified: lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/IndexSortingTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/IndexSortingTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/IndexSortingTest.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/IndexSortingTest.java Wed Mar 12 14:39:17 2014
@@ -43,7 +43,7 @@ public class IndexSortingTest extends So
// only read the values of the undeleted documents, since after addIndexes,
// the deleted ones will be dropped from the index.
Bits liveDocs = reader.getLiveDocs();
- List<Integer> values = new ArrayList<Integer>();
+ List<Integer> values = new ArrayList<>();
for (int i = 0; i < reader.maxDoc(); i++) {
if (liveDocs == null || liveDocs.get(i)) {
values.add(Integer.valueOf(reader.document(i).get(ID_FIELD)));
Modified: lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/SorterTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/SorterTestBase.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/SorterTestBase.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/SorterTestBase.java Wed Mar 12 14:39:17 2014
@@ -194,7 +194,7 @@ public abstract class SorterTestBase ext
/** Creates an index for sorting. */
public static void createIndex(Directory dir, int numDocs, Random random) throws IOException {
- List<Integer> ids = new ArrayList<Integer>();
+ List<Integer> ids = new ArrayList<>();
for (int i = 0; i < numDocs; i++) {
ids.add(Integer.valueOf(i * 10));
}
Modified: lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/TestBlockJoinSorter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/TestBlockJoinSorter.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/TestBlockJoinSorter.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/TestBlockJoinSorter.java Wed Mar 12 14:39:17 2014
@@ -73,7 +73,7 @@ public class TestBlockJoinSorter extends
final StringField parent = new StringField("parent", "true", Store.YES);
parentDoc.add(parent);
for (int i = 0; i < numParents; ++i) {
- List<Document> documents = new ArrayList<Document>();
+ List<Document> documents = new ArrayList<>();
final int numChildren = random().nextInt(10);
for (int j = 0; j < numChildren; ++j) {
final Document childDoc = new Document();
Modified: lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/TestEarlyTermination.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/TestEarlyTermination.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/TestEarlyTermination.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/TestEarlyTermination.java Wed Mar 12 14:39:17 2014
@@ -73,11 +73,11 @@ public class TestEarlyTermination extend
dir = newDirectory();
numDocs = atLeast(150);
final int numTerms = TestUtil.nextInt(random(), 1, numDocs / 5);
- Set<String> randomTerms = new HashSet<String>();
+ Set<String> randomTerms = new HashSet<>();
while (randomTerms.size() < numTerms) {
randomTerms.add(TestUtil.randomSimpleString(random()));
}
- terms = new ArrayList<String>(randomTerms);
+ terms = new ArrayList<>(randomTerms);
final long seed = random().nextLong();
final IndexWriterConfig iwc = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(new Random(seed)));
iwc.setMergePolicy(TestSortingMergePolicy.newSortingMergePolicy(sort));
Modified: lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/TestSortingMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/TestSortingMergePolicy.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/TestSortingMergePolicy.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/TestSortingMergePolicy.java Wed Mar 12 14:39:17 2014
@@ -93,11 +93,11 @@ public class TestSortingMergePolicy exte
dir2 = newDirectory();
final int numDocs = atLeast(150);
final int numTerms = TestUtil.nextInt(random(), 1, numDocs / 5);
- Set<String> randomTerms = new HashSet<String>();
+ Set<String> randomTerms = new HashSet<>();
while (randomTerms.size() < numTerms) {
randomTerms.add(TestUtil.randomSimpleString(random()));
}
- terms = new ArrayList<String>(randomTerms);
+ terms = new ArrayList<>(randomTerms);
final long seed = random().nextLong();
final IndexWriterConfig iwc1 = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(new Random(seed)));
final IndexWriterConfig iwc2 = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(new Random(seed)));
Modified: lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/util/fst/TestFSTsMisc.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/util/fst/TestFSTsMisc.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/util/fst/TestFSTsMisc.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/util/fst/TestFSTsMisc.java Wed Mar 12 14:39:17 2014
@@ -67,7 +67,7 @@ public class TestFSTsMisc extends Lucene
}
for(int inputMode=0;inputMode<2;inputMode++) {
final int numWords = random.nextInt(maxNumWords+1);
- Set<IntsRef> termsSet = new HashSet<IntsRef>();
+ Set<IntsRef> termsSet = new HashSet<>();
IntsRef[] terms = new IntsRef[numWords];
while(termsSet.size() < numWords) {
final String term = getRandomString(random);
@@ -88,7 +88,7 @@ public class TestFSTsMisc extends Lucene
System.out.println("TEST: now test UpToTwoPositiveIntOutputs");
}
final UpToTwoPositiveIntOutputs outputs = UpToTwoPositiveIntOutputs.getSingleton(true);
- final List<FSTTester.InputOutput<Object>> pairs = new ArrayList<FSTTester.InputOutput<Object>>(terms.length);
+ final List<FSTTester.InputOutput<Object>> pairs = new ArrayList<>(terms.length);
long lastOutput = 0;
for(int idx=0;idx<terms.length;idx++) {
// Sometimes go backwards
@@ -102,14 +102,14 @@ public class TestFSTsMisc extends Lucene
while(value2 < 0) {
value2 = lastOutput + TestUtil.nextInt(random(), -100, 1000);
}
- List<Long> values = new ArrayList<Long>();
+ List<Long> values = new ArrayList<>();
values.add(value);
values.add(value2);
output = values;
} else {
output = outputs.get(value);
}
- pairs.add(new FSTTester.InputOutput<Object>(terms[idx], output));
+ pairs.add(new FSTTester.InputOutput<>(terms[idx], output));
}
new FSTTester<Object>(random(), dir, inputMode, pairs, outputs, false) {
@Override
@@ -133,13 +133,13 @@ public class TestFSTsMisc extends Lucene
System.out.println("TEST: now test OneOrMoreOutputs");
}
final PositiveIntOutputs _outputs = PositiveIntOutputs.getSingleton();
- final ListOfOutputs<Long> outputs = new ListOfOutputs<Long>(_outputs);
- final List<FSTTester.InputOutput<Object>> pairs = new ArrayList<FSTTester.InputOutput<Object>>(terms.length);
+ final ListOfOutputs<Long> outputs = new ListOfOutputs<>(_outputs);
+ final List<FSTTester.InputOutput<Object>> pairs = new ArrayList<>(terms.length);
long lastOutput = 0;
for(int idx=0;idx<terms.length;idx++) {
int outputCount = TestUtil.nextInt(random(), 1, 7);
- List<Long> values = new ArrayList<Long>();
+ List<Long> values = new ArrayList<>();
for(int i=0;i<outputCount;i++) {
// Sometimes go backwards
long value = lastOutput + TestUtil.nextInt(random(), -100, 1000);
@@ -157,16 +157,16 @@ public class TestFSTsMisc extends Lucene
output = values;
}
- pairs.add(new FSTTester.InputOutput<Object>(terms[idx], output));
+ pairs.add(new FSTTester.InputOutput<>(terms[idx], output));
}
- new FSTTester<Object>(random(), dir, inputMode, pairs, outputs, false).doTest(false);
+ new FSTTester<>(random(), dir, inputMode, pairs, outputs, false).doTest(false);
}
}
public void testListOfOutputs() throws Exception {
PositiveIntOutputs _outputs = PositiveIntOutputs.getSingleton();
- ListOfOutputs<Long> outputs = new ListOfOutputs<Long>(_outputs);
- final Builder<Object> builder = new Builder<Object>(FST.INPUT_TYPE.BYTE1, outputs);
+ ListOfOutputs<Long> outputs = new ListOfOutputs<>(_outputs);
+ final Builder<Object> builder = new Builder<>(FST.INPUT_TYPE.BYTE1, outputs);
final IntsRef scratch = new IntsRef();
// Add the same input more than once and the outputs
@@ -194,8 +194,8 @@ public class TestFSTsMisc extends Lucene
public void testListOfOutputsEmptyString() throws Exception {
PositiveIntOutputs _outputs = PositiveIntOutputs.getSingleton();
- ListOfOutputs<Long> outputs = new ListOfOutputs<Long>(_outputs);
- final Builder<Object> builder = new Builder<Object>(FST.INPUT_TYPE.BYTE1, outputs);
+ ListOfOutputs<Long> outputs = new ListOfOutputs<>(_outputs);
+ final Builder<Object> builder = new Builder<>(FST.INPUT_TYPE.BYTE1, outputs);
final IntsRef scratch = new IntsRef();
builder.add(scratch, 0L);
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/BooleanFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/BooleanFilter.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/BooleanFilter.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/BooleanFilter.java Wed Mar 12 14:39:17 2014
@@ -43,7 +43,7 @@ import org.apache.lucene.util.FixedBitSe
*/
public class BooleanFilter extends Filter implements Iterable<FilterClause> {
- private final List<FilterClause> clauses = new ArrayList<FilterClause>();
+ private final List<FilterClause> clauses = new ArrayList<>();
/**
* Returns the a DocIdSetIterator representing the Boolean composition
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/CommonTermsQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/CommonTermsQuery.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/CommonTermsQuery.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/CommonTermsQuery.java Wed Mar 12 14:39:17 2014
@@ -67,7 +67,7 @@ public class CommonTermsQuery extends Qu
* rewrite to dismax rather than boolean. Yet, this can already be subclassed
* to do so.
*/
- protected final List<Term> terms = new ArrayList<Term>();
+ protected final List<Term> terms = new ArrayList<>();
protected final boolean disableCoord;
protected final float maxTermFrequency;
protected final Occur lowFreqOccur;
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/TermsFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/TermsFilter.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/TermsFilter.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/TermsFilter.java Wed Mar 12 14:39:17 2014
@@ -129,7 +129,7 @@ public final class TermsFilter extends F
this.offsets = new int[length+1];
int lastEndOffset = 0;
int index = 0;
- ArrayList<TermsAndField> termsAndFields = new ArrayList<TermsAndField>();
+ ArrayList<TermsAndField> termsAndFields = new ArrayList<>();
TermsAndField lastTermsAndField = null;
BytesRef previousTerm = null;
String previousField = null;
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java Wed Mar 12 14:39:17 2014
@@ -706,7 +706,7 @@ public final class MoreLikeThis {
* @param docNum the id of the lucene document from which to find terms
*/
public PriorityQueue<Object[]> retrieveTerms(int docNum) throws IOException {
- Map<String, Int> termFreqMap = new HashMap<String, Int>();
+ Map<String, Int> termFreqMap = new HashMap<>();
for (String fieldName : fieldNames) {
final Fields vectors = ir.getTermVectors(docNum);
final Terms vector;
@@ -846,7 +846,7 @@ public final class MoreLikeThis {
* @see #retrieveInterestingTerms
*/
public PriorityQueue<Object[]> retrieveTerms(Reader r, String fieldName) throws IOException {
- Map<String, Int> words = new HashMap<String, Int>();
+ Map<String, Int> words = new HashMap<>();
addTermFrequencies(r, words, fieldName);
return createQueue(words);
}
@@ -855,7 +855,7 @@ public final class MoreLikeThis {
* @see #retrieveInterestingTerms(java.io.Reader, String)
*/
public String[] retrieveInterestingTerms(int docNum) throws IOException {
- ArrayList<Object> al = new ArrayList<Object>(maxQueryTerms);
+ ArrayList<Object> al = new ArrayList<>(maxQueryTerms);
PriorityQueue<Object[]> pq = retrieveTerms(docNum);
Object cur;
int lim = maxQueryTerms; // have to be careful, retrieveTerms returns all words but that's probably not useful to our caller...
@@ -879,7 +879,7 @@ public final class MoreLikeThis {
* @see #setMaxQueryTerms
*/
public String[] retrieveInterestingTerms(Reader r, String fieldName) throws IOException {
- ArrayList<Object> al = new ArrayList<Object>(maxQueryTerms);
+ ArrayList<Object> al = new ArrayList<>(maxQueryTerms);
PriorityQueue<Object[]> pq = retrieveTerms(r, fieldName);
Object cur;
int lim = maxQueryTerms; // have to be careful, retrieveTerms returns all words but that's probably not useful to our caller...
Modified: lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/CommonTermsQueryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/CommonTermsQueryTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/CommonTermsQueryTest.java (original)
+++ lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/CommonTermsQueryTest.java Wed Mar 12 14:39:17 2014
@@ -477,7 +477,7 @@ public class CommonTermsQueryTest extend
TopDocs verifySearch = searcher.search(verifyQuery, reader.maxDoc());
assertEquals(verifySearch.totalHits, cqSearch.totalHits);
- Set<Integer> hits = new HashSet<Integer>();
+ Set<Integer> hits = new HashSet<>();
for (ScoreDoc doc : verifySearch.scoreDocs) {
hits.add(doc.doc);
}
@@ -508,7 +508,7 @@ public class CommonTermsQueryTest extend
}
private static List<TermAndFreq> queueToList(PriorityQueue<TermAndFreq> queue) {
- List<TermAndFreq> terms = new ArrayList<CommonTermsQueryTest.TermAndFreq>();
+ List<TermAndFreq> terms = new ArrayList<>();
while (queue.size() > 0) {
terms.add(queue.pop());
}
Modified: lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TermFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TermFilterTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TermFilterTest.java (original)
+++ lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TermFilterTest.java Wed Mar 12 14:39:17 2014
@@ -45,7 +45,7 @@ public class TermFilterTest extends Luce
public void testCachability() throws Exception {
TermFilter a = termFilter("field1", "a");
- HashSet<Filter> cachedFilters = new HashSet<Filter>();
+ HashSet<Filter> cachedFilters = new HashSet<>();
cachedFilters.add(a);
assertTrue("Must be cached", cachedFilters.contains(termFilter("field1", "a")));
assertFalse("Must not be cached", cachedFilters.contains(termFilter("field1", "b")));
@@ -84,7 +84,7 @@ public class TermFilterTest extends Luce
Directory dir = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random(), dir);
int num = atLeast(100);
- List<Term> terms = new ArrayList<Term>();
+ List<Term> terms = new ArrayList<>();
for (int i = 0; i < num; i++) {
String field = "field" + i;
String string = TestUtil.randomRealisticUnicodeString(random());
Modified: lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java (original)
+++ lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java Wed Mar 12 14:39:17 2014
@@ -55,7 +55,7 @@ public class TermsFilterTest extends Luc
public void testCachability() throws Exception {
TermsFilter a = termsFilter(random().nextBoolean(), new Term("field1", "a"), new Term("field1", "b"));
- HashSet<Filter> cachedFilters = new HashSet<Filter>();
+ HashSet<Filter> cachedFilters = new HashSet<>();
cachedFilters.add(a);
TermsFilter b = termsFilter(random().nextBoolean(), new Term("field1", "b"), new Term("field1", "a"));
assertTrue("Must be cached", cachedFilters.contains(b));
@@ -79,7 +79,7 @@ public class TermsFilterTest extends Luc
AtomicReaderContext context = (AtomicReaderContext) reader.getContext();
w.close();
- List<Term> terms = new ArrayList<Term>();
+ List<Term> terms = new ArrayList<>();
terms.add(new Term(fieldName, "19"));
FixedBitSet bits = (FixedBitSet) termsFilter(random().nextBoolean(), terms).getDocIdSet(context, context.reader().getLiveDocs());
assertNull("Must match nothing", bits);
@@ -142,7 +142,7 @@ public class TermsFilterTest extends Luc
RandomIndexWriter w = new RandomIndexWriter(random(), dir);
int num = atLeast(3);
int skip = random().nextInt(num);
- List<Term> terms = new ArrayList<Term>();
+ List<Term> terms = new ArrayList<>();
for (int i = 0; i < num; i++) {
terms.add(new Term("field" + i, "content1"));
Document doc = new Document();
@@ -173,7 +173,7 @@ public class TermsFilterTest extends Luc
Directory dir = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random(), dir);
int num = atLeast(10);
- Set<Term> terms = new HashSet<Term>();
+ Set<Term> terms = new HashSet<>();
for (int i = 0; i < num; i++) {
String field = "field" + random().nextInt(100);
terms.add(new Term(field, "content1"));
@@ -197,7 +197,7 @@ public class TermsFilterTest extends Luc
w.close();
assertEquals(1, reader.leaves().size());
AtomicReaderContext context = reader.leaves().get(0);
- TermsFilter tf = new TermsFilter(new ArrayList<Term>(terms));
+ TermsFilter tf = new TermsFilter(new ArrayList<>(terms));
FixedBitSet bits = (FixedBitSet) tf.getDocIdSet(context, context.reader().getLiveDocs());
assertEquals(context.reader().numDocs(), bits.cardinality());
@@ -210,7 +210,7 @@ public class TermsFilterTest extends Luc
RandomIndexWriter w = new RandomIndexWriter(random(), dir);
int num = atLeast(100);
final boolean singleField = random().nextBoolean();
- List<Term> terms = new ArrayList<Term>();
+ List<Term> terms = new ArrayList<>();
for (int i = 0; i < num; i++) {
String field = "field" + (singleField ? "1" : random().nextInt(100));
String string = TestUtil.randomRealisticUnicodeString(random());
@@ -255,10 +255,10 @@ public class TermsFilterTest extends Luc
private TermsFilter termsFilter(boolean singleField, Collection<Term> termList) {
if (!singleField) {
- return new TermsFilter(new ArrayList<Term>(termList));
+ return new TermsFilter(new ArrayList<>(termList));
}
final TermsFilter filter;
- List<BytesRef> bytes = new ArrayList<BytesRef>();
+ List<BytesRef> bytes = new ArrayList<>();
String field = null;
for (Term term : termList) {
bytes.add(term.bytes());
@@ -275,8 +275,8 @@ public class TermsFilterTest extends Luc
public void testHashCodeAndEquals() {
int num = atLeast(100);
final boolean singleField = random().nextBoolean();
- List<Term> terms = new ArrayList<Term>();
- Set<Term> uniqueTerms = new HashSet<Term>();
+ List<Term> terms = new ArrayList<>();
+ Set<Term> uniqueTerms = new HashSet<>();
for (int i = 0; i < num; i++) {
String field = "field" + (singleField ? "1" : random().nextInt(100));
String string = TestUtil.randomRealisticUnicodeString(random());
@@ -288,7 +288,7 @@ public class TermsFilterTest extends Luc
assertEquals(right, left);
assertEquals(right.hashCode(), left.hashCode());
if (uniqueTerms.size() > 1) {
- List<Term> asList = new ArrayList<Term>(uniqueTerms);
+ List<Term> asList = new ArrayList<>(uniqueTerms);
asList.remove(0);
TermsFilter notEqual = termsFilter(singleField ? random().nextBoolean() : false, asList);
assertFalse(left.equals(notEqual));
Modified: lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java (original)
+++ lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java Wed Mar 12 14:39:17 2014
@@ -343,7 +343,7 @@ public class TestCustomScoreQuery extend
// since custom scoring modifies the order of docs, map results
// by doc ids so that we can later compare/verify them
private Map<Integer,Float> topDocsToMap(TopDocs td) {
- Map<Integer,Float> h = new HashMap<Integer,Float>();
+ Map<Integer,Float> h = new HashMap<>();
for (int i=0; i<td.totalHits; i++) {
h.put(td.scoreDocs[i].doc, td.scoreDocs[i].score);
}
Modified: lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java (original)
+++ lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java Wed Mar 12 14:39:17 2014
@@ -108,7 +108,7 @@ public class TestMoreLikeThis extends Lu
}
private Map<String,Float> getOriginalValues() throws IOException {
- Map<String,Float> originalValues = new HashMap<String,Float>();
+ Map<String,Float> originalValues = new HashMap<>();
MoreLikeThis mlt = new MoreLikeThis(reader);
mlt.setAnalyzer(new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false));
mlt.setMinDocFreq(1);
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/MultiFieldQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/MultiFieldQueryParser.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/MultiFieldQueryParser.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/MultiFieldQueryParser.java Wed Mar 12 14:39:17 2014
@@ -98,7 +98,7 @@ public class MultiFieldQueryParser exten
@Override
protected Query getFieldQuery(String field, String queryText, int slop) throws ParseException {
if (field == null) {
- List<BooleanClause> clauses = new ArrayList<BooleanClause>();
+ List<BooleanClause> clauses = new ArrayList<>();
for (int i = 0; i < fields.length; i++) {
Query q = super.getFieldQuery(fields[i], queryText, true);
if (q != null) {
@@ -135,7 +135,7 @@ public class MultiFieldQueryParser exten
@Override
protected Query getFieldQuery(String field, String queryText, boolean quoted) throws ParseException {
if (field == null) {
- List<BooleanClause> clauses = new ArrayList<BooleanClause>();
+ List<BooleanClause> clauses = new ArrayList<>();
for (int i = 0; i < fields.length; i++) {
Query q = super.getFieldQuery(fields[i], queryText, quoted);
if (q != null) {
@@ -163,7 +163,7 @@ public class MultiFieldQueryParser exten
protected Query getFuzzyQuery(String field, String termStr, float minSimilarity) throws ParseException
{
if (field == null) {
- List<BooleanClause> clauses = new ArrayList<BooleanClause>();
+ List<BooleanClause> clauses = new ArrayList<>();
for (int i = 0; i < fields.length; i++) {
clauses.add(new BooleanClause(getFuzzyQuery(fields[i], termStr, minSimilarity),
BooleanClause.Occur.SHOULD));
@@ -177,7 +177,7 @@ public class MultiFieldQueryParser exten
protected Query getPrefixQuery(String field, String termStr) throws ParseException
{
if (field == null) {
- List<BooleanClause> clauses = new ArrayList<BooleanClause>();
+ List<BooleanClause> clauses = new ArrayList<>();
for (int i = 0; i < fields.length; i++) {
clauses.add(new BooleanClause(getPrefixQuery(fields[i], termStr),
BooleanClause.Occur.SHOULD));
@@ -190,7 +190,7 @@ public class MultiFieldQueryParser exten
@Override
protected Query getWildcardQuery(String field, String termStr) throws ParseException {
if (field == null) {
- List<BooleanClause> clauses = new ArrayList<BooleanClause>();
+ List<BooleanClause> clauses = new ArrayList<>();
for (int i = 0; i < fields.length; i++) {
clauses.add(new BooleanClause(getWildcardQuery(fields[i], termStr),
BooleanClause.Occur.SHOULD));
@@ -204,7 +204,7 @@ public class MultiFieldQueryParser exten
@Override
protected Query getRangeQuery(String field, String part1, String part2, boolean startInclusive, boolean endInclusive) throws ParseException {
if (field == null) {
- List<BooleanClause> clauses = new ArrayList<BooleanClause>();
+ List<BooleanClause> clauses = new ArrayList<>();
for (int i = 0; i < fields.length; i++) {
clauses.add(new BooleanClause(getRangeQuery(fields[i], part1, part2, startInclusive, endInclusive),
BooleanClause.Occur.SHOULD));
@@ -220,7 +220,7 @@ public class MultiFieldQueryParser exten
protected Query getRegexpQuery(String field, String termStr)
throws ParseException {
if (field == null) {
- List<BooleanClause> clauses = new ArrayList<BooleanClause>();
+ List<BooleanClause> clauses = new ArrayList<>();
for (int i = 0; i < fields.length; i++) {
clauses.add(new BooleanClause(getRegexpQuery(fields[i], termStr),
BooleanClause.Occur.SHOULD));
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.java Wed Mar 12 14:39:17 2014
@@ -174,7 +174,7 @@ public class QueryParser extends QueryPa
}
final public Query Query(String field) throws ParseException {
- List<BooleanClause> clauses = new ArrayList<BooleanClause>();
+ List<BooleanClause> clauses = new ArrayList<>();
Query q, firstQuery=null;
int conj, mods;
mods = Modifiers();
@@ -640,7 +640,7 @@ public class QueryParser extends QueryPa
return (jj_ntk = jj_nt.kind);
}
- private java.util.List<int[]> jj_expentries = new java.util.ArrayList<int[]>();
+ private java.util.List<int[]> jj_expentries = new java.util.ArrayList<>();
private int[] jj_expentry;
private int jj_kind = -1;
private int[] jj_lasttokens = new int[100];
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserBase.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserBase.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserBase.java Wed Mar 12 14:39:17 2014
@@ -351,7 +351,7 @@ public abstract class QueryParserBase ex
if (fieldToDateResolution == null) {
// lazily initialize HashMap
- fieldToDateResolution = new HashMap<String,DateTools.Resolution>();
+ fieldToDateResolution = new HashMap<>();
}
fieldToDateResolution.put(fieldName, dateResolution);
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/complexPhrase/ComplexPhraseQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/complexPhrase/ComplexPhraseQueryParser.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/complexPhrase/ComplexPhraseQueryParser.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/complexPhrase/ComplexPhraseQueryParser.java Wed Mar 12 14:39:17 2014
@@ -104,7 +104,7 @@ public class ComplexPhraseQueryParser ex
// First pass - parse the top-level query recording any PhraseQuerys
// which will need to be resolved
- complexPhrases = new ArrayList<ComplexPhraseQuery>();
+ complexPhrases = new ArrayList<>();
Query q = super.parse(query);
// Perform second pass, using this QueryParser to parse any nested
@@ -254,7 +254,7 @@ public class ComplexPhraseQueryParser ex
}
if (qc instanceof BooleanQuery) {
- ArrayList<SpanQuery> sc = new ArrayList<SpanQuery>();
+ ArrayList<SpanQuery> sc = new ArrayList<>();
addComplexPhraseClause(sc, (BooleanQuery) qc);
if (sc.size() > 0) {
allSpanClauses[i] = sc.get(0);
@@ -285,7 +285,7 @@ public class ComplexPhraseQueryParser ex
// Complex case - we have mixed positives and negatives in the
// sequence.
// Need to return a SpanNotQuery
- ArrayList<SpanQuery> positiveClauses = new ArrayList<SpanQuery>();
+ ArrayList<SpanQuery> positiveClauses = new ArrayList<>();
for (int j = 0; j < allSpanClauses.length; j++) {
if (!bclauses[j].getOccur().equals(BooleanClause.Occur.MUST_NOT)) {
positiveClauses.add(allSpanClauses[j]);
@@ -312,8 +312,8 @@ public class ComplexPhraseQueryParser ex
}
private void addComplexPhraseClause(List<SpanQuery> spanClauses, BooleanQuery qc) {
- ArrayList<SpanQuery> ors = new ArrayList<SpanQuery>();
- ArrayList<SpanQuery> nots = new ArrayList<SpanQuery>();
+ ArrayList<SpanQuery> ors = new ArrayList<>();
+ ArrayList<SpanQuery> nots = new ArrayList<>();
BooleanClause[] bclauses = qc.getClauses();
// For all clauses e.g. one* two~
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/ext/Extensions.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/ext/Extensions.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/ext/Extensions.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/ext/Extensions.java Wed Mar 12 14:39:17 2014
@@ -42,7 +42,7 @@ import java.util.Map;
* @see ParserExtension
*/
public class Extensions {
- private final Map<String,ParserExtension> extensions = new HashMap<String,ParserExtension>();
+ private final Map<String,ParserExtension> extensions = new HashMap<>();
private final char extensionFieldDelimiter;
/**
* The default extension field delimiter character. This constant is set to
@@ -122,11 +122,11 @@ public class Extensions {
String field) {
int indexOf = field.indexOf(this.extensionFieldDelimiter);
if (indexOf < 0)
- return new Pair<String,String>(field, null);
+ return new Pair<>(field, null);
final String indexField = indexOf == 0 ? defaultField : field.substring(0,
indexOf);
final String extensionKey = field.substring(indexOf + 1);
- return new Pair<String,String>(indexField, extensionKey);
+ return new Pair<>(indexField, extensionKey);
}
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/builders/QueryTreeBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/builders/QueryTreeBuilder.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/builders/QueryTreeBuilder.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/builders/QueryTreeBuilder.java Wed Mar 12 14:39:17 2014
@@ -79,7 +79,7 @@ public class QueryTreeBuilder implements
public void setBuilder(CharSequence fieldName, QueryBuilder builder) {
if (this.fieldNameBuilders == null) {
- this.fieldNameBuilders = new HashMap<String, QueryBuilder>();
+ this.fieldNameBuilders = new HashMap<>();
}
this.fieldNameBuilders.put(fieldName.toString(), builder);
@@ -97,7 +97,7 @@ public class QueryTreeBuilder implements
QueryBuilder builder) {
if (this.queryNodeBuilders == null) {
- this.queryNodeBuilders = new HashMap<Class<? extends QueryNode>, QueryBuilder>();
+ this.queryNodeBuilders = new HashMap<>();
}
this.queryNodeBuilders.put(queryNodeClass, builder);