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 19:14:27 UTC
svn commit: r1576837 [8/29] - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/analysis/
lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/
lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/
lucene/analysis/com...
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/automaton/SpecialOperations.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/automaton/SpecialOperations.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/automaton/SpecialOperations.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/automaton/SpecialOperations.java Wed Mar 12 18:14:05 2014
@@ -95,7 +95,7 @@ final public class SpecialOperations {
public static String getCommonPrefix(Automaton a) {
if (a.isSingleton()) return a.singleton;
StringBuilder b = new StringBuilder();
- HashSet<State> visited = new HashSet<State>();
+ HashSet<State> visited = new HashSet<>();
State s = a.initial;
boolean done;
do {
@@ -119,7 +119,7 @@ final public class SpecialOperations {
public static BytesRef getCommonPrefixBytesRef(Automaton a) {
if (a.isSingleton()) return new BytesRef(a.singleton);
BytesRef ref = new BytesRef(10);
- HashSet<State> visited = new HashSet<State>();
+ HashSet<State> visited = new HashSet<>();
State s = a.initial;
boolean done;
do {
@@ -185,9 +185,9 @@ final public class SpecialOperations {
public static Set<State> reverse(Automaton a) {
a.expandSingleton();
// reverse all edges
- HashMap<State, HashSet<Transition>> m = new HashMap<State, HashSet<Transition>>();
+ HashMap<State, HashSet<Transition>> m = new HashMap<>();
State[] states = a.getNumberedStates();
- Set<State> accept = new HashSet<State>();
+ Set<State> accept = new HashSet<>();
for (State s : states)
if (s.isAccept())
accept.add(s);
@@ -223,7 +223,7 @@ final public class SpecialOperations {
* the limit is infinite.
*/
public static Set<IntsRef> getFiniteStrings(Automaton a, int limit) {
- HashSet<IntsRef> strings = new HashSet<IntsRef>();
+ HashSet<IntsRef> strings = new HashSet<>();
if (a.isSingleton()) {
if (limit > 0) {
strings.add(Util.toUTF32(a.singleton, new IntsRef()));
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/automaton/UTF32ToUTF8.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/automaton/UTF32ToUTF8.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/automaton/UTF32ToUTF8.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/automaton/UTF32ToUTF8.java Wed Mar 12 18:14:05 2014
@@ -261,7 +261,7 @@ public final class UTF32ToUTF8 {
}
State[] map = new State[utf32.getNumberedStates().length];
- List<State> pending = new ArrayList<State>();
+ List<State> pending = new ArrayList<>();
State utf32State = utf32.getInitialState();
pending.add(utf32State);
Automaton utf8 = new Automaton();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/Builder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/Builder.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/Builder.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/Builder.java Wed Mar 12 18:14:05 2014
@@ -160,9 +160,9 @@ public class Builder<T> {
this.shareMaxTailLength = shareMaxTailLength;
this.doPackFST = doPackFST;
this.acceptableOverheadRatio = acceptableOverheadRatio;
- fst = new FST<T>(inputType, outputs, doPackFST, acceptableOverheadRatio, allowArrayArcs, bytesPageBits);
+ fst = new FST<>(inputType, outputs, doPackFST, acceptableOverheadRatio, allowArrayArcs, bytesPageBits);
if (doShareSuffix) {
- dedupHash = new NodeHash<T>(fst, fst.bytes.getReverseReader(false));
+ dedupHash = new NodeHash<>(fst, fst.bytes.getReverseReader(false));
} else {
dedupHash = null;
}
@@ -172,7 +172,7 @@ public class Builder<T> {
(UnCompiledNode<T>[]) new UnCompiledNode[10];
frontier = f;
for(int idx=0;idx<frontier.length;idx++) {
- frontier[idx] = new UnCompiledNode<T>(this, idx);
+ frontier[idx] = new UnCompiledNode<>(this, idx);
}
}
@@ -301,7 +301,7 @@ public class Builder<T> {
// undecided on whether to prune it. later, it
// will be either compiled or pruned, so we must
// allocate a new node:
- frontier[idx] = new UnCompiledNode<T>(this, idx);
+ frontier[idx] = new UnCompiledNode<>(this, idx);
}
}
}
@@ -384,7 +384,7 @@ public class Builder<T> {
new UnCompiledNode[ArrayUtil.oversize(input.length+1, RamUsageEstimator.NUM_BYTES_OBJECT_REF)];
System.arraycopy(frontier, 0, next, 0, frontier.length);
for(int idx=frontier.length;idx<next.length;idx++) {
- next[idx] = new UnCompiledNode<T>(this, idx);
+ next[idx] = new UnCompiledNode<>(this, idx);
}
frontier = next;
}
@@ -553,7 +553,7 @@ public class Builder<T> {
public UnCompiledNode(Builder<T> owner, int depth) {
this.owner = owner;
arcs = (Arc<T>[]) new Arc[1];
- arcs[0] = new Arc<T>();
+ arcs[0] = new Arc<>();
output = owner.NO_OUTPUT;
this.depth = depth;
}
@@ -587,7 +587,7 @@ public class Builder<T> {
new Arc[ArrayUtil.oversize(numArcs+1, RamUsageEstimator.NUM_BYTES_OBJECT_REF)];
System.arraycopy(arcs, 0, newArcs, 0, arcs.length);
for(int arcIdx=numArcs;arcIdx<newArcs.length;arcIdx++) {
- newArcs[arcIdx] = new Arc<T>();
+ newArcs[arcIdx] = new Arc<>();
}
arcs = newArcs;
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/BytesRefFSTEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/BytesRefFSTEnum.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/BytesRefFSTEnum.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/BytesRefFSTEnum.java Wed Mar 12 18:14:05 2014
@@ -30,7 +30,7 @@ import org.apache.lucene.util.BytesRef;
public final class BytesRefFSTEnum<T> extends FSTEnum<T> {
private final BytesRef current = new BytesRef(10);
- private final InputOutput<T> result = new InputOutput<T>();
+ private final InputOutput<T> result = new InputOutput<>();
private BytesRef target;
/** Holds a single input (BytesRef) + output pair. */
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/BytesStore.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/BytesStore.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/BytesStore.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/BytesStore.java Wed Mar 12 18:14:05 2014
@@ -29,7 +29,7 @@ import org.apache.lucene.store.DataOutpu
class BytesStore extends DataOutput {
- private final List<byte[]> blocks = new ArrayList<byte[]>();
+ private final List<byte[]> blocks = new ArrayList<>();
private final int blockSize;
private final int blockBits;
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/FST.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/FST.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/FST.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/FST.java Wed Mar 12 18:14:05 2014
@@ -437,7 +437,7 @@ public final class FST<T> {
}
public void readRootArcs(Arc<T>[] arcs) throws IOException {
- final Arc<T> arc = new Arc<T>();
+ final Arc<T> arc = new Arc<>();
getFirstArc(arc);
final BytesReader in = getBytesReader();
if (targetHasArcs(arc)) {
@@ -592,7 +592,7 @@ public final class FST<T> {
InputStream is = new BufferedInputStream(new FileInputStream(file));
boolean success = false;
try {
- FST<T> fst = new FST<T>(new InputStreamDataInput(is), outputs);
+ FST<T> fst = new FST<>(new InputStreamDataInput(is), outputs);
success = true;
return fst;
} finally {
@@ -1349,7 +1349,7 @@ public final class FST<T> {
// TODO: must assert this FST was built with
// "willRewrite"
- final List<ArcAndState<T>> queue = new ArrayList<ArcAndState<T>>();
+ final List<ArcAndState<T>> queue = new ArrayList<>();
// TODO: use bitset to not revisit nodes already
// visited
@@ -1358,7 +1358,7 @@ public final class FST<T> {
int saved = 0;
queue.add(new ArcAndState<T>(getFirstArc(new Arc<T>()), new IntsRef()));
- Arc<T> scratchArc = new Arc<T>();
+ Arc<T> scratchArc = new Arc<>();
while(queue.size() > 0) {
//System.out.println("cycle size=" + queue.size());
//for(ArcAndState<T> ent : queue) {
@@ -1499,7 +1499,7 @@ public final class FST<T> {
throw new IllegalArgumentException("this FST was not built with willPackFST=true");
}
- Arc<T> arc = new Arc<T>();
+ Arc<T> arc = new Arc<>();
final BytesReader r = getBytesReader();
@@ -1526,7 +1526,7 @@ public final class FST<T> {
// Free up RAM:
inCounts = null;
- final Map<Integer,Integer> topNodeMap = new HashMap<Integer,Integer>();
+ final Map<Integer,Integer> topNodeMap = new HashMap<>();
for(int downTo=q.size()-1;downTo>=0;downTo--) {
NodeAndInCount n = q.pop();
topNodeMap.put(n.node, downTo);
@@ -1558,7 +1558,7 @@ public final class FST<T> {
// for assert:
boolean negDelta = false;
- fst = new FST<T>(inputType, outputs, bytes.getBlockBits());
+ fst = new FST<>(inputType, outputs, bytes.getBlockBits());
final BytesStore writer = fst.bytes;
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/FSTEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/FSTEnum.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/FSTEnum.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/FSTEnum.java Wed Mar 12 18:14:05 2014
@@ -36,7 +36,7 @@ abstract class FSTEnum<T> {
protected final T NO_OUTPUT;
protected final FST.BytesReader fstReader;
- protected final FST.Arc<T> scratchArc = new FST.Arc<T>();
+ protected final FST.Arc<T> scratchArc = new FST.Arc<>();
protected int upto;
protected int targetLength;
@@ -522,7 +522,7 @@ abstract class FSTEnum<T> {
private FST.Arc<T> getArc(int idx) {
if (arcs[idx] == null) {
- arcs[idx] = new FST.Arc<T>();
+ arcs[idx] = new FST.Arc<>();
}
return arcs[idx];
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/IntsRefFSTEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/IntsRefFSTEnum.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/IntsRefFSTEnum.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/IntsRefFSTEnum.java Wed Mar 12 18:14:05 2014
@@ -30,7 +30,7 @@ import java.io.IOException;
public final class IntsRefFSTEnum<T> extends FSTEnum<T> {
private final IntsRef current = new IntsRef(10);
- private final InputOutput<T> result = new InputOutput<T>();
+ private final InputOutput<T> result = new InputOutput<>();
private IntsRef target;
/** Holds a single input (IntsRef) + output pair. */
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/NodeHash.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/NodeHash.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/NodeHash.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/NodeHash.java Wed Mar 12 18:14:05 2014
@@ -29,7 +29,7 @@ final class NodeHash<T> {
private long count;
private long mask;
private final FST<T> fst;
- private final FST.Arc<T> scratchArc = new FST.Arc<T>();
+ private final FST.Arc<T> scratchArc = new FST.Arc<>();
private final FST.BytesReader in;
public NodeHash(FST<T> fst, FST.BytesReader in) {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/PairOutputs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/PairOutputs.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/PairOutputs.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/PairOutputs.java Wed Mar 12 18:14:05 2014
@@ -66,7 +66,7 @@ public class PairOutputs<A,B> extends Ou
public PairOutputs(Outputs<A> outputs1, Outputs<B> outputs2) {
this.outputs1 = outputs1;
this.outputs2 = outputs2;
- NO_OUTPUT = new Pair<A,B>(outputs1.getNoOutput(), outputs2.getNoOutput());
+ NO_OUTPUT = new Pair<>(outputs1.getNoOutput(), outputs2.getNoOutput());
}
/** Create a new Pair */
@@ -81,7 +81,7 @@ public class PairOutputs<A,B> extends Ou
if (a == outputs1.getNoOutput() && b == outputs2.getNoOutput()) {
return NO_OUTPUT;
} else {
- final Pair<A,B> p = new Pair<A,B>(a, b);
+ final Pair<A,B> p = new Pair<>(a, b);
assert valid(p);
return p;
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/Util.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/Util.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/Util.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/fst/Util.java Wed Mar 12 18:14:05 2014
@@ -104,7 +104,7 @@ public final class Util {
// TODO: would be nice not to alloc this on every lookup
FST.Arc<Long> arc = fst.getFirstArc(new FST.Arc<Long>());
- FST.Arc<Long> scratchArc = new FST.Arc<Long>();
+ FST.Arc<Long> scratchArc = new FST.Arc<>();
final IntsRef result = new IntsRef();
@@ -288,7 +288,7 @@ public final class Util {
private final int topN;
private final int maxQueueDepth;
- private final FST.Arc<T> scratchArc = new FST.Arc<T>();
+ private final FST.Arc<T> scratchArc = new FST.Arc<>();
final Comparator<T> comparator;
@@ -301,7 +301,7 @@ public final class Util {
this.maxQueueDepth = maxQueueDepth;
this.comparator = comparator;
- queue = new TreeSet<FSTPath<T>>(new TieBreakByInputComparator<T>(comparator));
+ queue = new TreeSet<>(new TieBreakByInputComparator<>(comparator));
}
// If back plus this arc is competitive then add to queue:
@@ -344,7 +344,7 @@ public final class Util {
System.arraycopy(path.input.ints, 0, newInput.ints, 0, path.input.length);
newInput.ints[path.input.length] = path.arc.label;
newInput.length = path.input.length+1;
- final FSTPath<T> newPath = new FSTPath<T>(cost, path.arc, newInput);
+ final FSTPath<T> newPath = new FSTPath<>(cost, path.arc, newInput);
queue.add(newPath);
@@ -362,7 +362,7 @@ public final class Util {
startOutput = fst.outputs.getNoOutput();
}
- FSTPath<T> path = new FSTPath<T>(startOutput, node, input);
+ FSTPath<T> path = new FSTPath<>(startOutput, node, input);
fst.readFirstTargetArc(node, path.arc, bytesReader);
//System.out.println("add start paths");
@@ -381,7 +381,7 @@ public final class Util {
public MinResult<T>[] search() throws IOException {
- final List<MinResult<T>> results = new ArrayList<MinResult<T>>();
+ final List<MinResult<T>> results = new ArrayList<>();
//System.out.println("search topN=" + topN);
@@ -422,7 +422,7 @@ public final class Util {
//System.out.println(" empty string! cost=" + path.cost);
// Empty string!
path.input.length--;
- results.add(new MinResult<T>(path.input, path.cost));
+ results.add(new MinResult<>(path.input, path.cost));
continue;
}
@@ -486,7 +486,7 @@ public final class Util {
T finalOutput = fst.outputs.add(path.cost, path.arc.output);
if (acceptResult(path.input, finalOutput)) {
//System.out.println(" add result: " + path);
- results.add(new MinResult<T>(path.input, finalOutput));
+ results.add(new MinResult<>(path.input, finalOutput));
} else {
rejectCount++;
assert rejectCount + topN <= maxQueueDepth: "maxQueueDepth (" + maxQueueDepth + ") is too small for topN (" + topN + "): rejected " + rejectCount + " paths";
@@ -529,7 +529,7 @@ public final class Util {
// All paths are kept, so we can pass topN for
// maxQueueDepth and the pruning is admissible:
- TopNSearcher<T> searcher = new TopNSearcher<T>(fst, topN, topN, comparator);
+ TopNSearcher<T> searcher = new TopNSearcher<>(fst, topN, topN, comparator);
// since this search is initialized with a single start node
// it is okay to start with an empty input path here
@@ -578,15 +578,15 @@ public final class Util {
final FST.Arc<T> startArc = fst.getFirstArc(new FST.Arc<T>());
// A queue of transitions to consider for the next level.
- final List<FST.Arc<T>> thisLevelQueue = new ArrayList<FST.Arc<T>>();
+ final List<FST.Arc<T>> thisLevelQueue = new ArrayList<>();
// A queue of transitions to consider when processing the next level.
- final List<FST.Arc<T>> nextLevelQueue = new ArrayList<FST.Arc<T>>();
+ final List<FST.Arc<T>> nextLevelQueue = new ArrayList<>();
nextLevelQueue.add(startArc);
//System.out.println("toDot: startArc: " + startArc);
// A list of states on the same level (for ranking).
- final List<Integer> sameLevelStates = new ArrayList<Integer>();
+ final List<Integer> sameLevelStates = new ArrayList<>();
// A bitset of already seen states (target offset).
final BitSet seen = new BitSet();
@@ -609,7 +609,7 @@ public final class Util {
final T NO_OUTPUT = fst.outputs.getNoOutput();
final BytesReader r = fst.getBytesReader();
- // final FST.Arc<T> scratchArc = new FST.Arc<T>();
+ // final FST.Arc<T> scratchArc = new FST.Arc<>();
{
final String stateColor;
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/TestSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/TestSearch.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/TestSearch.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/TestSearch.java Wed Mar 12 18:14:05 2014
@@ -159,7 +159,7 @@ public class TestSearch extends LuceneTe
}
private List<Query> buildQueries() {
- List<Query> queries = new ArrayList<Query>();
+ List<Query> queries = new ArrayList<>();
BooleanQuery booleanAB = new BooleanQuery();
booleanAB.add(new TermQuery(new Term("contents", "a")), BooleanClause.Occur.SHOULD);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/analysis/TestGraphTokenizers.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/analysis/TestGraphTokenizers.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/analysis/TestGraphTokenizers.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/analysis/TestGraphTokenizers.java Wed Mar 12 18:14:05 2014
@@ -126,7 +126,7 @@ public class TestGraphTokenizers extends
final String[] parts = sb.toString().split(" ");
- tokens = new ArrayList<Token>();
+ tokens = new ArrayList<>();
int pos = 0;
int maxPos = -1;
int offset = 0;
@@ -462,7 +462,7 @@ public class TestGraphTokenizers extends
private static final Automaton HOLE_A = BasicAutomata.makeChar(TokenStreamToAutomaton.HOLE);
private Automaton join(String ... strings) {
- List<Automaton> as = new ArrayList<Automaton>();
+ List<Automaton> as = new ArrayList<>();
for(String s : strings) {
as.add(BasicAutomata.makeString(s));
as.add(SEP_A);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/analysis/TrivialLookaheadFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/analysis/TrivialLookaheadFilter.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/analysis/TrivialLookaheadFilter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/analysis/TrivialLookaheadFilter.java Wed Mar 12 18:14:05 2014
@@ -78,7 +78,7 @@ final public class TrivialLookaheadFilte
}
private void peekSentence() throws IOException {
- List<String> facts = new ArrayList<String>();
+ List<String> facts = new ArrayList<>();
boolean haveSentence = false;
do {
if (peekToken()) {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/lucene3x/TestSurrogates.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/lucene3x/TestSurrogates.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/lucene3x/TestSurrogates.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/lucene3x/TestSurrogates.java Wed Mar 12 18:14:05 2014
@@ -141,7 +141,7 @@ public class TestSurrogates extends Luce
// from there
private void doTestSeekExists(Random r, List<Term> fieldTerms, IndexReader reader) throws IOException {
- final Map<String,TermsEnum> tes = new HashMap<String,TermsEnum>();
+ final Map<String,TermsEnum> tes = new HashMap<>();
// Test random seek to existing term, then enum:
if (VERBOSE) {
@@ -204,7 +204,7 @@ public class TestSurrogates extends Luce
private void doTestSeekDoesNotExist(Random r, int numField, List<Term> fieldTerms, Term[] fieldTermsArray, IndexReader reader) throws IOException {
- final Map<String,TermsEnum> tes = new HashMap<String,TermsEnum>();
+ final Map<String,TermsEnum> tes = new HashMap<>();
if (VERBOSE) {
System.out.println("TEST: top random seeks");
@@ -297,13 +297,13 @@ public class TestSurrogates extends Luce
int tc = 0;
- List<Term> fieldTerms = new ArrayList<Term>();
+ List<Term> fieldTerms = new ArrayList<>();
for(int f=0;f<numField;f++) {
String field = "f" + f;
final int numTerms = atLeast(200);
- final Set<String> uniqueTerms = new HashSet<String>();
+ final Set<String> uniqueTerms = new HashSet<>();
for(int i=0;i<numTerms;i++) {
String term = getRandomString(random()) + "_ " + (tc++);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/lucene3x/TestTermInfosReaderIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/lucene3x/TestTermInfosReaderIndex.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/lucene3x/TestTermInfosReaderIndex.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/lucene3x/TestTermInfosReaderIndex.java Wed Mar 12 18:14:05 2014
@@ -154,7 +154,7 @@ public class TestTermInfosReaderIndex ex
}
private static List<Term> sample(Random random, IndexReader reader, int size) throws IOException {
- List<Term> sample = new ArrayList<Term>();
+ List<Term> sample = new ArrayList<>();
Fields fields = MultiFields.getFields(reader);
for (String field : fields) {
Terms terms = fields.terms(field);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestLucene40PostingsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestLucene40PostingsReader.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestLucene40PostingsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestLucene40PostingsReader.java Wed Mar 12 18:14:05 2014
@@ -112,7 +112,7 @@ public class TestLucene40PostingsReader
}
String fieldValue(int maxTF) {
- ArrayList<String> shuffled = new ArrayList<String>();
+ ArrayList<String> shuffled = new ArrayList<>();
StringBuilder sb = new StringBuilder();
int i = random().nextInt(terms.length);
while (i < terms.length) {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestReuseDocsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestReuseDocsEnum.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestReuseDocsEnum.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestReuseDocsEnum.java Wed Mar 12 18:14:05 2014
@@ -62,7 +62,7 @@ public class TestReuseDocsEnum extends L
AtomicReader indexReader = ctx.reader();
Terms terms = indexReader.terms("body");
TermsEnum iterator = terms.iterator(null);
- IdentityHashMap<DocsEnum, Boolean> enums = new IdentityHashMap<DocsEnum, Boolean>();
+ IdentityHashMap<DocsEnum, Boolean> enums = new IdentityHashMap<>();
MatchNoBits bits = new Bits.MatchNoBits(indexReader.maxDoc());
while ((iterator.next()) != null) {
DocsEnum docs = iterator.docs(random().nextBoolean() ? bits : new Bits.MatchNoBits(indexReader.maxDoc()), null, random().nextBoolean() ? DocsEnum.FLAG_FREQS : DocsEnum.FLAG_NONE);
@@ -88,7 +88,7 @@ public class TestReuseDocsEnum extends L
for (AtomicReaderContext ctx : open.leaves()) {
Terms terms = ctx.reader().terms("body");
TermsEnum iterator = terms.iterator(null);
- IdentityHashMap<DocsEnum, Boolean> enums = new IdentityHashMap<DocsEnum, Boolean>();
+ IdentityHashMap<DocsEnum, Boolean> enums = new IdentityHashMap<>();
MatchNoBits bits = new Bits.MatchNoBits(open.maxDoc());
DocsEnum docs = null;
while ((iterator.next()) != null) {
@@ -139,7 +139,7 @@ public class TestReuseDocsEnum extends L
for (AtomicReaderContext ctx : leaves) {
Terms terms = ctx.reader().terms("body");
TermsEnum iterator = terms.iterator(null);
- IdentityHashMap<DocsEnum, Boolean> enums = new IdentityHashMap<DocsEnum, Boolean>();
+ IdentityHashMap<DocsEnum, Boolean> enums = new IdentityHashMap<>();
MatchNoBits bits = new Bits.MatchNoBits(firstReader.maxDoc());
iterator = terms.iterator(null);
DocsEnum docs = null;
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/lucene41/TestBlockPostingsFormat3.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/lucene41/TestBlockPostingsFormat3.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/lucene41/TestBlockPostingsFormat3.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/lucene41/TestBlockPostingsFormat3.java Wed Mar 12 18:14:05 2014
@@ -202,7 +202,7 @@ public class TestBlockPostingsFormat3 ex
Random random = random();
// collect this number of terms from the left side
- HashSet<BytesRef> tests = new HashSet<BytesRef>();
+ HashSet<BytesRef> tests = new HashSet<>();
int numPasses = 0;
while (numPasses < 10 && tests.size() < numTests) {
leftEnum = leftTerms.iterator(leftEnum);
@@ -229,7 +229,7 @@ public class TestBlockPostingsFormat3 ex
numPasses++;
}
- ArrayList<BytesRef> shuffledTests = new ArrayList<BytesRef>(tests);
+ ArrayList<BytesRef> shuffledTests = new ArrayList<>(tests);
Collections.shuffle(shuffledTests, random);
for (BytesRef b : shuffledTests) {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java Wed Mar 12 18:14:05 2014
@@ -66,7 +66,7 @@ public class Test2BTerms extends LuceneT
private final int tokensPerDoc;
private int tokenCount;
- public final List<BytesRef> savedTerms = new ArrayList<BytesRef>();
+ public final List<BytesRef> savedTerms = new ArrayList<>();
private int nextSave;
private final Random random;
@@ -221,7 +221,7 @@ public class Test2BTerms extends LuceneT
savedTerms = findTerms(r);
}
final int numSavedTerms = savedTerms.size();
- final List<BytesRef> bigOrdTerms = new ArrayList<BytesRef>(savedTerms.subList(numSavedTerms-10, numSavedTerms));
+ final List<BytesRef> bigOrdTerms = new ArrayList<>(savedTerms.subList(numSavedTerms-10, numSavedTerms));
System.out.println("TEST: test big ord terms...");
testSavedTerms(r, bigOrdTerms);
System.out.println("TEST: test all saved terms...");
@@ -240,7 +240,7 @@ public class Test2BTerms extends LuceneT
private List<BytesRef> findTerms(IndexReader r) throws IOException {
System.out.println("TEST: findTerms");
final TermsEnum termsEnum = MultiFields.getTerms(r, "field").iterator(null);
- final List<BytesRef> savedTerms = new ArrayList<BytesRef>();
+ final List<BytesRef> savedTerms = new ArrayList<>();
int nextSave = TestUtil.nextInt(random(), 500000, 1000000);
BytesRef term;
while((term = termsEnum.next()) != null) {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java Wed Mar 12 18:14:05 2014
@@ -652,7 +652,7 @@ public class TestAddIndexes extends Luce
Directory dir, dir2;
final static int NUM_INIT_DOCS = 17;
IndexWriter writer2;
- final List<Throwable> failures = new ArrayList<Throwable>();
+ final List<Throwable> failures = new ArrayList<>();
volatile boolean didClose;
final IndexReader[] readers;
final int NUM_COPY;
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java Wed Mar 12 18:14:05 2014
@@ -213,10 +213,10 @@ public class TestBackwardsCompatibility
@BeforeClass
public static void beforeClass() throws Exception {
assertFalse("test infra is broken!", LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE);
- List<String> names = new ArrayList<String>(oldNames.length + oldSingleSegmentNames.length);
+ List<String> names = new ArrayList<>(oldNames.length + oldSingleSegmentNames.length);
names.addAll(Arrays.asList(oldNames));
names.addAll(Arrays.asList(oldSingleSegmentNames));
- oldIndexDirs = new HashMap<String,Directory>();
+ oldIndexDirs = new HashMap<>();
for (String name : names) {
File dir = TestUtil.getTempDir(name);
File dataFile = new File(TestBackwardsCompatibility.class.getResource("index." + name + ".zip").toURI());
@@ -926,7 +926,7 @@ public class TestBackwardsCompatibility
}
public void testUpgradeOldIndex() throws Exception {
- List<String> names = new ArrayList<String>(oldNames.length + oldSingleSegmentNames.length);
+ List<String> names = new ArrayList<>(oldNames.length + oldSingleSegmentNames.length);
names.addAll(Arrays.asList(oldNames));
names.addAll(Arrays.asList(oldSingleSegmentNames));
for(String name : names) {
@@ -952,7 +952,7 @@ public class TestBackwardsCompatibility
String path = dir.getAbsolutePath();
- List<String> args = new ArrayList<String>();
+ List<String> args = new ArrayList<>();
if (random().nextBoolean()) {
args.add("-verbose");
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility3x.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility3x.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility3x.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility3x.java Wed Mar 12 18:14:05 2014
@@ -146,10 +146,10 @@ public class TestBackwardsCompatibility3
@BeforeClass
public static void beforeClass() throws Exception {
assertFalse("test infra is broken!", LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE);
- List<String> names = new ArrayList<String>(oldNames.length + oldSingleSegmentNames.length);
+ List<String> names = new ArrayList<>(oldNames.length + oldSingleSegmentNames.length);
names.addAll(Arrays.asList(oldNames));
names.addAll(Arrays.asList(oldSingleSegmentNames));
- oldIndexDirs = new HashMap<String,Directory>();
+ oldIndexDirs = new HashMap<>();
for (String name : names) {
File dir = TestUtil.getTempDir(name);
File dataFile = new File(TestBackwardsCompatibility3x.class.getResource("index." + name + ".zip").toURI());
@@ -890,7 +890,7 @@ public class TestBackwardsCompatibility3
}
public void testUpgradeOldIndex() throws Exception {
- List<String> names = new ArrayList<String>(oldNames.length + oldSingleSegmentNames.length);
+ List<String> names = new ArrayList<>(oldNames.length + oldSingleSegmentNames.length);
names.addAll(Arrays.asList(oldNames));
names.addAll(Arrays.asList(oldSingleSegmentNames));
for(String name : names) {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestBagOfPositions.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestBagOfPositions.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestBagOfPositions.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestBagOfPositions.java Wed Mar 12 18:14:05 2014
@@ -44,7 +44,7 @@ import org.apache.lucene.util.TestUtil;
// Lucene3x doesnt have totalTermFreq, so the test isn't interesting there.
public class TestBagOfPositions extends LuceneTestCase {
public void test() throws Exception {
- List<String> postingsList = new ArrayList<String>();
+ List<String> postingsList = new ArrayList<>();
int numTerms = atLeast(300);
final int maxTermsPerDoc = TestUtil.nextInt(random(), 10, 20);
boolean isSimpleText = "SimpleText".equals(TestUtil.getPostingsFormat("field"));
@@ -67,7 +67,7 @@ public class TestBagOfPositions extends
}
Collections.shuffle(postingsList, random());
- final ConcurrentLinkedQueue<String> postings = new ConcurrentLinkedQueue<String>(postingsList);
+ final ConcurrentLinkedQueue<String> postings = new ConcurrentLinkedQueue<>(postingsList);
Directory dir = newFSDirectory(TestUtil.getTempDir("bagofpositions"));
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestBagOfPostings.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestBagOfPostings.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestBagOfPostings.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestBagOfPostings.java Wed Mar 12 18:14:05 2014
@@ -43,7 +43,7 @@ import org.apache.lucene.util.TestUtil;
@SuppressCodecs({"Direct", "Memory"}) // at night this makes like 200k/300k docs and will make Direct's heart beat!
public class TestBagOfPostings extends LuceneTestCase {
public void test() throws Exception {
- List<String> postingsList = new ArrayList<String>();
+ List<String> postingsList = new ArrayList<>();
int numTerms = atLeast(300);
final int maxTermsPerDoc = TestUtil.nextInt(random(), 10, 20);
@@ -69,7 +69,7 @@ public class TestBagOfPostings extends L
}
Collections.shuffle(postingsList, random());
- final ConcurrentLinkedQueue<String> postings = new ConcurrentLinkedQueue<String>(postingsList);
+ final ConcurrentLinkedQueue<String> postings = new ConcurrentLinkedQueue<>(postingsList);
Directory dir = newFSDirectory(TestUtil.getTempDir("bagofpostings"));
final RandomIndexWriter iw = new RandomIndexWriter(random(), dir, iwc);
@@ -94,7 +94,7 @@ public class TestBagOfPostings extends L
startingGun.await();
while (!postings.isEmpty()) {
StringBuilder text = new StringBuilder();
- Set<String> visited = new HashSet<String>();
+ Set<String> visited = new HashSet<>();
for (int i = 0; i < maxTermsPerDoc; i++) {
String token = postings.poll();
if (token == null) {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCheckIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCheckIndex.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCheckIndex.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCheckIndex.java Wed Mar 12 18:14:05 2014
@@ -90,7 +90,7 @@ public class TestCheckIndex extends Luce
assertEquals(18, seg.termVectorStatus.totVectors);
assertTrue(seg.diagnostics.size() > 0);
- final List<String> onlySegments = new ArrayList<String>();
+ final List<String> onlySegments = new ArrayList<>();
onlySegments.add("_0");
assertTrue(checker.checkIndex(onlySegments).clean == true);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java Wed Mar 12 18:14:05 2014
@@ -225,7 +225,7 @@ public class TestCodecs extends LuceneTe
//final int numTerms = 2;
final TermData[] terms = new TermData[numTerms];
- final HashSet<String> termsSeen = new HashSet<String>();
+ final HashSet<String> termsSeen = new HashSet<>();
for(int i=0;i<numTerms;i++) {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDeletionPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDeletionPolicy.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDeletionPolicy.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDeletionPolicy.java Wed Mar 12 18:14:05 2014
@@ -120,7 +120,7 @@ public class TestDeletionPolicy extends
int numOnCommit;
int numToKeep;
int numDelete;
- Set<String> seen = new HashSet<String>();
+ Set<String> seen = new HashSet<>();
public KeepLastNDeletionPolicy(int numToKeep) {
this.numToKeep = numToKeep;
@@ -228,7 +228,7 @@ public class TestDeletionPolicy extends
mp.setNoCFSRatio(1.0);
IndexWriter writer = new IndexWriter(dir, conf);
ExpirationTimeDeletionPolicy policy = (ExpirationTimeDeletionPolicy) writer.getConfig().getIndexDeletionPolicy();
- Map<String,String> commitData = new HashMap<String,String>();
+ Map<String,String> commitData = new HashMap<>();
commitData.put("commitTime", String.valueOf(System.currentTimeMillis()));
writer.setCommitData(commitData);
writer.commit();
@@ -250,7 +250,7 @@ public class TestDeletionPolicy extends
for(int j=0;j<17;j++) {
addDoc(writer);
}
- commitData = new HashMap<String,String>();
+ commitData = new HashMap<>();
commitData.put("commitTime", String.valueOf(System.currentTimeMillis()));
writer.setCommitData(commitData);
writer.commit();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java Wed Mar 12 18:14:05 2014
@@ -249,10 +249,10 @@ public class TestDirectoryReader extends
reader = DirectoryReader.open(d);
fieldInfos = MultiFields.getMergedFieldInfos(reader);
- Collection<String> allFieldNames = new HashSet<String>();
- Collection<String> indexedFieldNames = new HashSet<String>();
- Collection<String> notIndexedFieldNames = new HashSet<String>();
- Collection<String> tvFieldNames = new HashSet<String>();
+ Collection<String> allFieldNames = new HashSet<>();
+ Collection<String> indexedFieldNames = new HashSet<>();
+ Collection<String> notIndexedFieldNames = new HashSet<>();
+ Collection<String> tvFieldNames = new HashSet<>();
for(FieldInfo fieldInfo : fieldInfos) {
final String name = fieldInfo.name;
@@ -742,7 +742,7 @@ public void testFilesOpenClose() throws
Collection<IndexCommit> commits = DirectoryReader.listCommits(dir);
for (final IndexCommit commit : commits) {
Collection<String> files = commit.getFileNames();
- HashSet<String> seen = new HashSet<String>();
+ HashSet<String> seen = new HashSet<>();
for (final String fileName : files) {
assertTrue("file " + fileName + " was duplicated", !seen.contains(fileName));
seen.add(fileName);
@@ -1124,7 +1124,7 @@ public void testFilesOpenClose() throws
writer.addDocument(doc);
DirectoryReader r = writer.getReader();
writer.close();
- Set<String> fieldsToLoad = new HashSet<String>();
+ Set<String> fieldsToLoad = new HashSet<>();
assertEquals(0, r.document(0, fieldsToLoad).getFields().size());
fieldsToLoad.add("field1");
Document doc2 = r.document(0, fieldsToLoad);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReaderReopen.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReaderReopen.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReaderReopen.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReaderReopen.java Wed Mar 12 18:14:05 2014
@@ -552,14 +552,14 @@ public class TestDirectoryReaderReopen e
Document doc = new Document();
doc.add(newStringField("id", ""+i, Field.Store.NO));
writer.addDocument(doc);
- Map<String,String> data = new HashMap<String,String>();
+ Map<String,String> data = new HashMap<>();
data.put("index", i+"");
writer.setCommitData(data);
writer.commit();
}
for(int i=0;i<4;i++) {
writer.deleteDocuments(new Term("id", ""+i));
- Map<String,String> data = new HashMap<String,String>();
+ Map<String,String> data = new HashMap<>();
data.put("index", (4+i)+"");
writer.setCommitData(data);
writer.commit();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDoc.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDoc.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDoc.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDoc.java Wed Mar 12 18:14:05 2014
@@ -71,7 +71,7 @@ public class TestDoc extends LuceneTestC
Directory directory = newFSDirectory(indexDir);
directory.close();
- files = new LinkedList<File>();
+ files = new LinkedList<>();
files.add(createOutput("test.txt",
"This is the first test file"
));
@@ -229,7 +229,7 @@ public class TestDoc extends LuceneTestC
final SegmentInfo info = new SegmentInfo(si1.info.dir, Constants.LUCENE_MAIN_VERSION, merged,
si1.info.getDocCount() + si2.info.getDocCount(),
false, codec, null);
- info.setFiles(new HashSet<String>(trackingDir.getCreatedFiles()));
+ info.setFiles(new HashSet<>(trackingDir.getCreatedFiles()));
if (useCompoundFile) {
Collection<String> filesToDelete = IndexWriter.createCompoundFile(InfoStream.getDefault(), dir, MergeState.CheckAbort.NONE, info, newIOContext(random()));
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocTermOrds.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocTermOrds.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocTermOrds.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocTermOrds.java Wed Mar 12 18:14:05 2014
@@ -95,7 +95,7 @@ public class TestDocTermOrds extends Luc
Directory dir = newDirectory();
final int NUM_TERMS = atLeast(20);
- final Set<BytesRef> terms = new HashSet<BytesRef>();
+ final Set<BytesRef> terms = new HashSet<>();
while(terms.size() < NUM_TERMS) {
final String s = TestUtil.randomRealisticUnicodeString(random());
//final String s = TestUtil.randomSimpleString(random);
@@ -120,7 +120,7 @@ public class TestDocTermOrds extends Luc
final RandomIndexWriter w = new RandomIndexWriter(random(), dir, conf);
final int[][] idToOrds = new int[NUM_DOCS][];
- final Set<Integer> ordsForDocSet = new HashSet<Integer>();
+ final Set<Integer> ordsForDocSet = new HashSet<>();
for(int id=0;id<NUM_DOCS;id++) {
Document doc = new Document();
@@ -181,7 +181,7 @@ public class TestDocTermOrds extends Luc
public void testRandomWithPrefix() throws Exception {
Directory dir = newDirectory();
- final Set<String> prefixes = new HashSet<String>();
+ final Set<String> prefixes = new HashSet<>();
final int numPrefix = TestUtil.nextInt(random(), 2, 7);
if (VERBOSE) {
System.out.println("TEST: use " + numPrefix + " prefixes");
@@ -193,7 +193,7 @@ public class TestDocTermOrds extends Luc
final String[] prefixesArray = prefixes.toArray(new String[prefixes.size()]);
final int NUM_TERMS = atLeast(20);
- final Set<BytesRef> terms = new HashSet<BytesRef>();
+ final Set<BytesRef> terms = new HashSet<>();
while(terms.size() < NUM_TERMS) {
final String s = prefixesArray[random().nextInt(prefixesArray.length)] + TestUtil.randomRealisticUnicodeString(random());
//final String s = prefixesArray[random.nextInt(prefixesArray.length)] + TestUtil.randomSimpleString(random);
@@ -217,7 +217,7 @@ public class TestDocTermOrds extends Luc
final RandomIndexWriter w = new RandomIndexWriter(random(), dir, conf);
final int[][] idToOrds = new int[NUM_DOCS][];
- final Set<Integer> ordsForDocSet = new HashSet<Integer>();
+ final Set<Integer> ordsForDocSet = new HashSet<>();
for(int id=0;id<NUM_DOCS;id++) {
Document doc = new Document();
@@ -262,7 +262,7 @@ public class TestDocTermOrds extends Luc
final int[][] idToOrdsPrefix = new int[NUM_DOCS][];
for(int id=0;id<NUM_DOCS;id++) {
final int[] docOrds = idToOrds[id];
- final List<Integer> newOrds = new ArrayList<Integer>();
+ final List<Integer> newOrds = new ArrayList<>();
for(int ord : idToOrds[id]) {
if (StringHelper.startsWith(termsArray[ord], prefixRef)) {
newOrds.add(ord);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocValuesWithThreads.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocValuesWithThreads.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocValuesWithThreads.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocValuesWithThreads.java Wed Mar 12 18:14:05 2014
@@ -45,9 +45,9 @@ public class TestDocValuesWithThreads ex
Directory dir = newDirectory();
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMergePolicy(newLogMergePolicy()));
- final List<Long> numbers = new ArrayList<Long>();
- final List<BytesRef> binary = new ArrayList<BytesRef>();
- final List<BytesRef> sorted = new ArrayList<BytesRef>();
+ final List<Long> numbers = new ArrayList<>();
+ final List<BytesRef> binary = new ArrayList<>();
+ final List<BytesRef> sorted = new ArrayList<>();
final int numDocs = atLeast(100);
for(int i=0;i<numDocs;i++) {
Document d = new Document();
@@ -71,7 +71,7 @@ public class TestDocValuesWithThreads ex
final AtomicReader ar = r.leaves().get(0).reader();
int numThreads = TestUtil.nextInt(random(), 2, 5);
- List<Thread> threads = new ArrayList<Thread>();
+ List<Thread> threads = new ArrayList<>();
final CountDownLatch startingGun = new CountDownLatch(1);
for(int t=0;t<numThreads;t++) {
final Random threadRandom = new Random(random().nextLong());
@@ -141,12 +141,12 @@ public class TestDocValuesWithThreads ex
final Directory dir = newDirectory();
final RandomIndexWriter writer = new RandomIndexWriter(random, dir);
final boolean allowDups = random.nextBoolean();
- final Set<String> seen = new HashSet<String>();
+ final Set<String> seen = new HashSet<>();
if (VERBOSE) {
System.out.println("TEST: NUM_DOCS=" + NUM_DOCS + " allowDups=" + allowDups);
}
int numDocs = 0;
- final List<BytesRef> docValues = new ArrayList<BytesRef>();
+ final List<BytesRef> docValues = new ArrayList<>();
// TODO: deletions
while (numDocs < NUM_DOCS) {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java Wed Mar 12 18:14:05 2014
@@ -120,7 +120,7 @@ public class TestDocsAndPositions extend
customType.setOmitNorms(true);
for (int i = 0; i < numDocs; i++) {
Document doc = new Document();
- ArrayList<Integer> positions = new ArrayList<Integer>();
+ ArrayList<Integer> positions = new ArrayList<>();
StringBuilder builder = new StringBuilder();
int num = atLeast(131);
for (int j = 0; j < num; j++) {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterDeleteQueue.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterDeleteQueue.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterDeleteQueue.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterDeleteQueue.java Wed Mar 12 18:14:05 2014
@@ -47,7 +47,7 @@ public class TestDocumentsWriterDeleteQu
BufferedUpdates bd2 = new BufferedUpdates();
int last1 = 0;
int last2 = 0;
- Set<Term> uniqueValues = new HashSet<Term>();
+ Set<Term> uniqueValues = new HashSet<>();
for (int j = 0; j < ids.length; j++) {
Integer i = ids[j];
// create an array here since we compare identity below against tailItem
@@ -72,7 +72,7 @@ public class TestDocumentsWriterDeleteQu
}
assertEquals(uniqueValues, bd1.terms.keySet());
assertEquals(uniqueValues, bd2.terms.keySet());
- HashSet<Term> frozenSet = new HashSet<Term>();
+ HashSet<Term> frozenSet = new HashSet<>();
for (Term t : queue.freezeGlobalBuffer(null).termsIterable()) {
BytesRef bytesRef = new BytesRef();
bytesRef.copyBytes(t.bytes);
@@ -173,7 +173,7 @@ public class TestDocumentsWriterDeleteQu
public void testStressDeleteQueue() throws InterruptedException {
DocumentsWriterDeleteQueue queue = new DocumentsWriterDeleteQueue();
- Set<Term> uniqueValues = new HashSet<Term>();
+ Set<Term> uniqueValues = new HashSet<>();
final int size = 10000 + random().nextInt(500) * RANDOM_MULTIPLIER;
Integer[] ids = new Integer[size];
for (int i = 0; i < ids.length; i++) {
@@ -201,7 +201,7 @@ public class TestDocumentsWriterDeleteQu
assertEquals(uniqueValues, deletes.terms.keySet());
}
queue.tryApplyGlobalSlice();
- Set<Term> frozenSet = new HashSet<Term>();
+ Set<Term> frozenSet = new HashSet<>();
for (Term t : queue.freezeGlobalBuffer(null).termsIterable()) {
BytesRef bytesRef = new BytesRef();
bytesRef.copyBytes(t.bytes);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java Wed Mar 12 18:14:05 2014
@@ -342,8 +342,8 @@ public class TestFlushByRamOrCountsPolic
@Override
public void onDelete(DocumentsWriterFlushControl control, ThreadState state) {
- final ArrayList<ThreadState> pending = new ArrayList<DocumentsWriterPerThreadPool.ThreadState>();
- final ArrayList<ThreadState> notPending = new ArrayList<DocumentsWriterPerThreadPool.ThreadState>();
+ final ArrayList<ThreadState> pending = new ArrayList<>();
+ final ArrayList<ThreadState> notPending = new ArrayList<>();
findPending(control, pending, notPending);
final boolean flushCurrent = state.flushPending;
final ThreadState toFlush;
@@ -374,8 +374,8 @@ public class TestFlushByRamOrCountsPolic
@Override
public void onInsert(DocumentsWriterFlushControl control, ThreadState state) {
- final ArrayList<ThreadState> pending = new ArrayList<DocumentsWriterPerThreadPool.ThreadState>();
- final ArrayList<ThreadState> notPending = new ArrayList<DocumentsWriterPerThreadPool.ThreadState>();
+ final ArrayList<ThreadState> pending = new ArrayList<>();
+ final ArrayList<ThreadState> notPending = new ArrayList<>();
findPending(control, pending, notPending);
final boolean flushCurrent = state.flushPending;
long activeBytes = control.activeBytes();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java Wed Mar 12 18:14:05 2014
@@ -141,9 +141,9 @@ public class TestIndexFileDeleter extend
}
private static Set<String> difFiles(String[] files1, String[] files2) {
- Set<String> set1 = new HashSet<String>();
- Set<String> set2 = new HashSet<String>();
- Set<String> extra = new HashSet<String>();
+ Set<String> set1 = new HashSet<>();
+ Set<String> set2 = new HashSet<>();
+ Set<String> extra = new HashSet<>();
for (int x=0; x < files1.length; x++) {
set1.add(files1[x]);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java Wed Mar 12 18:14:05 2014
@@ -1390,7 +1390,7 @@ public class TestIndexWriter extends Luc
r = DirectoryReader.open(dir);
}
- List<String> files = new ArrayList<String>(Arrays.asList(dir.listAll()));
+ List<String> files = new ArrayList<>(Arrays.asList(dir.listAll()));
// RAMDir won't have a write.lock, but fs dirs will:
files.remove("write.lock");
@@ -1868,7 +1868,7 @@ public class TestIndexWriter extends Luc
IndexWriter w = new IndexWriter(dir,
new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())));
- final List<Document> docs = new ArrayList<Document>();
+ final List<Document> docs = new ArrayList<>();
docs.add(new Document());
w.updateDocuments(new Term("foo", "bar"),
docs);
@@ -2183,9 +2183,9 @@ public class TestIndexWriter extends Luc
int iters = atLeast(100);
int docCount = 0;
int docId = 0;
- Set<String> liveIds = new HashSet<String>();
+ Set<String> liveIds = new HashSet<>();
for (int i = 0; i < iters; i++) {
- List<Iterable<IndexableField>> docs = new ArrayList<Iterable<IndexableField>>();
+ List<Iterable<IndexableField>> docs = new ArrayList<>();
FieldType ft = new FieldType(TextField.TYPE_NOT_STORED);
FieldType idFt = new FieldType(TextField.TYPE_STORED);
@@ -2364,7 +2364,7 @@ public class TestIndexWriter extends Luc
public void testMergeAllDeleted() throws IOException {
Directory dir = newDirectory();
IndexWriterConfig iwc = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()));
- final SetOnce<IndexWriter> iwRef = new SetOnce<IndexWriter>();
+ final SetOnce<IndexWriter> iwRef = new SetOnce<>();
iwc.setInfoStream(new RandomIndexWriter.TestPointInfoStream(iwc.getInfoStream(), new RandomIndexWriter.TestPoint() {
@Override
public void apply(String message) {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java Wed Mar 12 18:14:05 2014
@@ -426,7 +426,7 @@ public class TestIndexWriterCommit exten
w.addDocument(doc);
// commit to "first"
- Map<String,String> commitData = new HashMap<String,String>();
+ Map<String,String> commitData = new HashMap<>();
commitData.put("tag", "first");
w.setCommitData(commitData);
w.commit();
@@ -634,7 +634,7 @@ public class TestIndexWriterCommit exten
w = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMaxBufferedDocs(2));
for(int j=0;j<17;j++)
TestIndexWriter.addDoc(w);
- Map<String,String> data = new HashMap<String,String>();
+ Map<String,String> data = new HashMap<>();
data.put("label", "test1");
w.setCommitData(data);
w.close();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java Wed Mar 12 18:14:05 2014
@@ -84,7 +84,7 @@ public class TestIndexWriterConfig exten
assertEquals(InfoStream.getDefault(), conf.getInfoStream());
assertEquals(IndexWriterConfig.DEFAULT_USE_COMPOUND_FILE_SYSTEM, conf.getUseCompoundFile());
// Sanity check - validate that all getters are covered.
- Set<String> getters = new HashSet<String>();
+ Set<String> getters = new HashSet<>();
getters.add("getAnalyzer");
getters.add("getIndexCommit");
getters.add("getIndexDeletionPolicy");
@@ -121,8 +121,8 @@ public class TestIndexWriterConfig exten
@Test
public void testSettersChaining() throws Exception {
// Ensures that every setter returns IndexWriterConfig to allow chaining.
- HashSet<String> liveSetters = new HashSet<String>();
- HashSet<String> allSetters = new HashSet<String>();
+ HashSet<String> liveSetters = new HashSet<>();
+ HashSet<String> allSetters = new HashSet<>();
for (Method m : IndexWriterConfig.class.getDeclaredMethods()) {
if (m.getName().startsWith("set") && !Modifier.isStatic(m.getModifiers())) {
allSetters.add(m.getName());
@@ -179,7 +179,7 @@ public class TestIndexWriterConfig exten
// Test that IndexWriterConfig overrides all getters, so that javadocs
// contain all methods for the users. Also, ensures that IndexWriterConfig
// doesn't declare getters that are not declared on LiveIWC.
- HashSet<String> liveGetters = new HashSet<String>();
+ HashSet<String> liveGetters = new HashSet<>();
for (Method m : LiveIndexWriterConfig.class.getDeclaredMethods()) {
if (m.getName().startsWith("get") && !Modifier.isStatic(m.getModifiers())) {
liveGetters.add(m.getName());
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java Wed Mar 12 18:14:05 2014
@@ -950,7 +950,7 @@ public class TestIndexWriterDelete exten
final Directory dir = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random(), dir);
final int NUM_DOCS = atLeast(1000);
- final List<Integer> ids = new ArrayList<Integer>(NUM_DOCS);
+ final List<Integer> ids = new ArrayList<>(NUM_DOCS);
for(int id=0;id<NUM_DOCS;id++) {
ids.add(id);
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java Wed Mar 12 18:14:05 2014
@@ -217,7 +217,7 @@ public class TestIndexWriterExceptions e
}
}
- ThreadLocal<Thread> doFail = new ThreadLocal<Thread>();
+ ThreadLocal<Thread> doFail = new ThreadLocal<>();
private class TestPoint1 implements RandomIndexWriter.TestPoint {
Random r = new Random(random().nextLong());
@@ -1363,7 +1363,7 @@ public class TestIndexWriterExceptions e
w.addDocument(doc);
}
- final List<Document> docs = new ArrayList<Document>();
+ final List<Document> docs = new ArrayList<>();
for(int docCount=0;docCount<7;docCount++) {
Document doc = new Document();
docs.add(doc);
@@ -1422,7 +1422,7 @@ public class TestIndexWriterExceptions e
}
// Use addDocs (no exception) to get docs in the index:
- final List<Document> docs = new ArrayList<Document>();
+ final List<Document> docs = new ArrayList<>();
final int numDocs2 = random().nextInt(25);
for(int docCount=0;docCount<numDocs2;docCount++) {
Document doc = new Document();
@@ -1579,7 +1579,7 @@ public class TestIndexWriterExceptions e
try {
doc = new Document();
// try to boost with norms omitted
- List<IndexableField> list = new ArrayList<IndexableField>();
+ List<IndexableField> list = new ArrayList<>();
list.add(new IndexableField() {
@Override
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java Wed Mar 12 18:14:05 2014
@@ -398,7 +398,7 @@ public class TestIndexWriterMerging exte
((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(2);
final IndexWriter finalWriter = writer;
- final ArrayList<Throwable> failure = new ArrayList<Throwable>();
+ final ArrayList<Throwable> failure = new ArrayList<>();
Thread t1 = new Thread() {
@Override
public void run() {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnJRECrash.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnJRECrash.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnJRECrash.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnJRECrash.java Wed Mar 12 18:14:05 2014
@@ -86,7 +86,7 @@ public class TestIndexWriterOnJRECrash e
/** fork ourselves in a new jvm. sets -Dtests.crashmode=true */
public void forkTest() throws Exception {
- List<String> cmd = new ArrayList<String>();
+ List<String> cmd = new ArrayList<>();
cmd.add(System.getProperty("java.home")
+ System.getProperty("file.separator")
+ "bin"
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOutOfFileDescriptors.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOutOfFileDescriptors.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOutOfFileDescriptors.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOutOfFileDescriptors.java Wed Mar 12 18:14:05 2014
@@ -132,7 +132,7 @@ public class TestIndexWriterOutOfFileDes
dir.setRandomIOExceptionRateOnOpen(0.0);
r = DirectoryReader.open(dir);
dirCopy = newMockFSDirectory(TestUtil.getTempDir("TestIndexWriterOutOfFileDescriptors.copy"));
- Set<String> files = new HashSet<String>();
+ Set<String> files = new HashSet<>();
for (String file : dir.listAll()) {
dir.copy(dirCopy, file, file, IOContext.DEFAULT);
files.add(file);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java Wed Mar 12 18:14:05 2014
@@ -404,7 +404,7 @@ public class TestIndexWriterReader exten
int numDirs;
final Thread[] threads = new Thread[numThreads];
IndexWriter mainWriter;
- final List<Throwable> failures = new ArrayList<Throwable>();
+ final List<Throwable> failures = new ArrayList<>();
IndexReader[] readers;
boolean didClose = false;
AtomicInteger count = new AtomicInteger(0);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java Wed Mar 12 18:14:05 2014
@@ -137,7 +137,7 @@ public class TestIndexWriterUnicode exte
BytesRef last = new BytesRef();
- Set<String> seenTerms = new HashSet<String>();
+ Set<String> seenTerms = new HashSet<>();
while(true) {
final BytesRef term = terms.next();
@@ -279,7 +279,7 @@ public class TestIndexWriterUnicode exte
Field f = newStringField("f", "", Field.Store.NO);
d.add(f);
char[] chars = new char[2];
- final Set<String> allTerms = new HashSet<String>();
+ final Set<String> allTerms = new HashSet<>();
int num = atLeast(200);
for (int i = 0; i < num; i++) {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java Wed Mar 12 18:14:05 2014
@@ -549,7 +549,7 @@ public class TestIndexWriterWithThreads
final int threadCount = TestUtil.nextInt(random(), 2, 6);
- final AtomicReference<IndexWriter> writerRef = new AtomicReference<IndexWriter>();
+ final AtomicReference<IndexWriter> writerRef = new AtomicReference<>();
MockAnalyzer analyzer = new MockAnalyzer(random());
analyzer.setMaxTokenLength(TestUtil.nextInt(random(), 1, IndexWriter.MAX_TERM_LENGTH));
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIntBlockPool.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIntBlockPool.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIntBlockPool.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIntBlockPool.java Wed Mar 12 18:14:05 2014
@@ -63,7 +63,7 @@ public class TestIntBlockPool extends Lu
Counter bytesUsed = Counter.newCounter();
IntBlockPool pool = new IntBlockPool(new ByteTrackingAllocator(bytesUsed));
for (int j = 0; j < 2; j++) {
- List<StartEndAndValues> holders = new ArrayList<TestIntBlockPool.StartEndAndValues>();
+ List<StartEndAndValues> holders = new ArrayList<>();
int num = atLeast(4);
for (int i = 0; i < num; i++) {
holders.add(new StartEndAndValues(random().nextInt(1000)));
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java Wed Mar 12 18:14:05 2014
@@ -39,7 +39,7 @@ public class TestMaxTermFrequency extend
Directory dir;
IndexReader reader;
/* expected maxTermFrequency values for our documents */
- ArrayList<Integer> expected = new ArrayList<Integer>();
+ ArrayList<Integer> expected = new ArrayList<>();
@Override
public void setUp() throws Exception {
@@ -81,7 +81,7 @@ public class TestMaxTermFrequency extend
* puts the max-frequency term into expected, to be checked against the norm.
*/
private String addValue() {
- List<String> terms = new ArrayList<String>();
+ List<String> terms = new ArrayList<>();
int maxCeiling = TestUtil.nextInt(random(), 0, 255);
int max = 0;
for (char ch = 'a'; ch <= 'z'; ch++) {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestMixedCodecs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestMixedCodecs.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestMixedCodecs.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestMixedCodecs.java Wed Mar 12 18:14:05 2014
@@ -72,7 +72,7 @@ public class TestMixedCodecs extends Luc
}
// Random delete half the docs:
- final Set<Integer> deleted = new HashSet<Integer>();
+ final Set<Integer> deleted = new HashSet<>();
while(deleted.size() < NUM_DOCS/2) {
final Integer toDelete = random().nextInt(NUM_DOCS);
if (!deleted.contains(toDelete)) {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestMultiDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestMultiDocValues.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestMultiDocValues.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestMultiDocValues.java Wed Mar 12 18:14:05 2014
@@ -243,7 +243,7 @@ public class TestMultiDocValues extends
// check ord list
for (int i = 0; i < numDocs; i++) {
single.setDocument(i);
- ArrayList<Long> expectedList = new ArrayList<Long>();
+ ArrayList<Long> expectedList = new ArrayList<>();
long ord;
while ((ord = single.nextOrd()) != SortedSetDocValues.NO_MORE_ORDS) {
expectedList.add(ord);
@@ -308,7 +308,7 @@ public class TestMultiDocValues extends
// check ord list
for (int i = 0; i < numDocs; i++) {
single.setDocument(i);
- ArrayList<Long> expectedList = new ArrayList<Long>();
+ ArrayList<Long> expectedList = new ArrayList<>();
long ord;
while ((ord = single.nextOrd()) != SortedSetDocValues.NO_MORE_ORDS) {
expectedList.add(ord);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java Wed Mar 12 18:14:05 2014
@@ -40,9 +40,9 @@ public class TestMultiFields extends Luc
// we can do this because we use NoMergePolicy (and dont merge to "nothing")
w.setKeepFullyDeletedSegments(true);
- Map<BytesRef,List<Integer>> docs = new HashMap<BytesRef,List<Integer>>();
- Set<Integer> deleted = new HashSet<Integer>();
- List<BytesRef> terms = new ArrayList<BytesRef>();
+ Map<BytesRef,List<Integer>> docs = new HashMap<>();
+ Set<Integer> deleted = new HashSet<>();
+ List<BytesRef> terms = new ArrayList<>();
int numDocs = TestUtil.nextInt(random(), 1, 100 * RANDOM_MULTIPLIER);
Document doc = new Document();
@@ -55,7 +55,7 @@ public class TestMultiFields extends Luc
if (VERBOSE) {
System.out.println("TEST: onlyUniqueTerms=" + onlyUniqueTerms + " numDocs=" + numDocs);
}
- Set<BytesRef> uniqueTerms = new HashSet<BytesRef>();
+ Set<BytesRef> uniqueTerms = new HashSet<>();
for(int i=0;i<numDocs;i++) {
if (!onlyUniqueTerms && random().nextBoolean() && terms.size() > 0) {
@@ -90,7 +90,7 @@ public class TestMultiFields extends Luc
}
if (VERBOSE) {
- List<BytesRef> termsList = new ArrayList<BytesRef>(uniqueTerms);
+ List<BytesRef> termsList = new ArrayList<>(uniqueTerms);
Collections.sort(termsList, BytesRef.getUTF8SortedAsUTF16Comparator());
System.out.println("TEST: terms in UTF16 order:");
for(BytesRef b : termsList) {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestNeverDelete.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestNeverDelete.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestNeverDelete.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestNeverDelete.java Wed Mar 12 18:14:05 2014
@@ -80,7 +80,7 @@ public class TestNeverDelete extends Luc
indexThreads[x].start();
}
- final Set<String> allFiles = new HashSet<String>();
+ final Set<String> allFiles = new HashSet<>();
DirectoryReader r = DirectoryReader.open(d);
while(System.currentTimeMillis() < stopTime) {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java Wed Mar 12 18:14:05 2014
@@ -1202,7 +1202,7 @@ public class TestNumericDocValuesUpdates
final int numDocs = atLeast(50);
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()));
}
@@ -1300,7 +1300,7 @@ public class TestNumericDocValuesUpdates
final int numDocs = atLeast(20000);
final int numNumericFields = atLeast(5);
final int numTerms = TestUtil.nextInt(random, 10, 100); // terms should affect many docs
- Set<String> updateTerms = new HashSet<String>();
+ Set<String> updateTerms = new HashSet<>();
while (updateTerms.size() < numTerms) {
updateTerms.add(TestUtil.randomSimpleString(random));
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java?rev=1576837&r1=1576836&r2=1576837&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java Wed Mar 12 18:14:05 2014
@@ -360,7 +360,7 @@ public class TestPayloads extends Lucene
* This Analyzer uses an WhitespaceTokenizer and PayloadFilter.
*/
private static class PayloadAnalyzer extends Analyzer {
- Map<String,PayloadData> fieldToData = new HashMap<String,PayloadData>();
+ Map<String,PayloadData> fieldToData = new HashMap<>();
public PayloadAnalyzer() {
super(PER_FIELD_REUSE_STRATEGY);
@@ -540,7 +540,7 @@ public class TestPayloads extends Lucene
private List<byte[]> pool;
ByteArrayPool(int capacity, int size) {
- pool = new ArrayList<byte[]>();
+ pool = new ArrayList<>();
for (int i = 0; i < capacity; i++) {
pool.add(new byte[size]);
}