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 [6/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/an...
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/SnapshotDeletionPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/SnapshotDeletionPolicy.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/SnapshotDeletionPolicy.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/SnapshotDeletionPolicy.java Wed Mar 12 14:39:17 2014
@@ -47,10 +47,10 @@ public class SnapshotDeletionPolicy exte
/** Records how many snapshots are held against each
* commit generation */
- protected Map<Long,Integer> refCounts = new HashMap<Long,Integer>();
+ protected Map<Long,Integer> refCounts = new HashMap<>();
/** Used to map gen to IndexCommit. */
- protected Map<Long,IndexCommit> indexCommits = new HashMap<Long,IndexCommit>();
+ protected Map<Long,IndexCommit> indexCommits = new HashMap<>();
/** Wrapped {@link IndexDeletionPolicy} */
private IndexDeletionPolicy primary;
@@ -167,7 +167,7 @@ public class SnapshotDeletionPolicy exte
/** Returns all IndexCommits held by at least one snapshot. */
public synchronized List<IndexCommit> getSnapshots() {
- return new ArrayList<IndexCommit>(indexCommits.values());
+ return new ArrayList<>(indexCommits.values());
}
/** Returns the total number of snapshots currently held. */
@@ -192,15 +192,15 @@ public class SnapshotDeletionPolicy exte
SnapshotDeletionPolicy other = (SnapshotDeletionPolicy) super.clone();
other.primary = this.primary.clone();
other.lastCommit = null;
- other.refCounts = new HashMap<Long,Integer>(refCounts);
- other.indexCommits = new HashMap<Long,IndexCommit>(indexCommits);
+ other.refCounts = new HashMap<>(refCounts);
+ other.indexCommits = new HashMap<>(indexCommits);
return other;
}
/** Wraps each {@link IndexCommit} as a {@link
* SnapshotCommitPoint}. */
private List<IndexCommit> wrapCommits(List<? extends IndexCommit> commits) {
- List<IndexCommit> wrappedCommits = new ArrayList<IndexCommit>(commits.size());
+ List<IndexCommit> wrappedCommits = new ArrayList<>(commits.size());
for (IndexCommit ic : commits) {
wrappedCommits.add(new SnapshotCommitPoint(ic));
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java Wed Mar 12 14:39:17 2014
@@ -78,7 +78,7 @@ final class StandardDirectoryReader exte
// no need to process segments in reverse order
final int numSegments = infos.size();
- List<SegmentReader> readers = new ArrayList<SegmentReader>();
+ List<SegmentReader> readers = new ArrayList<>();
final Directory dir = writer.getDirectory();
final SegmentInfos segmentInfos = infos.clone();
@@ -134,7 +134,7 @@ final class StandardDirectoryReader exte
// we put the old SegmentReaders in a map, that allows us
// to lookup a reader using its segment name
- final Map<String,Integer> segmentReaders = new HashMap<String,Integer>();
+ final Map<String,Integer> segmentReaders = new HashMap<>();
if (oldReaders != null) {
// create a Map SegmentName->SegmentReader
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/StoredDocument.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/StoredDocument.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/StoredDocument.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/StoredDocument.java Wed Mar 12 14:39:17 2014
@@ -34,7 +34,7 @@ import org.apache.lucene.util.BytesRef;
// TODO: shouldn't this really be in the .document package?
public class StoredDocument implements Iterable<StorableField> {
- private final List<StorableField> fields = new ArrayList<StorableField>();
+ private final List<StorableField> fields = new ArrayList<>();
/** Sole constructor. */
public StoredDocument() {
@@ -61,7 +61,7 @@ public class StoredDocument implements I
* @return a <code>StorableField[]</code> array
*/
public StorableField[] getFields(String name) {
- List<StorableField> result = new ArrayList<StorableField>();
+ List<StorableField> result = new ArrayList<>();
for (StorableField field : fields) {
if (field.name().equals(name)) {
result.add(field);
@@ -112,7 +112,7 @@ public class StoredDocument implements I
* @return a <code>BytesRef[]</code> of binary field values
*/
public final BytesRef[] getBinaryValues(String name) {
- final List<BytesRef> result = new ArrayList<BytesRef>();
+ final List<BytesRef> result = new ArrayList<>();
for (StorableField field : fields) {
if (field.name().equals(name)) {
final BytesRef bytes = field.binaryValue();
@@ -158,7 +158,7 @@ public class StoredDocument implements I
* @return a <code>String[]</code> of field values
*/
public final String[] getValues(String name) {
- List<String> result = new ArrayList<String>();
+ List<String> result = new ArrayList<>();
for (StorableField field : fields) {
if (field.name().equals(name) && field.stringValue() != null) {
result.add(field.stringValue());
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/TermsHash.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/TermsHash.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/TermsHash.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/TermsHash.java Wed Mar 12 14:39:17 2014
@@ -96,11 +96,11 @@ final class TermsHash extends InvertedDo
@Override
void flush(Map<String,InvertedDocConsumerPerField> fieldsToFlush, final SegmentWriteState state) throws IOException {
- Map<String,TermsHashConsumerPerField> childFields = new HashMap<String,TermsHashConsumerPerField>();
+ Map<String,TermsHashConsumerPerField> childFields = new HashMap<>();
Map<String,InvertedDocConsumerPerField> nextChildFields;
if (nextTermsHash != null) {
- nextChildFields = new HashMap<String,InvertedDocConsumerPerField>();
+ nextChildFields = new HashMap<>();
} else {
nextChildFields = null;
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/ThreadAffinityDocumentsWriterThreadPool.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/ThreadAffinityDocumentsWriterThreadPool.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/ThreadAffinityDocumentsWriterThreadPool.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/ThreadAffinityDocumentsWriterThreadPool.java Wed Mar 12 14:39:17 2014
@@ -31,7 +31,7 @@ import org.apache.lucene.index.Documents
* minimal contended {@link ThreadState}.
*/
class ThreadAffinityDocumentsWriterThreadPool extends DocumentsWriterPerThreadPool {
- private Map<Thread, ThreadState> threadBindings = new ConcurrentHashMap<Thread, ThreadState>();
+ private Map<Thread, ThreadState> threadBindings = new ConcurrentHashMap<>();
/**
* Creates a new {@link ThreadAffinityDocumentsWriterThreadPool} with a given maximum of {@link ThreadState}s.
@@ -78,7 +78,7 @@ class ThreadAffinityDocumentsWriterThrea
@Override
public ThreadAffinityDocumentsWriterThreadPool clone() {
ThreadAffinityDocumentsWriterThreadPool clone = (ThreadAffinityDocumentsWriterThreadPool) super.clone();
- clone.threadBindings = new ConcurrentHashMap<Thread, ThreadState>();
+ clone.threadBindings = new ConcurrentHashMap<>();
return clone;
}
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java Wed Mar 12 14:39:17 2014
@@ -280,9 +280,9 @@ public class TieredMergePolicy extends M
return null;
}
final Collection<SegmentCommitInfo> merging = writer.get().getMergingSegments();
- final Collection<SegmentCommitInfo> toBeMerged = new HashSet<SegmentCommitInfo>();
+ final Collection<SegmentCommitInfo> toBeMerged = new HashSet<>();
- final List<SegmentCommitInfo> infosSorted = new ArrayList<SegmentCommitInfo>(infos.asList());
+ final List<SegmentCommitInfo> infosSorted = new ArrayList<>(infos.asList());
Collections.sort(infosSorted, new SegmentByteSizeDescending());
// Compute total index bytes & print details about the index
@@ -341,7 +341,7 @@ public class TieredMergePolicy extends M
// Gather eligible segments for merging, ie segments
// not already being merged and not already picked (by
// prior iteration of this loop) for merging:
- final List<SegmentCommitInfo> eligible = new ArrayList<SegmentCommitInfo>();
+ final List<SegmentCommitInfo> eligible = new ArrayList<>();
for(int idx = tooBigCount; idx<infosSorted.size(); idx++) {
final SegmentCommitInfo info = infosSorted.get(idx);
if (merging.contains(info)) {
@@ -374,7 +374,7 @@ public class TieredMergePolicy extends M
long totAfterMergeBytes = 0;
- final List<SegmentCommitInfo> candidate = new ArrayList<SegmentCommitInfo>();
+ final List<SegmentCommitInfo> candidate = new ArrayList<>();
boolean hitTooLarge = false;
for(int idx = startIdx;idx<eligible.size() && candidate.size() < maxMergeAtOnce;idx++) {
final SegmentCommitInfo info = eligible.get(idx);
@@ -497,7 +497,7 @@ public class TieredMergePolicy extends M
message("findForcedMerges maxSegmentCount=" + maxSegmentCount + " infos=" + writer.get().segString(infos) + " segmentsToMerge=" + segmentsToMerge);
}
- List<SegmentCommitInfo> eligible = new ArrayList<SegmentCommitInfo>();
+ List<SegmentCommitInfo> eligible = new ArrayList<>();
boolean forceMergeRunning = false;
final Collection<SegmentCommitInfo> merging = writer.get().getMergingSegments();
boolean segmentIsOriginal = false;
@@ -568,7 +568,7 @@ public class TieredMergePolicy extends M
if (verbose()) {
message("findForcedDeletesMerges infos=" + writer.get().segString(infos) + " forceMergeDeletesPctAllowed=" + forceMergeDeletesPctAllowed);
}
- final List<SegmentCommitInfo> eligible = new ArrayList<SegmentCommitInfo>();
+ final List<SegmentCommitInfo> eligible = new ArrayList<>();
final Collection<SegmentCommitInfo> merging = writer.get().getMergingSegments();
for(SegmentCommitInfo info : infos) {
double pctDeletes = 100.*((double) writer.get().numDeletedDocs(info))/info.info.getDocCount();
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/UpgradeIndexMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/UpgradeIndexMergePolicy.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/UpgradeIndexMergePolicy.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/UpgradeIndexMergePolicy.java Wed Mar 12 14:39:17 2014
@@ -82,7 +82,7 @@ public class UpgradeIndexMergePolicy ext
@Override
public MergeSpecification findForcedMerges(SegmentInfos segmentInfos, int maxSegmentCount, Map<SegmentCommitInfo,Boolean> segmentsToMerge) throws IOException {
// first find all old segments
- final Map<SegmentCommitInfo,Boolean> oldSegments = new HashMap<SegmentCommitInfo,Boolean>();
+ final Map<SegmentCommitInfo,Boolean> oldSegments = new HashMap<>();
for (final SegmentCommitInfo si : segmentInfos) {
final Boolean v = segmentsToMerge.get(si);
if (v != null && shouldUpgradeSegment(si)) {
@@ -113,7 +113,7 @@ public class UpgradeIndexMergePolicy ext
message("findForcedMerges: " + base.getClass().getSimpleName() +
" does not want to merge all old segments, merge remaining ones into new segment: " + oldSegments);
}
- final List<SegmentCommitInfo> newInfos = new ArrayList<SegmentCommitInfo>();
+ final List<SegmentCommitInfo> newInfos = new ArrayList<>();
for (final SegmentCommitInfo si : segmentInfos) {
if (oldSegments.containsKey(si)) {
newInfos.add(si);
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/BooleanQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/BooleanQuery.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/BooleanQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/BooleanQuery.java Wed Mar 12 14:39:17 2014
@@ -68,7 +68,7 @@ public class BooleanQuery extends Query
BooleanQuery.maxClauseCount = maxClauseCount;
}
- private ArrayList<BooleanClause> clauses = new ArrayList<BooleanClause>();
+ private ArrayList<BooleanClause> clauses = new ArrayList<>();
private final boolean disableCoord;
/** Constructs an empty boolean query. */
@@ -179,7 +179,7 @@ public class BooleanQuery extends Query
throws IOException {
this.similarity = searcher.getSimilarity();
this.disableCoord = disableCoord;
- weights = new ArrayList<Weight>(clauses.size());
+ weights = new ArrayList<>(clauses.size());
for (int i = 0 ; i < clauses.size(); i++) {
BooleanClause c = clauses.get(i);
Weight w = c.getQuery().createWeight(searcher);
@@ -343,9 +343,9 @@ public class BooleanQuery extends Query
@Override
public Scorer scorer(AtomicReaderContext context, Bits acceptDocs)
throws IOException {
- List<Scorer> required = new ArrayList<Scorer>();
- List<Scorer> prohibited = new ArrayList<Scorer>();
- List<Scorer> optional = new ArrayList<Scorer>();
+ List<Scorer> required = new ArrayList<>();
+ List<Scorer> prohibited = new ArrayList<>();
+ List<Scorer> optional = new ArrayList<>();
Iterator<BooleanClause> cIter = clauses.iterator();
for (Weight w : weights) {
BooleanClause c = cIter.next();
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/BooleanScorer2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/BooleanScorer2.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/BooleanScorer2.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/BooleanScorer2.java Wed Mar 12 14:39:17 2014
@@ -238,7 +238,7 @@ class BooleanScorer2 extends Scorer {
private Scorer makeCountingSumScorerSomeReq(boolean disableCoord) throws IOException { // At least one required scorer.
if (optionalScorers.size() == minNrShouldMatch) { // all optional scorers also required.
- ArrayList<Scorer> allReq = new ArrayList<Scorer>(requiredScorers);
+ ArrayList<Scorer> allReq = new ArrayList<>(requiredScorers);
allReq.addAll(optionalScorers);
return addProhibitedScorers(countingConjunctionSumScorer(disableCoord, allReq));
} else { // optionalScorers.size() > minNrShouldMatch, and at least one required scorer
@@ -313,7 +313,7 @@ class BooleanScorer2 extends Scorer {
@Override
public Collection<ChildScorer> getChildren() {
- ArrayList<ChildScorer> children = new ArrayList<ChildScorer>();
+ ArrayList<ChildScorer> children = new ArrayList<>();
for (Scorer s : optionalScorers) {
children.add(new ChildScorer(s, "SHOULD"));
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/CachingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/CachingCollector.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/CachingCollector.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/CachingCollector.java Wed Mar 12 14:39:17 2014
@@ -107,7 +107,7 @@ public abstract class CachingCollector e
super(other, maxRAMMB, true);
cachedScorer = new CachedScorer();
- cachedScores = new ArrayList<float[]>();
+ cachedScores = new ArrayList<>();
curScores = new float[INITIAL_ARRAY_SIZE];
cachedScores.add(curScores);
}
@@ -116,7 +116,7 @@ public abstract class CachingCollector e
super(other, maxDocsToCache);
cachedScorer = new CachedScorer();
- cachedScores = new ArrayList<float[]>();
+ cachedScores = new ArrayList<>();
curScores = new float[INITIAL_ARRAY_SIZE];
cachedScores.add(curScores);
}
@@ -315,7 +315,7 @@ public abstract class CachingCollector e
protected final Collector other;
protected final int maxDocsToCache;
- protected final List<SegStart> cachedSegs = new ArrayList<SegStart>();
+ protected final List<SegStart> cachedSegs = new ArrayList<>();
protected final List<int[]> cachedDocs;
private AtomicReaderContext lastReaderContext;
@@ -393,7 +393,7 @@ public abstract class CachingCollector e
private CachingCollector(Collector other, double maxRAMMB, boolean cacheScores) {
this.other = other;
- cachedDocs = new ArrayList<int[]>();
+ cachedDocs = new ArrayList<>();
curDocs = new int[INITIAL_ARRAY_SIZE];
cachedDocs.add(curDocs);
@@ -407,7 +407,7 @@ public abstract class CachingCollector e
private CachingCollector(Collector other, int maxDocsToCache) {
this.other = other;
- cachedDocs = new ArrayList<int[]>();
+ cachedDocs = new ArrayList<>();
curDocs = new int[INITIAL_ARRAY_SIZE];
cachedDocs.add(curDocs);
this.maxDocsToCache = maxDocsToCache;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/CachingWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/CachingWrapperFilter.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/CachingWrapperFilter.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/CachingWrapperFilter.java Wed Mar 12 14:39:17 2014
@@ -155,7 +155,7 @@ public class CachingWrapperFilter extend
// Sync only to pull the current set of values:
List<DocIdSet> docIdSets;
synchronized(cache) {
- docIdSets = new ArrayList<DocIdSet>(cache.values());
+ docIdSets = new ArrayList<>(cache.values());
}
long total = 0;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ConjunctionScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ConjunctionScorer.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ConjunctionScorer.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ConjunctionScorer.java Wed Mar 12 14:39:17 2014
@@ -122,7 +122,7 @@ class ConjunctionScorer extends Scorer {
@Override
public Collection<ChildScorer> getChildren() {
- ArrayList<ChildScorer> children = new ArrayList<ChildScorer>(docsAndFreqs.length);
+ ArrayList<ChildScorer> children = new ArrayList<>(docsAndFreqs.length);
for (DocsAndFreqs docs : docsAndFreqs) {
children.add(new ChildScorer(docs.scorer, "MUST"));
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java Wed Mar 12 14:39:17 2014
@@ -45,7 +45,7 @@ import org.apache.lucene.util.Bits;
public class DisjunctionMaxQuery extends Query implements Iterable<Query> {
/* The subqueries */
- private ArrayList<Query> disjuncts = new ArrayList<Query>();
+ private ArrayList<Query> disjuncts = new ArrayList<>();
/* Multiple of the non-max disjunct scores added into our final score. Non-zero values support tie-breaking. */
private float tieBreakerMultiplier = 0.0f;
@@ -115,7 +115,7 @@ public class DisjunctionMaxQuery extends
protected class DisjunctionMaxWeight extends Weight {
/** The Weights for our subqueries, in 1-1 correspondence with disjuncts */
- protected ArrayList<Weight> weights = new ArrayList<Weight>(); // The Weight's for our subqueries, in 1-1 correspondence with disjuncts
+ protected ArrayList<Weight> weights = new ArrayList<>(); // The Weight's for our subqueries, in 1-1 correspondence with disjuncts
/** Construct the Weight for this Query searched by searcher. Recursively construct subquery weights. */
public DisjunctionMaxWeight(IndexSearcher searcher) throws IOException {
@@ -154,7 +154,7 @@ public class DisjunctionMaxQuery extends
/** Create the scorer used to score our associated DisjunctionMaxQuery */
@Override
public Scorer scorer(AtomicReaderContext context, Bits acceptDocs) throws IOException {
- List<Scorer> scorers = new ArrayList<Scorer>();
+ List<Scorer> scorers = new ArrayList<>();
for (Weight w : weights) {
// we will advance() subscorers
Scorer subScorer = w.scorer(context, acceptDocs);
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DisjunctionScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DisjunctionScorer.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DisjunctionScorer.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DisjunctionScorer.java Wed Mar 12 14:39:17 2014
@@ -102,7 +102,7 @@ abstract class DisjunctionScorer extends
@Override
public final Collection<ChildScorer> getChildren() {
- ArrayList<ChildScorer> children = new ArrayList<ChildScorer>(numScorers);
+ ArrayList<ChildScorer> children = new ArrayList<>(numScorers);
for (int i = 0; i < numScorers; i++) {
children.add(new ChildScorer(subScorers[i], "SHOULD"));
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/Explanation.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/Explanation.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/Explanation.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/Explanation.java Wed Mar 12 14:39:17 2014
@@ -76,7 +76,7 @@ public class Explanation {
/** Adds a sub-node to this explanation node. */
public void addDetail(Explanation detail) {
if (details == null)
- details = new ArrayList<Explanation>();
+ details = new ArrayList<>();
details.add(detail);
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FieldCacheImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FieldCacheImpl.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FieldCacheImpl.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FieldCacheImpl.java Wed Mar 12 14:39:17 2014
@@ -61,7 +61,7 @@ class FieldCacheImpl implements FieldCac
}
private synchronized void init() {
- caches = new HashMap<Class<?>,Cache>(9);
+ caches = new HashMap<>(9);
caches.put(Integer.TYPE, new IntCache(this));
caches.put(Float.TYPE, new FloatCache(this));
caches.put(Long.TYPE, new LongCache(this));
@@ -86,7 +86,7 @@ class FieldCacheImpl implements FieldCac
@Override
public synchronized CacheEntry[] getCacheEntries() {
- List<CacheEntry> result = new ArrayList<CacheEntry>(17);
+ List<CacheEntry> result = new ArrayList<>(17);
for(final Map.Entry<Class<?>,Cache> cacheEntry: caches.entrySet()) {
final Cache cache = cacheEntry.getValue();
final Class<?> cacheType = cacheEntry.getKey();
@@ -149,7 +149,7 @@ class FieldCacheImpl implements FieldCac
final FieldCacheImpl wrapper;
- final Map<Object,Map<CacheKey,Object>> readerCache = new WeakHashMap<Object,Map<CacheKey,Object>>();
+ final Map<Object,Map<CacheKey,Object>> readerCache = new WeakHashMap<>();
protected abstract Object createValue(AtomicReader reader, CacheKey key, boolean setDocsWithField)
throws IOException;
@@ -169,7 +169,7 @@ class FieldCacheImpl implements FieldCac
Map<CacheKey,Object> innerCache = readerCache.get(readerKey);
if (innerCache == null) {
// First time this reader is using FieldCache
- innerCache = new HashMap<CacheKey,Object>();
+ innerCache = new HashMap<>();
readerCache.put(readerKey, innerCache);
wrapper.initReader(reader);
}
@@ -190,7 +190,7 @@ class FieldCacheImpl implements FieldCac
innerCache = readerCache.get(readerKey);
if (innerCache == null) {
// First time this reader is using FieldCache
- innerCache = new HashMap<CacheKey,Object>();
+ innerCache = new HashMap<>();
readerCache.put(readerKey, innerCache);
wrapper.initReader(reader);
value = null;
@@ -438,7 +438,7 @@ class FieldCacheImpl implements FieldCac
return wrapper.getInts(reader, key.field, NUMERIC_UTILS_INT_PARSER, setDocsWithField);
}
- final HoldsOneThing<GrowableWriterAndMinValue> valuesRef = new HoldsOneThing<GrowableWriterAndMinValue>();
+ final HoldsOneThing<GrowableWriterAndMinValue> valuesRef = new HoldsOneThing<>();
Uninvert u = new Uninvert() {
private int minValue;
@@ -626,7 +626,7 @@ class FieldCacheImpl implements FieldCac
return wrapper.getFloats(reader, key.field, NUMERIC_UTILS_FLOAT_PARSER, setDocsWithField);
}
- final HoldsOneThing<float[]> valuesRef = new HoldsOneThing<float[]>();
+ final HoldsOneThing<float[]> valuesRef = new HoldsOneThing<>();
Uninvert u = new Uninvert() {
private float currentValue;
@@ -733,7 +733,7 @@ class FieldCacheImpl implements FieldCac
return wrapper.getLongs(reader, key.field, NUMERIC_UTILS_LONG_PARSER, setDocsWithField);
}
- final HoldsOneThing<GrowableWriterAndMinValue> valuesRef = new HoldsOneThing<GrowableWriterAndMinValue>();
+ final HoldsOneThing<GrowableWriterAndMinValue> valuesRef = new HoldsOneThing<>();
Uninvert u = new Uninvert() {
private long minValue;
@@ -851,7 +851,7 @@ class FieldCacheImpl implements FieldCac
return wrapper.getDoubles(reader, key.field, NUMERIC_UTILS_DOUBLE_PARSER, setDocsWithField);
}
- final HoldsOneThing<double[]> valuesRef = new HoldsOneThing<double[]>();
+ final HoldsOneThing<double[]> valuesRef = new HoldsOneThing<>();
Uninvert u = new Uninvert() {
private double currentValue;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FieldValueHitQueue.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FieldValueHitQueue.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FieldValueHitQueue.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FieldValueHitQueue.java Wed Mar 12 14:39:17 2014
@@ -168,9 +168,9 @@ public abstract class FieldValueHitQueue
}
if (fields.length == 1) {
- return new OneComparatorFieldValueHitQueue<T>(fields, size);
+ return new OneComparatorFieldValueHitQueue<>(fields, size);
} else {
- return new MultiComparatorsFieldValueHitQueue<T>(fields, size);
+ return new MultiComparatorsFieldValueHitQueue<>(fields, size);
}
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FuzzyTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FuzzyTermsEnum.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FuzzyTermsEnum.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FuzzyTermsEnum.java Wed Mar 12 14:39:17 2014
@@ -405,7 +405,7 @@ public class FuzzyTermsEnum extends Term
* Stores compiled automata as a list (indexed by edit distance)
* @lucene.internal */
public static final class LevenshteinAutomataAttributeImpl extends AttributeImpl implements LevenshteinAutomataAttribute {
- private final List<CompiledAutomaton> automata = new ArrayList<CompiledAutomaton>();
+ private final List<CompiledAutomaton> automata = new ArrayList<>();
@Override
public List<CompiledAutomaton> automata() {
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java Wed Mar 12 14:39:17 2014
@@ -441,7 +441,7 @@ public class IndexSearcher {
} else {
final HitQueue hq = new HitQueue(nDocs, false);
final Lock lock = new ReentrantLock();
- final ExecutionHelper<TopDocs> runner = new ExecutionHelper<TopDocs>(executor);
+ final ExecutionHelper<TopDocs> runner = new ExecutionHelper<>(executor);
for (int i = 0; i < leafSlices.length; i++) { // search each sub
runner.submit(new SearcherCallableNoSort(lock, this, leafSlices[i], weight, after, nDocs, hq));
@@ -532,7 +532,7 @@ public class IndexSearcher {
false);
final Lock lock = new ReentrantLock();
- final ExecutionHelper<TopFieldDocs> runner = new ExecutionHelper<TopFieldDocs>(executor);
+ final ExecutionHelper<TopFieldDocs> runner = new ExecutionHelper<>(executor);
for (int i = 0; i < leafSlices.length; i++) { // search each leaf slice
runner.submit(
new SearcherCallableWithSort(lock, this, leafSlices[i], weight, after, nDocs, topCollector, sort, doDocScores, doMaxScore));
@@ -810,7 +810,7 @@ public class IndexSearcher {
private int numTasks;
ExecutionHelper(final Executor executor) {
- this.service = new ExecutorCompletionService<T>(executor);
+ this.service = new ExecutorCompletionService<>(executor);
}
@Override
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/LiveFieldValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/LiveFieldValues.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/LiveFieldValues.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/LiveFieldValues.java Wed Mar 12 14:39:17 2014
@@ -35,8 +35,8 @@ import java.util.concurrent.ConcurrentHa
public abstract class LiveFieldValues<S,T> implements ReferenceManager.RefreshListener, Closeable {
- private volatile Map<String,T> current = new ConcurrentHashMap<String,T>();
- private volatile Map<String,T> old = new ConcurrentHashMap<String,T>();
+ private volatile Map<String,T> current = new ConcurrentHashMap<>();
+ private volatile Map<String,T> old = new ConcurrentHashMap<>();
private final ReferenceManager<S> mgr;
private final T missingValue;
@@ -58,7 +58,7 @@ public abstract class LiveFieldValues<S,
// map. While reopen is running, any lookup will first
// try this new map, then fallback to old, then to the
// current searcher:
- current = new ConcurrentHashMap<String,T>();
+ current = new ConcurrentHashMap<>();
}
@Override
@@ -69,7 +69,7 @@ public abstract class LiveFieldValues<S,
// entries in it, which is fine: it means they were
// actually already included in the previously opened
// reader. So we can safely clear old here:
- old = new ConcurrentHashMap<String,T>();
+ old = new ConcurrentHashMap<>();
}
/** Call this after you've successfully added a document
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/MinShouldMatchSumScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/MinShouldMatchSumScorer.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/MinShouldMatchSumScorer.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/MinShouldMatchSumScorer.java Wed Mar 12 14:39:17 2014
@@ -119,7 +119,7 @@ class MinShouldMatchSumScorer extends Sc
@Override
public final Collection<ChildScorer> getChildren() {
- ArrayList<ChildScorer> children = new ArrayList<ChildScorer>(numScorers);
+ ArrayList<ChildScorer> children = new ArrayList<>(numScorers);
for (int i = 0; i < numScorers; i++) {
children.add(new ChildScorer(subScorers[i], "SHOULD"));
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java Wed Mar 12 14:39:17 2014
@@ -50,8 +50,8 @@ import org.apache.lucene.util.ToStringUt
*/
public class MultiPhraseQuery extends Query {
private String field;
- private ArrayList<Term[]> termArrays = new ArrayList<Term[]>();
- private ArrayList<Integer> positions = new ArrayList<Integer>();
+ private ArrayList<Term[]> termArrays = new ArrayList<>();
+ private ArrayList<Integer> positions = new ArrayList<>();
private int slop = 0;
@@ -141,7 +141,7 @@ public class MultiPhraseQuery extends Qu
private class MultiPhraseWeight extends Weight {
private final Similarity similarity;
private final Similarity.SimWeight stats;
- private final Map<Term,TermContext> termContexts = new HashMap<Term,TermContext>();
+ private final Map<Term,TermContext> termContexts = new HashMap<>();
public MultiPhraseWeight(IndexSearcher searcher)
throws IOException {
@@ -149,7 +149,7 @@ public class MultiPhraseQuery extends Qu
final IndexReaderContext context = searcher.getTopReaderContext();
// compute idf
- ArrayList<TermStatistics> allTermStats = new ArrayList<TermStatistics>();
+ ArrayList<TermStatistics> allTermStats = new ArrayList<>();
for(final Term[] terms: termArrays) {
for (Term term: terms) {
TermContext termContext = termContexts.get(term);
@@ -479,7 +479,7 @@ class UnionDocsAndPositionsEnum extends
private long cost;
public UnionDocsAndPositionsEnum(Bits liveDocs, AtomicReaderContext context, Term[] terms, Map<Term,TermContext> termContexts, TermsEnum termsEnum) throws IOException {
- List<DocsAndPositionsEnum> docsEnums = new LinkedList<DocsAndPositionsEnum>();
+ List<DocsAndPositionsEnum> docsEnums = new LinkedList<>();
for (int i = 0; i < terms.length; i++) {
final Term term = terms[i];
TermState termState = termContexts.get(term).get(context.ord);
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/MultiTermQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/MultiTermQuery.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/MultiTermQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/MultiTermQuery.java Wed Mar 12 14:39:17 2014
@@ -92,7 +92,7 @@ public abstract class MultiTermQuery ext
public static final RewriteMethod CONSTANT_SCORE_FILTER_REWRITE = new RewriteMethod() {
@Override
public Query rewrite(IndexReader reader, MultiTermQuery query) {
- Query result = new ConstantScoreQuery(new MultiTermQueryWrapperFilter<MultiTermQuery>(query));
+ Query result = new ConstantScoreQuery(new MultiTermQueryWrapperFilter<>(query));
result.setBoost(query.getBoost());
return result;
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/NumericRangeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/NumericRangeFilter.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/NumericRangeFilter.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/NumericRangeFilter.java Wed Mar 12 14:39:17 2014
@@ -61,7 +61,7 @@ public final class NumericRangeFilter<T
public static NumericRangeFilter<Long> newLongRange(final String field, final int precisionStep,
Long min, Long max, final boolean minInclusive, final boolean maxInclusive
) {
- return new NumericRangeFilter<Long>(
+ return new NumericRangeFilter<>(
NumericRangeQuery.newLongRange(field, precisionStep, min, max, minInclusive, maxInclusive)
);
}
@@ -76,7 +76,7 @@ public final class NumericRangeFilter<T
public static NumericRangeFilter<Long> newLongRange(final String field,
Long min, Long max, final boolean minInclusive, final boolean maxInclusive
) {
- return new NumericRangeFilter<Long>(
+ return new NumericRangeFilter<>(
NumericRangeQuery.newLongRange(field, min, max, minInclusive, maxInclusive)
);
}
@@ -91,7 +91,7 @@ public final class NumericRangeFilter<T
public static NumericRangeFilter<Integer> newIntRange(final String field, final int precisionStep,
Integer min, Integer max, final boolean minInclusive, final boolean maxInclusive
) {
- return new NumericRangeFilter<Integer>(
+ return new NumericRangeFilter<>(
NumericRangeQuery.newIntRange(field, precisionStep, min, max, minInclusive, maxInclusive)
);
}
@@ -106,7 +106,7 @@ public final class NumericRangeFilter<T
public static NumericRangeFilter<Integer> newIntRange(final String field,
Integer min, Integer max, final boolean minInclusive, final boolean maxInclusive
) {
- return new NumericRangeFilter<Integer>(
+ return new NumericRangeFilter<>(
NumericRangeQuery.newIntRange(field, min, max, minInclusive, maxInclusive)
);
}
@@ -123,7 +123,7 @@ public final class NumericRangeFilter<T
public static NumericRangeFilter<Double> newDoubleRange(final String field, final int precisionStep,
Double min, Double max, final boolean minInclusive, final boolean maxInclusive
) {
- return new NumericRangeFilter<Double>(
+ return new NumericRangeFilter<>(
NumericRangeQuery.newDoubleRange(field, precisionStep, min, max, minInclusive, maxInclusive)
);
}
@@ -140,7 +140,7 @@ public final class NumericRangeFilter<T
public static NumericRangeFilter<Double> newDoubleRange(final String field,
Double min, Double max, final boolean minInclusive, final boolean maxInclusive
) {
- return new NumericRangeFilter<Double>(
+ return new NumericRangeFilter<>(
NumericRangeQuery.newDoubleRange(field, min, max, minInclusive, maxInclusive)
);
}
@@ -157,7 +157,7 @@ public final class NumericRangeFilter<T
public static NumericRangeFilter<Float> newFloatRange(final String field, final int precisionStep,
Float min, Float max, final boolean minInclusive, final boolean maxInclusive
) {
- return new NumericRangeFilter<Float>(
+ return new NumericRangeFilter<>(
NumericRangeQuery.newFloatRange(field, precisionStep, min, max, minInclusive, maxInclusive)
);
}
@@ -174,7 +174,7 @@ public final class NumericRangeFilter<T
public static NumericRangeFilter<Float> newFloatRange(final String field,
Float min, Float max, final boolean minInclusive, final boolean maxInclusive
) {
- return new NumericRangeFilter<Float>(
+ return new NumericRangeFilter<>(
NumericRangeQuery.newFloatRange(field, min, max, minInclusive, maxInclusive)
);
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/NumericRangeQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/NumericRangeQuery.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/NumericRangeQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/NumericRangeQuery.java Wed Mar 12 14:39:17 2014
@@ -191,7 +191,7 @@ public final class NumericRangeQuery<T e
public static NumericRangeQuery<Long> newLongRange(final String field, final int precisionStep,
Long min, Long max, final boolean minInclusive, final boolean maxInclusive
) {
- return new NumericRangeQuery<Long>(field, precisionStep, NumericType.LONG, min, max, minInclusive, maxInclusive);
+ return new NumericRangeQuery<>(field, precisionStep, NumericType.LONG, min, max, minInclusive, maxInclusive);
}
/**
@@ -204,7 +204,7 @@ public final class NumericRangeQuery<T e
public static NumericRangeQuery<Long> newLongRange(final String field,
Long min, Long max, final boolean minInclusive, final boolean maxInclusive
) {
- return new NumericRangeQuery<Long>(field, NumericUtils.PRECISION_STEP_DEFAULT, NumericType.LONG, min, max, minInclusive, maxInclusive);
+ return new NumericRangeQuery<>(field, NumericUtils.PRECISION_STEP_DEFAULT, NumericType.LONG, min, max, minInclusive, maxInclusive);
}
/**
@@ -217,7 +217,7 @@ public final class NumericRangeQuery<T e
public static NumericRangeQuery<Integer> newIntRange(final String field, final int precisionStep,
Integer min, Integer max, final boolean minInclusive, final boolean maxInclusive
) {
- return new NumericRangeQuery<Integer>(field, precisionStep, NumericType.INT, min, max, minInclusive, maxInclusive);
+ return new NumericRangeQuery<>(field, precisionStep, NumericType.INT, min, max, minInclusive, maxInclusive);
}
/**
@@ -230,7 +230,7 @@ public final class NumericRangeQuery<T e
public static NumericRangeQuery<Integer> newIntRange(final String field,
Integer min, Integer max, final boolean minInclusive, final boolean maxInclusive
) {
- return new NumericRangeQuery<Integer>(field, NumericUtils.PRECISION_STEP_DEFAULT, NumericType.INT, min, max, minInclusive, maxInclusive);
+ return new NumericRangeQuery<>(field, NumericUtils.PRECISION_STEP_DEFAULT, NumericType.INT, min, max, minInclusive, maxInclusive);
}
/**
@@ -245,7 +245,7 @@ public final class NumericRangeQuery<T e
public static NumericRangeQuery<Double> newDoubleRange(final String field, final int precisionStep,
Double min, Double max, final boolean minInclusive, final boolean maxInclusive
) {
- return new NumericRangeQuery<Double>(field, precisionStep, NumericType.DOUBLE, min, max, minInclusive, maxInclusive);
+ return new NumericRangeQuery<>(field, precisionStep, NumericType.DOUBLE, min, max, minInclusive, maxInclusive);
}
/**
@@ -260,7 +260,7 @@ public final class NumericRangeQuery<T e
public static NumericRangeQuery<Double> newDoubleRange(final String field,
Double min, Double max, final boolean minInclusive, final boolean maxInclusive
) {
- return new NumericRangeQuery<Double>(field, NumericUtils.PRECISION_STEP_DEFAULT, NumericType.DOUBLE, min, max, minInclusive, maxInclusive);
+ return new NumericRangeQuery<>(field, NumericUtils.PRECISION_STEP_DEFAULT, NumericType.DOUBLE, min, max, minInclusive, maxInclusive);
}
/**
@@ -275,7 +275,7 @@ public final class NumericRangeQuery<T e
public static NumericRangeQuery<Float> newFloatRange(final String field, final int precisionStep,
Float min, Float max, final boolean minInclusive, final boolean maxInclusive
) {
- return new NumericRangeQuery<Float>(field, precisionStep, NumericType.FLOAT, min, max, minInclusive, maxInclusive);
+ return new NumericRangeQuery<>(field, precisionStep, NumericType.FLOAT, min, max, minInclusive, maxInclusive);
}
/**
@@ -290,7 +290,7 @@ public final class NumericRangeQuery<T e
public static NumericRangeQuery<Float> newFloatRange(final String field,
Float min, Float max, final boolean minInclusive, final boolean maxInclusive
) {
- return new NumericRangeQuery<Float>(field, NumericUtils.PRECISION_STEP_DEFAULT, NumericType.FLOAT, min, max, minInclusive, maxInclusive);
+ return new NumericRangeQuery<>(field, NumericUtils.PRECISION_STEP_DEFAULT, NumericType.FLOAT, min, max, minInclusive, maxInclusive);
}
@Override @SuppressWarnings("unchecked")
@@ -390,7 +390,7 @@ public final class NumericRangeQuery<T e
private BytesRef currentLowerBound, currentUpperBound;
- private final LinkedList<BytesRef> rangeBounds = new LinkedList<BytesRef>();
+ private final LinkedList<BytesRef> rangeBounds = new LinkedList<>();
NumericRangeTermsEnum(final TermsEnum tenum) {
super(tenum);
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/PhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/PhraseQuery.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/PhraseQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/PhraseQuery.java Wed Mar 12 14:39:17 2014
@@ -46,8 +46,8 @@ import org.apache.lucene.util.ToStringUt
*/
public class PhraseQuery extends Query {
private String field;
- private ArrayList<Term> terms = new ArrayList<Term>(4);
- private ArrayList<Integer> positions = new ArrayList<Integer>(4);
+ private ArrayList<Term> terms = new ArrayList<>(4);
+ private ArrayList<Integer> positions = new ArrayList<>(4);
private int maxPosition = 0;
private int slop = 0;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ReferenceManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ReferenceManager.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ReferenceManager.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ReferenceManager.java Wed Mar 12 14:39:17 2014
@@ -47,7 +47,7 @@ public abstract class ReferenceManager<G
private final Lock refreshLock = new ReentrantLock();
- private final List<RefreshListener> refreshListeners = new CopyOnWriteArrayList<RefreshListener>();
+ private final List<RefreshListener> refreshListeners = new CopyOnWriteArrayList<>();
private void ensureOpen() {
if (current == null) {
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ReqOptSumScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ReqOptSumScorer.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ReqOptSumScorer.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ReqOptSumScorer.java Wed Mar 12 14:39:17 2014
@@ -94,7 +94,7 @@ class ReqOptSumScorer extends Scorer {
@Override
public Collection<ChildScorer> getChildren() {
- ArrayList<ChildScorer> children = new ArrayList<ChildScorer>(2);
+ ArrayList<ChildScorer> children = new ArrayList<>(2);
children.add(new ChildScorer(reqScorer, "MUST"));
children.add(new ChildScorer(optScorer, "SHOULD"));
return children;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/SearcherLifetimeManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/SearcherLifetimeManager.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/SearcherLifetimeManager.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/SearcherLifetimeManager.java Wed Mar 12 14:39:17 2014
@@ -132,7 +132,7 @@ public class SearcherLifetimeManager imp
// TODO: we could get by w/ just a "set"; need to have
// Tracker hash by its version and have compareTo(Long)
// compare to its version
- private final ConcurrentHashMap<Long,SearcherTracker> searchers = new ConcurrentHashMap<Long,SearcherTracker>();
+ private final ConcurrentHashMap<Long,SearcherTracker> searchers = new ConcurrentHashMap<>();
private void ensureOpen() {
if (closed) {
@@ -246,7 +246,7 @@ public class SearcherLifetimeManager imp
// (not thread-safe since the values can change while
// ArrayList is init'ing itself); must instead iterate
// ourselves:
- final List<SearcherTracker> trackers = new ArrayList<SearcherTracker>();
+ final List<SearcherTracker> trackers = new ArrayList<>();
for(SearcherTracker tracker : searchers.values()) {
trackers.add(tracker);
}
@@ -285,7 +285,7 @@ public class SearcherLifetimeManager imp
@Override
public synchronized void close() throws IOException {
closed = true;
- final List<SearcherTracker> toClose = new ArrayList<SearcherTracker>(searchers.values());
+ final List<SearcherTracker> toClose = new ArrayList<>(searchers.values());
// Remove up front in case exc below, so we don't
// over-decRef on double-close:
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/SloppyPhraseScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/SloppyPhraseScorer.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/SloppyPhraseScorer.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/SloppyPhraseScorer.java Wed Mar 12 14:39:17 2014
@@ -379,7 +379,7 @@ final class SloppyPhraseScorer extends S
/** Detect repetition groups. Done once - for first doc */
private ArrayList<ArrayList<PhrasePositions>> gatherRptGroups(LinkedHashMap<Term,Integer> rptTerms) throws IOException {
PhrasePositions[] rpp = repeatingPPs(rptTerms);
- ArrayList<ArrayList<PhrasePositions>> res = new ArrayList<ArrayList<PhrasePositions>>();
+ ArrayList<ArrayList<PhrasePositions>> res = new ArrayList<>();
if (!hasMultiTermRpts) {
// simpler - no multi-terms - can base on positions in first doc
for (int i=0; i<rpp.length; i++) {
@@ -399,7 +399,7 @@ final class SloppyPhraseScorer extends S
if (g < 0) {
g = res.size();
pp.rptGroup = g;
- ArrayList<PhrasePositions> rl = new ArrayList<PhrasePositions>(2);
+ ArrayList<PhrasePositions> rl = new ArrayList<>(2);
rl.add(pp);
res.add(rl);
}
@@ -409,11 +409,11 @@ final class SloppyPhraseScorer extends S
}
} else {
// more involved - has multi-terms
- ArrayList<HashSet<PhrasePositions>> tmp = new ArrayList<HashSet<PhrasePositions>>();
+ ArrayList<HashSet<PhrasePositions>> tmp = new ArrayList<>();
ArrayList<FixedBitSet> bb = ppTermsBitSets(rpp, rptTerms);
unionTermGroups(bb);
HashMap<Term,Integer> tg = termGroups(rptTerms, bb);
- HashSet<Integer> distinctGroupIDs = new HashSet<Integer>(tg.values());
+ HashSet<Integer> distinctGroupIDs = new HashSet<>(tg.values());
for (int i=0; i<distinctGroupIDs.size(); i++) {
tmp.add(new HashSet<PhrasePositions>());
}
@@ -428,7 +428,7 @@ final class SloppyPhraseScorer extends S
}
}
for (HashSet<PhrasePositions> hs : tmp) {
- res.add(new ArrayList<PhrasePositions>(hs));
+ res.add(new ArrayList<>(hs));
}
}
return res;
@@ -441,8 +441,8 @@ final class SloppyPhraseScorer extends S
/** find repeating terms and assign them ordinal values */
private LinkedHashMap<Term,Integer> repeatingTerms() {
- LinkedHashMap<Term,Integer> tord = new LinkedHashMap<Term,Integer>();
- HashMap<Term,Integer> tcnt = new HashMap<Term,Integer>();
+ LinkedHashMap<Term,Integer> tord = new LinkedHashMap<>();
+ HashMap<Term,Integer> tcnt = new HashMap<>();
for (PhrasePositions pp=min,prev=null; prev!=max; pp=(prev=pp).next) { // iterate cyclic list: done once handled max
for (Term t : pp.terms) {
Integer cnt0 = tcnt.get(t);
@@ -458,7 +458,7 @@ final class SloppyPhraseScorer extends S
/** find repeating pps, and for each, if has multi-terms, update this.hasMultiTermRpts */
private PhrasePositions[] repeatingPPs(HashMap<Term,Integer> rptTerms) {
- ArrayList<PhrasePositions> rp = new ArrayList<PhrasePositions>();
+ ArrayList<PhrasePositions> rp = new ArrayList<>();
for (PhrasePositions pp=min,prev=null; prev!=max; pp=(prev=pp).next) { // iterate cyclic list: done once handled max
for (Term t : pp.terms) {
if (rptTerms.containsKey(t)) {
@@ -473,7 +473,7 @@ final class SloppyPhraseScorer extends S
/** bit-sets - for each repeating pp, for each of its repeating terms, the term ordinal values is set */
private ArrayList<FixedBitSet> ppTermsBitSets(PhrasePositions[] rpp, HashMap<Term,Integer> tord) {
- ArrayList<FixedBitSet> bb = new ArrayList<FixedBitSet>(rpp.length);
+ ArrayList<FixedBitSet> bb = new ArrayList<>(rpp.length);
for (PhrasePositions pp : rpp) {
FixedBitSet b = new FixedBitSet(tord.size());
Integer ord;
@@ -507,7 +507,7 @@ final class SloppyPhraseScorer extends S
/** map each term to the single group that contains it */
private HashMap<Term,Integer> termGroups(LinkedHashMap<Term,Integer> tord, ArrayList<FixedBitSet> bb) throws IOException {
- HashMap<Term,Integer> tg = new HashMap<Term,Integer>();
+ HashMap<Term,Integer> tg = new HashMap<>();
Term[] t = tord.keySet().toArray(new Term[0]);
for (int i=0; i<bb.size(); i++) { // i is the group no.
DocIdSetIterator bits = bb.get(i).iterator();
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/TopTermsRewrite.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/TopTermsRewrite.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/TopTermsRewrite.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/TopTermsRewrite.java Wed Mar 12 14:39:17 2014
@@ -62,12 +62,12 @@ public abstract class TopTermsRewrite<Q
@Override
public final Q rewrite(final IndexReader reader, final MultiTermQuery query) throws IOException {
final int maxSize = Math.min(size, getMaxSize());
- final PriorityQueue<ScoreTerm> stQueue = new PriorityQueue<ScoreTerm>();
+ final PriorityQueue<ScoreTerm> stQueue = new PriorityQueue<>();
collectTerms(reader, query, new TermCollector() {
private final MaxNonCompetitiveBoostAttribute maxBoostAtt =
attributes.addAttribute(MaxNonCompetitiveBoostAttribute.class);
- private final Map<BytesRef,ScoreTerm> visitedTerms = new HashMap<BytesRef,ScoreTerm>();
+ private final Map<BytesRef,ScoreTerm> visitedTerms = new HashMap<>();
private TermsEnum termsEnum;
private BoostAttribute boostAtt;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/WildcardQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/WildcardQuery.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/WildcardQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/WildcardQuery.java Wed Mar 12 14:39:17 2014
@@ -63,7 +63,7 @@ public class WildcardQuery extends Autom
*/
@SuppressWarnings("fallthrough")
public static Automaton toAutomaton(Term wildcardquery) {
- List<Automaton> automata = new ArrayList<Automaton>();
+ List<Automaton> automata = new ArrayList<>();
String wildcardText = wildcardquery.text();
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/payloads/PayloadSpanUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/payloads/PayloadSpanUtil.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/payloads/PayloadSpanUtil.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/payloads/PayloadSpanUtil.java Wed Mar 12 14:39:17 2014
@@ -74,7 +74,7 @@ public class PayloadSpanUtil {
* @throws IOException if there is a low-level I/O error
*/
public Collection<byte[]> getPayloadsForQuery(Query query) throws IOException {
- Collection<byte[]> payloads = new ArrayList<byte[]>();
+ Collection<byte[]> payloads = new ArrayList<>();
queryToSpanQuery(query, payloads);
return payloads;
}
@@ -143,7 +143,7 @@ public class PayloadSpanUtil {
final Term[] termArray = termArrays.get(i);
List<Query> disjuncts = disjunctLists[positions[i]];
if (disjuncts == null) {
- disjuncts = (disjunctLists[positions[i]] = new ArrayList<Query>(
+ disjuncts = (disjunctLists[positions[i]] = new ArrayList<>(
termArray.length));
++distinctPositions;
}
@@ -178,8 +178,8 @@ public class PayloadSpanUtil {
private void getPayloads(Collection<byte []> payloads, SpanQuery query)
throws IOException {
- Map<Term,TermContext> termContexts = new HashMap<Term,TermContext>();
- TreeSet<Term> terms = new TreeSet<Term>();
+ Map<Term,TermContext> termContexts = new HashMap<>();
+ TreeSet<Term> terms = new TreeSet<>();
query.extractTerms(terms);
for (Term term : terms) {
termContexts.put(term, TermContext.build(context, term));
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java Wed Mar 12 14:39:17 2014
@@ -103,7 +103,7 @@ public class NearSpansOrdered extends Sp
allowedSlop = spanNearQuery.getSlop();
SpanQuery[] clauses = spanNearQuery.getClauses();
subSpans = new Spans[clauses.length];
- matchPayload = new LinkedList<byte[]>();
+ matchPayload = new LinkedList<>();
subSpansByDoc = new Spans[clauses.length];
for (int i = 0; i < clauses.length; i++) {
subSpans[i] = clauses[i].getSpans(context, acceptDocs, termContexts);
@@ -282,7 +282,7 @@ public class NearSpansOrdered extends Sp
private boolean shrinkToAfterShortestMatch() throws IOException {
matchStart = subSpans[subSpans.length - 1].start();
matchEnd = subSpans[subSpans.length - 1].end();
- Set<byte[]> possibleMatchPayloads = new HashSet<byte[]>();
+ Set<byte[]> possibleMatchPayloads = new HashSet<>();
if (subSpans[subSpans.length - 1].isPayloadAvailable()) {
possibleMatchPayloads.addAll(subSpans[subSpans.length - 1].getPayload());
}
@@ -296,7 +296,7 @@ public class NearSpansOrdered extends Sp
Spans prevSpans = subSpans[i];
if (collectPayloads && prevSpans.isPayloadAvailable()) {
Collection<byte[]> payload = prevSpans.getPayload();
- possiblePayload = new ArrayList<byte[]>(payload.size());
+ possiblePayload = new ArrayList<>(payload.size());
possiblePayload.addAll(payload);
}
@@ -320,7 +320,7 @@ public class NearSpansOrdered extends Sp
prevEnd = ppEnd;
if (collectPayloads && prevSpans.isPayloadAvailable()) {
Collection<byte[]> payload = prevSpans.getPayload();
- possiblePayload = new ArrayList<byte[]>(payload.size());
+ possiblePayload = new ArrayList<>(payload.size());
possiblePayload.addAll(payload);
}
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java Wed Mar 12 14:39:17 2014
@@ -40,7 +40,7 @@ import java.util.HashSet;
public class NearSpansUnordered extends Spans {
private SpanNearQuery query;
- private List<SpansCell> ordered = new ArrayList<SpansCell>(); // spans in query order
+ private List<SpansCell> ordered = new ArrayList<>(); // spans in query order
private Spans[] subSpans;
private int slop; // from query
@@ -121,7 +121,7 @@ public class NearSpansUnordered extends
// TODO: Remove warning after API has been finalized
@Override
public Collection<byte[]> getPayload() throws IOException {
- return new ArrayList<byte[]>(spans.getPayload());
+ return new ArrayList<>(spans.getPayload());
}
// TODO: Remove warning after API has been finalized
@@ -250,7 +250,7 @@ public class NearSpansUnordered extends
*/
@Override
public Collection<byte[]> getPayload() throws IOException {
- Set<byte[]> matchPayload = new HashSet<byte[]>();
+ Set<byte[]> matchPayload = new HashSet<>();
for (SpansCell cell = first; cell != null; cell = cell.next) {
if (cell.isPayloadAvailable()) {
matchPayload.addAll(cell.getPayload());
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanNearQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanNearQuery.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanNearQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanNearQuery.java Wed Mar 12 14:39:17 2014
@@ -61,7 +61,7 @@ public class SpanNearQuery extends SpanQ
public SpanNearQuery(SpanQuery[] clauses, int slop, boolean inOrder, boolean collectPayloads) {
// copy clauses array into an ArrayList
- this.clauses = new ArrayList<SpanQuery>(clauses.length);
+ this.clauses = new ArrayList<>(clauses.length);
for (int i = 0; i < clauses.length; i++) {
SpanQuery clause = clauses[i];
if (field == null) { // check field
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanNotQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanNotQuery.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanNotQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanNotQuery.java Wed Mar 12 14:39:17 2014
@@ -175,7 +175,7 @@ public class SpanNotQuery extends SpanQu
public Collection<byte[]> getPayload() throws IOException {
ArrayList<byte[]> result = null;
if (includeSpans.isPayloadAvailable()) {
- result = new ArrayList<byte[]>(includeSpans.getPayload());
+ result = new ArrayList<>(includeSpans.getPayload());
}
return result;
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanOrQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanOrQuery.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanOrQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanOrQuery.java Wed Mar 12 14:39:17 2014
@@ -44,7 +44,7 @@ public class SpanOrQuery extends SpanQue
public SpanOrQuery(SpanQuery... clauses) {
// copy clauses array into an ArrayList
- this.clauses = new ArrayList<SpanQuery>(clauses.length);
+ this.clauses = new ArrayList<>(clauses.length);
for (int i = 0; i < clauses.length; i++) {
addClause(clauses[i]);
}
@@ -242,7 +242,7 @@ public class SpanOrQuery extends SpanQue
ArrayList<byte[]> result = null;
Spans theTop = top();
if (theTop != null && theTop.isPayloadAvailable()) {
- result = new ArrayList<byte[]>(theTop.getPayload());
+ result = new ArrayList<>(theTop.getPayload());
}
return result;
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanPositionCheckQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanPositionCheckQuery.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanPositionCheckQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanPositionCheckQuery.java Wed Mar 12 14:39:17 2014
@@ -169,7 +169,7 @@ public abstract class SpanPositionCheckQ
public Collection<byte[]> getPayload() throws IOException {
ArrayList<byte[]> result = null;
if (spans.isPayloadAvailable()) {
- result = new ArrayList<byte[]>(spans.getPayload());
+ result = new ArrayList<>(spans.getPayload());
}
return result;//TODO: any way to avoid the new construction?
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanWeight.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanWeight.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanWeight.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/spans/SpanWeight.java Wed Mar 12 14:39:17 2014
@@ -45,8 +45,8 @@ public class SpanWeight extends Weight {
this.similarity = searcher.getSimilarity();
this.query = query;
- termContexts = new HashMap<Term,TermContext>();
- TreeSet<Term> terms = new TreeSet<Term>();
+ termContexts = new HashMap<>();
+ TreeSet<Term> terms = new TreeSet<>();
query.extractTerms(terms);
final IndexReaderContext context = searcher.getTopReaderContext();
final TermStatistics termStats[] = new TermStatistics[terms.size()];
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/CompoundFileDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/CompoundFileDirectory.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/CompoundFileDirectory.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/CompoundFileDirectory.java Wed Mar 12 14:39:17 2014
@@ -130,7 +130,7 @@ public final class CompoundFileDirectory
entriesStream = dir.openInput(entriesFileName, IOContext.READONCE);
CodecUtil.checkHeader(entriesStream, CompoundFileWriter.ENTRY_CODEC, CompoundFileWriter.VERSION_START, CompoundFileWriter.VERSION_START);
final int numEntries = entriesStream.readVInt();
- final Map<String, FileEntry> mapping = new HashMap<String,FileEntry>(numEntries);
+ final Map<String, FileEntry> mapping = new HashMap<>(numEntries);
for (int i = 0; i < numEntries; i++) {
final FileEntry fileEntry = new FileEntry();
final String id = entriesStream.readString();
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/CompoundFileWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/CompoundFileWriter.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/CompoundFileWriter.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/CompoundFileWriter.java Wed Mar 12 14:39:17 2014
@@ -60,10 +60,10 @@ final class CompoundFileWriter implement
static final String ENTRY_CODEC = "CompoundFileWriterEntries";
private final Directory directory;
- private final Map<String, FileEntry> entries = new HashMap<String, FileEntry>();
- private final Set<String> seenIDs = new HashSet<String>();
+ private final Map<String, FileEntry> entries = new HashMap<>();
+ private final Set<String> seenIDs = new HashSet<>();
// all entries that are written to a sep. file but not yet moved into CFS
- private final Queue<FileEntry> pendingEntries = new LinkedList<FileEntry>();
+ private final Queue<FileEntry> pendingEntries = new LinkedList<>();
private boolean closed = false;
private IndexOutput dataOut;
private final AtomicBoolean outputTaken = new AtomicBoolean(false);
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/DataInput.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/DataInput.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/DataInput.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/DataInput.java Wed Mar 12 14:39:17 2014
@@ -212,7 +212,7 @@ public abstract class DataInput implemen
/** Reads a Map<String,String> previously written
* with {@link DataOutput#writeStringStringMap(Map)}. */
public Map<String,String> readStringStringMap() throws IOException {
- final Map<String,String> map = new HashMap<String,String>();
+ final Map<String,String> map = new HashMap<>();
final int count = readInt();
for(int i=0;i<count;i++) {
final String key = readString();
@@ -226,7 +226,7 @@ public abstract class DataInput implemen
/** Reads a Set<String> previously written
* with {@link DataOutput#writeStringSet(Set)}. */
public Set<String> readStringSet() throws IOException {
- final Set<String> set = new HashSet<String>();
+ final Set<String> set = new HashSet<>();
final int count = readInt();
for(int i=0;i<count;i++) {
set.add(readString());
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/FSDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/FSDirectory.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/FSDirectory.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/FSDirectory.java Wed Mar 12 14:39:17 2014
@@ -295,7 +295,7 @@ public abstract class FSDirectory extend
@Override
public void sync(Collection<String> names) throws IOException {
ensureOpen();
- Set<String> toSync = new HashSet<String>(names);
+ Set<String> toSync = new HashSet<>(names);
toSync.retainAll(staleFiles);
for (String name : toSync)
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/FileSwitchDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/FileSwitchDirectory.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/FileSwitchDirectory.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/FileSwitchDirectory.java Wed Mar 12 14:39:17 2014
@@ -77,7 +77,7 @@ public class FileSwitchDirectory extends
@Override
public String[] listAll() throws IOException {
- Set<String> files = new HashSet<String>();
+ Set<String> files = new HashSet<>();
// LUCENE-3380: either or both of our dirs could be FSDirs,
// but if one underlying delegate is an FSDir and mkdirs() has not
// yet been called, because so far everything is written to the other,
@@ -154,8 +154,8 @@ public class FileSwitchDirectory extends
@Override
public void sync(Collection<String> names) throws IOException {
- List<String> primaryNames = new ArrayList<String>();
- List<String> secondaryNames = new ArrayList<String>();
+ List<String> primaryNames = new ArrayList<>();
+ List<String> secondaryNames = new ArrayList<>();
for (String name : names)
if (primaryExtensions.contains(getExtension(name)))
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java Wed Mar 12 14:39:17 2014
@@ -120,7 +120,7 @@ public class NRTCachingDirectory extends
@Override
public synchronized String[] listAll() throws IOException {
- final Set<String> files = new HashSet<String>();
+ final Set<String> files = new HashSet<>();
for(String f : cache.listAll()) {
files.add(f);
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/NativeFSLockFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/NativeFSLockFactory.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/NativeFSLockFactory.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/NativeFSLockFactory.java Wed Mar 12 14:39:17 2014
@@ -146,7 +146,7 @@ class NativeFSLock extends Lock {
* (same FileChannel instance or not), so we may want to
* change this when Lucene moves to Java 1.6.
*/
- private static HashSet<String> LOCK_HELD = new HashSet<String>();
+ private static HashSet<String> LOCK_HELD = new HashSet<>();
public NativeFSLock(File lockDir, String lockFileName) {
this.lockDir = lockDir;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/RAMDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/RAMDirectory.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/RAMDirectory.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/RAMDirectory.java Wed Mar 12 14:39:17 2014
@@ -46,7 +46,7 @@ import java.util.concurrent.atomic.Atomi
* operating system, so copying data to Java heap space is not useful.
*/
public class RAMDirectory extends BaseDirectory {
- protected final Map<String,RAMFile> fileMap = new ConcurrentHashMap<String,RAMFile>();
+ protected final Map<String,RAMFile> fileMap = new ConcurrentHashMap<>();
protected final AtomicLong sizeInBytes = new AtomicLong();
// *****
@@ -113,7 +113,7 @@ public class RAMDirectory extends BaseDi
// NOTE: fileMap.keySet().toArray(new String[0]) is broken in non Sun JDKs,
// and the code below is resilient to map changes during the array population.
Set<String> fileNames = fileMap.keySet();
- List<String> names = new ArrayList<String>(fileNames.size());
+ List<String> names = new ArrayList<>(fileNames.size());
for (String name : fileNames) names.add(name);
return names.toArray(new String[names.size()]);
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/RAMFile.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/RAMFile.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/RAMFile.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/RAMFile.java Wed Mar 12 14:39:17 2014
@@ -23,7 +23,7 @@ import java.util.ArrayList;
* Represents a file in RAM as a list of byte[] buffers.
* @lucene.internal */
public class RAMFile {
- protected ArrayList<byte[]> buffers = new ArrayList<byte[]>();
+ protected ArrayList<byte[]> buffers = new ArrayList<>();
long length;
RAMDirectory directory;
protected long sizeInBytes;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/SingleInstanceLockFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/SingleInstanceLockFactory.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/SingleInstanceLockFactory.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/SingleInstanceLockFactory.java Wed Mar 12 14:39:17 2014
@@ -33,7 +33,7 @@ import java.util.HashSet;
public class SingleInstanceLockFactory extends LockFactory {
- private HashSet<String> locks = new HashSet<String>();
+ private HashSet<String> locks = new HashSet<>();
@Override
public Lock makeLock(String lockName) {
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/AttributeSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/AttributeSource.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/AttributeSource.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/AttributeSource.java Wed Mar 12 14:39:17 2014
@@ -145,8 +145,8 @@ public class AttributeSource {
* An AttributeSource using the supplied {@link AttributeFactory} for creating new {@link Attribute} instances.
*/
public AttributeSource(AttributeFactory factory) {
- this.attributes = new LinkedHashMap<Class<? extends Attribute>, AttributeImpl>();
- this.attributeImpls = new LinkedHashMap<Class<? extends AttributeImpl>, AttributeImpl>();
+ this.attributes = new LinkedHashMap<>();
+ this.attributeImpls = new LinkedHashMap<>();
this.currentState = new State[1];
this.factory = factory;
}
@@ -207,7 +207,7 @@ public class AttributeSource {
LinkedList<WeakReference<Class<? extends Attribute>>> foundInterfaces = knownImplClasses.get(clazz);
if (foundInterfaces == null) {
// we have the slight chance that another thread may do the same, but who cares?
- foundInterfaces = new LinkedList<WeakReference<Class<? extends Attribute>>>();
+ foundInterfaces = new LinkedList<>();
// find all interfaces that this attribute instance implements
// and that extend the Attribute interface
Class<?> actClazz = clazz;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/CloseableThreadLocal.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/CloseableThreadLocal.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/CloseableThreadLocal.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/CloseableThreadLocal.java Wed Mar 12 14:39:17 2014
@@ -55,11 +55,11 @@ import java.util.concurrent.atomic.Atomi
public class CloseableThreadLocal<T> implements Closeable {
- private ThreadLocal<WeakReference<T>> t = new ThreadLocal<WeakReference<T>>();
+ private ThreadLocal<WeakReference<T>> t = new ThreadLocal<>();
// Use a WeakHashMap so that if a Thread exits and is
// GC'able, its entry may be removed:
- private Map<Thread,T> hardRefs = new WeakHashMap<Thread,T>();
+ private Map<Thread,T> hardRefs = new WeakHashMap<>();
// Increase this to decrease frequency of purging in get:
private static int PURGE_MULTIPLIER = 20;
@@ -92,7 +92,7 @@ public class CloseableThreadLocal<T> imp
public void set(T object) {
- t.set(new WeakReference<T>(object));
+ t.set(new WeakReference<>(object));
synchronized(hardRefs) {
hardRefs.put(Thread.currentThread(), object);
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/DoubleBarrelLRUCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/DoubleBarrelLRUCache.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/DoubleBarrelLRUCache.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/DoubleBarrelLRUCache.java Wed Mar 12 14:39:17 2014
@@ -59,8 +59,8 @@ final public class DoubleBarrelLRUCache<
public DoubleBarrelLRUCache(int maxSize) {
this.maxSize = maxSize;
countdown = new AtomicInteger(maxSize);
- cache1 = new ConcurrentHashMap<K,V>();
- cache2 = new ConcurrentHashMap<K,V>();
+ cache1 = new ConcurrentHashMap<>();
+ cache2 = new ConcurrentHashMap<>();
}
@SuppressWarnings("unchecked")