Index: lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthFilterFactory.java =================================================================== --- lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthFilterFactory.java (working copy) @@ -30,7 +30,7 @@ public class TestCJKWidthFilterFactory extends BaseTokenStreamTestCase { public void test() throws Exception { Reader reader = new StringReader("Ｔｅｓｔ １２３４"); - CJKWidthFilterFactory factory = new CJKWidthFilterFactory(); + CJKWidthFilterFactory factory = new CJKWidthFilterFactory(TEST_VERSION_CURRENT_MAP()); TokenStream stream = factory.create(new MockTokenizer(reader, MockTokenizer.WHITESPACE, false)); assertTokenStreamContents(stream, new String[] { "Test", "1234" }); } Index: lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilterFactory.java =================================================================== --- lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilterFactory.java (working copy) @@ -33,10 +33,7 @@ public class TestCJKBigramFilterFactory extends BaseTokenStreamTestCase { public void testDefaults() throws Exception { Reader reader = new StringReader("多くの学生が試験に落ちた。"); - CJKBigramFilterFactory factory = new CJKBigramFilterFactory(); - factory.setLuceneMatchVersion(TEST_VERSION_CURRENT); - Map args = Collections.emptyMap(); - factory.init(args); + CJKBigramFilterFactory factory = new CJKBigramFilterFactory(TEST_VERSION_CURRENT_MAP()); TokenStream stream = factory.create(new StandardTokenizer(TEST_VERSION_CURRENT, reader)); assertTokenStreamContents(stream, new String[] { "多く", "くの", "の学", "学生", "生が", "が試", "試験", "験に", "に落", "落ち", "ちた" }); @@ -44,10 +41,9 @@ public void testHanOnly() throws Exception { Reader reader = new StringReader("多くの学生が試験に落ちた。"); - CJKBigramFilterFactory factory = new CJKBigramFilterFactory(); Map args = new HashMap(); args.put("hiragana", "false"); - factory.init(args); + CJKBigramFilterFactory factory = new CJKBigramFilterFactory(args); TokenStream stream = factory.create(new StandardTokenizer(TEST_VERSION_CURRENT, reader)); assertTokenStreamContents(stream, new String[] { "多", "く", "の", "学生", "が", "試験", "に", "落", "ち", "た" }); Index: lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymFilterFactory.java =================================================================== --- lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymFilterFactory.java (working copy) @@ -18,7 +18,6 @@ */ import java.io.StringReader; -import java.util.HashMap; import java.util.Map; import org.apache.lucene.analysis.BaseTokenStreamTestCase; @@ -31,11 +30,9 @@ public class TestSynonymFilterFactory extends BaseTokenStreamTestCase { /** test that we can parse and use the solr syn file */ public void testSynonyms() throws Exception { - SynonymFilterFactory factory = new SynonymFilterFactory(); - Map args = new HashMap(); + Map args = TEST_VERSION_CURRENT_MAP(); args.put("synonyms", "synonyms.txt"); - factory.setLuceneMatchVersion(TEST_VERSION_CURRENT); - factory.init(args); + SynonymFilterFactory factory = new SynonymFilterFactory(args); factory.inform(new ResourceAsStreamResourceLoader(getClass())); TokenStream ts = factory.create(new MockTokenizer(new StringReader("GB"), MockTokenizer.WHITESPACE, false)); assertTrue(ts instanceof SynonymFilter); @@ -46,11 +43,9 @@ /** if the synonyms are completely empty, test that we still analyze correctly */ public void testEmptySynonyms() throws Exception { - SynonymFilterFactory factory = new SynonymFilterFactory(); - Map args = new HashMap(); + Map args = TEST_VERSION_CURRENT_MAP(); args.put("synonyms", "synonyms.txt"); - factory.setLuceneMatchVersion(TEST_VERSION_CURRENT); - factory.init(args); + SynonymFilterFactory factory = new SynonymFilterFactory(args); factory.inform(new StringMockResourceLoader("")); // empty file! TokenStream ts = factory.create(new MockTokenizer(new StringReader("GB"), MockTokenizer.WHITESPACE, false)); assertTokenStreamContents(ts, new String[] { "GB" }); Index: lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemFilterFactory.java =================================================================== --- lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemFilterFactory.java (working copy) @@ -35,7 +35,7 @@ public void testStemming() throws Exception { Reader reader = new StringReader("компютри"); Tokenizer tokenizer = new MockTokenizer(reader, MockTokenizer.WHITESPACE, false); - BulgarianStemFilterFactory factory = new BulgarianStemFilterFactory(); + BulgarianStemFilterFactory factory = new BulgarianStemFilterFactory(TEST_VERSION_CURRENT_MAP()); TokenStream stream = factory.create(tokenizer); assertTokenStreamContents(stream, new String[] { "компютр" }); } Index: lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestStandardFactories.java =================================================================== --- lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestStandardFactories.java (revision 1365864) +++ lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestStandardFactories.java (working copy) @@ -42,10 +42,7 @@ */ public void testStandardTokenizer() throws Exception { Reader reader = new StringReader("Wha\u0301t's this thing do?"); - StandardTokenizerFactory factory = new StandardTokenizerFactory(); - factory.setLuceneMatchVersion(TEST_VERSION_CURRENT); - Map args = Collections.emptyMap(); - factory.init(args); + StandardTokenizerFactory factory = new StandardTokenizerFactory(TEST_VERSION_CURRENT_MAP()); Tokenizer stream = factory.create(reader); assertTokenStreamContents(stream, new String[] {"Wha\u0301t's", "this", "thing", "do" }); @@ -59,11 +56,9 @@ String longWord = builder.toString(); String content = "one two three " + longWord + " four five six"; Reader reader = new StringReader(content); - Map args = new HashMap(); + Map args = TEST_VERSION_CURRENT_MAP(); args.put("maxTokenLength", "1000"); - StandardTokenizerFactory factory = new StandardTokenizerFactory(); - factory.setLuceneMatchVersion(TEST_VERSION_CURRENT); - factory.init(args); + StandardTokenizerFactory factory = new StandardTokenizerFactory(args); Tokenizer stream = factory.create(reader); assertTokenStreamContents(stream, new String[] {"one", "two", "three", longWord, "four", "five", "six" }); @@ -74,10 +69,7 @@ */ public void testClassicTokenizer() throws Exception { Reader reader = new StringReader("What's this thing do?"); - ClassicTokenizerFactory factory = new ClassicTokenizerFactory(); - factory.setLuceneMatchVersion(TEST_VERSION_CURRENT); - Map args = Collections.emptyMap(); - factory.init(args); + ClassicTokenizerFactory factory = new ClassicTokenizerFactory(TEST_VERSION_CURRENT_MAP()); Tokenizer stream = factory.create(reader); assertTokenStreamContents(stream, new String[] {"What's", "this", "thing", "do" }); @@ -91,11 +83,9 @@ String longWord = builder.toString(); String content = "one two three " + longWord + " four five six"; Reader reader = new StringReader(content); - Map args = new HashMap(); + Map args = TEST_VERSION_CURRENT_MAP(); args.put("maxTokenLength", "1000"); - ClassicTokenizerFactory factory = new ClassicTokenizerFactory(); - factory.setLuceneMatchVersion(TEST_VERSION_CURRENT); - factory.init(args); + ClassicTokenizerFactory factory = new ClassicTokenizerFactory(args); Tokenizer stream = factory.create(reader); assertTokenStreamContents(stream, new String[] {"one", "two", "three", longWord, "four", "five", "six" }); @@ -106,13 +96,8 @@ */ public void testStandardFilter() throws Exception { Reader reader = new StringReader("What's this thing do?"); - ClassicTokenizerFactory factory = new ClassicTokenizerFactory(); - factory.setLuceneMatchVersion(TEST_VERSION_CURRENT); - Map args = Collections.emptyMap(); - factory.init(args); - ClassicFilterFactory filterFactory = new ClassicFilterFactory(); - filterFactory.setLuceneMatchVersion(TEST_VERSION_CURRENT); - filterFactory.init(args); + ClassicTokenizerFactory factory = new ClassicTokenizerFactory(TEST_VERSION_CURRENT_MAP()); + ClassicFilterFactory filterFactory = new ClassicFilterFactory(TEST_VERSION_CURRENT_MAP()); Tokenizer tokenizer = factory.create(reader); TokenStream stream = filterFactory.create(tokenizer); assertTokenStreamContents(stream, @@ -124,10 +109,7 @@ */ public void testKeywordTokenizer() throws Exception { Reader reader = new StringReader("What's this thing do?"); - KeywordTokenizerFactory factory = new KeywordTokenizerFactory(); - factory.setLuceneMatchVersion(TEST_VERSION_CURRENT); - Map args = Collections.emptyMap(); - factory.init(args); + KeywordTokenizerFactory factory = new KeywordTokenizerFactory(TEST_VERSION_CURRENT_MAP()); Tokenizer stream = factory.create(reader); assertTokenStreamContents(stream, new String[] {"What's this thing do?"}); @@ -138,10 +120,7 @@ */ public void testWhitespaceTokenizer() throws Exception { Reader reader = new StringReader("What's this thing do?"); - WhitespaceTokenizerFactory factory = new WhitespaceTokenizerFactory(); - factory.setLuceneMatchVersion(TEST_VERSION_CURRENT); - Map args = Collections.emptyMap(); - factory.init(args); + WhitespaceTokenizerFactory factory = new WhitespaceTokenizerFactory(TEST_VERSION_CURRENT_MAP()); Tokenizer stream = factory.create(reader); assertTokenStreamContents(stream, new String[] {"What's", "this", "thing", "do?"}); @@ -152,10 +131,7 @@ */ public void testLetterTokenizer() throws Exception { Reader reader = new StringReader("What's this thing do?"); - LetterTokenizerFactory factory = new LetterTokenizerFactory(); - factory.setLuceneMatchVersion(TEST_VERSION_CURRENT); - Map args = Collections.emptyMap(); - factory.init(args); + LetterTokenizerFactory factory = new LetterTokenizerFactory(TEST_VERSION_CURRENT_MAP()); Tokenizer stream = factory.create(reader); assertTokenStreamContents(stream, new String[] {"What", "s", "this", "thing", "do"}); @@ -166,10 +142,7 @@ */ public void testLowerCaseTokenizer() throws Exception { Reader reader = new StringReader("What's this thing do?"); - LowerCaseTokenizerFactory factory = new LowerCaseTokenizerFactory(); - factory.setLuceneMatchVersion(TEST_VERSION_CURRENT); - Map args = Collections.emptyMap(); - factory.init(args); + LowerCaseTokenizerFactory factory = new LowerCaseTokenizerFactory(TEST_VERSION_CURRENT_MAP()); Tokenizer stream = factory.create(reader); assertTokenStreamContents(stream, new String[] {"what", "s", "this", "thing", "do"}); @@ -181,10 +154,7 @@ public void testASCIIFolding() throws Exception { Reader reader = new StringReader("Česká"); Tokenizer tokenizer = new MockTokenizer(reader, MockTokenizer.WHITESPACE, false); - ASCIIFoldingFilterFactory factory = new ASCIIFoldingFilterFactory(); - factory.setLuceneMatchVersion(TEST_VERSION_CURRENT); - Map args = Collections.emptyMap(); - factory.init(args); + ASCIIFoldingFilterFactory factory = new ASCIIFoldingFilterFactory(TEST_VERSION_CURRENT_MAP()); TokenStream stream = factory.create(tokenizer); assertTokenStreamContents(stream, new String[] { "Ceska" }); } Index: lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizerFactory.java =================================================================== --- lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizerFactory.java (revision 1365864) +++ lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizerFactory.java (working copy) @@ -34,10 +34,7 @@ public void testUAX29URLEmailTokenizer() throws Exception { Reader reader = new StringReader("Wha\u0301t's this thing do?"); - UAX29URLEmailTokenizerFactory factory = new UAX29URLEmailTokenizerFactory(); - factory.setLuceneMatchVersion(TEST_VERSION_CURRENT); - Map args = Collections.emptyMap(); - factory.init(args); + UAX29URLEmailTokenizerFactory factory = new UAX29URLEmailTokenizerFactory(TEST_VERSION_CURRENT_MAP()); Tokenizer stream = factory.create(reader); assertTokenStreamContents(stream, new String[] {"Wha\u0301t's", "this", "thing", "do" }); @@ -45,10 +42,7 @@ public void testArabic() throws Exception { Reader reader = new StringReader("الفيلم الوثائقي الأول عن ويكيبيديا يسمى \"الحقيقة بالأرقام: قصة ويكيبيديا\" (بالإنجليزية: Truth in Numbers: The Wikipedia Story)، سيتم إطلاقه في 2008."); - UAX29URLEmailTokenizerFactory factory = new UAX29URLEmailTokenizerFactory(); - factory.setLuceneMatchVersion(TEST_VERSION_CURRENT); - Map args = Collections.emptyMap(); - factory.init(args); + UAX29URLEmailTokenizerFactory factory = new UAX29URLEmailTokenizerFactory(TEST_VERSION_CURRENT_MAP()); Tokenizer stream = factory.create(reader); assertTokenStreamContents(stream, new String[] {"الفيلم", "الوثائقي", "الأول", "عن", "ويكيبيديا", "يسمى", "الحقيقة", "بالأرقام", "قصة", "ويكيبيديا", @@ -57,10 +51,7 @@ public void testChinese() throws Exception { Reader reader = new StringReader("我是中国人。 １２３４ Ｔｅｓｔｓ "); - UAX29URLEmailTokenizerFactory factory = new UAX29URLEmailTokenizerFactory(); - factory.setLuceneMatchVersion(TEST_VERSION_CURRENT); - Map args = Collections.emptyMap(); - factory.init(args); + UAX29URLEmailTokenizerFactory factory = new UAX29URLEmailTokenizerFactory(TEST_VERSION_CURRENT_MAP()); Tokenizer stream = factory.create(reader); assertTokenStreamContents(stream, new String[] {"我", "是", "中", "国", "人", "１２３４", "Ｔｅｓｔｓ"}); @@ -68,10 +59,7 @@ public void testKorean() throws Exception { Reader reader = new StringReader("안녕하세요 한글입니다"); - UAX29URLEmailTokenizerFactory factory = new UAX29URLEmailTokenizerFactory(); - factory.setLuceneMatchVersion(TEST_VERSION_CURRENT); - Map args = Collections.emptyMap(); - factory.init(args); + UAX29URLEmailTokenizerFactory factory = new UAX29URLEmailTokenizerFactory(TEST_VERSION_CURRENT_MAP()); Tokenizer stream = factory.create(reader); assertTokenStreamContents(stream, new String[] {"안녕하세요", "한글입니다"}); @@ -79,10 +67,7 @@ public void testHyphen() throws Exception { Reader reader = new StringReader("some-dashed-phrase"); - UAX29URLEmailTokenizerFactory factory = new UAX29URLEmailTokenizerFactory(); - factory.setLuceneMatchVersion(TEST_VERSION_CURRENT); - Map args = Collections.emptyMap(); - factory.init(args); + UAX29URLEmailTokenizerFactory factory = new UAX29URLEmailTokenizerFactory(TEST_VERSION_CURRENT_MAP()); Tokenizer stream = factory.create(reader); assertTokenStreamContents(stream, new String[] {"some", "dashed", "phrase"}); @@ -105,10 +90,7 @@ + " blah Sirrah woof " + "http://[a42:a7b6::]/qSmxSUU4z/%52qVl4\n"; Reader reader = new StringReader(textWithURLs); - UAX29URLEmailTokenizerFactory factory = new UAX29URLEmailTokenizerFactory(); - factory.setLuceneMatchVersion(TEST_VERSION_CURRENT); - Map args = Collections.emptyMap(); - factory.init(args); + UAX29URLEmailTokenizerFactory factory = new UAX29URLEmailTokenizerFactory(TEST_VERSION_CURRENT_MAP()); Tokenizer stream = factory.create(reader); assertTokenStreamContents(stream, new String[] { @@ -147,10 +129,7 @@ + "lMahAA.j/5.RqUjS745.DtkcYdi@d2-4gb-l6.ae\n" + "lv'p@tqk.vj5s0tgl.0dlu7su3iyiaz.dqso.494.3hb76.XN--MGBAAM7A8H\n"; Reader reader = new StringReader(textWithEmails); - UAX29URLEmailTokenizerFactory factory = new UAX29URLEmailTokenizerFactory(); - factory.setLuceneMatchVersion(TEST_VERSION_CURRENT); - Map args = Collections.emptyMap(); - factory.init(args); + UAX29URLEmailTokenizerFactory factory = new UAX29URLEmailTokenizerFactory(TEST_VERSION_CURRENT_MAP()); Tokenizer stream = factory.create(reader); assertTokenStreamContents(stream, new String[] { @@ -180,11 +159,9 @@ String longWord = builder.toString(); String content = "one two three " + longWord + " four five six"; Reader reader = new StringReader(content); - Map args = new HashMap(); + Map args = TEST_VERSION_CURRENT_MAP(); args.put("maxTokenLength", "1000"); - UAX29URLEmailTokenizerFactory factory = new UAX29URLEmailTokenizerFactory(); - factory.setLuceneMatchVersion(TEST_VERSION_CURRENT); - factory.init(args); + UAX29URLEmailTokenizerFactory factory = new UAX29URLEmailTokenizerFactory(args); Tokenizer stream = factory.create(reader); assertTokenStreamContents(stream, new String[] {"one", "two", "three", longWord, "four", "five", "six" }); Index: lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemFilterFactory.java =================================================================== --- lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemFilterFactory.java (working copy) @@ -35,7 +35,7 @@ public void testStemming() throws Exception { Reader reader = new StringReader("Brasília"); Tokenizer tokenizer = new MockTokenizer(reader, MockTokenizer.WHITESPACE, false); - BrazilianStemFilterFactory factory = new BrazilianStemFilterFactory(); + BrazilianStemFilterFactory factory = new BrazilianStemFilterFactory(TEST_VERSION_CURRENT_MAP()); TokenStream stream = factory.create(tokenizer); assertTokenStreamContents(stream, new String[] { "brasil" }); } Index: lucene/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/TestWikipediaTokenizerFactory.java =================================================================== --- lucene/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/TestWikipediaTokenizerFactory.java (revision 1365864) +++ lucene/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/TestWikipediaTokenizerFactory.java (working copy) @@ -20,6 +20,7 @@ import java.io.IOException; import java.io.Reader; import java.io.StringReader; +import java.util.HashMap; import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.Tokenizer; @@ -31,7 +32,7 @@ public class TestWikipediaTokenizerFactory extends BaseTokenStreamTestCase { public void testTokenizer() throws IOException { Reader reader = new StringReader("This is a [[Category:foo]]"); - WikipediaTokenizerFactory factory = new WikipediaTokenizerFactory(); + WikipediaTokenizerFactory factory = new WikipediaTokenizerFactory(new HashMap()); Tokenizer tokenizer = factory.create(reader); assertTokenStreamContents(tokenizer, new String[] { "This", "is", "a", "foo" }, Index: lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestAnalysisSPILoader.java =================================================================== --- lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestAnalysisSPILoader.java (revision 1365864) +++ lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestAnalysisSPILoader.java (working copy) @@ -17,30 +17,31 @@ * limitations under the License. */ +import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.charfilter.HTMLStripCharFilterFactory; import org.apache.lucene.analysis.core.LowerCaseFilterFactory; import org.apache.lucene.analysis.core.WhitespaceTokenizerFactory; import org.apache.lucene.analysis.miscellaneous.RemoveDuplicatesTokenFilterFactory; import org.apache.lucene.util.LuceneTestCase; -public class TestAnalysisSPILoader extends LuceneTestCase { +public class TestAnalysisSPILoader extends BaseTokenStreamTestCase { public void testLookupTokenizer() { - assertSame(WhitespaceTokenizerFactory.class, TokenizerFactory.forName("Whitespace").getClass()); - assertSame(WhitespaceTokenizerFactory.class, TokenizerFactory.forName("WHITESPACE").getClass()); - assertSame(WhitespaceTokenizerFactory.class, TokenizerFactory.forName("whitespace").getClass()); + assertSame(WhitespaceTokenizerFactory.class, TokenizerFactory.forName("Whitespace", TEST_VERSION_CURRENT_MAP()).getClass()); + assertSame(WhitespaceTokenizerFactory.class, TokenizerFactory.forName("WHITESPACE", TEST_VERSION_CURRENT_MAP()).getClass()); + assertSame(WhitespaceTokenizerFactory.class, TokenizerFactory.forName("whitespace", TEST_VERSION_CURRENT_MAP()).getClass()); } public void testBogusLookupTokenizer() { try { - TokenizerFactory.forName("sdfsdfsdfdsfsdfsdf"); + TokenizerFactory.forName("sdfsdfsdfdsfsdfsdf", TEST_VERSION_CURRENT_MAP()); fail(); } catch (IllegalArgumentException expected) { // } try { - TokenizerFactory.forName("!(**#$U*#$*"); + TokenizerFactory.forName("!(**#$U*#$*", TEST_VERSION_CURRENT_MAP()); fail(); } catch (IllegalArgumentException expected) { // @@ -74,25 +75,25 @@ } public void testLookupTokenFilter() { - assertSame(LowerCaseFilterFactory.class, TokenFilterFactory.forName("Lowercase").getClass()); - assertSame(LowerCaseFilterFactory.class, TokenFilterFactory.forName("LOWERCASE").getClass()); - assertSame(LowerCaseFilterFactory.class, TokenFilterFactory.forName("lowercase").getClass()); + assertSame(LowerCaseFilterFactory.class, TokenFilterFactory.forName("Lowercase", TEST_VERSION_CURRENT_MAP()).getClass()); + assertSame(LowerCaseFilterFactory.class, TokenFilterFactory.forName("LOWERCASE", TEST_VERSION_CURRENT_MAP()).getClass()); + assertSame(LowerCaseFilterFactory.class, TokenFilterFactory.forName("lowercase", TEST_VERSION_CURRENT_MAP()).getClass()); - assertSame(RemoveDuplicatesTokenFilterFactory.class, TokenFilterFactory.forName("RemoveDuplicates").getClass()); - assertSame(RemoveDuplicatesTokenFilterFactory.class, TokenFilterFactory.forName("REMOVEDUPLICATES").getClass()); - assertSame(RemoveDuplicatesTokenFilterFactory.class, TokenFilterFactory.forName("removeduplicates").getClass()); + assertSame(RemoveDuplicatesTokenFilterFactory.class, TokenFilterFactory.forName("RemoveDuplicates", TEST_VERSION_CURRENT_MAP()).getClass()); + assertSame(RemoveDuplicatesTokenFilterFactory.class, TokenFilterFactory.forName("REMOVEDUPLICATES", TEST_VERSION_CURRENT_MAP()).getClass()); + assertSame(RemoveDuplicatesTokenFilterFactory.class, TokenFilterFactory.forName("removeduplicates", TEST_VERSION_CURRENT_MAP()).getClass()); } public void testBogusLookupTokenFilter() { try { - TokenFilterFactory.forName("sdfsdfsdfdsfsdfsdf"); + TokenFilterFactory.forName("sdfsdfsdfdsfsdfsdf", TEST_VERSION_CURRENT_MAP()); fail(); } catch (IllegalArgumentException expected) { // } try { - TokenFilterFactory.forName("!(**#$U*#$*"); + TokenFilterFactory.forName("!(**#$U*#$*", TEST_VERSION_CURRENT_MAP()); fail(); } catch (IllegalArgumentException expected) { // @@ -131,21 +132,21 @@ } public void testLookupCharFilter() { - assertSame(HTMLStripCharFilterFactory.class, CharFilterFactory.forName("HTMLStrip").getClass()); - assertSame(HTMLStripCharFilterFactory.class, CharFilterFactory.forName("HTMLSTRIP").getClass()); - assertSame(HTMLStripCharFilterFactory.class, CharFilterFactory.forName("htmlstrip").getClass()); + assertSame(HTMLStripCharFilterFactory.class, CharFilterFactory.forName("HTMLStrip", TEST_VERSION_CURRENT_MAP()).getClass()); + assertSame(HTMLStripCharFilterFactory.class, CharFilterFactory.forName("HTMLSTRIP", TEST_VERSION_CURRENT_MAP()).getClass()); + assertSame(HTMLStripCharFilterFactory.class, CharFilterFactory.forName("htmlstrip", TEST_VERSION_CURRENT_MAP()).getClass()); } public void testBogusLookupCharFilter() { try { - CharFilterFactory.forName("sdfsdfsdfdsfsdfsdf"); + CharFilterFactory.forName("sdfsdfsdfdsfsdfsdf", TEST_VERSION_CURRENT_MAP()); fail(); } catch (IllegalArgumentException expected) { // } try { - CharFilterFactory.forName("!(**#$U*#$*"); + CharFilterFactory.forName("!(**#$U*#$*", TEST_VERSION_CURRENT_MAP()); fail(); } catch (IllegalArgumentException expected) { // Index: lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilterFactory.java =================================================================== --- lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilterFactory.java (working copy) @@ -34,10 +34,9 @@ // 11111111112 // 012345678901234567890 final String text = "this is only a test."; - HTMLStripCharFilterFactory factory = new HTMLStripCharFilterFactory(); Map args = new HashMap(); args.put("escapedTags", "a, Title"); - factory.init(args); + HTMLStripCharFilterFactory factory = new HTMLStripCharFilterFactory(args); CharFilter cs = factory.create(new StringReader(text)); TokenStream ts = new MockTokenizer(cs, MockTokenizer.WHITESPACE, false); assertTokenStreamContents(ts, @@ -50,9 +49,7 @@ // 11111111112222222222333333333344 // 012345678901234567890123456789012345678901 final String text = "this is only a test."; - HTMLStripCharFilterFactory factory = new HTMLStripCharFilterFactory(); - Map args = new HashMap(); - factory.init(args); + HTMLStripCharFilterFactory factory = new HTMLStripCharFilterFactory(new HashMap()); CharFilter cs = factory.create(new StringReader(text)); TokenStream ts = new MockTokenizer(cs, MockTokenizer.WHITESPACE, false); assertTokenStreamContents(ts, @@ -65,10 +62,9 @@ // 11111111112222222222333333333344 // 012345678901234567890123456789012345678901 final String text = "this is only a test."; - HTMLStripCharFilterFactory factory = new HTMLStripCharFilterFactory(); Map args = new HashMap(); args.put("escapedTags", "U i"); - factory.init(args); + HTMLStripCharFilterFactory factory = new HTMLStripCharFilterFactory(args); CharFilter cs = factory.create(new StringReader(text)); TokenStream ts = new MockTokenizer(cs, MockTokenizer.WHITESPACE, false); assertTokenStreamContents(ts, @@ -81,10 +77,9 @@ // 11111111112222222222333333333344 // 012345678901234567890123456789012345678901 final String text = "this is only a test."; - HTMLStripCharFilterFactory factory = new HTMLStripCharFilterFactory(); Map args = new HashMap(); args.put("escapedTags", ",, , "); - factory.init(args); + HTMLStripCharFilterFactory factory = new HTMLStripCharFilterFactory(args); CharFilter cs = factory.create(new StringReader(text)); TokenStream ts = new MockTokenizer(cs, MockTokenizer.WHITESPACE, false); assertTokenStreamContents(ts, @@ -97,10 +92,9 @@ // 11111111112222222222333333333344 // 012345678901234567890123456789012345678901 final String text = "this is only a test."; - HTMLStripCharFilterFactory factory = new HTMLStripCharFilterFactory(); Map args = new HashMap(); args.put("escapedTags", ""); - factory.init(args); + HTMLStripCharFilterFactory factory = new HTMLStripCharFilterFactory(args); CharFilter cs = factory.create(new StringReader(text)); TokenStream ts = new MockTokenizer(cs, MockTokenizer.WHITESPACE, false); assertTokenStreamContents(ts, @@ -113,10 +107,9 @@ // 11111111112222222222333333333344 // 012345678901234567890123456789012345678901 final String text = "this is only a test."; - HTMLStripCharFilterFactory factory = new HTMLStripCharFilterFactory(); Map args = new HashMap(); args.put("escapedTags", ", B\r\n\t"); - factory.init(args); + HTMLStripCharFilterFactory factory = new HTMLStripCharFilterFactory(args); CharFilter cs = factory.create(new StringReader(text)); TokenStream ts = new MockTokenizer(cs, MockTokenizer.WHITESPACE, false); assertTokenStreamContents(ts, Index: lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilterFactory.java =================================================================== --- lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilterFactory.java (revision 1365865) +++ lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilterFactory.java (working copy) @@ -17,12 +17,14 @@ * limitations under the License. */ +import java.util.HashMap; + import org.apache.lucene.util.LuceneTestCase; public class TestMappingCharFilterFactory extends LuceneTestCase { public void testParseString() throws Exception { - MappingCharFilterFactory f = new MappingCharFilterFactory(); + MappingCharFilterFactory f = new MappingCharFilterFactory(new HashMap()); try { f.parseString( "\\" ); Index: lucene/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishLightStemFilterFactory.java =================================================================== --- lucene/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishLightStemFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishLightStemFilterFactory.java (working copy) @@ -19,6 +19,7 @@ import java.io.Reader; import java.io.StringReader; +import java.util.HashMap; import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.MockTokenizer; @@ -30,7 +31,7 @@ public class TestSwedishLightStemFilterFactory extends BaseTokenStreamTestCase { public void testStemming() throws Exception { Reader reader = new StringReader("äpplen äpple"); - SwedishLightStemFilterFactory factory = new SwedishLightStemFilterFactory(); + SwedishLightStemFilterFactory factory = new SwedishLightStemFilterFactory(new HashMap()); TokenStream stream = factory.create(new MockTokenizer(reader, MockTokenizer.WHITESPACE, false)); assertTokenStreamContents(stream, new String[] { "äppl", "äppl" }); } Index: lucene/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiWordFilterFactory.java =================================================================== --- lucene/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiWordFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiWordFilterFactory.java (working copy) @@ -19,8 +19,6 @@ import java.io.Reader; import java.io.StringReader; -import java.util.Collections; -import java.util.Map; import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.MockTokenizer; @@ -39,10 +37,7 @@ assumeTrue("JRE does not support Thai dictionary-based BreakIterator", ThaiWordFilter.DBBI_AVAILABLE); Reader reader = new StringReader("การที่ได้ต้องแสดงว่างานดี"); Tokenizer tokenizer = new MockTokenizer(reader, MockTokenizer.WHITESPACE, false); - ThaiWordFilterFactory factory = new ThaiWordFilterFactory(); - factory.setLuceneMatchVersion(TEST_VERSION_CURRENT); - Map args = Collections.emptyMap(); - factory.init(args); + ThaiWordFilterFactory factory = new ThaiWordFilterFactory(TEST_VERSION_CURRENT_MAP()); TokenStream stream = factory.create(tokenizer); assertTokenStreamContents(stream, new String[] {"การ", "ที่", "ได้", "ต้อง", "แสดง", "ว่า", "งาน", "ดี"}); Index: lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballPorterFilterFactory.java =================================================================== --- lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballPorterFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballPorterFilterFactory.java (working copy) @@ -44,12 +44,9 @@ gold[i] = stemmer.getCurrent(); } - SnowballPorterFilterFactory factory = new SnowballPorterFilterFactory(); - Map args = new HashMap(); + Map args = TEST_VERSION_CURRENT_MAP(); args.put("language", "English"); - - factory.setLuceneMatchVersion(TEST_VERSION_CURRENT); - factory.init(args); + SnowballPorterFilterFactory factory = new SnowballPorterFilterFactory(args); factory.inform(new StringMockResourceLoader("")); Tokenizer tokenizer = new MockTokenizer( new StringReader(join(test, ' ')), MockTokenizer.WHITESPACE, false); @@ -92,13 +89,11 @@ * Test the protected words mechanism of SnowballPorterFilterFactory */ public void testProtected() throws Exception { - SnowballPorterFilterFactory factory = new SnowballPorterFilterFactory(); ResourceLoader loader = new StringMockResourceLoader("ridding"); - Map args = new HashMap(); + Map args = TEST_VERSION_CURRENT_MAP(); args.put("protected", "protwords.txt"); args.put("language", "English"); - factory.setLuceneMatchVersion(TEST_VERSION_CURRENT); - factory.init(args); + SnowballPorterFilterFactory factory = new SnowballPorterFilterFactory(args); factory.inform(loader); Reader reader = new StringReader("ridding of some stemming"); Tokenizer tokenizer = new MockTokenizer(reader, MockTokenizer.WHITESPACE, false); Index: lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishLowerCaseFilterFactory.java =================================================================== --- lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishLowerCaseFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishLowerCaseFilterFactory.java (working copy) @@ -19,6 +19,7 @@ import java.io.Reader; import java.io.StringReader; +import java.util.HashMap; import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.MockTokenizer; @@ -35,7 +36,7 @@ public void testCasing() throws Exception { Reader reader = new StringReader("AĞACI"); Tokenizer tokenizer = new MockTokenizer(reader, MockTokenizer.WHITESPACE, false); - TurkishLowerCaseFilterFactory factory = new TurkishLowerCaseFilterFactory(); + TurkishLowerCaseFilterFactory factory = new TurkishLowerCaseFilterFactory(new HashMap()); TokenStream stream = factory.create(tokenizer); assertTokenStreamContents(stream, new String[] { "ağacı" }); } Index: lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicFilters.java =================================================================== --- lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicFilters.java (revision 1365864) +++ lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicFilters.java (working copy) @@ -38,13 +38,8 @@ */ public void testNormalizer() throws Exception { Reader reader = new StringReader("الذين مَلكت أيمانكم"); - StandardTokenizerFactory factory = new StandardTokenizerFactory(); - factory.setLuceneMatchVersion(TEST_VERSION_CURRENT); - ArabicNormalizationFilterFactory filterFactory = new ArabicNormalizationFilterFactory(); - filterFactory.setLuceneMatchVersion(TEST_VERSION_CURRENT); - Map args = Collections.emptyMap(); - factory.init(args); - filterFactory.init(args); + StandardTokenizerFactory factory = new StandardTokenizerFactory(TEST_VERSION_CURRENT_MAP()); + ArabicNormalizationFilterFactory filterFactory = new ArabicNormalizationFilterFactory(TEST_VERSION_CURRENT_MAP()); Tokenizer tokenizer = factory.create(reader); TokenStream stream = filterFactory.create(tokenizer); assertTokenStreamContents(stream, new String[] {"الذين", "ملكت", "ايمانكم"}); @@ -55,14 +50,9 @@ */ public void testStemmer() throws Exception { Reader reader = new StringReader("الذين مَلكت أيمانكم"); - StandardTokenizerFactory factory = new StandardTokenizerFactory(); - factory.setLuceneMatchVersion(TEST_VERSION_CURRENT); - ArabicNormalizationFilterFactory normFactory = new ArabicNormalizationFilterFactory(); - normFactory.setLuceneMatchVersion(TEST_VERSION_CURRENT); - ArabicStemFilterFactory stemFactory = new ArabicStemFilterFactory(); - Map args = Collections.emptyMap(); - factory.init(args); - normFactory.init(args); + StandardTokenizerFactory factory = new StandardTokenizerFactory(TEST_VERSION_CURRENT_MAP()); + ArabicNormalizationFilterFactory normFactory = new ArabicNormalizationFilterFactory(TEST_VERSION_CURRENT_MAP()); + ArabicStemFilterFactory stemFactory = new ArabicStemFilterFactory(TEST_VERSION_CURRENT_MAP()); Tokenizer tokenizer = factory.create(reader); TokenStream stream = normFactory.create(tokenizer); stream = stemFactory.create(stream); @@ -74,11 +64,8 @@ */ public void testPersianCharFilter() throws Exception { Reader reader = new StringReader("می‌خورد"); - PersianCharFilterFactory charfilterFactory = new PersianCharFilterFactory(); - StandardTokenizerFactory tokenizerFactory = new StandardTokenizerFactory(); - tokenizerFactory.setLuceneMatchVersion(TEST_VERSION_CURRENT); - Map args = Collections.emptyMap(); - tokenizerFactory.init(args); + PersianCharFilterFactory charfilterFactory = new PersianCharFilterFactory(TEST_VERSION_CURRENT_MAP()); + StandardTokenizerFactory tokenizerFactory = new StandardTokenizerFactory(TEST_VERSION_CURRENT_MAP()); TokenStream stream = tokenizerFactory.create(charfilterFactory.create(reader)); assertTokenStreamContents(stream, new String[] { "می", "خورد" }); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.br.BrazilianStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; @@ -34,6 +36,11 @@ * */ public class BrazilianStemFilterFactory extends TokenFilterFactory { + + public BrazilianStemFilterFactory(Map args) { + super(args); + } + public BrazilianStemFilter create(TokenStream in) { return new BrazilianStemFilter(in); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerFactory.java (working copy) @@ -18,6 +18,7 @@ */ import java.io.Reader; +import java.util.Map; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.util.TokenizerFactory; @@ -34,6 +35,11 @@ * */ public class WikipediaTokenizerFactory extends TokenizerFactory { + + public WikipediaTokenizerFactory(Map args) { + super(args); + } + // TODO: add support for WikipediaTokenizer's advanced options. public Tokenizer create(Reader input) { return new WikipediaTokenizer(input); Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKWidthFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKWidthFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKWidthFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.cjk.CJKWidthFilter; import org.apache.lucene.analysis.util.AbstractAnalysisFactory; @@ -38,6 +40,10 @@ public class CJKWidthFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent { + public CJKWidthFilterFactory(Map args) { + super(args); + } + @Override public TokenStream create(TokenStream input) { return new CJKWidthFilter(input); Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKBigramFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKBigramFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKBigramFilterFactory.java (working copy) @@ -40,9 +40,8 @@ public class CJKBigramFilterFactory extends TokenFilterFactory { int flags; - @Override - public void init(Map args) { - super.init(args); + public CJKBigramFilterFactory(Map args) { + super(args); flags = 0; if (getBoolean("han", true)) { flags |= CJKBigramFilter.HAN; Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/ElisionFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/ElisionFilterFactory.java (revision 1365865) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/ElisionFilterFactory.java (working copy) @@ -20,6 +20,8 @@ import org.apache.lucene.analysis.util.*; import java.io.IOException; +import java.util.Map; + import org.apache.lucene.analysis.TokenStream; /** @@ -37,6 +39,10 @@ */ public class ElisionFilterFactory extends TokenFilterFactory implements ResourceLoaderAware { + public ElisionFilterFactory(Map args) { + super(args); + } + private CharArraySet articles; public void inform(ResourceLoader loader) throws IOException { Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchMinimalStemFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchMinimalStemFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchMinimalStemFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.fr.FrenchMinimalStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; @@ -35,6 +37,11 @@ * */ public class FrenchMinimalStemFilterFactory extends TokenFilterFactory { + + public FrenchMinimalStemFilterFactory(Map args) { + super(args); + } + public TokenStream create(TokenStream input) { return new FrenchMinimalStemFilter(input); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchLightStemFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchLightStemFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchLightStemFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.fr.FrenchLightStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; @@ -35,6 +37,11 @@ * */ public class FrenchLightStemFilterFactory extends TokenFilterFactory { + + public FrenchLightStemFilterFactory(Map args) { + super(args); + } + public TokenStream create(TokenStream input) { return new FrenchLightStemFilter(input); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianMinimalStemFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianMinimalStemFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianMinimalStemFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.no.NorwegianMinimalStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; @@ -33,6 +35,11 @@ * </fieldType> */ public class NorwegianMinimalStemFilterFactory extends TokenFilterFactory { + + public NorwegianMinimalStemFilterFactory(Map args) { + super(args); + } + public TokenStream create(TokenStream input) { return new NorwegianMinimalStemFilter(input); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianLightStemFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianLightStemFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianLightStemFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.no.NorwegianLightStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; @@ -33,6 +35,11 @@ * </fieldType> */ public class NorwegianLightStemFilterFactory extends TokenFilterFactory { + + public NorwegianLightStemFilterFactory(Map args) { + super(args); + } + public TokenStream create(TokenStream input) { return new NorwegianLightStemFilter(input); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java (revision 1365865) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java (working copy) @@ -26,6 +26,7 @@ import java.nio.charset.CodingErrorAction; import java.text.ParseException; import java.util.List; +import java.util.Map; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.TokenStream; @@ -55,6 +56,10 @@ private SynonymMap map; private boolean ignoreCase; + public SynonymFilterFactory(Map args) { + super(args); + } + @Override public TokenStream create(TokenStream input) { // if the fst is null, it means there's actually no synonyms... just return the original stream @@ -155,8 +160,9 @@ // (there are no tests for this functionality) private TokenizerFactory loadTokenizerFactory(ResourceLoader loader, String cname) throws IOException { TokenizerFactory tokFactory = loader.newInstance(cname, TokenizerFactory.class); - tokFactory.setLuceneMatchVersion(luceneMatchVersion); - tokFactory.init(args); + // nocommit, we must fix resourceloader to take args to fix tis + // tokFactory.setLuceneMatchVersion(luceneMatchVersion); + // tokFactory.init(args); if (tokFactory instanceof ResourceLoaderAware) { ((ResourceLoaderAware) tokFactory).inform(loader); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballPorterFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballPorterFilterFactory.java (revision 1365865) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballPorterFilterFactory.java (working copy) @@ -46,7 +46,7 @@ public static final String PROTECTED_TOKENS = "protected"; private String language = "English"; - private Class stemClass; + private final Class stemClass; public void inform(ResourceLoader loader) throws IOException { @@ -58,14 +58,13 @@ private CharArraySet protectedWords = null; - @Override - public void init(Map args) { - super.init(args); + public SnowballPorterFilterFactory(Map args) { + super(args); final String cfgLanguage = args.get("language"); if(cfgLanguage!=null) language = cfgLanguage; try { - stemClass = Class.forName("org.tartarus.snowball.ext." + language + "Stemmer"); + stemClass = Class.forName("org.tartarus.snowball.ext." + language + "Stemmer").asSubclass(SnowballProgram.class); } catch (ClassNotFoundException e) { throw new IllegalArgumentException("Can't find class for stemmer language " + language, e); } @@ -74,7 +73,7 @@ public TokenFilter create(TokenStream input) { SnowballProgram program; try { - program = (SnowballProgram)stemClass.newInstance(); + program = stemClass.newInstance(); } catch (Exception e) { throw new RuntimeException("Error instantiating stemmer for language " + language + "from class " + stemClass, e); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilterFactory.java (revision 1365865) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilterFactory.java (working copy) @@ -18,6 +18,7 @@ */ import java.io.IOException; +import java.util.Map; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.commongrams.CommonGramsFilter; @@ -42,6 +43,10 @@ public class CommonGramsFilterFactory extends TokenFilterFactory implements ResourceLoaderAware { + public CommonGramsFilterFactory(Map args) { + super(args); + } + public void inform(ResourceLoader loader) throws IOException { String commonWordFiles = args.get("words"); ignoreCase = getBoolean("ignoreCase", false); Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilterFactory.java (revision 1365865) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilterFactory.java (working copy) @@ -44,9 +44,8 @@ public class CommonGramsQueryFilterFactory extends TokenFilterFactory implements ResourceLoaderAware { - @Override - public void init(Map args) { - super.init(args); + public CommonGramsQueryFilterFactory(Map args) { + super(args); assureMatchVersion(); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianLightStemFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianLightStemFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianLightStemFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.ru.RussianLightStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; @@ -34,6 +36,11 @@ * */ public class RussianLightStemFilterFactory extends TokenFilterFactory { + + public RussianLightStemFilterFactory(Map args) { + super(args); + } + public TokenStream create(TokenStream input) { return new RussianLightStemFilter(input); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/ga/IrishLowerCaseFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/ga/IrishLowerCaseFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/ga/IrishLowerCaseFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.ga.IrishLowerCaseFilter; import org.apache.lucene.analysis.util.AbstractAnalysisFactory; @@ -36,6 +38,10 @@ */ public class IrishLowerCaseFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent { + public IrishLowerCaseFilterFactory(Map args) { + super(args); + } + @Override public TokenStream create(TokenStream input) { return new IrishLowerCaseFilter(input); Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/path/PathHierarchyTokenizerFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/path/PathHierarchyTokenizerFactory.java (revision 1365865) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/path/PathHierarchyTokenizerFactory.java (working copy) @@ -45,9 +45,8 @@ /** * Require a configured pattern */ - @Override - public void init(Map args){ - super.init( args ); + public PathHierarchyTokenizerFactory(Map args){ + super( args ); String v = args.get( "delimiter" ); if( v != null ){ Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianStemFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianStemFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianStemFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.gl.GalicianStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; @@ -34,6 +36,11 @@ * */ public class GalicianStemFilterFactory extends TokenFilterFactory { + + public GalicianStemFilterFactory(Map args) { + super(args); + } + public TokenStream create(TokenStream input) { return new GalicianStemFilter(input); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianMinimalStemFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianMinimalStemFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianMinimalStemFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.gl.GalicianMinimalStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; @@ -34,6 +36,11 @@ * */ public class GalicianMinimalStemFilterFactory extends TokenFilterFactory { + + public GalicianMinimalStemFilterFactory(Map args) { + super(args); + } + public TokenStream create(TokenStream input) { return new GalicianMinimalStemFilter(input); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/reverse/ReverseStringFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/reverse/ReverseStringFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/reverse/ReverseStringFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.reverse.ReverseStringFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; @@ -35,8 +37,13 @@ * @since solr 1.4 */ public class ReverseStringFilterFactory extends TokenFilterFactory { + + public ReverseStringFilterFactory(Map args) { + super(args); + assureMatchVersion(); + } + public ReverseStringFilter create(TokenStream in) { - assureMatchVersion(); return new ReverseStringFilter(luceneMatchVersion,in); } } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechStemFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechStemFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechStemFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.cz.CzechStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; @@ -33,6 +35,11 @@ * </fieldType> */ public class CzechStemFilterFactory extends TokenFilterFactory { + + public CzechStemFilterFactory(Map args) { + super(args); + } + public TokenStream create(TokenStream input) { return new CzechStemFilter(input); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilterFactory.java (working copy) @@ -53,9 +53,8 @@ return charFilter; } - @Override - public void init(Map args) { - super.init(args); + public HTMLStripCharFilterFactory(Map args) { + super(args); String escapedTagsArg = args.get("escapedTags"); if (null != escapedTagsArg) { Matcher matcher = TAG_NAME_PATTERN.matcher(escapedTagsArg); Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilterFactory.java (revision 1365877) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilterFactory.java (working copy) @@ -22,6 +22,7 @@ import java.io.Reader; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -49,6 +50,10 @@ protected NormalizeCharMap normMap; private String mapping; + public MappingCharFilterFactory(Map args) { + super(args); + } + // TODO: this should use inputstreams from the loader, not File! public void inform(ResourceLoader loader) throws IOException { mapping = args.get("mapping"); Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilterFactory.java (revision 1365865) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilterFactory.java (working copy) @@ -37,14 +37,14 @@ */ public class DictionaryCompoundWordTokenFilterFactory extends TokenFilterFactory implements ResourceLoaderAware { private CharArraySet dictionary; - private String dictFile; - private int minWordSize; - private int minSubwordSize; - private int maxSubwordSize; - private boolean onlyLongestMatch; - @Override - public void init(Map args) { - super.init(args); + private final String dictFile; + private final int minWordSize; + private final int minSubwordSize; + private final int maxSubwordSize; + private final boolean onlyLongestMatch; + + public DictionaryCompoundWordTokenFilterFactory(Map args) { + super(args); assureMatchVersion(); dictFile = args.get("dictionary"); if (null == dictFile) { Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java (revision 1365865) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java (working copy) @@ -59,21 +59,22 @@ public class HyphenationCompoundWordTokenFilterFactory extends TokenFilterFactory implements ResourceLoaderAware { private CharArraySet dictionary; private HyphenationTree hyphenator; - private String dictFile; - private String hypFile; - private String encoding; - private int minWordSize; - private int minSubwordSize; - private int maxSubwordSize; - private boolean onlyLongestMatch; + private final String dictFile; + private final String hypFile; + private final String encoding; + private final int minWordSize; + private final int minSubwordSize; + private final int maxSubwordSize; + private final boolean onlyLongestMatch; - @Override - public void init(Map args) { - super.init(args); + public HyphenationCompoundWordTokenFilterFactory(Map args) { + super(args); assureMatchVersion(); dictFile = args.get("dictionary"); if (args.containsKey("encoding")) encoding = args.get("encoding"); + else + encoding = null; hypFile = args.get("hyphenator"); if (null == hypFile) { throw new IllegalArgumentException("Missing required parameter: hyphenator"); Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishLightStemFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishLightStemFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishLightStemFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.sv.SwedishLightStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; @@ -34,6 +36,11 @@ * */ public class SwedishLightStemFilterFactory extends TokenFilterFactory { + + public SwedishLightStemFilterFactory(Map args) { + super(args); + } + public TokenStream create(TokenStream input) { return new SwedishLightStemFilter(input); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanLightStemFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanLightStemFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanLightStemFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.de.GermanLightStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; @@ -34,6 +36,11 @@ * */ public class GermanLightStemFilterFactory extends TokenFilterFactory { + + public GermanLightStemFilterFactory(Map args) { + super(args); + } + public TokenStream create(TokenStream input) { return new GermanLightStemFilter(input); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.de.GermanStemFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.util.TokenFilterFactory; @@ -34,6 +36,11 @@ * */ public class GermanStemFilterFactory extends TokenFilterFactory { + + public GermanStemFilterFactory(Map args) { + super(args); + } + public GermanStemFilter create(TokenStream in) { return new GermanStemFilter(in); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanMinimalStemFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanMinimalStemFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanMinimalStemFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.de.GermanMinimalStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; @@ -34,6 +36,11 @@ * */ public class GermanMinimalStemFilterFactory extends TokenFilterFactory { + + public GermanMinimalStemFilterFactory(Map args) { + super(args); + } + public TokenStream create(TokenStream input) { return new GermanMinimalStemFilter(input); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanNormalizationFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanNormalizationFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanNormalizationFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.de.GermanNormalizationFilter; import org.apache.lucene.analysis.util.AbstractAnalysisFactory; @@ -36,6 +38,10 @@ */ public class GermanNormalizationFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent { + public GermanNormalizationFilterFactory(Map args) { + super(args); + } + public TokenStream create(TokenStream input) { return new GermanNormalizationFilter(input); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizationFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizationFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizationFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.hi.HindiNormalizationFilter; import org.apache.lucene.analysis.util.AbstractAnalysisFactory; @@ -35,6 +37,11 @@ * */ public class HindiNormalizationFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent { + + public HindiNormalizationFilterFactory(Map args) { + super(args); + } + public TokenStream create(TokenStream input) { return new HindiNormalizationFilter(input); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiStemFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiStemFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiStemFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.hi.HindiStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; @@ -33,6 +35,11 @@ * */ public class HindiStemFilterFactory extends TokenFilterFactory { + + public HindiStemFilterFactory(Map args) { + super(args); + } + public TokenStream create(TokenStream input) { return new HindiStemFilter(input); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.util.TokenFilterFactory; @@ -35,6 +37,11 @@ * */ public class ClassicFilterFactory extends TokenFilterFactory { + + public ClassicFilterFactory(Map args) { + super(args); + } + public TokenFilter create(TokenStream input) { return new ClassicFilter(input); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerFactory.java (working copy) @@ -37,11 +37,10 @@ public class StandardTokenizerFactory extends TokenizerFactory { - private int maxTokenLength; + private final int maxTokenLength; - @Override - public void init(Map args) { - super.init(args); + public StandardTokenizerFactory(Map args) { + super(args); assureMatchVersion(); maxTokenLength = getInt("maxTokenLength", StandardAnalyzer.DEFAULT_MAX_TOKEN_LENGTH); Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerFactory.java (working copy) @@ -38,11 +38,10 @@ public class UAX29URLEmailTokenizerFactory extends TokenizerFactory { - private int maxTokenLength; + private final int maxTokenLength; - @Override - public void init(Map args) { - super.init(args); + public UAX29URLEmailTokenizerFactory(Map args) { + super(args); assureMatchVersion(); maxTokenLength = getInt("maxTokenLength", StandardAnalyzer.DEFAULT_MAX_TOKEN_LENGTH); Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardFilterFactory.java (working copy) @@ -35,9 +35,9 @@ * */ public class StandardFilterFactory extends TokenFilterFactory { - @Override - public void init(Map args) { - super.init(args); + + public StandardFilterFactory(Map args) { + super(args); assureMatchVersion(); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerFactory.java (working copy) @@ -39,11 +39,10 @@ public class ClassicTokenizerFactory extends TokenizerFactory { - private int maxTokenLength; + private final int maxTokenLength; - @Override - public void init(Map args) { - super.init(args); + public ClassicTokenizerFactory(Map args) { + super(args); assureMatchVersion(); maxTokenLength = getInt("maxTokenLength", StandardAnalyzer.DEFAULT_MAX_TOKEN_LENGTH); Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiWordFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiWordFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiWordFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.th.ThaiWordFilter; import org.apache.lucene.analysis.TokenStream; @@ -34,6 +36,11 @@ * */ public class ThaiWordFilterFactory extends TokenFilterFactory { + + public ThaiWordFilterFactory(Map args) { + super(args); + } + public ThaiWordFilter create(TokenStream input) { assureMatchVersion(); return new ThaiWordFilter(luceneMatchVersion, input); Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.payloads.TokenOffsetPayloadTokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.util.TokenFilterFactory; @@ -33,6 +35,11 @@ * */ public class TokenOffsetPayloadTokenFilterFactory extends TokenFilterFactory { + + public TokenOffsetPayloadTokenFilterFactory(Map args) { + super(args); + } + public TokenOffsetPayloadTokenFilter create(TokenStream input) { return new TokenOffsetPayloadTokenFilter(input); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterFactory.java (revision 1365865) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterFactory.java (working copy) @@ -53,9 +53,8 @@ return new DelimitedPayloadTokenFilter(input, delimiter, encoder); } - @Override - public void init(Map args) { - super.init(args); + public DelimitedPayloadTokenFilterFactory(Map args) { + super(args); } public void inform(ResourceLoader loader) { Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterFactory.java (revision 1365865) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterFactory.java (working copy) @@ -34,11 +34,11 @@ * */ public class NumericPayloadTokenFilterFactory extends TokenFilterFactory { - private float payload; - private String typeMatch; - @Override - public void init(Map args) { - super.init(args); + private final float payload; + private final String typeMatch; + + public NumericPayloadTokenFilterFactory(Map args) { + super(args); String payloadArg = args.get("payload"); typeMatch = args.get("typeMatch"); if (payloadArg == null || typeMatch == null) { Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.payloads.TypeAsPayloadTokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.util.TokenFilterFactory; @@ -33,6 +35,11 @@ * */ public class TypeAsPayloadTokenFilterFactory extends TokenFilterFactory { + + public TypeAsPayloadTokenFilterFactory(Map args) { + super(args); + } + public TypeAsPayloadTokenFilter create(TokenStream input) { return new TypeAsPayloadTokenFilter(input); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.hu.HungarianLightStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; @@ -34,6 +36,11 @@ * */ public class HungarianLightStemFilterFactory extends TokenFilterFactory { + + public HungarianLightStemFilterFactory(Map args) { + super(args); + } + public TokenStream create(TokenStream input) { return new HungarianLightStemFilter(input); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/LatvianStemFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/LatvianStemFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/LatvianStemFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.lv.LatvianStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; @@ -33,6 +35,11 @@ * </fieldType> */ public class LatvianStemFilterFactory extends TokenFilterFactory { + + public LatvianStemFilterFactory(Map args) { + super(args); + } + public TokenStream create(TokenStream input) { return new LatvianStemFilter(input); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseMinimalStemFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseMinimalStemFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseMinimalStemFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.pt.PortugueseMinimalStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; @@ -34,6 +36,11 @@ * */ public class PortugueseMinimalStemFilterFactory extends TokenFilterFactory { + + public PortugueseMinimalStemFilterFactory(Map args) { + super(args); + } + public TokenStream create(TokenStream input) { return new PortugueseMinimalStemFilter(input); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseLightStemFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseLightStemFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseLightStemFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.pt.PortugueseLightStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; @@ -34,6 +36,11 @@ * */ public class PortugueseLightStemFilterFactory extends TokenFilterFactory { + + public PortugueseLightStemFilterFactory(Map args) { + super(args); + } + public TokenStream create(TokenStream input) { return new PortugueseLightStemFilter(input); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseStemFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseStemFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseStemFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.pt.PortugueseStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; @@ -34,6 +36,11 @@ * */ public class PortugueseStemFilterFactory extends TokenFilterFactory { + + public PortugueseStemFilterFactory(Map args) { + super(args); + } + public TokenStream create(TokenStream input) { return new PortugueseStemFilter(input); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishLowerCaseFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishLowerCaseFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishLowerCaseFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tr.TurkishLowerCaseFilter; import org.apache.lucene.analysis.util.AbstractAnalysisFactory; @@ -35,6 +37,11 @@ * */ public class TurkishLowerCaseFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent { + + public TurkishLowerCaseFilterFactory(Map args) { + super(args); + } + public TokenStream create(TokenStream input) { return new TurkishLowerCaseFilter(input); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellStemFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellStemFilterFactory.java (revision 1365865) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellStemFilterFactory.java (working copy) @@ -22,6 +22,7 @@ import java.text.ParseException; import java.util.ArrayList; import java.util.List; +import java.util.Map; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.hunspell.HunspellDictionary; @@ -62,6 +63,10 @@ private HunspellDictionary dictionary; private boolean ignoreCase = false; + public HunspellStemFilterFactory(Map args) { + super(args); + } + /** * Loads the hunspell dictionary and affix files defined in the configuration * Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/id/IndonesianStemFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/id/IndonesianStemFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/id/IndonesianStemFilterFactory.java (working copy) @@ -36,11 +36,10 @@ * */ public class IndonesianStemFilterFactory extends TokenFilterFactory { - private boolean stemDerivational = true; + private final boolean stemDerivational; - @Override - public void init(Map args) { - super.init(args); + public IndonesianStemFilterFactory(Map args) { + super(args); stemDerivational = getBoolean("stemDerivational", true); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilterFactory.java (revision 1365865) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilterFactory.java (working copy) @@ -38,9 +38,8 @@ */ public class GreekLowerCaseFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent { - @Override - public void init(Map args) { - super.init(args); + public GreekLowerCaseFilterFactory(Map args) { + super(args); assureMatchVersion(); if (args.containsKey("charset")) throw new IllegalArgumentException( Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekStemFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekStemFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekStemFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.el.GreekStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; @@ -35,6 +37,10 @@ */ public class GreekStemFilterFactory extends TokenFilterFactory { + public GreekStemFilterFactory(Map args) { + super(args); + } + public TokenStream create(TokenStream input) { return new GreekStemFilter(input); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishPossessiveFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishPossessiveFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishPossessiveFilterFactory.java (working copy) @@ -37,9 +37,8 @@ */ public class EnglishPossessiveFilterFactory extends TokenFilterFactory { - @Override - public void init(Map args) { - super.init(args); + public EnglishPossessiveFilterFactory(Map args) { + super(args); assureMatchVersion(); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.en.EnglishMinimalStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; @@ -34,6 +36,11 @@ * */ public class EnglishMinimalStemFilterFactory extends TokenFilterFactory { + + public EnglishMinimalStemFilterFactory(Map args) { + super(args); + } + public TokenStream create(TokenStream input) { return new EnglishMinimalStemFilter(input); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.en.PorterStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; @@ -34,6 +36,11 @@ * */ public class PorterStemFilterFactory extends TokenFilterFactory { + + public PorterStemFilterFactory(Map args) { + super(args); + } + public PorterStemFilter create(TokenStream input) { return new PorterStemFilter(input); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.en.KStemFilter; @@ -27,6 +29,10 @@ */ public class KStemFilterFactory extends TokenFilterFactory { + public KStemFilterFactory(Map args) { + super(args); + } + public TokenFilter create(TokenStream input) { return new KStemFilter(input); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizationFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizationFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizationFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.ar.ArabicNormalizationFilter; import org.apache.lucene.analysis.util.AbstractAnalysisFactory; @@ -37,6 +39,10 @@ */ public class ArabicNormalizationFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent { + public ArabicNormalizationFilterFactory(Map args) { + super(args); + } + public ArabicNormalizationFilter create(TokenStream input) { return new ArabicNormalizationFilter(input); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicStemFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicStemFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicStemFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.ar.ArabicStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; @@ -36,6 +38,9 @@ */ public class ArabicStemFilterFactory extends TokenFilterFactory { + public ArabicStemFilterFactory(Map args) { + super(args); + } public ArabicStemFilter create(TokenStream input) { return new ArabicStemFilter(input); Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/RemoveDuplicatesTokenFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/RemoveDuplicatesTokenFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/RemoveDuplicatesTokenFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.RemoveDuplicatesTokenFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; @@ -33,6 +35,11 @@ * */ public class RemoveDuplicatesTokenFilterFactory extends TokenFilterFactory { + + public RemoveDuplicatesTokenFilterFactory(Map args) { + super(args); + } + public RemoveDuplicatesTokenFilter create(TokenStream input) { return new RemoveDuplicatesTokenFilter(input); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LengthFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LengthFilterFactory.java (revision 1365865) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LengthFilterFactory.java (working copy) @@ -35,14 +35,14 @@ * */ public class LengthFilterFactory extends TokenFilterFactory { - int min,max; - boolean enablePositionIncrements; + final int min; + final int max; + final boolean enablePositionIncrements; public static final String MIN_KEY = "min"; public static final String MAX_KEY = "max"; - @Override - public void init(Map args) { - super.init(args); + public LengthFilterFactory(Map args) { + super(args); String minKey = args.get(MIN_KEY); String maxKey = args.get(MAX_KEY); if (minKey == null || maxKey == null) { Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeywordMarkerFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeywordMarkerFilterFactory.java (revision 1365865) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeywordMarkerFilterFactory.java (working copy) @@ -18,6 +18,7 @@ */ import java.io.IOException; +import java.util.Map; import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; import org.apache.lucene.analysis.util.*; @@ -39,6 +40,10 @@ private CharArraySet protectedWords; private boolean ignoreCase; + public KeywordMarkerFilterFactory(Map args) { + super(args); + } + public void inform(ResourceLoader loader) throws IOException { String wordFiles = args.get(PROTECTED_TOKENS); ignoreCase = getBoolean("ignoreCase", false); Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountFilterFactory.java (revision 1365865) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountFilterFactory.java (working copy) @@ -36,11 +36,10 @@ */ public class LimitTokenCountFilterFactory extends TokenFilterFactory { - int maxTokenCount; + final int maxTokenCount; - @Override - public void init(Map args) { - super.init( args ); + public LimitTokenCountFilterFactory(Map args) { + super(args); String maxTokenCountArg = args.get("maxTokenCount"); if (maxTokenCountArg == null) { throw new IllegalArgumentException("maxTokenCount is mandatory."); Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ASCIIFoldingFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ASCIIFoldingFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ASCIIFoldingFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.util.AbstractAnalysisFactory; import org.apache.lucene.analysis.util.MultiTermAwareComponent; import org.apache.lucene.analysis.util.TokenFilterFactory; @@ -35,6 +37,11 @@ * */ public class ASCIIFoldingFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent { + + public ASCIIFoldingFilterFactory(Map args) { + super(args); + } + public ASCIIFoldingFilter create(TokenStream input) { return new ASCIIFoldingFilter(input); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/HyphenatedWordsFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/HyphenatedWordsFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/HyphenatedWordsFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.HyphenatedWordsFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; @@ -33,7 +35,12 @@ * */ public class HyphenatedWordsFilterFactory extends TokenFilterFactory { - public HyphenatedWordsFilter create(TokenStream input) { + + public HyphenatedWordsFilterFactory(Map args) { + super(args); + } + + public HyphenatedWordsFilter create(TokenStream input) { return new HyphenatedWordsFilter(input); } } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilterFactory.java (revision 1365877) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilterFactory.java (working copy) @@ -74,9 +74,8 @@ private int flags; byte[] typeTable = null; - @Override - public void init(Map args) { - super.init(args); + public WordDelimiterFilterFactory(Map args) { + super(args); if (getInt("generateWordParts", 1) != 0) { flags |= GENERATE_WORD_PARTS; } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TrimFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TrimFilterFactory.java (revision 1365865) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TrimFilterFactory.java (working copy) @@ -39,9 +39,8 @@ protected boolean updateOffsets = false; - @Override - public void init(Map args) { - super.init( args ); + public TrimFilterFactory(Map args) { + super(args); String v = args.get( "updateOffsets" ); if (v != null) { Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CapitalizationFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CapitalizationFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CapitalizationFilterFactory.java (working copy) @@ -78,9 +78,8 @@ boolean onlyFirstWord = true; boolean forceFirstLetter = true; // make sure the first letter is capitol even if it is in the keep list - @Override - public void init(Map args) { - super.init(args); + public CapitalizationFilterFactory(Map args) { + super(args); assureMatchVersion(); String k = args.get(KEEP); Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilterFactory.java (revision 1365877) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilterFactory.java (working copy) @@ -19,6 +19,7 @@ import java.io.IOException; import java.util.List; +import java.util.Map; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.StemmerOverrideFilter; @@ -39,6 +40,10 @@ private CharArrayMap dictionary = null; private boolean ignoreCase; + public StemmerOverrideFilterFactory(Map args) { + super(args); + } + public void inform(ResourceLoader loader) throws IOException { String dictionaryFiles = args.get("dictionary"); ignoreCase = getBoolean("ignoreCase", false); Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeepWordFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeepWordFilterFactory.java (revision 1365865) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeepWordFilterFactory.java (working copy) @@ -38,9 +38,8 @@ */ public class KeepWordFilterFactory extends TokenFilterFactory implements ResourceLoaderAware { - @Override - public void init(Map args) { - super.init(args); + public KeepWordFilterFactory(Map args) { + super(args); assureMatchVersion(); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/position/PositionFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/position/PositionFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/position/PositionFilterFactory.java (working copy) @@ -40,11 +40,10 @@ * @since solr 1.4 */ public class PositionFilterFactory extends TokenFilterFactory { - private int positionIncrement; + private final int positionIncrement; - @Override - public void init(Map args) { - super.init(args); + public PositionFilterFactory(Map args) { + super(args); positionIncrement = getInt("positionIncrement", 0); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerFactory.java (working copy) @@ -34,15 +34,14 @@ * */ public class EdgeNGramTokenizerFactory extends TokenizerFactory { - private int maxGramSize = 0; + private final int maxGramSize; - private int minGramSize = 0; + private final int minGramSize; private String side; - @Override - public void init(Map args) { - super.init(args); + public EdgeNGramTokenizerFactory(Map args) { + super(args); String maxArg = args.get("maxGramSize"); maxGramSize = (maxArg != null ? Integer.parseInt(maxArg) : EdgeNGramTokenizer.DEFAULT_MAX_GRAM_SIZE); Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramFilterFactory.java (working copy) @@ -34,15 +34,14 @@ * */ public class EdgeNGramFilterFactory extends TokenFilterFactory { - private int maxGramSize = 0; + private final int maxGramSize; - private int minGramSize = 0; + private final int minGramSize; private String side; - @Override - public void init(Map args) { - super.init(args); + public EdgeNGramFilterFactory(Map args) { + super(args); String maxArg = args.get("maxGramSize"); maxGramSize = (maxArg != null ? Integer.parseInt(maxArg) : EdgeNGramTokenFilter.DEFAULT_MAX_GRAM_SIZE); Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizerFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizerFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizerFactory.java (working copy) @@ -35,13 +35,12 @@ * */ public class NGramTokenizerFactory extends TokenizerFactory { - private int maxGramSize = 0; - private int minGramSize = 0; + private final int maxGramSize; + private final int minGramSize; /** Initializes the n-gram min and max sizes and the side from which one should start tokenizing. */ - @Override - public void init(Map args) { - super.init(args); + public NGramTokenizerFactory(Map args) { + super(args); String maxArg = args.get("maxGramSize"); maxGramSize = (maxArg != null ? Integer.parseInt(maxArg) : NGramTokenizer.DEFAULT_MAX_NGRAM_SIZE); Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramFilterFactory.java (working copy) @@ -34,14 +34,13 @@ * */ public class NGramFilterFactory extends TokenFilterFactory { - private int maxGramSize = 0; + private final int maxGramSize; - private int minGramSize = 0; + private final int minGramSize; /** Initialize the n-gram min and max sizes and the side from which one should start tokenizing. */ - @Override - public void init(Map args) { - super.init(args); + public NGramFilterFactory(Map args) { + super(args); String maxArg = args.get("maxGramSize"); maxGramSize = (maxArg != null ? Integer.parseInt(maxArg) : NGramTokenFilter.DEFAULT_MAX_NGRAM_SIZE); Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/in/IndicNormalizationFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/in/IndicNormalizationFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/in/IndicNormalizationFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.in.IndicNormalizationFilter; import org.apache.lucene.analysis.util.AbstractAnalysisFactory; @@ -35,6 +37,11 @@ * */ public class IndicNormalizationFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent { + + public IndicNormalizationFilterFactory(Map args) { + super(args); + } + public TokenStream create(TokenStream input) { return new IndicNormalizationFilter(input); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishLightStemFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishLightStemFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishLightStemFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.es.SpanishLightStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; @@ -34,6 +36,11 @@ * */ public class SpanishLightStemFilterFactory extends TokenFilterFactory { + + public SpanishLightStemFilterFactory(Map args) { + super(args); + } + public TokenStream create(TokenStream input) { return new SpanishLightStemFilter(input); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianLightStemFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianLightStemFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianLightStemFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.it.ItalianLightStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; @@ -34,6 +36,11 @@ * */ public class ItalianLightStemFilterFactory extends TokenFilterFactory { + + public ItalianLightStemFilterFactory(Map args) { + super(args); + } + public TokenStream create(TokenStream input) { return new ItalianLightStemFilter(input); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharFilterFactory.java (working copy) @@ -18,6 +18,7 @@ */ import java.io.Reader; +import java.util.Map; import java.util.Set; import org.apache.lucene.analysis.CharFilter; @@ -28,6 +29,10 @@ */ public abstract class CharFilterFactory extends AbstractAnalysisFactory { + public CharFilterFactory(Map args) { + super(args); + } + private static final AnalysisSPILoader loader = getSPILoader(Thread.currentThread().getContextClassLoader()); @@ -41,8 +46,8 @@ } /** looks up a charfilter by name from context classpath */ - public static CharFilterFactory forName(String name) { - return loader.newInstance(name); + public static CharFilterFactory forName(String name, Map args) { + return loader.newInstance(name, args); } /** looks up a charfilter class by name from context classpath */ Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/util/TokenFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/util/TokenFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/util/TokenFilterFactory.java (working copy) @@ -17,6 +17,7 @@ * limitations under the License. */ +import java.util.Map; import java.util.Set; import org.apache.lucene.analysis.TokenStream; @@ -27,6 +28,10 @@ */ public abstract class TokenFilterFactory extends AbstractAnalysisFactory { + public TokenFilterFactory(Map args) { + super(args); + } + private static final AnalysisSPILoader loader = getSPILoader(Thread.currentThread().getContextClassLoader()); @@ -41,8 +46,8 @@ } /** looks up a tokenfilter by name from context classpath */ - public static TokenFilterFactory forName(String name) { - return loader.newInstance(name); + public static TokenFilterFactory forName(String name, Map args) { + return loader.newInstance(name, args); } /** looks up a tokenfilter class by name from context classpath */ Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AbstractAnalysisFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AbstractAnalysisFactory.java (revision 1365877) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AbstractAnalysisFactory.java (working copy) @@ -41,13 +41,15 @@ public abstract class AbstractAnalysisFactory { /** The init args */ - protected Map args; + protected final Map args; /** the luceneVersion arg */ - protected Version luceneMatchVersion = null; + protected final Version luceneMatchVersion; - public void init(Map args) { + public AbstractAnalysisFactory(Map args) { this.args = args; + String luceneMatchVersionArg = args.get("luceneMatchVersion"); + this.luceneMatchVersion = luceneMatchVersionArg == null ? null : Version.parseLeniently(luceneMatchVersionArg); } public Map getArgs() { @@ -64,10 +66,6 @@ } } - public void setLuceneMatchVersion(Version luceneMatchVersion) { - this.luceneMatchVersion = luceneMatchVersion; - } - public Version getLuceneMatchVersion() { return this.luceneMatchVersion; } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AnalysisSPILoader.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AnalysisSPILoader.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AnalysisSPILoader.java (working copy) @@ -76,10 +76,11 @@ this.services = Collections.unmodifiableMap(services); } - public S newInstance(String name) { + public S newInstance(String name, Map args) { final Class service = lookupClass(name); try { - return service.newInstance(); + // TODO: can we just populate the map with ctors? + return service.getConstructor(Map.class).newInstance(args); } catch (Exception e) { throw new IllegalArgumentException("SPI class of type "+clazz.getName()+" with name '"+name+"' cannot be instantiated. " + "This is likely due to a misconfiguration of the java class '" + service.getName() + "': ", e); Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/util/TokenizerFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/util/TokenizerFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/util/TokenizerFactory.java (working copy) @@ -20,6 +20,7 @@ import org.apache.lucene.analysis.Tokenizer; import java.io.Reader; +import java.util.Map; import java.util.Set; /** @@ -28,6 +29,10 @@ */ public abstract class TokenizerFactory extends AbstractAnalysisFactory { + public TokenizerFactory(Map args) { + super(args); + } + private static final AnalysisSPILoader loader = getSPILoader(Thread.currentThread().getContextClassLoader()); @@ -41,8 +46,8 @@ } /** looks up a tokenizer by name from context classpath */ - public static TokenizerFactory forName(String name) { - return loader.newInstance(name); + public static TokenizerFactory forName(String name, Map args) { + return loader.newInstance(name, args); } /** looks up a tokenizer class by name from context classpath */ Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceCharFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceCharFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceCharFilterFactory.java (working copy) @@ -44,9 +44,8 @@ private Pattern p; private String replacement; - @Override - public void init(Map args) { - super.init( args ); + public PatternReplaceCharFilterFactory(Map args) { + super( args ); p = getPattern("pattern"); replacement = args.get( "replacement" ); if( replacement == null ) Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceFilterFactory.java (revision 1365865) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceFilterFactory.java (working copy) @@ -43,9 +43,8 @@ String replacement; boolean all = true; - @Override - public void init(Map args) { - super.init(args); + public PatternReplaceFilterFactory(Map args) { + super(args); p = getPattern("pattern"); replacement = args.get("replacement"); Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizerFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizerFactory.java (revision 1365865) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizerFactory.java (working copy) @@ -74,10 +74,9 @@ /** * Require a configured pattern */ - @Override - public void init(Map args) + public PatternTokenizerFactory(Map args) { - super.init(args); + super(args); pattern = getPattern( PATTERN ); group = -1; // use 'split' Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizationFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizationFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizationFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.fa.PersianNormalizationFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.util.AbstractAnalysisFactory; @@ -36,6 +38,11 @@ * */ public class PersianNormalizationFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent { + + public PersianNormalizationFilterFactory(Map args) { + super(args); + } + public PersianNormalizationFilter create(TokenStream input) { return new PersianNormalizationFilter(input); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianCharFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianCharFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianCharFilterFactory.java (working copy) @@ -18,6 +18,7 @@ */ import java.io.Reader; +import java.util.Map; import org.apache.lucene.analysis.CharFilter; import org.apache.lucene.analysis.fa.PersianCharFilter; @@ -38,6 +39,10 @@ */ public class PersianCharFilterFactory extends CharFilterFactory implements MultiTermAwareComponent { + public PersianCharFilterFactory(Map args) { + super(args); + } + @Override public CharFilter create(Reader input) { return new PersianCharFilter(input); Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordTokenizerFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordTokenizerFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordTokenizerFactory.java (working copy) @@ -21,6 +21,7 @@ import org.apache.lucene.analysis.util.TokenizerFactory; import java.io.Reader; +import java.util.Map; /** * Factory for {@link KeywordTokenizer}. @@ -33,6 +34,11 @@ * */ public class KeywordTokenizerFactory extends TokenizerFactory { + + public KeywordTokenizerFactory(Map args) { + super(args); + } + public KeywordTokenizer create(Reader input) { return new KeywordTokenizer(input); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/core/WhitespaceTokenizerFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/core/WhitespaceTokenizerFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/core/WhitespaceTokenizerFactory.java (working copy) @@ -34,9 +34,9 @@ * */ public class WhitespaceTokenizerFactory extends TokenizerFactory { - @Override - public void init(Map args) { - super.init(args); + + public WhitespaceTokenizerFactory(Map args) { + super(args); assureMatchVersion(); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/core/TypeTokenFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/core/TypeTokenFilterFactory.java (revision 1365877) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/core/TypeTokenFilterFactory.java (working copy) @@ -26,6 +26,7 @@ import java.io.IOException; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Set; /** @@ -41,6 +42,10 @@ */ public class TypeTokenFilterFactory extends TokenFilterFactory implements ResourceLoaderAware { + public TypeTokenFilterFactory(Map args) { + super(args); + } + @Override public void inform(ResourceLoader loader) throws IOException { String stopTypesFiles = args.get("types"); Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseTokenizerFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseTokenizerFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseTokenizerFactory.java (working copy) @@ -36,9 +36,9 @@ * */ public class LowerCaseTokenizerFactory extends TokenizerFactory implements MultiTermAwareComponent { - @Override - public void init(Map args) { - super.init(args); + + public LowerCaseTokenizerFactory(Map args) { + super(args); assureMatchVersion(); } @@ -48,9 +48,6 @@ @Override public AbstractAnalysisFactory getMultiTermComponent() { - LowerCaseFilterFactory filt = new LowerCaseFilterFactory(); - filt.setLuceneMatchVersion(luceneMatchVersion); - filt.init(args); - return filt; + return new LowerCaseFilterFactory(args); } } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LetterTokenizerFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LetterTokenizerFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LetterTokenizerFactory.java (working copy) @@ -35,9 +35,8 @@ */ public class LetterTokenizerFactory extends TokenizerFactory { - @Override - public void init(Map args) { - super.init(args); + public LetterTokenizerFactory(Map args) { + super(args); assureMatchVersion(); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseFilterFactory.java (working copy) @@ -37,9 +37,9 @@ * */ public class LowerCaseFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent { - @Override - public void init(Map args) { - super.init(args); + + public LowerCaseFilterFactory(Map args) { + super(args); assureMatchVersion(); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/core/StopFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/core/StopFilterFactory.java (revision 1365865) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/core/StopFilterFactory.java (working copy) @@ -39,9 +39,8 @@ */ public class StopFilterFactory extends TokenFilterFactory implements ResourceLoaderAware { - @Override - public void init(Map args) { - super.init(args); + public StopFilterFactory(Map args) { + super(args); assureMatchVersion(); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.bg.BulgarianStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; @@ -34,6 +36,11 @@ * */ public class BulgarianStemFilterFactory extends TokenFilterFactory { + + public BulgarianStemFilterFactory(Map args) { + super(args); + } + public TokenStream create(TokenStream input) { return new BulgarianStemFilter(input); } Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilterFactory.java (revision 1365865) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilterFactory.java (working copy) @@ -36,15 +36,14 @@ * */ public class ShingleFilterFactory extends TokenFilterFactory { - private int minShingleSize; - private int maxShingleSize; - private boolean outputUnigrams; - private boolean outputUnigramsIfNoShingles; - private String tokenSeparator; + private final int minShingleSize; + private final int maxShingleSize; + private final boolean outputUnigrams; + private final boolean outputUnigramsIfNoShingles; + private final String tokenSeparator; - @Override - public void init(Map args) { - super.init(args); + public ShingleFilterFactory(Map args) { + super(args); maxShingleSize = getInt("maxShingleSize", ShingleFilter.DEFAULT_MAX_SHINGLE_SIZE); if (maxShingleSize < 2) { Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishLightStemFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishLightStemFilterFactory.java (revision 1365864) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishLightStemFilterFactory.java (working copy) @@ -17,6 +17,8 @@ * limitations under the License. */ +import java.util.Map; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.fi.FinnishLightStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; @@ -34,6 +36,11 @@ * */ public class FinnishLightStemFilterFactory extends TokenFilterFactory { + + public FinnishLightStemFilterFactory(Map args) { + super(args); + } + public TokenStream create(TokenStream input) { return new FinnishLightStemFilter(input); } Index: lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java =================================================================== --- lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java (revision 1365864) +++ lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java (working copy) @@ -906,4 +906,10 @@ } return ret; } + + public static Map TEST_VERSION_CURRENT_MAP() { + Map map = new HashMap(); + map.put("luceneMatchVersion", TEST_VERSION_CURRENT.toString()); + return map; + } }