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 [3/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/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerTest.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerTest.java Wed Mar 12 14:39:17 2014
@@ -130,7 +130,7 @@ public class WikipediaTokenizerTest exte
}
public void testLucene1133() throws Exception {
- Set<String> untoks = new HashSet<String>();
+ Set<String> untoks = new HashSet<>();
untoks.add(WikipediaTokenizer.CATEGORY);
untoks.add(WikipediaTokenizer.ITALICS);
//should be exactly the same, regardless of untoks
@@ -150,7 +150,7 @@ public class WikipediaTokenizerTest exte
}
public void testBoth() throws Exception {
- Set<String> untoks = new HashSet<String>();
+ Set<String> untoks = new HashSet<>();
untoks.add(WikipediaTokenizer.CATEGORY);
untoks.add(WikipediaTokenizer.ITALICS);
String test = "[[Category:a b c d]] [[Category:e f g]] [[link here]] [[link there]] ''italics here'' something ''more italics'' [[Category:h i j]]";
Modified: lucene/dev/trunk/lucene/analysis/common/src/tools/java/org/apache/lucene/analysis/standard/GenerateJflexTLDMacros.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/tools/java/org/apache/lucene/analysis/standard/GenerateJflexTLDMacros.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/tools/java/org/apache/lucene/analysis/standard/GenerateJflexTLDMacros.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/tools/java/org/apache/lucene/analysis/standard/GenerateJflexTLDMacros.java Wed Mar 12 14:39:17 2014
@@ -111,7 +111,7 @@ public class GenerateJflexTLDMacros {
* @throws java.io.IOException if there is a problem downloading the database
*/
private SortedSet<String> getIANARootZoneDatabase() throws IOException {
- final SortedSet<String> TLDs = new TreeSet<String>();
+ final SortedSet<String> TLDs = new TreeSet<>();
final URLConnection connection = tldFileURL.openConnection();
connection.setUseCaches(false);
connection.addRequestProperty("Cache-Control", "no-cache");
Modified: lucene/dev/trunk/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizerFactory.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizerFactory.java (original)
+++ lucene/dev/trunk/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizerFactory.java Wed Mar 12 14:39:17 2014
@@ -84,7 +84,7 @@ public class ICUTokenizerFactory extends
/** Creates a new ICUTokenizerFactory */
public ICUTokenizerFactory(Map<String,String> args) {
super(args);
- tailored = new HashMap<Integer,String>();
+ tailored = new HashMap<>();
String rulefilesArg = get(args, RULEFILES);
if (rulefilesArg != null) {
List<String> scriptAndResourcePaths = splitFileNames(rulefilesArg);
Modified: lucene/dev/trunk/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUTransformFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUTransformFilterFactory.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUTransformFilterFactory.java (original)
+++ lucene/dev/trunk/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUTransformFilterFactory.java Wed Mar 12 14:39:17 2014
@@ -32,7 +32,7 @@ public class TestICUTransformFilterFacto
/** ensure the transform is working */
public void test() throws Exception {
Reader reader = new StringReader("ç°¡åå");
- Map<String,String> args = new HashMap<String,String>();
+ Map<String,String> args = new HashMap<>();
args.put("id", "Traditional-Simplified");
ICUTransformFilterFactory factory = new ICUTransformFilterFactory(args);
TokenStream stream = whitespaceMockTokenizer(reader);
@@ -44,7 +44,7 @@ public class TestICUTransformFilterFacto
public void testForwardDirection() throws Exception {
// forward
Reader reader = new StringReader("РоÑÑийÑÐºÐ°Ñ Ð¤ÐµÐ´ÐµÑаÑиÑ");
- Map<String,String> args = new HashMap<String,String>();
+ Map<String,String> args = new HashMap<>();
args.put("id", "Cyrillic-Latin");
ICUTransformFilterFactory factory = new ICUTransformFilterFactory(args);
TokenStream stream = whitespaceMockTokenizer(reader);
@@ -55,7 +55,7 @@ public class TestICUTransformFilterFacto
public void testReverseDirection() throws Exception {
// backward (invokes Latin-Cyrillic)
Reader reader = new StringReader("Rossijskaâ Federaciâ");
- Map<String,String> args = new HashMap<String,String>();
+ Map<String,String> args = new HashMap<>();
args.put("id", "Cyrillic-Latin");
args.put("direction", "reverse");
ICUTransformFilterFactory factory = new ICUTransformFilterFactory(args);
Modified: lucene/dev/trunk/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizerFactory.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizerFactory.java (original)
+++ lucene/dev/trunk/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizerFactory.java Wed Mar 12 14:39:17 2014
@@ -44,7 +44,7 @@ public class TestICUTokenizerFactory ext
// â U+201C LEFT DOUBLE QUOTATION MARK; â U+201D RIGHT DOUBLE QUOTATION MARK
Reader reader = new StringReader
(" Don't,break.at?/(punct)! \u201Cnice\u201D\r\n\r\n85_At:all; `really\" +2=3$5,&813 !@#%$^)(*@#$ ");
- final Map<String,String> args = new HashMap<String,String>();
+ final Map<String,String> args = new HashMap<>();
args.put(ICUTokenizerFactory.RULEFILES, "Latn:Latin-break-only-on-whitespace.rbbi");
ICUTokenizerFactory factory = new ICUTokenizerFactory(args);
factory.inform(new ClasspathResourceLoader(this.getClass()));
@@ -58,7 +58,7 @@ public class TestICUTokenizerFactory ext
public void testTokenizeLatinDontBreakOnHyphens() throws Exception {
Reader reader = new StringReader
("One-two punch. Brang-, not brung-it. This one--not that one--is the right one, -ish.");
- final Map<String,String> args = new HashMap<String,String>();
+ final Map<String,String> args = new HashMap<>();
args.put(ICUTokenizerFactory.RULEFILES, "Latn:Latin-dont-break-on-hyphens.rbbi");
ICUTokenizerFactory factory = new ICUTokenizerFactory(args);
factory.inform(new ClasspathResourceLoader(getClass()));
@@ -78,7 +78,7 @@ public class TestICUTokenizerFactory ext
public void testKeywordTokenizeCyrillicAndThai() throws Exception {
Reader reader = new StringReader
("Some English. Ðемного ÑÑÑÑкий. à¸à¹à¸à¸à¸§à¸²à¸¡à¸ าษาà¹à¸à¸¢à¹à¸¥à¹à¸ ๠à¸à¹à¸à¸¢ ๠More English.");
- final Map<String,String> args = new HashMap<String,String>();
+ final Map<String,String> args = new HashMap<>();
args.put(ICUTokenizerFactory.RULEFILES, "Cyrl:KeywordTokenizer.rbbi,Thai:KeywordTokenizer.rbbi");
ICUTokenizerFactory factory = new ICUTokenizerFactory(args);
factory.inform(new ClasspathResourceLoader(getClass()));
Modified: lucene/dev/trunk/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateHTMLStripCharFilterSupplementaryMacros.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateHTMLStripCharFilterSupplementaryMacros.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateHTMLStripCharFilterSupplementaryMacros.java (original)
+++ lucene/dev/trunk/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateHTMLStripCharFilterSupplementaryMacros.java Wed Mar 12 14:39:17 2014
@@ -76,7 +76,7 @@ public class GenerateHTMLStripCharFilter
System.out.println("\t []");
}
- HashMap<Character,UnicodeSet> utf16ByLead = new HashMap<Character,UnicodeSet>();
+ HashMap<Character,UnicodeSet> utf16ByLead = new HashMap<>();
for (UnicodeSetIterator it = new UnicodeSetIterator(set); it.next();) {
char utf16[] = Character.toChars(it.codepoint);
UnicodeSet trails = utf16ByLead.get(utf16[0]);
@@ -87,7 +87,7 @@ public class GenerateHTMLStripCharFilter
trails.add(utf16[1]);
}
- Map<String,UnicodeSet> utf16ByTrail = new HashMap<String,UnicodeSet>();
+ Map<String,UnicodeSet> utf16ByTrail = new HashMap<>();
for (Map.Entry<Character,UnicodeSet> entry : utf16ByLead.entrySet()) {
String trail = entry.getValue().getRegexEquivalent();
UnicodeSet leads = utf16ByTrail.get(trail);
Modified: lucene/dev/trunk/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateJFlexSupplementaryMacros.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateJFlexSupplementaryMacros.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateJFlexSupplementaryMacros.java (original)
+++ lucene/dev/trunk/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateJFlexSupplementaryMacros.java Wed Mar 12 14:39:17 2014
@@ -95,7 +95,7 @@ public class GenerateJFlexSupplementaryM
System.out.println("\t []");
}
- HashMap<Character,UnicodeSet> utf16ByLead = new HashMap<Character,UnicodeSet>();
+ HashMap<Character,UnicodeSet> utf16ByLead = new HashMap<>();
for (UnicodeSetIterator it = new UnicodeSetIterator(set); it.next();) {
char utf16[] = Character.toChars(it.codepoint);
UnicodeSet trails = utf16ByLead.get(utf16[0]);
Modified: lucene/dev/trunk/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateUTR30DataFiles.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateUTR30DataFiles.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateUTR30DataFiles.java (original)
+++ lucene/dev/trunk/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateUTR30DataFiles.java Wed Mar 12 14:39:17 2014
@@ -188,7 +188,7 @@ public class GenerateUTR30DataFiles {
if (matcher.matches()) {
final String leftHandSide = matcher.group(1);
final String rightHandSide = matcher.group(2).trim();
- List<String> diacritics = new ArrayList<String>();
+ List<String> diacritics = new ArrayList<>();
for (String outputCodePoint : rightHandSide.split("\\s+")) {
int ch = Integer.parseInt(outputCodePoint, 16);
if (UCharacter.hasBinaryProperty(ch, UProperty.DIACRITIC)
Modified: lucene/dev/trunk/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/GraphvizFormatter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/GraphvizFormatter.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/GraphvizFormatter.java (original)
+++ lucene/dev/trunk/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/GraphvizFormatter.java Wed Mar 12 14:39:17 2014
@@ -48,7 +48,7 @@ public class GraphvizFormatter {
public GraphvizFormatter(ConnectionCosts costs) {
this.costs = costs;
- this.bestPathMap = new HashMap<String, String>();
+ this.bestPathMap = new HashMap<>();
sb.append(formatHeader());
sb.append(" init [style=invis]\n");
sb.append(" init -> 0.0 [label=\"" + BOS_LABEL + "\"]\n");
Modified: lucene/dev/trunk/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseAnalyzer.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseAnalyzer.java Wed Mar 12 14:39:17 2014
@@ -73,7 +73,7 @@ public class JapaneseAnalyzer extends St
try {
DEFAULT_STOP_SET = loadStopwordSet(true, JapaneseAnalyzer.class, "stopwords.txt", "#"); // ignore case
final CharArraySet tagset = loadStopwordSet(false, JapaneseAnalyzer.class, "stoptags.txt", "#");
- DEFAULT_STOP_TAGS = new HashSet<String>();
+ DEFAULT_STOP_TAGS = new HashSet<>();
for (Object element : tagset) {
char chars[] = (char[]) element;
DEFAULT_STOP_TAGS.add(new String(chars));
Modified: lucene/dev/trunk/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapanesePartOfSpeechStopFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapanesePartOfSpeechStopFilterFactory.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapanesePartOfSpeechStopFilterFactory.java (original)
+++ lucene/dev/trunk/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapanesePartOfSpeechStopFilterFactory.java Wed Mar 12 14:39:17 2014
@@ -58,7 +58,7 @@ public class JapanesePartOfSpeechStopFil
stopTags = null;
CharArraySet cas = getWordSet(loader, stopTagFiles, false);
if (cas != null) {
- stopTags = new HashSet<String>();
+ stopTags = new HashSet<>();
for (Object element : cas) {
char chars[] = (char[]) element;
stopTags.add(new String(chars));
Modified: lucene/dev/trunk/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseTokenizer.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseTokenizer.java (original)
+++ lucene/dev/trunk/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseTokenizer.java Wed Mar 12 14:39:17 2014
@@ -132,7 +132,7 @@ public final class JapaneseTokenizer ext
private static final int MAX_UNKNOWN_WORD_LENGTH = 1024;
private static final int MAX_BACKTRACE_GAP = 1024;
- private final EnumMap<Type, Dictionary> dictionaryMap = new EnumMap<Type, Dictionary>(Type.class);
+ private final EnumMap<Type, Dictionary> dictionaryMap = new EnumMap<>(Type.class);
private final TokenInfoFST fst;
private final TokenInfoDictionary dictionary;
@@ -141,7 +141,7 @@ public final class JapaneseTokenizer ext
private final UserDictionary userDictionary;
private final CharacterDefinition characterDefinition;
- private final FST.Arc<Long> arc = new FST.Arc<Long>();
+ private final FST.Arc<Long> arc = new FST.Arc<>();
private final FST.BytesReader fstReader;
private final IntsRef wordIdRef = new IntsRef();
@@ -174,7 +174,7 @@ public final class JapaneseTokenizer ext
private int pos;
// Already parsed, but not yet passed to caller, tokens:
- private final List<Token> pending = new ArrayList<Token>();
+ private final List<Token> pending = new ArrayList<>();
private final CharTermAttribute termAtt = addAttribute(CharTermAttribute.class);
private final OffsetAttribute offsetAtt = addAttribute(OffsetAttribute.class);
Modified: lucene/dev/trunk/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoDictionary.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoDictionary.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoDictionary.java (original)
+++ lucene/dev/trunk/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoDictionary.java Wed Mar 12 14:39:17 2014
@@ -44,7 +44,7 @@ public final class TokenInfoDictionary e
try {
is = getResource(FST_FILENAME_SUFFIX);
is = new BufferedInputStream(is);
- fst = new FST<Long>(new InputStreamDataInput(is), PositiveIntOutputs.getSingleton());
+ fst = new FST<>(new InputStreamDataInput(is), PositiveIntOutputs.getSingleton());
} catch (IOException ioe) {
priorE = ioe;
} finally {
Modified: lucene/dev/trunk/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoFST.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoFST.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoFST.java (original)
+++ lucene/dev/trunk/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoFST.java Wed Mar 12 14:39:17 2014
@@ -51,9 +51,9 @@ public final class TokenInfoFST {
@SuppressWarnings({"rawtypes","unchecked"})
private FST.Arc<Long>[] cacheRootArcs() throws IOException {
FST.Arc<Long> rootCache[] = new FST.Arc[1+(cacheCeiling-0x3040)];
- FST.Arc<Long> firstArc = new FST.Arc<Long>();
+ FST.Arc<Long> firstArc = new FST.Arc<>();
fst.getFirstArc(firstArc);
- FST.Arc<Long> arc = new FST.Arc<Long>();
+ FST.Arc<Long> arc = new FST.Arc<>();
final FST.BytesReader fstReader = fst.getBytesReader();
// TODO: jump to 3040, readNextRealArc to ceiling? (just be careful we don't add bugs)
for (int i = 0; i < rootCache.length; i++) {
Modified: lucene/dev/trunk/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UserDictionary.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UserDictionary.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UserDictionary.java (original)
+++ lucene/dev/trunk/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UserDictionary.java Wed Mar 12 14:39:17 2014
@@ -60,7 +60,7 @@ public final class UserDictionary implem
BufferedReader br = new BufferedReader(reader);
String line = null;
int wordId = CUSTOM_DICTIONARY_WORD_ID_OFFSET;
- List<String[]> featureEntries = new ArrayList<String[]>();
+ List<String[]> featureEntries = new ArrayList<>();
// text, segmentation, readings, POS
while ((line = br.readLine()) != null) {
@@ -85,11 +85,11 @@ public final class UserDictionary implem
}
});
- List<String> data = new ArrayList<String>(featureEntries.size());
- List<int[]> segmentations = new ArrayList<int[]>(featureEntries.size());
+ List<String> data = new ArrayList<>(featureEntries.size());
+ List<int[]> segmentations = new ArrayList<>(featureEntries.size());
PositiveIntOutputs fstOutput = PositiveIntOutputs.getSingleton();
- Builder<Long> fstBuilder = new Builder<Long>(FST.INPUT_TYPE.BYTE2, fstOutput);
+ Builder<Long> fstBuilder = new Builder<>(FST.INPUT_TYPE.BYTE2, fstOutput);
IntsRef scratch = new IntsRef();
long ord = 0;
@@ -136,12 +136,12 @@ public final class UserDictionary implem
*/
public int[][] lookup(char[] chars, int off, int len) throws IOException {
// TODO: can we avoid this treemap/toIndexArray?
- TreeMap<Integer, int[]> result = new TreeMap<Integer, int[]>(); // index, [length, length...]
+ TreeMap<Integer, int[]> result = new TreeMap<>(); // index, [length, length...]
boolean found = false; // true if we found any results
final FST.BytesReader fstReader = fst.getBytesReader();
- FST.Arc<Long> arc = new FST.Arc<Long>();
+ FST.Arc<Long> arc = new FST.Arc<>();
int end = off + len;
for (int startOffset = off; startOffset < end; startOffset++) {
arc = fst.getFirstArc(arc);
@@ -175,7 +175,7 @@ public final class UserDictionary implem
* @return array of {wordId, index, length}
*/
private int[][] toIndexArray(Map<Integer, int[]> input) {
- ArrayList<int[]> result = new ArrayList<int[]>();
+ ArrayList<int[]> result = new ArrayList<>();
for (int i : input.keySet()) {
int[] wordIdAndLength = input.get(i);
int wordId = wordIdAndLength[0];
Modified: lucene/dev/trunk/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/CSVUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/CSVUtil.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/CSVUtil.java (original)
+++ lucene/dev/trunk/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/CSVUtil.java Wed Mar 12 14:39:17 2014
@@ -42,7 +42,7 @@ public final class CSVUtil {
*/
public static String[] parse(String line) {
boolean insideQuote = false;
- ArrayList<String> result = new ArrayList<String>();
+ ArrayList<String> result = new ArrayList<>();
int quoteCount = 0;
StringBuilder sb = new StringBuilder();
for(int i = 0; i < line.length(); i++) {
Modified: lucene/dev/trunk/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/ToStringUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/ToStringUtil.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/ToStringUtil.java (original)
+++ lucene/dev/trunk/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/ToStringUtil.java Wed Mar 12 14:39:17 2014
@@ -26,7 +26,7 @@ import java.util.HashMap;
*/
public class ToStringUtil {
// a translation map for parts of speech, only used for reflectWith
- private static final HashMap<String,String> posTranslations = new HashMap<String,String>();
+ private static final HashMap<String,String> posTranslations = new HashMap<>();
static {
posTranslations.put("åè©", "noun");
posTranslations.put("åè©-ä¸è¬", "noun-common");
@@ -127,7 +127,7 @@ public class ToStringUtil {
}
// a translation map for inflection types, only used for reflectWith
- private static final HashMap<String,String> inflTypeTranslations = new HashMap<String,String>();
+ private static final HashMap<String,String> inflTypeTranslations = new HashMap<>();
static {
inflTypeTranslations.put("*", "*");
inflTypeTranslations.put("形容è©ã»ã¢ã¦ãªæ®µ", "adj-group-a-o-u");
@@ -197,7 +197,7 @@ public class ToStringUtil {
}
// a translation map for inflection forms, only used for reflectWith
- private static final HashMap<String,String> inflFormTranslations = new HashMap<String,String>();
+ private static final HashMap<String,String> inflFormTranslations = new HashMap<>();
static {
inflFormTranslations.put("*", "*");
inflFormTranslations.put("åºæ¬å½¢", "base");
Modified: lucene/dev/trunk/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseIterationMarkCharFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseIterationMarkCharFilterFactory.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseIterationMarkCharFilterFactory.java (original)
+++ lucene/dev/trunk/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseIterationMarkCharFilterFactory.java Wed Mar 12 14:39:17 2014
@@ -59,7 +59,7 @@ public class TestJapaneseIterationMarkCh
JapaneseTokenizerFactory tokenizerFactory = new JapaneseTokenizerFactory(new HashMap<String,String>());
tokenizerFactory.inform(new StringMockResourceLoader(""));
- Map<String, String> filterArgs = new HashMap<String, String>();
+ Map<String, String> filterArgs = new HashMap<>();
filterArgs.put("normalizeKanji", "true");
filterArgs.put("normalizeKana", "false");
JapaneseIterationMarkCharFilterFactory filterFactory = new JapaneseIterationMarkCharFilterFactory(filterArgs);
@@ -76,7 +76,7 @@ public class TestJapaneseIterationMarkCh
JapaneseTokenizerFactory tokenizerFactory = new JapaneseTokenizerFactory(new HashMap<String,String>());
tokenizerFactory.inform(new StringMockResourceLoader(""));
- Map<String, String> filterArgs = new HashMap<String, String>();
+ Map<String, String> filterArgs = new HashMap<>();
filterArgs.put("normalizeKanji", "false");
filterArgs.put("normalizeKana", "true");
JapaneseIterationMarkCharFilterFactory filterFactory = new JapaneseIterationMarkCharFilterFactory(filterArgs);
Modified: lucene/dev/trunk/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapanesePartOfSpeechStopFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapanesePartOfSpeechStopFilterFactory.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapanesePartOfSpeechStopFilterFactory.java (original)
+++ lucene/dev/trunk/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapanesePartOfSpeechStopFilterFactory.java Wed Mar 12 14:39:17 2014
@@ -39,7 +39,7 @@ public class TestJapanesePartOfSpeechSto
tokenizerFactory.inform(new StringMockResourceLoader(""));
TokenStream ts = tokenizerFactory.create();
((Tokenizer)ts).setReader(new StringReader("ç§ã¯å¶éã¹ãã¼ããè¶
ããã"));
- Map<String,String> args = new HashMap<String,String>();
+ Map<String,String> args = new HashMap<>();
args.put("luceneMatchVersion", TEST_VERSION_CURRENT.toString());
args.put("tags", "stoptags.txt");
JapanesePartOfSpeechStopFilterFactory factory = new JapanesePartOfSpeechStopFilterFactory(args);
Modified: lucene/dev/trunk/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizerFactory.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizerFactory.java (original)
+++ lucene/dev/trunk/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizerFactory.java Wed Mar 12 14:39:17 2014
@@ -60,7 +60,7 @@ public class TestJapaneseTokenizerFactor
* Test mode parameter: specifying normal mode
*/
public void testMode() throws IOException {
- Map<String,String> args = new HashMap<String,String>();
+ Map<String,String> args = new HashMap<>();
args.put("mode", "normal");
JapaneseTokenizerFactory factory = new JapaneseTokenizerFactory(args);
factory.inform(new StringMockResourceLoader(""));
@@ -81,7 +81,7 @@ public class TestJapaneseTokenizerFactor
"é¢è¥¿å½é空港,é¢è¥¿ å½é 空港,ã«ã³ãµã¤ ã³ã¯ãµã¤ ã¯ã¦ã³ã¦,ãã¹ãåè©\n" +
"# Custom reading for sumo wrestler\n" +
"æéé¾,æéé¾,ã¢ãµã·ã§ã¦ãªã¥ã¦,ã«ã¹ã¿ã 人å\n";
- Map<String,String> args = new HashMap<String,String>();
+ Map<String,String> args = new HashMap<>();
args.put("userDictionary", "userdict.txt");
JapaneseTokenizerFactory factory = new JapaneseTokenizerFactory(args);
factory.inform(new StringMockResourceLoader(userDict));
@@ -96,7 +96,7 @@ public class TestJapaneseTokenizerFactor
* Test preserving punctuation
*/
public void testPreservePunctuation() throws IOException {
- Map<String,String> args = new HashMap<String,String>();
+ Map<String,String> args = new HashMap<>();
args.put("discardPunctuation", "false");
JapaneseTokenizerFactory factory = new JapaneseTokenizerFactory(args);
factory.inform(new StringMockResourceLoader(""));
Modified: lucene/dev/trunk/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestTokenInfoDictionary.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestTokenInfoDictionary.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestTokenInfoDictionary.java (original)
+++ lucene/dev/trunk/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestTokenInfoDictionary.java Wed Mar 12 14:39:17 2014
@@ -37,7 +37,7 @@ public class TestTokenInfoDictionary ext
TokenInfoDictionary tid = TokenInfoDictionary.getInstance();
ConnectionCosts matrix = ConnectionCosts.getInstance();
FST<Long> fst = tid.getFST().getInternalFST();
- IntsRefFSTEnum<Long> fstEnum = new IntsRefFSTEnum<Long>(fst);
+ IntsRefFSTEnum<Long> fstEnum = new IntsRefFSTEnum<>(fst);
InputOutput<Long> mapping;
IntsRef scratch = new IntsRef();
while ((mapping = fstEnum.next()) != null) {
Modified: lucene/dev/trunk/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/BinaryDictionaryWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/BinaryDictionaryWriter.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/BinaryDictionaryWriter.java (original)
+++ lucene/dev/trunk/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/BinaryDictionaryWriter.java Wed Mar 12 14:39:17 2014
@@ -40,7 +40,7 @@ public abstract class BinaryDictionaryWr
private int targetMapEndOffset = 0, lastWordId = -1, lastSourceId = -1;
private int[] targetMap = new int[8192];
private int[] targetMapOffsets = new int[8192];
- private final ArrayList<String> posDict = new ArrayList<String>();
+ private final ArrayList<String> posDict = new ArrayList<>();
public BinaryDictionaryWriter(Class<? extends BinaryDictionary> implClazz, int size) {
this.implClazz = implClazz;
Modified: lucene/dev/trunk/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/TokenInfoDictionaryBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/TokenInfoDictionaryBuilder.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/TokenInfoDictionaryBuilder.java (original)
+++ lucene/dev/trunk/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/TokenInfoDictionaryBuilder.java Wed Mar 12 14:39:17 2014
@@ -69,7 +69,7 @@ public class TokenInfoDictionaryBuilder
return name.endsWith(".csv");
}
};
- ArrayList<File> csvFiles = new ArrayList<File>();
+ ArrayList<File> csvFiles = new ArrayList<>();
for (File file : new File(dirname).listFiles(filter)) {
csvFiles.add(file);
}
@@ -82,7 +82,7 @@ public class TokenInfoDictionaryBuilder
// all lines in the file
System.out.println(" parse...");
- List<String[]> lines = new ArrayList<String[]>(400000);
+ List<String[]> lines = new ArrayList<>(400000);
for (File file : csvFiles){
FileInputStream inputStream = new FileInputStream(file);
Charset cs = Charset.forName(encoding);
@@ -132,7 +132,7 @@ public class TokenInfoDictionaryBuilder
System.out.println(" encode...");
PositiveIntOutputs fstOutput = PositiveIntOutputs.getSingleton();
- Builder<Long> fstBuilder = new Builder<Long>(FST.INPUT_TYPE.BYTE2, 0, 0, true, true, Integer.MAX_VALUE, fstOutput, null, true, PackedInts.DEFAULT, true, 15);
+ Builder<Long> fstBuilder = new Builder<>(FST.INPUT_TYPE.BYTE2, 0, 0, true, true, Integer.MAX_VALUE, fstOutput, null, true, PackedInts.DEFAULT, true, 15);
IntsRef scratch = new IntsRef();
long ord = -1; // first ord will be 0
String lastValue = null;
Modified: lucene/dev/trunk/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/UnknownDictionaryBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/UnknownDictionaryBuilder.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/UnknownDictionaryBuilder.java (original)
+++ lucene/dev/trunk/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/UnknownDictionaryBuilder.java Wed Mar 12 14:39:17 2014
@@ -66,7 +66,7 @@ public class UnknownDictionaryBuilder {
dictionary.put(CSVUtil.parse(NGRAM_DICTIONARY_ENTRY));
- List<String[]> lines = new ArrayList<String[]>();
+ List<String[]> lines = new ArrayList<>();
String line = null;
while ((line = lineReader.readLine()) != null) {
// note: unk.def only has 10 fields, it simplifies the writer to just append empty reading and pronunciation,
Modified: lucene/dev/trunk/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikFilter.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikFilter.java Wed Mar 12 14:39:17 2014
@@ -56,7 +56,7 @@ public class MorfologikFilter extends To
private final IStemmer stemmer;
private List<WordData> lemmaList;
- private final ArrayList<StringBuilder> tagsList = new ArrayList<StringBuilder>();
+ private final ArrayList<StringBuilder> tagsList = new ArrayList<>();
private int lemmaListIndex;
Modified: lucene/dev/trunk/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorphosyntacticTagsAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorphosyntacticTagsAttributeImpl.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorphosyntacticTagsAttributeImpl.java (original)
+++ lucene/dev/trunk/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorphosyntacticTagsAttributeImpl.java Wed Mar 12 14:39:17 2014
@@ -82,7 +82,7 @@ public class MorphosyntacticTagsAttribut
public void copyTo(AttributeImpl target) {
List<StringBuilder> cloned = null;
if (tags != null) {
- cloned = new ArrayList<StringBuilder>(tags.size());
+ cloned = new ArrayList<>(tags.size());
for (StringBuilder b : tags) {
cloned.add(new StringBuilder(b));
}
Modified: lucene/dev/trunk/lucene/analysis/morfologik/src/test/org/apache/lucene/analysis/morfologik/TestMorfologikAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/morfologik/src/test/org/apache/lucene/analysis/morfologik/TestMorfologikAnalyzer.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/morfologik/src/test/org/apache/lucene/analysis/morfologik/TestMorfologikAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/morfologik/src/test/org/apache/lucene/analysis/morfologik/TestMorfologikAnalyzer.java Wed Mar 12 14:39:17 2014
@@ -124,8 +124,8 @@ public class TestMorfologikAnalyzer exte
ts.incrementToken();
assertEquals(term, ts.getAttribute(CharTermAttribute.class).toString());
- TreeSet<String> actual = new TreeSet<String>();
- TreeSet<String> expected = new TreeSet<String>();
+ TreeSet<String> actual = new TreeSet<>();
+ TreeSet<String> expected = new TreeSet<>();
for (StringBuilder b : ts.getAttribute(MorphosyntacticTagsAttribute.class).getTags()) {
actual.add(b.toString());
}
Modified: lucene/dev/trunk/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/DoubleMetaphoneFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/DoubleMetaphoneFilter.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/DoubleMetaphoneFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/DoubleMetaphoneFilter.java Wed Mar 12 14:39:17 2014
@@ -32,7 +32,7 @@ public final class DoubleMetaphoneFilter
private static final String TOKEN_TYPE = "DoubleMetaphone";
- private final LinkedList<State> remainingTokens = new LinkedList<State>();
+ private final LinkedList<State> remainingTokens = new LinkedList<>();
private final DoubleMetaphone encoder = new DoubleMetaphone();
private final boolean inject;
private final CharTermAttribute termAtt = addAttribute(CharTermAttribute.class);
Modified: lucene/dev/trunk/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/PhoneticFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/PhoneticFilterFactory.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/PhoneticFilterFactory.java (original)
+++ lucene/dev/trunk/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/PhoneticFilterFactory.java Wed Mar 12 14:39:17 2014
@@ -73,7 +73,7 @@ public class PhoneticFilterFactory exten
private static final String PACKAGE_CONTAINING_ENCODERS = "org.apache.commons.codec.language.";
//Effectively constants; uppercase keys
- private static final Map<String, Class<? extends Encoder>> registry = new HashMap<String, Class<? extends Encoder>>(6);
+ private static final Map<String, Class<? extends Encoder>> registry = new HashMap<>(6);
static {
registry.put("DoubleMetaphone".toUpperCase(Locale.ROOT), DoubleMetaphone.class);
Modified: lucene/dev/trunk/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestBeiderMorseFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestBeiderMorseFilterFactory.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestBeiderMorseFilterFactory.java (original)
+++ lucene/dev/trunk/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestBeiderMorseFilterFactory.java Wed Mar 12 14:39:17 2014
@@ -38,7 +38,7 @@ public class TestBeiderMorseFilterFactor
}
public void testLanguageSet() throws Exception {
- Map<String,String> args = new HashMap<String,String>();
+ Map<String,String> args = new HashMap<>();
args.put("languageSet", "polish");
BeiderMorseFilterFactory factory = new BeiderMorseFilterFactory(args);
TokenStream ts = factory.create(whitespaceMockTokenizer("Weinberg"));
@@ -50,7 +50,7 @@ public class TestBeiderMorseFilterFactor
}
public void testOptions() throws Exception {
- Map<String,String> args = new HashMap<String,String>();
+ Map<String,String> args = new HashMap<>();
args.put("nameType", "ASHKENAZI");
args.put("ruleType", "EXACT");
BeiderMorseFilterFactory factory = new BeiderMorseFilterFactory(args);
Modified: lucene/dev/trunk/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDoubleMetaphoneFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDoubleMetaphoneFilterFactory.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDoubleMetaphoneFilterFactory.java (original)
+++ lucene/dev/trunk/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDoubleMetaphoneFilterFactory.java Wed Mar 12 14:39:17 2014
@@ -39,7 +39,7 @@ public class TestDoubleMetaphoneFilterFa
}
public void testSettingSizeAndInject() throws Exception {
- Map<String,String> parameters = new HashMap<String,String>();
+ Map<String,String> parameters = new HashMap<>();
parameters.put("inject", "false");
parameters.put("maxCodeLength", "8");
DoubleMetaphoneFilterFactory factory = new DoubleMetaphoneFilterFactory(parameters);
Modified: lucene/dev/trunk/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestPhoneticFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestPhoneticFilterFactory.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestPhoneticFilterFactory.java (original)
+++ lucene/dev/trunk/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestPhoneticFilterFactory.java Wed Mar 12 14:39:17 2014
@@ -36,7 +36,7 @@ public class TestPhoneticFilterFactory e
* Case: default
*/
public void testFactoryDefaults() throws IOException {
- Map<String,String> args = new HashMap<String,String>();
+ Map<String,String> args = new HashMap<>();
args.put(PhoneticFilterFactory.ENCODER, "Metaphone");
PhoneticFilterFactory factory = new PhoneticFilterFactory(args);
factory.inform(new ClasspathResourceLoader(factory.getClass()));
@@ -45,7 +45,7 @@ public class TestPhoneticFilterFactory e
}
public void testInjectFalse() throws IOException {
- Map<String,String> args = new HashMap<String,String>();
+ Map<String,String> args = new HashMap<>();
args.put(PhoneticFilterFactory.ENCODER, "Metaphone");
args.put(PhoneticFilterFactory.INJECT, "false");
PhoneticFilterFactory factory = new PhoneticFilterFactory(args);
@@ -54,7 +54,7 @@ public class TestPhoneticFilterFactory e
}
public void testMaxCodeLength() throws IOException {
- Map<String,String> args = new HashMap<String,String>();
+ Map<String,String> args = new HashMap<>();
args.put(PhoneticFilterFactory.ENCODER, "Metaphone");
args.put(PhoneticFilterFactory.MAX_CODE_LENGTH, "2");
PhoneticFilterFactory factory = new PhoneticFilterFactory(args);
@@ -76,7 +76,7 @@ public class TestPhoneticFilterFactory e
public void testUnknownEncoder() throws IOException {
try {
- Map<String,String> args = new HashMap<String,String>();
+ Map<String,String> args = new HashMap<>();
args.put("encoder", "XXX");
PhoneticFilterFactory factory = new PhoneticFilterFactory(args);
factory.inform(new ClasspathResourceLoader(factory.getClass()));
@@ -88,7 +88,7 @@ public class TestPhoneticFilterFactory e
public void testUnknownEncoderReflection() throws IOException {
try {
- Map<String,String> args = new HashMap<String,String>();
+ Map<String,String> args = new HashMap<>();
args.put("encoder", "org.apache.commons.codec.language.NonExistence");
PhoneticFilterFactory factory = new PhoneticFilterFactory(args);
factory.inform(new ClasspathResourceLoader(factory.getClass()));
@@ -102,7 +102,7 @@ public class TestPhoneticFilterFactory e
* Case: Reflection
*/
public void testFactoryReflection() throws IOException {
- Map<String,String> args = new HashMap<String, String>();
+ Map<String,String> args = new HashMap<>();
args.put(PhoneticFilterFactory.ENCODER, "org.apache.commons.codec.language.Metaphone");
PhoneticFilterFactory factory = new PhoneticFilterFactory(args);
factory.inform(new ClasspathResourceLoader(factory.getClass()));
@@ -115,7 +115,7 @@ public class TestPhoneticFilterFactory e
* so this effectively tests reflection without package name
*/
public void testFactoryReflectionCaverphone2() throws IOException {
- Map<String,String> args = new HashMap<String, String>();
+ Map<String,String> args = new HashMap<>();
args.put(PhoneticFilterFactory.ENCODER, "Caverphone2");
PhoneticFilterFactory factory = new PhoneticFilterFactory(args);
factory.inform(new ClasspathResourceLoader(factory.getClass()));
@@ -124,7 +124,7 @@ public class TestPhoneticFilterFactory e
}
public void testFactoryReflectionCaverphone() throws IOException {
- Map<String,String> args = new HashMap<String, String>();
+ Map<String,String> args = new HashMap<>();
args.put(PhoneticFilterFactory.ENCODER, "Caverphone");
PhoneticFilterFactory factory = new PhoneticFilterFactory(args);
factory.inform(new ClasspathResourceLoader(factory.getClass()));
@@ -182,7 +182,7 @@ public class TestPhoneticFilterFactory e
static void assertAlgorithm(String algName, String inject, String input,
String[] expected) throws Exception {
Tokenizer tokenizer = whitespaceMockTokenizer(input);
- Map<String,String> args = new HashMap<String,String>();
+ Map<String,String> args = new HashMap<>();
args.put("encoder", algName);
args.put("inject", inject);
PhoneticFilterFactory factory = new PhoneticFilterFactory(args);
Modified: lucene/dev/trunk/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/BiSegGraph.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/BiSegGraph.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/BiSegGraph.java (original)
+++ lucene/dev/trunk/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/BiSegGraph.java Wed Mar 12 14:39:17 2014
@@ -34,7 +34,7 @@ import org.apache.lucene.analysis.cn.sma
*/
class BiSegGraph {
- private Map<Integer,ArrayList<SegTokenPair>> tokenPairListTable = new HashMap<Integer,ArrayList<SegTokenPair>>();
+ private Map<Integer,ArrayList<SegTokenPair>> tokenPairListTable = new HashMap<>();
private List<SegToken> segTokenList;
@@ -144,7 +144,7 @@ class BiSegGraph {
public void addSegTokenPair(SegTokenPair tokenPair) {
int to = tokenPair.to;
if (!isToExist(to)) {
- ArrayList<SegTokenPair> newlist = new ArrayList<SegTokenPair>();
+ ArrayList<SegTokenPair> newlist = new ArrayList<>();
newlist.add(tokenPair);
tokenPairListTable.put(to, newlist);
} else {
@@ -168,7 +168,7 @@ class BiSegGraph {
public List<SegToken> getShortPath() {
int current;
int nodeCount = getToCount();
- List<PathNode> path = new ArrayList<PathNode>();
+ List<PathNode> path = new ArrayList<>();
PathNode zeroPath = new PathNode();
zeroPath.weight = 0;
zeroPath.preNode = 0;
@@ -197,8 +197,8 @@ class BiSegGraph {
int preNode, lastNode;
lastNode = path.size() - 1;
current = lastNode;
- List<Integer> rpath = new ArrayList<Integer>();
- List<SegToken> resultPath = new ArrayList<SegToken>();
+ List<Integer> rpath = new ArrayList<>();
+ List<SegToken> resultPath = new ArrayList<>();
rpath.add(current);
while (current != 0) {
Modified: lucene/dev/trunk/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegGraph.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegGraph.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegGraph.java (original)
+++ lucene/dev/trunk/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegGraph.java Wed Mar 12 14:39:17 2014
@@ -34,7 +34,7 @@ class SegGraph {
/**
* Map of start offsets to ArrayList of tokens at that position
*/
- private Map<Integer,ArrayList<SegToken>> tokenListTable = new HashMap<Integer,ArrayList<SegToken>>();
+ private Map<Integer,ArrayList<SegToken>> tokenListTable = new HashMap<>();
private int maxStart = -1;
@@ -72,7 +72,7 @@ class SegGraph {
* @return a {@link List} of these ordered tokens.
*/
public List<SegToken> makeIndex() {
- List<SegToken> result = new ArrayList<SegToken>();
+ List<SegToken> result = new ArrayList<>();
int s = -1, count = 0, size = tokenListTable.size();
List<SegToken> tokenList;
int index = 0;
@@ -98,7 +98,7 @@ class SegGraph {
public void addToken(SegToken token) {
int s = token.startOffset;
if (!isStartExist(s)) {
- ArrayList<SegToken> newlist = new ArrayList<SegToken>();
+ ArrayList<SegToken> newlist = new ArrayList<>();
newlist.add(token);
tokenListTable.put(s, newlist);
} else {
@@ -115,7 +115,7 @@ class SegGraph {
* @return {@link List} of all tokens in the map.
*/
public List<SegToken> toTokenList() {
- List<SegToken> result = new ArrayList<SegToken>();
+ List<SegToken> result = new ArrayList<>();
int s = -1, count = 0, size = tokenListTable.size();
List<SegToken> tokenList;
Modified: lucene/dev/trunk/lucene/analysis/stempel/src/java/org/egothor/stemmer/Gener.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/stempel/src/java/org/egothor/stemmer/Gener.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/stempel/src/java/org/egothor/stemmer/Gener.java (original)
+++ lucene/dev/trunk/lucene/analysis/stempel/src/java/org/egothor/stemmer/Gener.java Wed Mar 12 14:39:17 2014
@@ -78,7 +78,7 @@ public class Gener extends Reduce {
@Override
public Trie optimize(Trie orig) {
List<CharSequence> cmds = orig.cmds;
- List<Row> rows = new ArrayList<Row>();
+ List<Row> rows = new ArrayList<>();
List<Row> orows = orig.rows;
int remap[] = new int[orows.size()];
Modified: lucene/dev/trunk/lucene/analysis/stempel/src/java/org/egothor/stemmer/Lift.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/stempel/src/java/org/egothor/stemmer/Lift.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/stempel/src/java/org/egothor/stemmer/Lift.java (original)
+++ lucene/dev/trunk/lucene/analysis/stempel/src/java/org/egothor/stemmer/Lift.java Wed Mar 12 14:39:17 2014
@@ -88,7 +88,7 @@ public class Lift extends Reduce {
@Override
public Trie optimize(Trie orig) {
List<CharSequence> cmds = orig.cmds;
- List<Row> rows = new ArrayList<Row>();
+ List<Row> rows = new ArrayList<>();
List<Row> orows = orig.rows;
int remap[] = new int[orows.size()];
Modified: lucene/dev/trunk/lucene/analysis/stempel/src/java/org/egothor/stemmer/MultiTrie.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/stempel/src/java/org/egothor/stemmer/MultiTrie.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/stempel/src/java/org/egothor/stemmer/MultiTrie.java (original)
+++ lucene/dev/trunk/lucene/analysis/stempel/src/java/org/egothor/stemmer/MultiTrie.java Wed Mar 12 14:39:17 2014
@@ -70,7 +70,7 @@ public class MultiTrie extends Trie {
final char EOM = '*';
final String EOM_NODE = "" + EOM;
- List<Trie> tries = new ArrayList<Trie>();
+ List<Trie> tries = new ArrayList<>();
int BY = 1;
@@ -186,7 +186,7 @@ public class MultiTrie extends Trie {
*/
@Override
public Trie reduce(Reduce by) {
- List<Trie> h = new ArrayList<Trie>();
+ List<Trie> h = new ArrayList<>();
for (Trie trie : tries)
h.add(trie.reduce(by));
Modified: lucene/dev/trunk/lucene/analysis/stempel/src/java/org/egothor/stemmer/MultiTrie2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/stempel/src/java/org/egothor/stemmer/MultiTrie2.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/stempel/src/java/org/egothor/stemmer/MultiTrie2.java (original)
+++ lucene/dev/trunk/lucene/analysis/stempel/src/java/org/egothor/stemmer/MultiTrie2.java Wed Mar 12 14:39:17 2014
@@ -277,7 +277,7 @@ public class MultiTrie2 extends MultiTri
*/
@Override
public Trie reduce(Reduce by) {
- List<Trie> h = new ArrayList<Trie>();
+ List<Trie> h = new ArrayList<>();
for (Trie trie : tries)
h.add(trie.reduce(by));
Modified: lucene/dev/trunk/lucene/analysis/stempel/src/java/org/egothor/stemmer/Optimizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/stempel/src/java/org/egothor/stemmer/Optimizer.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/stempel/src/java/org/egothor/stemmer/Optimizer.java (original)
+++ lucene/dev/trunk/lucene/analysis/stempel/src/java/org/egothor/stemmer/Optimizer.java Wed Mar 12 14:39:17 2014
@@ -81,7 +81,7 @@ public class Optimizer extends Reduce {
@Override
public Trie optimize(Trie orig) {
List<CharSequence> cmds = orig.cmds;
- List<Row> rows = new ArrayList<Row>();
+ List<Row> rows = new ArrayList<>();
List<Row> orows = orig.rows;
int remap[] = new int[orows.size()];
Modified: lucene/dev/trunk/lucene/analysis/stempel/src/java/org/egothor/stemmer/Reduce.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/stempel/src/java/org/egothor/stemmer/Reduce.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/stempel/src/java/org/egothor/stemmer/Reduce.java (original)
+++ lucene/dev/trunk/lucene/analysis/stempel/src/java/org/egothor/stemmer/Reduce.java Wed Mar 12 14:39:17 2014
@@ -78,7 +78,7 @@ public class Reduce {
*/
public Trie optimize(Trie orig) {
List<CharSequence> cmds = orig.cmds;
- List<Row> rows = new ArrayList<Row>();
+ List<Row> rows = new ArrayList<>();
List<Row> orows = orig.rows;
int remap[] = new int[orows.size()];
Modified: lucene/dev/trunk/lucene/analysis/stempel/src/java/org/egothor/stemmer/Row.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/stempel/src/java/org/egothor/stemmer/Row.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/stempel/src/java/org/egothor/stemmer/Row.java (original)
+++ lucene/dev/trunk/lucene/analysis/stempel/src/java/org/egothor/stemmer/Row.java Wed Mar 12 14:39:17 2014
@@ -65,7 +65,7 @@ import java.util.TreeMap;
* The Row class represents a row in a matrix representation of a trie.
*/
public class Row {
- TreeMap<Character,Cell> cells = new TreeMap<Character,Cell>();
+ TreeMap<Character,Cell> cells = new TreeMap<>();
int uniformCnt = 0;
int uniformSkip = 0;
Modified: lucene/dev/trunk/lucene/analysis/stempel/src/java/org/egothor/stemmer/Trie.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/stempel/src/java/org/egothor/stemmer/Trie.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/stempel/src/java/org/egothor/stemmer/Trie.java (original)
+++ lucene/dev/trunk/lucene/analysis/stempel/src/java/org/egothor/stemmer/Trie.java Wed Mar 12 14:39:17 2014
@@ -70,8 +70,8 @@ import java.util.List;
* for which a Trie is constructed.
*/
public class Trie {
- List<Row> rows = new ArrayList<Row>();
- List<CharSequence> cmds = new ArrayList<CharSequence>();
+ List<Row> rows = new ArrayList<>();
+ List<CharSequence> cmds = new ArrayList<>();
int root;
boolean forward = false;
Modified: lucene/dev/trunk/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMAAnnotationsTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMAAnnotationsTokenizerFactory.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMAAnnotationsTokenizerFactory.java (original)
+++ lucene/dev/trunk/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMAAnnotationsTokenizerFactory.java Wed Mar 12 14:39:17 2014
@@ -31,7 +31,7 @@ public class UIMAAnnotationsTokenizerFac
private String descriptorPath;
private String tokenType;
- private final Map<String,Object> configurationParameters = new HashMap<String,Object>();
+ private final Map<String,Object> configurationParameters = new HashMap<>();
/** Creates a new UIMAAnnotationsTokenizerFactory */
public UIMAAnnotationsTokenizerFactory(Map<String,String> args) {
Modified: lucene/dev/trunk/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnnotationsTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnnotationsTokenizerFactory.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnnotationsTokenizerFactory.java (original)
+++ lucene/dev/trunk/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnnotationsTokenizerFactory.java Wed Mar 12 14:39:17 2014
@@ -32,7 +32,7 @@ public class UIMATypeAwareAnnotationsTok
private String descriptorPath;
private String tokenType;
private String featurePath;
- private final Map<String,Object> configurationParameters = new HashMap<String,Object>();
+ private final Map<String,Object> configurationParameters = new HashMap<>();
/** Creates a new UIMATypeAwareAnnotationsTokenizerFactory */
public UIMATypeAwareAnnotationsTokenizerFactory(Map<String,String> args) {
Modified: lucene/dev/trunk/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/AEProviderFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/AEProviderFactory.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/AEProviderFactory.java (original)
+++ lucene/dev/trunk/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/AEProviderFactory.java Wed Mar 12 14:39:17 2014
@@ -27,7 +27,7 @@ public class AEProviderFactory {
private static final AEProviderFactory instance = new AEProviderFactory();
- private final Map<String, AEProvider> providerCache = new HashMap<String, AEProvider>();
+ private final Map<String, AEProvider> providerCache = new HashMap<>();
private AEProviderFactory() {
// Singleton
Modified: lucene/dev/trunk/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java (original)
+++ lucene/dev/trunk/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java Wed Mar 12 14:39:17 2014
@@ -127,7 +127,7 @@ public class UIMABaseAnalyzerTest extend
@Test
public void testRandomStringsWithConfigurationParameters() throws Exception {
- Map<String, Object> cp = new HashMap<String, Object>();
+ Map<String, Object> cp = new HashMap<>();
cp.put("line-end", "\r");
checkRandomData(random(), new UIMABaseAnalyzer("/uima/TestWSTokenizerAE.xml", "org.apache.lucene.uima.ts.TokenAnnotation", cp),
100 * RANDOM_MULTIPLIER);
Modified: lucene/dev/trunk/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/ae/OverridingParamsAEProviderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/ae/OverridingParamsAEProviderTest.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/ae/OverridingParamsAEProviderTest.java (original)
+++ lucene/dev/trunk/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/ae/OverridingParamsAEProviderTest.java Wed Mar 12 14:39:17 2014
@@ -53,7 +53,7 @@ public class OverridingParamsAEProviderT
@Test
public void testOverridingParamsInitialization() throws Exception {
- Map<String, Object> runtimeParameters = new HashMap<String, Object>();
+ Map<String, Object> runtimeParameters = new HashMap<>();
runtimeParameters.put("ngramsize", "3");
AEProvider aeProvider = new OverridingParamsAEProvider("/uima/AggregateSentenceAE.xml", runtimeParameters);
AnalysisEngine analysisEngine = aeProvider.getAE();
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/PerfRunData.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/PerfRunData.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/PerfRunData.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/PerfRunData.java Wed Mar 12 14:39:17 2014
@@ -81,7 +81,7 @@ public class PerfRunData implements Clos
// directory, analyzer, docMaker - created at startup.
// reader, writer, searcher - maintained by basic tasks.
private Directory directory;
- private Map<String,AnalyzerFactory> analyzerFactories = new HashMap<String,AnalyzerFactory>();
+ private Map<String,AnalyzerFactory> analyzerFactories = new HashMap<>();
private Analyzer analyzer;
private DocMaker docMaker;
private ContentSource contentSource;
@@ -102,7 +102,7 @@ public class PerfRunData implements Clos
private Config config;
private long startTimeMillis;
- private final HashMap<String, Object> perfObjects = new HashMap<String, Object>();
+ private final HashMap<String, Object> perfObjects = new HashMap<>();
// constructor
public PerfRunData (Config config) throws Exception {
@@ -125,7 +125,7 @@ public class PerfRunData implements Clos
"org.apache.lucene.benchmark.byTask.feeds.RandomFacetSource")).asSubclass(FacetSource.class).newInstance();
facetSource.setConfig(config);
// query makers
- readTaskQueryMaker = new HashMap<Class<? extends ReadTask>,QueryMaker>();
+ readTaskQueryMaker = new HashMap<>();
qmkrClass = Class.forName(config.get("query.maker","org.apache.lucene.benchmark.byTask.feeds.SimpleQueryMaker")).asSubclass(QueryMaker.class);
// index stuff
@@ -147,7 +147,7 @@ public class PerfRunData implements Clos
docMaker, facetSource, contentSource);
// close all perf objects that are closeable.
- ArrayList<Closeable> perfObjectsToClose = new ArrayList<Closeable>();
+ ArrayList<Closeable> perfObjectsToClose = new ArrayList<>();
for (Object obj : perfObjects.values()) {
if (obj instanceof Closeable) {
perfObjectsToClose.add((Closeable) obj);
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DemoHTMLParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DemoHTMLParser.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DemoHTMLParser.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DemoHTMLParser.java Wed Mar 12 14:39:17 2014
@@ -147,7 +147,7 @@ public class DemoHTMLParser implements H
}
private static final Set<String> createElementNameSet(String... names) {
- return Collections.unmodifiableSet(new HashSet<String>(Arrays.asList(names)));
+ return Collections.unmodifiableSet(new HashSet<>(Arrays.asList(names)));
}
/** HTML elements that cause a line break (they are block-elements) */
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DirContentSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DirContentSource.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DirContentSource.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DirContentSource.java Wed Mar 12 14:39:17 2014
@@ -82,7 +82,7 @@ public class DirContentSource extends Co
int count = 0;
- Stack<File> stack = new Stack<File>();
+ Stack<File> stack = new Stack<>();
/* this seems silly ... there must be a better way ...
not that this is good, but can it matter? */
@@ -156,7 +156,7 @@ public class DirContentSource extends Co
}
- private ThreadLocal<DateFormatInfo> dateFormat = new ThreadLocal<DateFormatInfo>();
+ private ThreadLocal<DateFormatInfo> dateFormat = new ThreadLocal<>();
private File dataDir = null;
private int iteration = 0;
private Iterator inputFiles = null;
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java Wed Mar 12 14:39:17 2014
@@ -108,8 +108,8 @@ public class DocMaker implements Closeab
this.reuseFields = reuseFields;
if (reuseFields) {
- fields = new HashMap<String,Field>();
- numericFields = new HashMap<String,Field>();
+ fields = new HashMap<>();
+ numericFields = new HashMap<>();
// Initialize the map with the default fields.
fields.put(BODY_FIELD, new Field(BODY_FIELD, "", bodyFt));
@@ -192,9 +192,9 @@ public class DocMaker implements Closeab
}
// leftovers are thread local, because it is unsafe to share residues between threads
- private ThreadLocal<LeftOver> leftovr = new ThreadLocal<LeftOver>();
- private ThreadLocal<DocState> docState = new ThreadLocal<DocState>();
- private ThreadLocal<DateUtil> dateParsers = new ThreadLocal<DateUtil>();
+ private ThreadLocal<LeftOver> leftovr = new ThreadLocal<>();
+ private ThreadLocal<DocState> docState = new ThreadLocal<>();
+ private ThreadLocal<DateUtil> dateParsers = new ThreadLocal<>();
public static final String BODY_FIELD = "body";
public static final String TITLE_FIELD = "doctitle";
@@ -459,7 +459,7 @@ public class DocMaker implements Closeab
// In a multi-rounds run, it is important to reset DocState since settings
// of fields may change between rounds, and this is the only way to reset
// the cache of all threads.
- docState = new ThreadLocal<DocState>();
+ docState = new ThreadLocal<>();
indexProperties = config.get("doc.index.props", false);
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.java Wed Mar 12 14:39:17 2014
@@ -254,7 +254,7 @@ public class EnwikiContentSource extends
}
- private static final Map<String,Integer> ELEMENTS = new HashMap<String,Integer>();
+ private static final Map<String,Integer> ELEMENTS = new HashMap<>();
private static final int TITLE = 0;
private static final int DATE = TITLE + 1;
private static final int BODY = DATE + 1;
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java Wed Mar 12 14:39:17 2014
@@ -94,7 +94,7 @@ public class EnwikiQueryMaker extends Ab
*/
private static Query[] createQueries(List<Object> qs, Analyzer a) {
QueryParser qp = new QueryParser(Version.LUCENE_CURRENT, DocMaker.BODY_FIELD, a);
- List<Object> queries = new ArrayList<Object>();
+ List<Object> queries = new ArrayList<>();
for (int i = 0; i < qs.size(); i++) {
try {
@@ -127,7 +127,7 @@ public class EnwikiQueryMaker extends Ab
// analyzer (default is standard analyzer)
Analyzer anlzr = NewAnalyzerTask.createAnalyzer(config.get("analyzer", StandardAnalyzer.class.getName()));
- List<Object> queryList = new ArrayList<Object>(20);
+ List<Object> queryList = new ArrayList<>(20);
queryList.addAll(Arrays.asList(STANDARD_QUERIES));
if(!config.get("enwikiQueryMaker.disableSpanQueries", false))
queryList.addAll(Arrays.asList(getPrebuiltQueries(DocMaker.BODY_FIELD)));
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java Wed Mar 12 14:39:17 2014
@@ -54,7 +54,7 @@ public class FileBasedQueryMaker extends
QueryParser qp = new QueryParser(Version.LUCENE_CURRENT, defaultField, anlzr);
qp.setAllowLeadingWildcard(true);
- List<Query> qq = new ArrayList<Query>();
+ List<Query> qq = new ArrayList<>();
String fileName = config.get("file.query.maker.file", null);
if (fileName != null)
{
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersContentSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersContentSource.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersContentSource.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersContentSource.java Wed Mar 12 14:39:17 2014
@@ -49,9 +49,9 @@ public class ReutersContentSource extend
ParsePosition pos;
}
- private ThreadLocal<DateFormatInfo> dateFormat = new ThreadLocal<DateFormatInfo>();
+ private ThreadLocal<DateFormatInfo> dateFormat = new ThreadLocal<>();
private File dataDir = null;
- private ArrayList<File> inputFiles = new ArrayList<File>();
+ private ArrayList<File> inputFiles = new ArrayList<>();
private int nextFile = 0;
private int iteration = 0;
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java Wed Mar 12 14:39:17 2014
@@ -74,7 +74,7 @@ public class ReutersQueryMaker extends A
*/
private static Query[] createQueries(List<Object> qs, Analyzer a) {
QueryParser qp = new QueryParser(Version.LUCENE_CURRENT, DocMaker.BODY_FIELD, a);
- List<Object> queries = new ArrayList<Object>();
+ List<Object> queries = new ArrayList<>();
for (int i = 0; i < qs.size(); i++) {
try {
@@ -108,7 +108,7 @@ public class ReutersQueryMaker extends A
Analyzer anlzr= NewAnalyzerTask.createAnalyzer(config.get("analyzer",
"org.apache.lucene.analysis.standard.StandardAnalyzer"));
- List<Object> queryList = new ArrayList<Object>(20);
+ List<Object> queryList = new ArrayList<>(20);
queryList.addAll(Arrays.asList(STANDARD_QUERIES));
queryList.addAll(Arrays.asList(getPrebuiltQueries(DocMaker.BODY_FIELD)));
return createQueries(queryList, anlzr);
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java Wed Mar 12 14:39:17 2014
@@ -49,7 +49,7 @@ public class SimpleQueryMaker extends Ab
"org.apache.lucene.analysis.standard.StandardAnalyzer"));
QueryParser qp = new QueryParser(Version.LUCENE_CURRENT, DocMaker.BODY_FIELD,anlzr);
- ArrayList<Query> qq = new ArrayList<Query>();
+ ArrayList<Query> qq = new ArrayList<>();
Query q1 = new TermQuery(new Term(DocMaker.ID_FIELD,"doc2"));
qq.add(q1);
Query q2 = new TermQuery(new Term(DocMaker.BODY_FIELD,"simple"));
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleSloppyPhraseQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleSloppyPhraseQueryMaker.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleSloppyPhraseQueryMaker.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleSloppyPhraseQueryMaker.java Wed Mar 12 14:39:17 2014
@@ -36,7 +36,7 @@ public class SimpleSloppyPhraseQueryMake
protected Query[] prepareQueries() throws Exception {
// extract some 100 words from doc text to an array
String words[];
- ArrayList<String> w = new ArrayList<String>();
+ ArrayList<String> w = new ArrayList<>();
StringTokenizer st = new StringTokenizer(SingleDocSource.DOC_TEXT);
while (st.hasMoreTokens() && w.size()<100) {
w.add(st.nextToken());
@@ -44,7 +44,7 @@ public class SimpleSloppyPhraseQueryMake
words = w.toArray(new String[0]);
// create queries (that would find stuff) with varying slops
- ArrayList<Query> queries = new ArrayList<Query>();
+ ArrayList<Query> queries = new ArrayList<>();
for (int slop=0; slop<8; slop++) {
for (int qlen=2; qlen<6; qlen++) {
for (int wd=0; wd<words.length-qlen-slop; wd++) {
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialDocMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialDocMaker.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialDocMaker.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialDocMaker.java Wed Mar 12 14:39:17 2014
@@ -50,7 +50,7 @@ public class SpatialDocMaker extends Doc
public static final String SPATIAL_FIELD = "spatial";
//cache spatialStrategy by round number
- private static Map<Integer,SpatialStrategy> spatialStrategyCache = new HashMap<Integer,SpatialStrategy>();
+ private static Map<Integer,SpatialStrategy> spatialStrategyCache = new HashMap<>();
private SpatialStrategy strategy;
private ShapeConverter shapeConverter;
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecContentSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecContentSource.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecContentSource.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecContentSource.java Wed Mar 12 14:39:17 2014
@@ -79,10 +79,10 @@ public class TrecContentSource extends C
"hhmm z.z.z. MMM dd, yyyy", // 0901 u.t.c. April 28, 1994
};
- private ThreadLocal<DateFormatInfo> dateFormats = new ThreadLocal<DateFormatInfo>();
- private ThreadLocal<StringBuilder> trecDocBuffer = new ThreadLocal<StringBuilder>();
+ private ThreadLocal<DateFormatInfo> dateFormats = new ThreadLocal<>();
+ private ThreadLocal<StringBuilder> trecDocBuffer = new ThreadLocal<>();
private File dataDir = null;
- private ArrayList<File> inputFiles = new ArrayList<File>();
+ private ArrayList<File> inputFiles = new ArrayList<>();
private int nextFile = 0;
// Use to synchronize threads on reading from the TREC documents.
private Object lock = new Object();
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecDocParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecDocParser.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecDocParser.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecDocParser.java Wed Mar 12 14:39:17 2014
@@ -35,7 +35,7 @@ public abstract class TrecDocParser {
/** trec parser type used for unknown extensions */
public static final ParsePathType DEFAULT_PATH_TYPE = ParsePathType.GOV2;
- static final Map<ParsePathType,TrecDocParser> pathType2parser = new HashMap<ParsePathType,TrecDocParser>();
+ static final Map<ParsePathType,TrecDocParser> pathType2parser = new HashMap<>();
static {
pathType2parser.put(ParsePathType.GOV2, new TrecGov2Parser());
pathType2parser.put(ParsePathType.FBIS, new TrecFBISParser());
@@ -44,7 +44,7 @@ public abstract class TrecDocParser {
pathType2parser.put(ParsePathType.LATIMES, new TrecLATimesParser());
}
- static final Map<String,ParsePathType> pathName2Type = new HashMap<String,ParsePathType>();
+ static final Map<String,ParsePathType> pathName2Type = new HashMap<>();
static {
for (ParsePathType ppt : ParsePathType.values()) {
pathName2Type.put(ppt.name().toUpperCase(Locale.ROOT),ppt);
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/Points.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/Points.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/Points.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/Points.java Wed Mar 12 14:39:17 2014
@@ -32,7 +32,7 @@ public class Points {
// stat points ordered by their start time.
// for now we collect points as TaskStats objects.
// later might optimize to collect only native data.
- private ArrayList<TaskStats> points = new ArrayList<TaskStats>();
+ private ArrayList<TaskStats> points = new ArrayList<>();
private int nextTaskRunNum = 0;
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddFacetedDocTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddFacetedDocTask.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddFacetedDocTask.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddFacetedDocTask.java Wed Mar 12 14:39:17 2014
@@ -74,7 +74,7 @@ public class AddFacetedDocTask extends A
@Override
public int doLogic() throws Exception {
if (config != null) {
- List<FacetField> facets = new ArrayList<FacetField>();
+ List<FacetField> facets = new ArrayList<>();
getRunData().getFacetSource().getNextFacets(facets);
for(FacetField ff : facets) {
doc.add(ff);
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java?rev=1576755&r1=1576754&r2=1576755&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java Wed Mar 12 14:39:17 2014
@@ -88,9 +88,9 @@ public class AnalyzerFactoryTask extends
String factoryName = null;
Integer positionIncrementGap = null;
Integer offsetGap = null;
- private List<CharFilterFactory> charFilterFactories = new ArrayList<CharFilterFactory>();
+ private List<CharFilterFactory> charFilterFactories = new ArrayList<>();
private TokenizerFactory tokenizerFactory = null;
- private List<TokenFilterFactory> tokenFilterFactories = new ArrayList<TokenFilterFactory>();
+ private List<TokenFilterFactory> tokenFilterFactories = new ArrayList<>();
public AnalyzerFactoryTask(PerfRunData runData) {
super(runData);
@@ -287,7 +287,7 @@ public class AnalyzerFactoryTask extends
*/
private void createAnalysisPipelineComponent
(StreamTokenizer stok, Class<? extends AbstractAnalysisFactory> clazz) {
- Map<String,String> argMap = new HashMap<String,String>();
+ Map<String,String> argMap = new HashMap<>();
boolean parenthetical = false;
try {
WHILE_LOOP: while (stok.nextToken() != StreamTokenizer.TT_EOF) {