You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2014/03/16 20:39:37 UTC
svn commit: r1578144 [4/37] - in /lucene/dev/branches/lucene5376_2: ./
dev-tools/ dev-tools/idea/.idea/libraries/
dev-tools/idea/solr/contrib/dataimporthandler/
dev-tools/idea/solr/contrib/map-reduce/ dev-tools/idea/solr/core/src/test/
dev-tools/script...
Modified: lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilter.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilter.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilter.java Sun Mar 16 19:39:10 2014
@@ -20,6 +20,7 @@ package org.apache.lucene.analysis.hunsp
import java.io.IOException;
import java.io.InputStream;
import java.util.Arrays;
+import java.util.Collections;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
@@ -30,7 +31,7 @@ import org.apache.lucene.analysis.hunspe
import org.apache.lucene.analysis.hunspell.HunspellStemFilter;
import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter;
import org.apache.lucene.analysis.util.CharArraySet;
-import org.apache.lucene.util.TestUtil;
+import org.apache.lucene.util.IOUtils;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -39,9 +40,13 @@ public class TestHunspellStemFilter exte
@BeforeClass
public static void beforeClass() throws Exception {
- try (InputStream affixStream = TestStemmer.class.getResourceAsStream("simple.aff");
- InputStream dictStream = TestStemmer.class.getResourceAsStream("simple.dic")) {
+ // no multiple try-with to workaround bogus VerifyError
+ InputStream affixStream = TestStemmer.class.getResourceAsStream("simple.aff");
+ InputStream dictStream = TestStemmer.class.getResourceAsStream("simple.dic");
+ try {
dictionary = new Dictionary(affixStream, dictStream);
+ } finally {
+ IOUtils.closeWhileHandlingException(affixStream, dictStream);
}
}
@@ -54,13 +59,13 @@ public class TestHunspellStemFilter exte
public void testKeywordAttribute() throws IOException {
MockTokenizer tokenizer = whitespaceMockTokenizer("lucene is awesome");
tokenizer.setEnableChecks(true);
- HunspellStemFilter filter = new HunspellStemFilter(tokenizer, dictionary, TestUtil.nextInt(random(), 1, 3));
+ HunspellStemFilter filter = new HunspellStemFilter(tokenizer, dictionary);
assertTokenStreamContents(filter, new String[]{"lucene", "lucen", "is", "awesome"}, new int[] {1, 0, 1, 1});
// assert with keyword marker
tokenizer = whitespaceMockTokenizer("lucene is awesome");
CharArraySet set = new CharArraySet(TEST_VERSION_CURRENT, Arrays.asList("Lucene"), true);
- filter = new HunspellStemFilter(new SetKeywordMarkerFilter(tokenizer, set), dictionary, TestUtil.nextInt(random(), 1, 3));
+ filter = new HunspellStemFilter(new SetKeywordMarkerFilter(tokenizer, set), dictionary);
assertTokenStreamContents(filter, new String[]{"lucene", "is", "awesome"}, new int[] {1, 1, 1});
}
@@ -68,7 +73,7 @@ public class TestHunspellStemFilter exte
public void testLongestOnly() throws IOException {
MockTokenizer tokenizer = whitespaceMockTokenizer("lucene is awesome");
tokenizer.setEnableChecks(true);
- HunspellStemFilter filter = new HunspellStemFilter(tokenizer, dictionary, true, TestUtil.nextInt(random(), 1, 3), true);
+ HunspellStemFilter filter = new HunspellStemFilter(tokenizer, dictionary, true, true);
assertTokenStreamContents(filter, new String[]{"lucene", "is", "awesome"}, new int[] {1, 1, 1});
}
@@ -78,7 +83,7 @@ public class TestHunspellStemFilter exte
@Override
protected TokenStreamComponents createComponents(String fieldName) {
Tokenizer tokenizer = new MockTokenizer(MockTokenizer.WHITESPACE, false);
- return new TokenStreamComponents(tokenizer, new HunspellStemFilter(tokenizer, dictionary, TestUtil.nextInt(random(), 1, 3)));
+ return new TokenStreamComponents(tokenizer, new HunspellStemFilter(tokenizer, dictionary));
}
};
checkRandomData(random(), analyzer, 1000*RANDOM_MULTIPLIER);
@@ -89,9 +94,29 @@ public class TestHunspellStemFilter exte
@Override
protected TokenStreamComponents createComponents(String fieldName) {
Tokenizer tokenizer = new KeywordTokenizer();
- return new TokenStreamComponents(tokenizer, new HunspellStemFilter(tokenizer, dictionary, TestUtil.nextInt(random(), 1, 3)));
+ return new TokenStreamComponents(tokenizer, new HunspellStemFilter(tokenizer, dictionary));
}
};
checkOneTerm(a, "", "");
}
+
+ public void testIgnoreCaseNoSideEffects() throws Exception {
+ final Dictionary d;
+ // no multiple try-with to workaround bogus VerifyError
+ InputStream affixStream = TestStemmer.class.getResourceAsStream("simple.aff");
+ InputStream dictStream = TestStemmer.class.getResourceAsStream("simple.dic");
+ try {
+ d = new Dictionary(affixStream, Collections.singletonList(dictStream), true);
+ } finally {
+ IOUtils.closeWhileHandlingException(affixStream, dictStream);
+ }
+ Analyzer a = new Analyzer() {
+ @Override
+ protected TokenStreamComponents createComponents(String fieldName) {
+ Tokenizer tokenizer = new KeywordTokenizer();
+ return new TokenStreamComponents(tokenizer, new HunspellStemFilter(tokenizer, d));
+ }
+ };
+ checkOneTerm(a, "NoChAnGy", "NoChAnGy");
+ }
}
Modified: lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestMorph.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestMorph.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestMorph.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestMorph.java Sun Mar 16 19:39:10 2014
@@ -29,5 +29,6 @@ public class TestMorph extends StemmerTe
public void testExamples() {
assertStemsTo("drink", "drink");
assertStemsTo("drinkable", "drink");
+ assertStemsTo("drinkableable");
}
}
Modified: lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestStemmer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestStemmer.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestStemmer.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestStemmer.java Sun Mar 16 19:39:10 2014
@@ -36,7 +36,8 @@ public class TestStemmer extends Stemmer
}
public void testRecursiveSuffix() {
- assertStemsTo("abcd", "ab");
+ // we should not recurse here, as the suffix has no continuation!
+ assertStemsTo("abcd");
}
// all forms unmunched from dictionary
@@ -45,7 +46,7 @@ public class TestStemmer extends Stemmer
assertStemsTo("abc", "ab");
assertStemsTo("apach", "apach");
assertStemsTo("apache", "apach");
- assertStemsTo("foo", "foo");
+ assertStemsTo("foo", "foo", "foo");
assertStemsTo("food", "foo");
assertStemsTo("foos", "foo");
assertStemsTo("lucen", "lucen");
Modified: lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestTwoFold.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestTwoFold.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestTwoFold.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestTwoFold.java Sun Mar 16 19:39:10 2014
@@ -30,5 +30,8 @@ public class TestTwoFold extends Stemmer
assertStemsTo("drink", "drink");
assertStemsTo("drinkable", "drink");
assertStemsTo("drinkables", "drink");
+ assertStemsTo("drinksable");
+ assertStemsTo("drinkableable");
+ assertStemsTo("drinks");
}
}
Modified: lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/broken.aff
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/broken.aff?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/broken.aff (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/broken.aff Sun Mar 16 19:39:10 2014
@@ -19,6 +19,6 @@ SFX E 0 d o
PFX B Y 1
PFX B 0 s o
-#wrong rule (only 4 elements)
+#wrong rule (only 3 elements)
PFX A0 Y 1
-PFX A0 0 a
\ No newline at end of file
+PFX A0 0
\ No newline at end of file
Modified: lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/compressed.aff
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/compressed.aff?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/compressed.aff (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/compressed.aff Sun Mar 16 19:39:10 2014
@@ -1,8 +1,3 @@
-SET UTF-8
-TRY abcdefghijklmopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ
-
-FLAG long
-
AF 5
AF AA
AF BB
@@ -10,6 +5,11 @@ AF CC
AF DD
AF EE
+SET UTF-8
+TRY abcdefghijklmopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ
+
+FLAG long
+
SFX AA Y 3
SFX AA 0 e n
SFX AA 0 e t
Modified: lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestASCIIFoldingFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestASCIIFoldingFilter.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestASCIIFoldingFilter.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestASCIIFoldingFilter.java Sun Mar 16 19:39:10 2014
@@ -1888,8 +1888,8 @@ public class TestASCIIFoldingFilter exte
};
// Construct input text and expected output tokens
- List<String> expectedUnfoldedTokens = new ArrayList<String>();
- List<String> expectedFoldedTokens = new ArrayList<String>();
+ List<String> expectedUnfoldedTokens = new ArrayList<>();
+ List<String> expectedFoldedTokens = new ArrayList<>();
StringBuilder inputText = new StringBuilder();
for (int n = 0 ; n < foldings.length ; n += 2) {
if (n > 0) {
Modified: lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCapitalizationFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCapitalizationFilter.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCapitalizationFilter.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCapitalizationFilter.java Sun Mar 16 19:39:10 2014
@@ -78,7 +78,7 @@ public class TestCapitalizationFilter ex
true, keep, true, null, 0, DEFAULT_MAX_WORD_COUNT, DEFAULT_MAX_TOKEN_LENGTH);
// Now try some prefixes
- List<char[]> okPrefix = new ArrayList<char[]>();
+ List<char[]> okPrefix = new ArrayList<>();
okPrefix.add("McK".toCharArray());
assertCapitalizesTo("McKinley",
Modified: lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeepWordFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeepWordFilter.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeepWordFilter.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeepWordFilter.java Sun Mar 16 19:39:10 2014
@@ -32,7 +32,7 @@ public class TestKeepWordFilter extends
public void testStopAndGo() throws Exception
{
- Set<String> words = new HashSet<String>();
+ Set<String> words = new HashSet<>();
words.add( "aaa" );
words.add( "bbb" );
@@ -51,7 +51,7 @@ public class TestKeepWordFilter extends
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- final Set<String> words = new HashSet<String>();
+ final Set<String> words = new HashSet<>();
words.add( "a" );
words.add( "b" );
Modified: lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPerFieldAnalyzerWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPerFieldAnalyzerWrapper.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPerFieldAnalyzerWrapper.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPerFieldAnalyzerWrapper.java Sun Mar 16 19:39:10 2014
@@ -31,7 +31,7 @@ public class TestPerFieldAnalyzerWrapper
public void testPerField() throws Exception {
String text = "Qwerty";
- Map<String, Analyzer> analyzerPerField = new HashMap<String, Analyzer>();
+ Map<String, Analyzer> analyzerPerField = new HashMap<>();
analyzerPerField.put("special", new SimpleAnalyzer(TEST_VERSION_CURRENT));
PerFieldAnalyzerWrapper analyzer =
Modified: lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilter.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilter.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilter.java Sun Mar 16 19:39:10 2014
@@ -78,7 +78,7 @@ public class TestStemmerOverrideFilter e
}
public void testRandomRealisticWhiteSpace() throws IOException {
- Map<String,String> map = new HashMap<String,String>();
+ Map<String,String> map = new HashMap<>();
int numTerms = atLeast(50);
for (int i = 0; i < numTerms; i++) {
String randomRealisticUnicodeString = TestUtil
@@ -105,7 +105,7 @@ public class TestStemmerOverrideFilter e
StemmerOverrideFilter.Builder builder = new StemmerOverrideFilter.Builder(random().nextBoolean());
Set<Entry<String,String>> entrySet = map.entrySet();
StringBuilder input = new StringBuilder();
- List<String> output = new ArrayList<String>();
+ List<String> output = new ArrayList<>();
for (Entry<String,String> entry : entrySet) {
builder.add(entry.getKey(), entry.getValue());
if (random().nextBoolean() || output.isEmpty()) {
@@ -121,7 +121,7 @@ public class TestStemmerOverrideFilter e
}
public void testRandomRealisticKeyword() throws IOException {
- Map<String,String> map = new HashMap<String,String>();
+ Map<String,String> map = new HashMap<>();
int numTerms = atLeast(50);
for (int i = 0; i < numTerms; i++) {
String randomRealisticUnicodeString = TestUtil
Modified: lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java Sun Mar 16 19:39:10 2014
@@ -210,7 +210,7 @@ public class TestWordDelimiterFilter ext
@Test
public void testPositionIncrements() throws Exception {
final int flags = GENERATE_WORD_PARTS | GENERATE_NUMBER_PARTS | CATENATE_ALL | SPLIT_ON_CASE_CHANGE | SPLIT_ON_NUMERICS | STEM_ENGLISH_POSSESSIVE;
- final CharArraySet protWords = new CharArraySet(TEST_VERSION_CURRENT, new HashSet<String>(Arrays.asList("NUTCH")), false);
+ final CharArraySet protWords = new CharArraySet(TEST_VERSION_CURRENT, new HashSet<>(Arrays.asList("NUTCH")), false);
/* analyzer that uses whitespace + wdf */
Analyzer a = new Analyzer() {
@@ -332,7 +332,7 @@ public class TestWordDelimiterFilter ext
final int flags = random().nextInt(512);
final CharArraySet protectedWords;
if (random().nextBoolean()) {
- protectedWords = new CharArraySet(TEST_VERSION_CURRENT, new HashSet<String>(Arrays.asList("a", "b", "cd")), false);
+ protectedWords = new CharArraySet(TEST_VERSION_CURRENT, new HashSet<>(Arrays.asList("a", "b", "cd")), false);
} else {
protectedWords = null;
}
@@ -355,7 +355,7 @@ public class TestWordDelimiterFilter ext
final int flags = i;
final CharArraySet protectedWords;
if (random.nextBoolean()) {
- protectedWords = new CharArraySet(TEST_VERSION_CURRENT, new HashSet<String>(Arrays.asList("a", "b", "cd")), false);
+ protectedWords = new CharArraySet(TEST_VERSION_CURRENT, new HashSet<>(Arrays.asList("a", "b", "cd")), false);
} else {
protectedWords = null;
}
Modified: lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTokenizer.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTokenizer.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTokenizer.java Sun Mar 16 19:39:10 2014
@@ -78,7 +78,7 @@ public class TestPatternTokenizer extend
final String INPUT = "Günther Günther is here";
// create MappingCharFilter
- List<String> mappingRules = new ArrayList<String>();
+ List<String> mappingRules = new ArrayList<>();
mappingRules.add( "\"ü\" => \"ü\"" );
NormalizeCharMap.Builder builder = new NormalizeCharMap.Builder();
builder.add("ü", "ü");
Modified: lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymMapFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymMapFilter.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymMapFilter.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymMapFilter.java Sun Mar 16 19:39:10 2014
@@ -396,8 +396,8 @@ public class TestSynonymMapFilter extend
final int numSyn = atLeast(5);
//final int numSyn = 2;
- final Map<String,OneSyn> synMap = new HashMap<String,OneSyn>();
- final List<OneSyn> syns = new ArrayList<OneSyn>();
+ final Map<String,OneSyn> synMap = new HashMap<>();
+ final List<OneSyn> syns = new ArrayList<>();
final boolean dedup = random().nextBoolean();
if (VERBOSE) {
System.out.println(" dedup=" + dedup);
@@ -410,7 +410,7 @@ public class TestSynonymMapFilter extend
s = new OneSyn();
s.in = synIn;
syns.add(s);
- s.out = new ArrayList<String>();
+ s.out = new ArrayList<>();
synMap.put(synIn, s);
s.keepOrig = random().nextBoolean();
}
@@ -453,7 +453,7 @@ public class TestSynonymMapFilter extend
}
private void pruneDups(List<OneSyn> syns) {
- Set<String> seen = new HashSet<String>();
+ Set<String> seen = new HashSet<>();
for(OneSyn syn : syns) {
int idx = 0;
while(idx < syn.out.size()) {
Modified: lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishAnalyzer.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishAnalyzer.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishAnalyzer.java Sun Mar 16 19:39:10 2014
@@ -38,6 +38,9 @@ public class TestTurkishAnalyzer extends
checkOneTerm(a, "aÄaç", "aÄaç");
// stopword
assertAnalyzesTo(a, "dolayı", new String[] {});
+ // apostrophes
+ checkOneTerm(a, "Kıbrıs'ta", "kıbrıs");
+ assertAnalyzesTo(a, "Van Gölü'ne", new String[]{"van", "göl"});
}
/** test use of exclusion set */
Modified: lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/BaseTokenStreamFactoryTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/BaseTokenStreamFactoryTestCase.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/BaseTokenStreamFactoryTestCase.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/BaseTokenStreamFactoryTestCase.java Sun Mar 16 19:39:10 2014
@@ -47,7 +47,7 @@ public abstract class BaseTokenStreamFac
if (keysAndValues.length % 2 == 1) {
throw new IllegalArgumentException("invalid keysAndValues map");
}
- Map<String,String> args = new HashMap<String,String>();
+ Map<String,String> args = new HashMap<>();
for (int i = 0; i < keysAndValues.length; i += 2) {
String previous = args.put(keysAndValues[i], keysAndValues[i+1]);
assertNull("duplicate values for key: " + keysAndValues[i], previous);
Modified: lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayMap.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayMap.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayMap.java Sun Mar 16 19:39:10 2014
@@ -25,8 +25,8 @@ import org.apache.lucene.util.LuceneTest
public class TestCharArrayMap extends LuceneTestCase {
public void doRandom(int iter, boolean ignoreCase) {
- CharArrayMap<Integer> map = new CharArrayMap<Integer>(TEST_VERSION_CURRENT, 1, ignoreCase);
- HashMap<String,Integer> hmap = new HashMap<String,Integer>();
+ CharArrayMap<Integer> map = new CharArrayMap<>(TEST_VERSION_CURRENT, 1, ignoreCase);
+ HashMap<String,Integer> hmap = new HashMap<>();
char[] key;
for (int i=0; i<iter; i++) {
@@ -64,8 +64,8 @@ public class TestCharArrayMap extends Lu
}
public void testMethods() {
- CharArrayMap<Integer> cm = new CharArrayMap<Integer>(TEST_VERSION_CURRENT, 2, false);
- HashMap<String,Integer> hm = new HashMap<String,Integer>();
+ CharArrayMap<Integer> cm = new CharArrayMap<>(TEST_VERSION_CURRENT, 2, false);
+ HashMap<String,Integer> hm = new HashMap<>();
hm.put("foo",1);
hm.put("bar",2);
cm.putAll(hm);
@@ -133,7 +133,7 @@ public class TestCharArrayMap extends Lu
}
public void testModifyOnUnmodifiable(){
- CharArrayMap<Integer> map = new CharArrayMap<Integer>(TEST_VERSION_CURRENT, 2, false);
+ CharArrayMap<Integer> map = new CharArrayMap<>(TEST_VERSION_CURRENT, 2, false);
map.put("foo",1);
map.put("bar",2);
final int size = map.size();
@@ -230,7 +230,7 @@ public class TestCharArrayMap extends Lu
}
public void testToString() {
- CharArrayMap<Integer> cm = new CharArrayMap<Integer>(TEST_VERSION_CURRENT, Collections.singletonMap("test",1), false);
+ CharArrayMap<Integer> cm = new CharArrayMap<>(TEST_VERSION_CURRENT, Collections.singletonMap("test",1), false);
assertEquals("[test]",cm.keySet().toString());
assertEquals("[1]",cm.values().toString());
assertEquals("[test=1]",cm.entrySet().toString());
Modified: lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArraySet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArraySet.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArraySet.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArraySet.java Sun Mar 16 19:39:10 2014
@@ -256,7 +256,7 @@ public class TestCharArraySet extends Lu
CharArraySet setCaseSensitive = new CharArraySet(TEST_VERSION_CURRENT, 10, false);
List<String> stopwords = Arrays.asList(TEST_STOP_WORDS);
- List<String> stopwordsUpper = new ArrayList<String>();
+ List<String> stopwordsUpper = new ArrayList<>();
for (String string : stopwords) {
stopwordsUpper.add(string.toUpperCase(Locale.ROOT));
}
@@ -278,7 +278,7 @@ public class TestCharArraySet extends Lu
assertFalse(copyCaseSens.contains(string));
}
// test adding terms to the copy
- List<String> newWords = new ArrayList<String>();
+ List<String> newWords = new ArrayList<>();
for (String string : stopwords) {
newWords.add(string+"_1");
}
@@ -303,7 +303,7 @@ public class TestCharArraySet extends Lu
CharArraySet setCaseSensitive = new CharArraySet(TEST_VERSION_CURRENT, 10, false);
List<String> stopwords = Arrays.asList(TEST_STOP_WORDS);
- List<String> stopwordsUpper = new ArrayList<String>();
+ List<String> stopwordsUpper = new ArrayList<>();
for (String string : stopwords) {
stopwordsUpper.add(string.toUpperCase(Locale.ROOT));
}
@@ -325,7 +325,7 @@ public class TestCharArraySet extends Lu
assertFalse(copyCaseSens.contains(string));
}
// test adding terms to the copy
- List<String> newWords = new ArrayList<String>();
+ List<String> newWords = new ArrayList<>();
for (String string : stopwords) {
newWords.add(string+"_1");
}
@@ -346,10 +346,10 @@ public class TestCharArraySet extends Lu
* Test the static #copy() function with a JDK {@link Set} as a source
*/
public void testCopyJDKSet() {
- Set<String> set = new HashSet<String>();
+ Set<String> set = new HashSet<>();
List<String> stopwords = Arrays.asList(TEST_STOP_WORDS);
- List<String> stopwordsUpper = new ArrayList<String>();
+ List<String> stopwordsUpper = new ArrayList<>();
for (String string : stopwords) {
stopwordsUpper.add(string.toUpperCase(Locale.ROOT));
}
@@ -365,7 +365,7 @@ public class TestCharArraySet extends Lu
assertFalse(copy.contains(string));
}
- List<String> newWords = new ArrayList<String>();
+ List<String> newWords = new ArrayList<>();
for (String string : stopwords) {
newWords.add(string+"_1");
}
Modified: lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestElision.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestElision.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestElision.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestElision.java Sun Mar 16 19:39:10 2014
@@ -51,7 +51,7 @@ public class TestElision extends BaseTok
}
private List<String> filter(TokenFilter filter) throws IOException {
- List<String> tas = new ArrayList<String>();
+ List<String> tas = new ArrayList<>();
CharTermAttribute termAtt = filter.getAttribute(CharTermAttribute.class);
filter.reset();
while (filter.incrementToken()) {
Modified: lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerTest.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerTest.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerTest.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/lucene/analysis/common/src/tools/java/org/apache/lucene/analysis/standard/GenerateJflexTLDMacros.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/tools/java/org/apache/lucene/analysis/standard/GenerateJflexTLDMacros.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/tools/java/org/apache/lucene/analysis/standard/GenerateJflexTLDMacros.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/common/src/tools/java/org/apache/lucene/analysis/standard/GenerateJflexTLDMacros.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizerFactory.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizerFactory.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizerFactory.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUTransformFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUTransformFilterFactory.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUTransformFilterFactory.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUTransformFilterFactory.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizerFactory.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizerFactory.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizerFactory.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateHTMLStripCharFilterSupplementaryMacros.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateHTMLStripCharFilterSupplementaryMacros.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateHTMLStripCharFilterSupplementaryMacros.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateHTMLStripCharFilterSupplementaryMacros.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateJFlexSupplementaryMacros.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateJFlexSupplementaryMacros.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateJFlexSupplementaryMacros.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateJFlexSupplementaryMacros.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateUTR30DataFiles.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateUTR30DataFiles.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateUTR30DataFiles.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateUTR30DataFiles.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/GraphvizFormatter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/GraphvizFormatter.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/GraphvizFormatter.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/GraphvizFormatter.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseAnalyzer.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseAnalyzer.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseAnalyzer.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapanesePartOfSpeechStopFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapanesePartOfSpeechStopFilterFactory.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapanesePartOfSpeechStopFilterFactory.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapanesePartOfSpeechStopFilterFactory.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseTokenizer.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseTokenizer.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseTokenizer.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoDictionary.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoDictionary.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoDictionary.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoDictionary.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoFST.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoFST.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoFST.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoFST.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UserDictionary.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UserDictionary.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UserDictionary.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UserDictionary.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/CSVUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/CSVUtil.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/CSVUtil.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/CSVUtil.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/ToStringUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/ToStringUtil.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/ToStringUtil.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/ToStringUtil.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseIterationMarkCharFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseIterationMarkCharFilterFactory.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseIterationMarkCharFilterFactory.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseIterationMarkCharFilterFactory.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapanesePartOfSpeechStopFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapanesePartOfSpeechStopFilterFactory.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapanesePartOfSpeechStopFilterFactory.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapanesePartOfSpeechStopFilterFactory.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizerFactory.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizerFactory.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizerFactory.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestTokenInfoDictionary.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestTokenInfoDictionary.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestTokenInfoDictionary.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestTokenInfoDictionary.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/BinaryDictionaryWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/BinaryDictionaryWriter.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/BinaryDictionaryWriter.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/BinaryDictionaryWriter.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/TokenInfoDictionaryBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/TokenInfoDictionaryBuilder.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/TokenInfoDictionaryBuilder.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/TokenInfoDictionaryBuilder.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/UnknownDictionaryBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/UnknownDictionaryBuilder.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/UnknownDictionaryBuilder.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/UnknownDictionaryBuilder.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikFilter.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikFilter.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikFilter.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorphosyntacticTagsAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorphosyntacticTagsAttributeImpl.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorphosyntacticTagsAttributeImpl.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorphosyntacticTagsAttributeImpl.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/lucene/analysis/morfologik/src/test/org/apache/lucene/analysis/morfologik/TestMorfologikAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/morfologik/src/test/org/apache/lucene/analysis/morfologik/TestMorfologikAnalyzer.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/morfologik/src/test/org/apache/lucene/analysis/morfologik/TestMorfologikAnalyzer.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/morfologik/src/test/org/apache/lucene/analysis/morfologik/TestMorfologikAnalyzer.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/DoubleMetaphoneFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/DoubleMetaphoneFilter.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/DoubleMetaphoneFilter.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/DoubleMetaphoneFilter.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/PhoneticFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/PhoneticFilterFactory.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/PhoneticFilterFactory.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/PhoneticFilterFactory.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestBeiderMorseFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestBeiderMorseFilterFactory.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestBeiderMorseFilterFactory.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestBeiderMorseFilterFactory.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDoubleMetaphoneFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDoubleMetaphoneFilterFactory.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDoubleMetaphoneFilterFactory.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDoubleMetaphoneFilterFactory.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestPhoneticFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestPhoneticFilterFactory.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestPhoneticFilterFactory.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestPhoneticFilterFactory.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/BiSegGraph.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/BiSegGraph.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/BiSegGraph.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/BiSegGraph.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegGraph.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegGraph.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegGraph.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegGraph.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/lucene/analysis/stempel/src/java/org/egothor/stemmer/Gener.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/stempel/src/java/org/egothor/stemmer/Gener.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/stempel/src/java/org/egothor/stemmer/Gener.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/stempel/src/java/org/egothor/stemmer/Gener.java Sun Mar 16 19:39:10 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/branches/lucene5376_2/lucene/analysis/stempel/src/java/org/egothor/stemmer/Lift.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376_2/lucene/analysis/stempel/src/java/org/egothor/stemmer/Lift.java?rev=1578144&r1=1578143&r2=1578144&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376_2/lucene/analysis/stempel/src/java/org/egothor/stemmer/Lift.java (original)
+++ lucene/dev/branches/lucene5376_2/lucene/analysis/stempel/src/java/org/egothor/stemmer/Lift.java Sun Mar 16 19:39:10 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()];