You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/07/26 04:05:30 UTC
svn commit: r1365868 [1/2] - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/analysis/
lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/
lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/
lucene/analysis/c...
Author: rmuir
Date: Thu Jul 26 02:05:28 2012
New Revision: 1365868
URL: http://svn.apache.org/viewvc?rev=1365868&view=rev
Log:
LUCENE-4255: clean up analysis factory exception handling
Removed:
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/HyphenationException.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/InitializationException.java
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/ (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/HyphenationTree.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternParser.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/StopFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/TypeTokenFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/ElisionFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellStemFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeepWordFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeywordMarkerFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LengthFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TrimFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/PathHierarchyTokenizerFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizerFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianLetterTokenizerFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballPorterFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/FSTSynonymFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SlowSynonymFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SlowSynonymMap.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AbstractAnalysisFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoaderAware.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationKeyFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAllAnalyzersHaveFactories.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFactories.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymMap.java
lucene/dev/branches/branch_4x/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUNormalizer2FilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUTransformFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseKatakanaStemFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapanesePartOfSpeechStopFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseTokenizerFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/PhoneticFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelPolishStemFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMAAnnotationsTokenizerFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnnotationsTokenizerFactory.java
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilterFactory.java?rev=1365868&r1=1365867&r2=1365868&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilterFactory.java Thu Jul 26 02:05:28 2012
@@ -49,30 +49,25 @@ public class MappingCharFilterFactory ex
protected NormalizeCharMap normMap;
private String mapping;
- public void inform(ResourceLoader loader) {
- mapping = args.get( "mapping" );
+ // TODO: this should use inputstreams from the loader, not File!
+ public void inform(ResourceLoader loader) throws IOException {
+ mapping = args.get("mapping");
- if( mapping != null ){
+ if (mapping != null) {
List<String> wlist = null;
- try{
- File mappingFile = new File( mapping );
- if( mappingFile.exists() ){
- wlist = loader.getLines( mapping );
+ File mappingFile = new File(mapping);
+ if (mappingFile.exists()) {
+ wlist = loader.getLines(mapping);
+ } else {
+ List<String> files = splitFileNames(mapping);
+ wlist = new ArrayList<String>();
+ for (String file : files) {
+ List<String> lines = loader.getLines(file.trim());
+ wlist.addAll(lines);
}
- else{
- List<String> files = splitFileNames( mapping );
- wlist = new ArrayList<String>();
- for( String file : files ){
- List<String> lines = loader.getLines( file.trim() );
- wlist.addAll( lines );
- }
- }
- }
- catch( IOException e ){
- throw new InitializationException("IOException thrown while loading mappings", e);
}
final NormalizeCharMap.Builder builder = new NormalizeCharMap.Builder();
- parseRules( wlist, builder );
+ parseRules(wlist, builder);
normMap = builder.build();
if (normMap.map == null) {
// if the inner FST is null, it means it accepts nothing (e.g. the file is empty)
@@ -95,7 +90,7 @@ public class MappingCharFilterFactory ex
for( String rule : rules ){
Matcher m = p.matcher( rule );
if( !m.find() )
- throw new InitializationException("Invalid Mapping Rule : [" + rule + "], file = " + mapping);
+ throw new IllegalArgumentException("Invalid Mapping Rule : [" + rule + "], file = " + mapping);
builder.add( parseString( m.group( 1 ) ), parseString( m.group( 2 ) ) );
}
}
@@ -110,7 +105,7 @@ public class MappingCharFilterFactory ex
char c = s.charAt( readPos++ );
if( c == '\\' ){
if( readPos >= len )
- throw new InitializationException("Invalid escaped char in [" + s + "]");
+ throw new IllegalArgumentException("Invalid escaped char in [" + s + "]");
c = s.charAt( readPos++ );
switch( c ) {
case '\\' : c = '\\'; break;
@@ -122,7 +117,7 @@ public class MappingCharFilterFactory ex
case 'f' : c = '\f'; break;
case 'u' :
if( readPos + 3 >= len )
- throw new InitializationException("Invalid escaped char in [" + s + "]");
+ throw new IllegalArgumentException("Invalid escaped char in [" + s + "]");
c = (char)Integer.parseInt( s.substring( readPos, readPos + 4 ), 16 );
readPos += 4;
break;
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilterFactory.java?rev=1365868&r1=1365867&r2=1365868&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilterFactory.java Thu Jul 26 02:05:28 2012
@@ -42,19 +42,15 @@ import org.apache.lucene.analysis.util.*
public class CommonGramsFilterFactory extends TokenFilterFactory implements
ResourceLoaderAware {
- public void inform(ResourceLoader loader) {
+ public void inform(ResourceLoader loader) throws IOException {
String commonWordFiles = args.get("words");
ignoreCase = getBoolean("ignoreCase", false);
if (commonWordFiles != null) {
- try {
- if ("snowball".equalsIgnoreCase(args.get("format"))) {
- commonWords = getSnowballWordSet(loader, commonWordFiles, ignoreCase);
- } else {
- commonWords = getWordSet(loader, commonWordFiles, ignoreCase);
- }
- } catch (IOException e) {
- throw new InitializationException("IOException thrown while loading common word file", e);
+ if ("snowball".equalsIgnoreCase(args.get("format"))) {
+ commonWords = getSnowballWordSet(loader, commonWordFiles, ignoreCase);
+ } else {
+ commonWords = getWordSet(loader, commonWordFiles, ignoreCase);
}
} else {
commonWords = StopAnalyzer.ENGLISH_STOP_WORDS_SET;
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilterFactory.java?rev=1365868&r1=1365867&r2=1365868&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilterFactory.java Thu Jul 26 02:05:28 2012
@@ -50,19 +50,15 @@ public class CommonGramsQueryFilterFacto
assureMatchVersion();
}
- public void inform(ResourceLoader loader) {
+ public void inform(ResourceLoader loader) throws IOException {
String commonWordFiles = args.get("words");
ignoreCase = getBoolean("ignoreCase", false);
if (commonWordFiles != null) {
- try {
- if ("snowball".equalsIgnoreCase(args.get("format"))) {
- commonWords = getSnowballWordSet(loader, commonWordFiles, ignoreCase);
- } else {
- commonWords = getWordSet(loader, commonWordFiles, ignoreCase);
- }
- } catch (IOException e) {
- throw new InitializationException("IOException thrown while loading common word file", e);
+ if ("snowball".equalsIgnoreCase(args.get("format"))) {
+ commonWords = getSnowballWordSet(loader, commonWordFiles, ignoreCase);
+ } else {
+ commonWords = getWordSet(loader, commonWordFiles, ignoreCase);
}
} else {
commonWords = StopAnalyzer.ENGLISH_STOP_WORDS_SET;
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilterFactory.java?rev=1365868&r1=1365867&r2=1365868&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilterFactory.java Thu Jul 26 02:05:28 2012
@@ -48,7 +48,7 @@ public class DictionaryCompoundWordToken
assureMatchVersion();
dictFile = args.get("dictionary");
if (null == dictFile) {
- throw new InitializationException("Missing required parameter: dictionary");
+ throw new IllegalArgumentException("Missing required parameter: dictionary");
}
minWordSize= getInt("minWordSize",CompoundWordTokenFilterBase.DEFAULT_MIN_WORD_SIZE);
@@ -56,12 +56,8 @@ public class DictionaryCompoundWordToken
maxSubwordSize= getInt("maxSubwordSize",CompoundWordTokenFilterBase.DEFAULT_MAX_SUBWORD_SIZE);
onlyLongestMatch = getBoolean("onlyLongestMatch",true);
}
- public void inform(ResourceLoader loader) {
- try {
- dictionary = super.getWordSet(loader, dictFile, false);
- } catch (IOException e) {
- throw new InitializationException("IOException thrown while loading dictionary", e);
- }
+ public void inform(ResourceLoader loader) throws IOException {
+ dictionary = super.getWordSet(loader, dictFile, false);
}
public TokenStream create(TokenStream input) {
// if the dictionary is null, it means it was empty
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java?rev=1365868&r1=1365867&r2=1365868&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java Thu Jul 26 02:05:28 2012
@@ -18,6 +18,7 @@ package org.apache.lucene.analysis.compo
*/
import java.io.File;
+import java.io.IOException;
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
@@ -134,7 +135,7 @@ public class HyphenationCompoundWordToke
* @throws Exception
*/
public static HyphenationTree getHyphenationTree(String hyphenationFilename)
- throws Exception {
+ throws IOException {
return getHyphenationTree(new InputSource(hyphenationFilename));
}
@@ -146,7 +147,7 @@ public class HyphenationCompoundWordToke
* @throws Exception
*/
public static HyphenationTree getHyphenationTree(File hyphenationFile)
- throws Exception {
+ throws IOException {
return getHyphenationTree(new InputSource(hyphenationFile.toURL().toExternalForm()));
}
@@ -158,7 +159,7 @@ public class HyphenationCompoundWordToke
* @throws Exception
*/
public static HyphenationTree getHyphenationTree(InputSource hyphenationSource)
- throws Exception {
+ throws IOException {
HyphenationTree tree = new HyphenationTree();
tree.loadPatterns(hyphenationSource);
return tree;
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java?rev=1365868&r1=1365867&r2=1365868&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java Thu Jul 26 02:05:28 2012
@@ -25,6 +25,7 @@ import org.apache.lucene.analysis.util.*
import org.apache.lucene.util.IOUtils;
import java.util.Map;
+import java.io.IOException;
import java.io.InputStream;
import org.xml.sax.InputSource;
@@ -75,7 +76,7 @@ public class HyphenationCompoundWordToke
encoding = args.get("encoding");
hypFile = args.get("hyphenator");
if (null == hypFile) {
- throw new InitializationException("Missing required parameter: hyphenator");
+ throw new IllegalArgumentException("Missing required parameter: hyphenator");
}
minWordSize = getInt("minWordSize", CompoundWordTokenFilterBase.DEFAULT_MIN_WORD_SIZE);
@@ -84,7 +85,7 @@ public class HyphenationCompoundWordToke
onlyLongestMatch = getBoolean("onlyLongestMatch", false);
}
- public void inform(ResourceLoader loader) {
+ public void inform(ResourceLoader loader) throws IOException {
InputStream stream = null;
try {
if (dictFile != null) // the dictionary can be empty.
@@ -96,8 +97,6 @@ public class HyphenationCompoundWordToke
is.setEncoding(encoding); // if it's null let xml parser decide
is.setSystemId(hypFile);
hyphenator = HyphenationCompoundWordTokenFilter.getHyphenationTree(is);
- } catch (Exception e) { // TODO: getHyphenationTree really shouldn't throw "Exception"
- throw new InitializationException("Exception thrown while loading dictionary and hyphenation file", e);
} finally {
IOUtils.closeWhileHandlingException(stream);
}
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/HyphenationTree.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/HyphenationTree.java?rev=1365868&r1=1365867&r2=1365868&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/HyphenationTree.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/HyphenationTree.java Thu Jul 26 02:05:28 2012
@@ -18,8 +18,8 @@
package org.apache.lucene.analysis.compound.hyphenation;
import java.io.File;
+import java.io.IOException;
import java.io.PrintStream;
-import java.net.MalformedURLException;
import java.util.ArrayList;
import java.util.HashMap;
@@ -108,25 +108,20 @@ public class HyphenationTree extends Ter
* Read hyphenation patterns from an XML file.
*
* @param f the filename
- * @throws HyphenationException In case the parsing fails
+ * @throws IOException In case the parsing fails
*/
- public void loadPatterns(File f) throws HyphenationException {
- try {
- InputSource src = new InputSource(f.toURL().toExternalForm());
- loadPatterns(src);
- } catch (MalformedURLException e) {
- throw new HyphenationException("Error converting the File '" + f
- + "' to a URL: " + e.getMessage());
- }
+ public void loadPatterns(File f) throws IOException {
+ InputSource src = new InputSource(f.toURL().toExternalForm());
+ loadPatterns(src);
}
/**
* Read hyphenation patterns from an XML file.
*
* @param source the InputSource for the file
- * @throws HyphenationException In case the parsing fails
+ * @throws IOException In case the parsing fails
*/
- public void loadPatterns(InputSource source) throws HyphenationException {
+ public void loadPatterns(InputSource source) throws IOException {
PatternParser pp = new PatternParser(this);
ivalues = new TernaryTree();
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternParser.java?rev=1365868&r1=1365867&r2=1365868&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternParser.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternParser.java Thu Jul 26 02:05:28 2012
@@ -27,9 +27,7 @@ import org.xml.sax.Attributes;
// Java
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.IOException;
-import java.net.MalformedURLException;
import java.util.ArrayList;
import javax.xml.parsers.SAXParserFactory;
@@ -87,9 +85,9 @@ public class PatternParser extends Defau
* Parses a hyphenation pattern file.
*
* @param filename the filename
- * @throws HyphenationException In case of an exception while parsing
+ * @throws IOException In case of an exception while parsing
*/
- public void parse(String filename) throws HyphenationException {
+ public void parse(String filename) throws IOException {
parse(new InputSource(filename));
}
@@ -97,33 +95,24 @@ public class PatternParser extends Defau
* Parses a hyphenation pattern file.
*
* @param file the pattern file
- * @throws HyphenationException In case of an exception while parsing
+ * @throws IOException In case of an exception while parsing
*/
- public void parse(File file) throws HyphenationException {
- try {
- InputSource src = new InputSource(file.toURL().toExternalForm());
- parse(src);
- } catch (MalformedURLException e) {
- throw new HyphenationException("Error converting the File '" + file
- + "' to a URL: " + e.getMessage());
- }
+ public void parse(File file) throws IOException {
+ InputSource src = new InputSource(file.toURL().toExternalForm());
+ parse(src);
}
/**
* Parses a hyphenation pattern file.
*
* @param source the InputSource for the file
- * @throws HyphenationException In case of an exception while parsing
+ * @throws IOException In case of an exception while parsing
*/
- public void parse(InputSource source) throws HyphenationException {
+ public void parse(InputSource source) throws IOException {
try {
parser.parse(source);
- } catch (FileNotFoundException fnfe) {
- throw new HyphenationException("File not found: " + fnfe.getMessage());
- } catch (IOException ioe) {
- throw new HyphenationException(ioe.getMessage());
} catch (SAXException e) {
- throw new HyphenationException(errMsg);
+ throw new IOException(e);
}
}
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/StopFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/StopFilterFactory.java?rev=1365868&r1=1365867&r2=1365868&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/StopFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/StopFilterFactory.java Thu Jul 26 02:05:28 2012
@@ -46,20 +46,16 @@ public class StopFilterFactory extends T
}
@Override
- public void inform(ResourceLoader loader) {
+ public void inform(ResourceLoader loader) throws IOException {
String stopWordFiles = args.get("words");
ignoreCase = getBoolean("ignoreCase",false);
enablePositionIncrements = getBoolean("enablePositionIncrements",false);
if (stopWordFiles != null) {
- try {
- if ("snowball".equalsIgnoreCase(args.get("format"))) {
- stopWords = getSnowballWordSet(loader, stopWordFiles, ignoreCase);
- } else {
- stopWords = getWordSet(loader, stopWordFiles, ignoreCase);
- }
- } catch (IOException e) {
- throw new InitializationException("IOException thrown while loading stopwords", e);
+ if ("snowball".equalsIgnoreCase(args.get("format"))) {
+ stopWords = getSnowballWordSet(loader, stopWordFiles, ignoreCase);
+ } else {
+ stopWords = getWordSet(loader, stopWordFiles, ignoreCase);
}
} else {
stopWords = new CharArraySet(luceneMatchVersion, StopAnalyzer.ENGLISH_STOP_WORDS_SET, ignoreCase);
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/TypeTokenFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/TypeTokenFilterFactory.java?rev=1365868&r1=1365867&r2=1365868&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/TypeTokenFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/TypeTokenFilterFactory.java Thu Jul 26 02:05:28 2012
@@ -19,7 +19,6 @@ package org.apache.lucene.analysis.core;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.core.TypeTokenFilter;
-import org.apache.lucene.analysis.util.InitializationException;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
import org.apache.lucene.analysis.util.TokenFilterFactory;
@@ -43,25 +42,21 @@ import java.util.Set;
public class TypeTokenFilterFactory extends TokenFilterFactory implements ResourceLoaderAware {
@Override
- public void inform(ResourceLoader loader) {
+ public void inform(ResourceLoader loader) throws IOException {
String stopTypesFiles = args.get("types");
enablePositionIncrements = getBoolean("enablePositionIncrements", false);
useWhitelist = getBoolean("useWhitelist", false);
if (stopTypesFiles != null) {
- try {
- List<String> files = splitFileNames(stopTypesFiles);
- if (files.size() > 0) {
- stopTypes = new HashSet<String>();
- for (String file : files) {
- List<String> typesLines = loader.getLines(file.trim());
- stopTypes.addAll(typesLines);
- }
+ List<String> files = splitFileNames(stopTypesFiles);
+ if (files.size() > 0) {
+ stopTypes = new HashSet<String>();
+ for (String file : files) {
+ List<String> typesLines = loader.getLines(file.trim());
+ stopTypes.addAll(typesLines);
}
- } catch (IOException e) {
- throw new InitializationException("IOException thrown while loading types", e);
}
} else {
- throw new InitializationException("Missing required parameter: types.");
+ throw new IllegalArgumentException("Missing required parameter: types.");
}
}
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilterFactory.java?rev=1365868&r1=1365867&r2=1365868&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilterFactory.java Thu Jul 26 02:05:28 2012
@@ -22,7 +22,6 @@ import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.el.GreekLowerCaseFilter;
import org.apache.lucene.analysis.util.AbstractAnalysisFactory;
-import org.apache.lucene.analysis.util.InitializationException;
import org.apache.lucene.analysis.util.MultiTermAwareComponent;
import org.apache.lucene.analysis.util.TokenFilterFactory;
@@ -44,7 +43,7 @@ public class GreekLowerCaseFilterFactory
super.init(args);
assureMatchVersion();
if (args.containsKey("charset"))
- throw new InitializationException(
+ throw new IllegalArgumentException(
"The charset parameter is no longer supported. "
+ "Please process your documents as Unicode instead.");
}
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/ElisionFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/ElisionFilterFactory.java?rev=1365868&r1=1365867&r2=1365868&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/ElisionFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/ElisionFilterFactory.java Thu Jul 26 02:05:28 2012
@@ -39,16 +39,12 @@ public class ElisionFilterFactory extend
private CharArraySet articles;
- public void inform(ResourceLoader loader) {
+ public void inform(ResourceLoader loader) throws IOException {
String articlesFile = args.get("articles");
boolean ignoreCase = getBoolean("ignoreCase", false);
if (articlesFile != null) {
- try {
- articles = getWordSet(loader, articlesFile, ignoreCase);
- } catch (IOException e) {
- throw new InitializationException("IOException thrown while loading articles", e);
- }
+ articles = getWordSet(loader, articlesFile, ignoreCase);
}
}
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellStemFilterFactory.java?rev=1365868&r1=1365867&r2=1365868&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellStemFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellStemFilterFactory.java Thu Jul 26 02:05:28 2012
@@ -17,14 +17,15 @@ package org.apache.lucene.analysis.hunsp
* limitations under the License.
*/
+import java.io.IOException;
import java.io.InputStream;
+import java.text.ParseException;
import java.util.ArrayList;
import java.util.List;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.hunspell.HunspellDictionary;
import org.apache.lucene.analysis.hunspell.HunspellStemFilter;
-import org.apache.lucene.analysis.util.InitializationException;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
import org.apache.lucene.analysis.util.TokenFilterFactory;
@@ -66,11 +67,11 @@ public class HunspellStemFilterFactory e
*
* @param loader ResourceLoader used to load the files
*/
- public void inform(ResourceLoader loader) {
+ public void inform(ResourceLoader loader) throws IOException {
assureMatchVersion();
String dictionaryArg = args.get(PARAM_DICTIONARY);
if (dictionaryArg == null) {
- throw new InitializationException("Parameter " + PARAM_DICTIONARY + " is mandatory.");
+ throw new IllegalArgumentException("Parameter " + PARAM_DICTIONARY + " is mandatory.");
}
String dictionaryFiles[] = args.get(PARAM_DICTIONARY).split(",");
String affixFile = args.get(PARAM_AFFIX);
@@ -78,7 +79,7 @@ public class HunspellStemFilterFactory e
if(pic != null) {
if(pic.equalsIgnoreCase(TRUE)) ignoreCase = true;
else if(pic.equalsIgnoreCase(FALSE)) ignoreCase = false;
- else throw new InitializationException("Unknown value for " + PARAM_IGNORE_CASE + ": " + pic + ". Must be true or false");
+ else throw new IllegalArgumentException("Unknown value for " + PARAM_IGNORE_CASE + ": " + pic + ". Must be true or false");
}
String strictAffixParsingParam = args.get(PARAM_STRICT_AFFIX_PARSING);
@@ -86,7 +87,7 @@ public class HunspellStemFilterFactory e
if(strictAffixParsingParam != null) {
if(strictAffixParsingParam.equalsIgnoreCase(FALSE)) strictAffixParsing = false;
else if(strictAffixParsingParam.equalsIgnoreCase(TRUE)) strictAffixParsing = true;
- else throw new InitializationException("Unknown value for " + PARAM_STRICT_AFFIX_PARSING + ": " + strictAffixParsingParam + ". Must be true or false");
+ else throw new IllegalArgumentException("Unknown value for " + PARAM_STRICT_AFFIX_PARSING + ": " + strictAffixParsingParam + ". Must be true or false");
}
InputStream affix = null;
@@ -100,8 +101,8 @@ public class HunspellStemFilterFactory e
affix = loader.openResource(affixFile);
this.dictionary = new HunspellDictionary(affix, dictionaries, luceneMatchVersion, ignoreCase, strictAffixParsing);
- } catch (Exception e) {
- throw new InitializationException("Unable to load hunspell data! [dictionary=" + args.get("dictionary") + ",affix=" + affixFile + "]", e);
+ } catch (ParseException e) {
+ throw new IOException("Unable to load hunspell data! [dictionary=" + args.get("dictionary") + ",affix=" + affixFile + "]", e);
} finally {
IOUtils.closeWhileHandlingException(affix);
IOUtils.closeWhileHandlingException(dictionaries);
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeepWordFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeepWordFilterFactory.java?rev=1365868&r1=1365867&r2=1365868&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeepWordFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeepWordFilterFactory.java Thu Jul 26 02:05:28 2012
@@ -44,17 +44,13 @@ public class KeepWordFilterFactory exten
assureMatchVersion();
}
- public void inform(ResourceLoader loader) {
+ public void inform(ResourceLoader loader) throws IOException {
String wordFiles = args.get("words");
ignoreCase = getBoolean("ignoreCase", false);
enablePositionIncrements = getBoolean("enablePositionIncrements",false);
if (wordFiles != null) {
- try {
- words = getWordSet(loader, wordFiles, ignoreCase);
- } catch (IOException e) {
- throw new InitializationException("IOException thrown while loading words", e);
- }
+ words = getWordSet(loader, wordFiles, ignoreCase);
}
}
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeywordMarkerFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeywordMarkerFilterFactory.java?rev=1365868&r1=1365867&r2=1365868&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeywordMarkerFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeywordMarkerFilterFactory.java Thu Jul 26 02:05:28 2012
@@ -39,15 +39,11 @@ public class KeywordMarkerFilterFactory
private CharArraySet protectedWords;
private boolean ignoreCase;
- public void inform(ResourceLoader loader) {
+ public void inform(ResourceLoader loader) throws IOException {
String wordFiles = args.get(PROTECTED_TOKENS);
ignoreCase = getBoolean("ignoreCase", false);
if (wordFiles != null) {
- try {
- protectedWords = getWordSet(loader, wordFiles, ignoreCase);
- } catch (IOException e) {
- throw new InitializationException("IOException thrown while loading protected words", e);
- }
+ protectedWords = getWordSet(loader, wordFiles, ignoreCase);
}
}
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LengthFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LengthFilterFactory.java?rev=1365868&r1=1365867&r2=1365868&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LengthFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LengthFilterFactory.java Thu Jul 26 02:05:28 2012
@@ -19,7 +19,6 @@ package org.apache.lucene.analysis.misce
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.miscellaneous.LengthFilter;
-import org.apache.lucene.analysis.util.InitializationException;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import java.util.Map;
@@ -47,7 +46,7 @@ public class LengthFilterFactory extends
String minKey = args.get(MIN_KEY);
String maxKey = args.get(MAX_KEY);
if (minKey == null || maxKey == null) {
- throw new InitializationException("Both " + MIN_KEY + " and " + MAX_KEY + " are mandatory");
+ throw new IllegalArgumentException("Both " + MIN_KEY + " and " + MAX_KEY + " are mandatory");
}
min=Integer.parseInt(minKey);
max=Integer.parseInt(maxKey);
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountFilterFactory.java?rev=1365868&r1=1365867&r2=1365868&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountFilterFactory.java Thu Jul 26 02:05:28 2012
@@ -21,7 +21,6 @@ import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.miscellaneous.LimitTokenCountFilter;
-import org.apache.lucene.analysis.util.InitializationException;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
@@ -44,7 +43,7 @@ public class LimitTokenCountFilterFactor
super.init( args );
String maxTokenCountArg = args.get("maxTokenCount");
if (maxTokenCountArg == null) {
- throw new InitializationException("maxTokenCount is mandatory.");
+ throw new IllegalArgumentException("maxTokenCount is mandatory.");
}
maxTokenCount = Integer.parseInt(args.get(maxTokenCountArg));
}
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilterFactory.java?rev=1365868&r1=1365867&r2=1365868&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilterFactory.java Thu Jul 26 02:05:28 2012
@@ -39,26 +39,22 @@ public class StemmerOverrideFilterFactor
private CharArrayMap<String> dictionary = null;
private boolean ignoreCase;
- public void inform(ResourceLoader loader) {
+ public void inform(ResourceLoader loader) throws IOException {
String dictionaryFiles = args.get("dictionary");
ignoreCase = getBoolean("ignoreCase", false);
if (dictionaryFiles != null) {
assureMatchVersion();
List<String> files = splitFileNames(dictionaryFiles);
- try {
- if (files.size() > 0) {
- dictionary = new CharArrayMap<String>(luceneMatchVersion,
- files.size() * 10, ignoreCase);
- for (String file : files) {
- List<String> list = loader.getLines(file.trim());
- for (String line : list) {
- String[] mapping = line.split("\t", 2);
- dictionary.put(mapping[0], mapping[1]);
- }
+ if (files.size() > 0) {
+ dictionary = new CharArrayMap<String>(luceneMatchVersion,
+ files.size() * 10, ignoreCase);
+ for (String file : files) {
+ List<String> list = loader.getLines(file.trim());
+ for (String line : list) {
+ String[] mapping = line.split("\t", 2);
+ dictionary.put(mapping[0], mapping[1]);
}
}
- } catch (IOException e) {
- throw new InitializationException("IOException thrown while loading dictionary", e);
}
}
}
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TrimFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TrimFilterFactory.java?rev=1365868&r1=1365867&r2=1365868&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TrimFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TrimFilterFactory.java Thu Jul 26 02:05:28 2012
@@ -21,7 +21,6 @@ import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.miscellaneous.TrimFilter;
-import org.apache.lucene.analysis.util.InitializationException;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
@@ -45,13 +44,8 @@ public class TrimFilterFactory extends T
super.init( args );
String v = args.get( "updateOffsets" );
- if( v != null ) {
- try {
- updateOffsets = Boolean.valueOf( v );
- }
- catch( Exception ex ) {
- throw new InitializationException("Error reading updateOffsets value. Must be true or false.", ex);
- }
+ if (v != null) {
+ updateOffsets = Boolean.valueOf( v );
}
}
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilterFactory.java?rev=1365868&r1=1365867&r2=1365868&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilterFactory.java Thu Jul 26 02:05:28 2012
@@ -53,28 +53,20 @@ public class WordDelimiterFilterFactory
public static final String PROTECTED_TOKENS = "protected";
public static final String TYPES = "types";
- public void inform(ResourceLoader loader) {
+ public void inform(ResourceLoader loader) throws IOException {
String wordFiles = args.get(PROTECTED_TOKENS);
if (wordFiles != null) {
- try {
- protectedWords = getWordSet(loader, wordFiles, false);
- } catch (IOException e) {
- throw new InitializationException("IOException thrown while loading protected words", e);
- }
+ protectedWords = getWordSet(loader, wordFiles, false);
}
String types = args.get(TYPES);
if (types != null) {
- try {
- List<String> files = splitFileNames( types );
- List<String> wlist = new ArrayList<String>();
- for( String file : files ){
- List<String> lines = loader.getLines( file.trim() );
- wlist.addAll( lines );
- }
- typeTable = parseTypes(wlist);
- } catch (IOException e) {
- throw new InitializationException("IOException while loading types", e);
+ List<String> files = splitFileNames( types );
+ List<String> wlist = new ArrayList<String>();
+ for( String file : files ){
+ List<String> lines = loader.getLines( file.trim() );
+ wlist.addAll( lines );
}
+ typeTable = parseTypes(wlist);
}
}
@@ -128,13 +120,13 @@ public class WordDelimiterFilterFactory
for( String rule : rules ){
Matcher m = typePattern.matcher(rule);
if( !m.find() )
- throw new InitializationException("Invalid Mapping Rule : [" + rule + "]");
+ throw new IllegalArgumentException("Invalid Mapping Rule : [" + rule + "]");
String lhs = parseString(m.group(1).trim());
Byte rhs = parseType(m.group(2).trim());
if (lhs.length() != 1)
- throw new InitializationException("Invalid Mapping Rule : [" + rule + "]. Only a single character is allowed.");
+ throw new IllegalArgumentException("Invalid Mapping Rule : [" + rule + "]. Only a single character is allowed.");
if (rhs == null)
- throw new InitializationException("Invalid Mapping Rule : [" + rule + "]. Illegal type.");
+ throw new IllegalArgumentException("Invalid Mapping Rule : [" + rule + "]. Illegal type.");
typeMap.put(lhs.charAt(0), rhs);
}
@@ -174,7 +166,7 @@ public class WordDelimiterFilterFactory
char c = s.charAt( readPos++ );
if( c == '\\' ){
if( readPos >= len )
- throw new InitializationException("Invalid escaped char in [" + s + "]");
+ throw new IllegalArgumentException("Invalid escaped char in [" + s + "]");
c = s.charAt( readPos++ );
switch( c ) {
case '\\' : c = '\\'; break;
@@ -185,7 +177,7 @@ public class WordDelimiterFilterFactory
case 'f' : c = '\f'; break;
case 'u' :
if( readPos + 3 >= len )
- throw new InitializationException("Invalid escaped char in [" + s + "]");
+ throw new IllegalArgumentException("Invalid escaped char in [" + s + "]");
c = (char)Integer.parseInt( s.substring( readPos, readPos + 4 ), 16 );
readPos += 4;
break;
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/PathHierarchyTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/PathHierarchyTokenizerFactory.java?rev=1365868&r1=1365867&r2=1365868&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/PathHierarchyTokenizerFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/PathHierarchyTokenizerFactory.java Thu Jul 26 02:05:28 2012
@@ -23,7 +23,6 @@ import java.util.Map;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.path.PathHierarchyTokenizer;
import org.apache.lucene.analysis.path.ReversePathHierarchyTokenizer;
-import org.apache.lucene.analysis.util.InitializationException;
import org.apache.lucene.analysis.util.TokenizerFactory;
/**
@@ -53,7 +52,7 @@ public class PathHierarchyTokenizerFacto
String v = args.get( "delimiter" );
if( v != null ){
if( v.length() != 1 ){
- throw new InitializationException("delimiter should be a char. \"" + v + "\" is invalid");
+ throw new IllegalArgumentException("delimiter should be a char. \"" + v + "\" is invalid");
}
else{
delimiter = v.charAt(0);
@@ -66,7 +65,7 @@ public class PathHierarchyTokenizerFacto
v = args.get( "replace" );
if( v != null ){
if( v.length() != 1 ){
- throw new InitializationException("replace should be a char. \"" + v + "\" is invalid");
+ throw new IllegalArgumentException("replace should be a char. \"" + v + "\" is invalid");
}
else{
replacement = v.charAt(0);
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceFilterFactory.java?rev=1365868&r1=1365867&r2=1365868&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceFilterFactory.java Thu Jul 26 02:05:28 2012
@@ -19,7 +19,6 @@ package org.apache.lucene.analysis.patte
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.pattern.PatternReplaceFilter;
-import org.apache.lucene.analysis.util.InitializationException;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import java.util.Map;
@@ -58,7 +57,7 @@ public class PatternReplaceFilterFactory
if (r.equals("first")) {
all = false;
} else {
- throw new InitializationException
+ throw new IllegalArgumentException
("Configuration Error: 'replace' must be 'first' or 'all' in "
+ this.getClass().getName());
}
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizerFactory.java?rev=1365868&r1=1365867&r2=1365868&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizerFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizerFactory.java Thu Jul 26 02:05:28 2012
@@ -24,7 +24,6 @@ import java.util.regex.Pattern;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.pattern.PatternTokenizer;
-import org.apache.lucene.analysis.util.InitializationException;
import org.apache.lucene.analysis.util.TokenizerFactory;
/**
@@ -84,12 +83,7 @@ public class PatternTokenizerFactory ext
group = -1; // use 'split'
String g = args.get( GROUP );
if( g != null ) {
- try {
- group = Integer.parseInt( g );
- }
- catch( Exception ex ) {
- throw new InitializationException("invalid group argument: " + g);
- }
+ group = Integer.parseInt( g );
}
}
@@ -100,7 +94,7 @@ public class PatternTokenizerFactory ext
try {
return new PatternTokenizer(in, pattern, group);
} catch( IOException ex ) {
- throw new InitializationException("IOException thrown creating PatternTokenizer instance", ex);
+ throw new RuntimeException("IOException thrown creating PatternTokenizer instance", ex);
}
}
}
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterFactory.java?rev=1365868&r1=1365867&r2=1365868&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterFactory.java Thu Jul 26 02:05:28 2012
@@ -23,7 +23,6 @@ import org.apache.lucene.analysis.payloa
import org.apache.lucene.analysis.payloads.FloatEncoder;
import org.apache.lucene.analysis.payloads.IntegerEncoder;
import org.apache.lucene.analysis.payloads.IdentityEncoder;
-import org.apache.lucene.analysis.util.InitializationException;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
import org.apache.lucene.analysis.util.TokenFilterFactory;
@@ -62,7 +61,7 @@ public class DelimitedPayloadTokenFilter
public void inform(ResourceLoader loader) {
String encoderClass = args.get(ENCODER_ATTR);
if (encoderClass == null) {
- throw new InitializationException("Parameter " + ENCODER_ATTR + " is mandatory");
+ throw new IllegalArgumentException("Parameter " + ENCODER_ATTR + " is mandatory");
}
if (encoderClass.equals("float")){
encoder = new FloatEncoder();
@@ -79,7 +78,7 @@ public class DelimitedPayloadTokenFilter
if (delim.length() == 1) {
delimiter = delim.charAt(0);
} else{
- throw new InitializationException("Delimiter must be one character only");
+ throw new IllegalArgumentException("Delimiter must be one character only");
}
}
}
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterFactory.java?rev=1365868&r1=1365867&r2=1365868&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterFactory.java Thu Jul 26 02:05:28 2012
@@ -19,7 +19,6 @@ package org.apache.lucene.analysis.paylo
import org.apache.lucene.analysis.payloads.NumericPayloadTokenFilter;
import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.util.InitializationException;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import java.util.Map;
@@ -43,7 +42,7 @@ public class NumericPayloadTokenFilterFa
String payloadArg = args.get("payload");
typeMatch = args.get("typeMatch");
if (payloadArg == null || typeMatch == null) {
- throw new InitializationException("Both payload and typeMatch are required");
+ throw new IllegalArgumentException("Both payload and typeMatch are required");
}
payload = Float.parseFloat(payloadArg);
}
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianLetterTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianLetterTokenizerFactory.java?rev=1365868&r1=1365867&r2=1365868&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianLetterTokenizerFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianLetterTokenizerFactory.java Thu Jul 26 02:05:28 2012
@@ -22,7 +22,6 @@ import java.util.Map;
import org.apache.lucene.analysis.ru.RussianLetterTokenizer;
import org.apache.lucene.analysis.standard.StandardTokenizerFactory; // javadocs
-import org.apache.lucene.analysis.util.InitializationException;
import org.apache.lucene.analysis.util.TokenizerFactory;
/** @deprecated Use {@link StandardTokenizerFactory} instead.
@@ -35,7 +34,7 @@ public class RussianLetterTokenizerFacto
public void init(Map<String, String> args) {
super.init(args);
if (args.containsKey("charset"))
- throw new InitializationException(
+ throw new IllegalArgumentException(
"The charset parameter is no longer supported. "
+ "Please process your documents as Unicode instead.");
assureMatchVersion();
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilterFactory.java?rev=1365868&r1=1365867&r2=1365868&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilterFactory.java Thu Jul 26 02:05:28 2012
@@ -19,7 +19,6 @@ package org.apache.lucene.analysis.shing
import org.apache.lucene.analysis.shingle.ShingleFilter;
import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.util.InitializationException;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import java.util.Map;
@@ -49,17 +48,17 @@ public class ShingleFilterFactory extend
maxShingleSize = getInt("maxShingleSize",
ShingleFilter.DEFAULT_MAX_SHINGLE_SIZE);
if (maxShingleSize < 2) {
- throw new InitializationException("Invalid maxShingleSize (" + maxShingleSize
+ throw new IllegalArgumentException("Invalid maxShingleSize (" + maxShingleSize
+ ") - must be at least 2");
}
minShingleSize = getInt("minShingleSize",
ShingleFilter.DEFAULT_MIN_SHINGLE_SIZE);
if (minShingleSize < 2) {
- throw new InitializationException("Invalid minShingleSize (" + minShingleSize
+ throw new IllegalArgumentException("Invalid minShingleSize (" + minShingleSize
+ ") - must be at least 2");
}
if (minShingleSize > maxShingleSize) {
- throw new InitializationException("Invalid minShingleSize (" + minShingleSize
+ throw new IllegalArgumentException("Invalid minShingleSize (" + minShingleSize
+ ") - must be no greater than maxShingleSize ("
+ maxShingleSize + ")");
}
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballPorterFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballPorterFilterFactory.java?rev=1365868&r1=1365867&r2=1365868&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballPorterFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballPorterFilterFactory.java Thu Jul 26 02:05:28 2012
@@ -49,14 +49,10 @@ public class SnowballPorterFilterFactory
private Class<?> stemClass;
- public void inform(ResourceLoader loader) {
+ public void inform(ResourceLoader loader) throws IOException {
String wordFiles = args.get(PROTECTED_TOKENS);
if (wordFiles != null) {
- try {
- protectedWords = getWordSet(loader, wordFiles, false);
- } catch (IOException e) {
- throw new InitializationException("IOException thrown while loading protected words", e);
- }
+ protectedWords = getWordSet(loader, wordFiles, false);
}
}
@@ -71,7 +67,7 @@ public class SnowballPorterFilterFactory
try {
stemClass = Class.forName("org.tartarus.snowball.ext." + language + "Stemmer");
} catch (ClassNotFoundException e) {
- throw new InitializationException("Can't find class for stemmer language " + language, e);
+ throw new IllegalArgumentException("Can't find class for stemmer language " + language, e);
}
}
@@ -80,7 +76,7 @@ public class SnowballPorterFilterFactory
try {
program = (SnowballProgram)stemClass.newInstance();
} catch (Exception e) {
- throw new InitializationException("Error instantiating stemmer for language " + language + "from class " + stemClass, e);
+ throw new RuntimeException("Error instantiating stemmer for language " + language + "from class " + stemClass, e);
}
if (protectedWords != null)
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/FSTSynonymFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/FSTSynonymFilterFactory.java?rev=1365868&r1=1365867&r2=1365868&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/FSTSynonymFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/FSTSynonymFilterFactory.java Thu Jul 26 02:05:28 2012
@@ -58,7 +58,7 @@ final class FSTSynonymFilterFactory exte
}
@Override
- public void inform(ResourceLoader loader) {
+ public void inform(ResourceLoader loader) throws IOException {
final boolean ignoreCase = getBoolean("ignoreCase", false);
this.ignoreCase = ignoreCase;
@@ -84,10 +84,10 @@ final class FSTSynonymFilterFactory exte
map = loadWordnetSynonyms(loader, true, analyzer);
} else {
// TODO: somehow make this more pluggable
- throw new InitializationException("Unrecognized synonyms format: " + format);
+ throw new IllegalArgumentException("Unrecognized synonyms format: " + format);
}
- } catch (Exception e) {
- throw new InitializationException("Exception thrown while loading synonyms", e);
+ } catch (ParseException e) {
+ throw new IOException("Exception thrown while loading synonyms", e);
}
}
@@ -98,7 +98,7 @@ final class FSTSynonymFilterFactory exte
final boolean expand = getBoolean("expand", true);
String synonyms = args.get("synonyms");
if (synonyms == null)
- throw new InitializationException("Missing required argument 'synonyms'.");
+ throw new IllegalArgumentException("Missing required argument 'synonyms'.");
CharsetDecoder decoder = Charset.forName("UTF-8").newDecoder()
.onMalformedInput(CodingErrorAction.REPORT)
@@ -126,7 +126,7 @@ final class FSTSynonymFilterFactory exte
final boolean expand = getBoolean("expand", true);
String synonyms = args.get("synonyms");
if (synonyms == null)
- throw new InitializationException("Missing required argument 'synonyms'.");
+ throw new IllegalArgumentException("Missing required argument 'synonyms'.");
CharsetDecoder decoder = Charset.forName("UTF-8").newDecoder()
.onMalformedInput(CodingErrorAction.REPORT)
@@ -147,7 +147,7 @@ final class FSTSynonymFilterFactory exte
return parser.build();
}
- private TokenizerFactory loadTokenizerFactory(ResourceLoader loader, String cname){
+ private TokenizerFactory loadTokenizerFactory(ResourceLoader loader, String cname) throws IOException {
TokenizerFactory tokFactory = loader.newInstance(cname, TokenizerFactory.class);
tokFactory.setLuceneMatchVersion(luceneMatchVersion);
tokFactory.init(args);
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SlowSynonymFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SlowSynonymFilterFactory.java?rev=1365868&r1=1365867&r2=1365868&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SlowSynonymFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SlowSynonymFilterFactory.java Thu Jul 26 02:05:28 2012
@@ -43,10 +43,10 @@ import java.util.List;
@Deprecated
final class SlowSynonymFilterFactory extends TokenFilterFactory implements ResourceLoaderAware {
- public void inform(ResourceLoader loader) {
+ public void inform(ResourceLoader loader) throws IOException {
String synonyms = args.get("synonyms");
if (synonyms == null)
- throw new InitializationException("Missing required argument 'synonyms'.");
+ throw new IllegalArgumentException("Missing required argument 'synonyms'.");
boolean ignoreCase = getBoolean("ignoreCase", false);
boolean expand = getBoolean("expand", true);
@@ -65,22 +65,18 @@ final class SlowSynonymFilterFactory ext
/**
* @return a list of all rules
*/
- protected Iterable<String> loadRules( String synonyms, ResourceLoader loader ) {
+ protected Iterable<String> loadRules( String synonyms, ResourceLoader loader ) throws IOException {
List<String> wlist=null;
- try {
- File synonymFile = new File(synonyms);
- if (synonymFile.exists()) {
- wlist = loader.getLines(synonyms);
- } else {
- List<String> files = splitFileNames(synonyms);
- wlist = new ArrayList<String>();
- for (String file : files) {
- List<String> lines = loader.getLines(file.trim());
- wlist.addAll(lines);
- }
+ File synonymFile = new File(synonyms);
+ if (synonymFile.exists()) {
+ wlist = loader.getLines(synonyms);
+ } else {
+ List<String> files = splitFileNames(synonyms);
+ wlist = new ArrayList<String>();
+ for (String file : files) {
+ List<String> lines = loader.getLines(file.trim());
+ wlist.addAll(lines);
}
- } catch (IOException e) {
- throw new InitializationException("IOException thrown while loading synonym rules", e);
}
return wlist;
}
@@ -88,7 +84,7 @@ final class SlowSynonymFilterFactory ext
private SlowSynonymMap synMap;
static void parseRules(Iterable<String> rules, SlowSynonymMap map, String mappingSep,
- String synSep, boolean expansion, TokenizerFactory tokFactory) {
+ String synSep, boolean expansion, TokenizerFactory tokFactory) throws IOException {
int count=0;
for (String rule : rules) {
// To use regexes, we need an expression that specifies an odd number of chars.
@@ -102,7 +98,7 @@ final class SlowSynonymFilterFactory ext
List<List<String>> target;
if (mapping.size() > 2) {
- throw new InitializationException("Invalid Synonym Rule:" + rule);
+ throw new IllegalArgumentException("Invalid Synonym Rule:" + rule);
} else if (mapping.size()==2) {
source = getSynList(mapping.get(0), synSep, tokFactory);
target = getSynList(mapping.get(1), synSep, tokFactory);
@@ -133,7 +129,7 @@ final class SlowSynonymFilterFactory ext
}
// a , b c , d e f => [[a],[b,c],[d,e,f]]
- private static List<List<String>> getSynList(String str, String separator, TokenizerFactory tokFactory) {
+ private static List<List<String>> getSynList(String str, String separator, TokenizerFactory tokFactory) throws IOException {
List<String> strList = splitSmart(str, separator, false);
// now split on whitespace to get a list of token strings
List<List<String>> synList = new ArrayList<List<String>>();
@@ -145,7 +141,7 @@ final class SlowSynonymFilterFactory ext
return synList;
}
- private static List<String> splitByTokenizer(String source, TokenizerFactory tokFactory){
+ private static List<String> splitByTokenizer(String source, TokenizerFactory tokFactory) throws IOException{
StringReader reader = new StringReader( source );
TokenStream ts = loadTokenizer(tokFactory, reader);
List<String> tokList = new ArrayList<String>();
@@ -155,16 +151,13 @@ final class SlowSynonymFilterFactory ext
if( termAtt.length() > 0 )
tokList.add( termAtt.toString() );
}
- } catch (IOException e) {
- throw new InitializationException("IOException thrown while tokenizing source", e);
- }
- finally{
+ } finally{
reader.close();
}
return tokList;
}
- private TokenizerFactory loadTokenizerFactory(ResourceLoader loader, String cname) {
+ private TokenizerFactory loadTokenizerFactory(ResourceLoader loader, String cname) throws IOException {
TokenizerFactory tokFactory = loader.newInstance(cname, TokenizerFactory.class);
tokFactory.setLuceneMatchVersion(luceneMatchVersion);
tokFactory.init( args );
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SlowSynonymMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SlowSynonymMap.java?rev=1365868&r1=1365867&r2=1365868&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SlowSynonymMap.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SlowSynonymMap.java Thu Jul 26 02:05:28 2012
@@ -19,7 +19,6 @@ package org.apache.lucene.analysis.synon
import org.apache.lucene.analysis.Token;
import org.apache.lucene.analysis.util.CharArrayMap;
-import org.apache.lucene.analysis.util.InitializationException;
import org.apache.lucene.util.Version;
import java.util.*;
@@ -72,7 +71,7 @@ class SlowSynonymMap {
}
if (currMap.synonyms != null && !mergeExisting) {
- throw new InitializationException("SynonymFilter: there is already a mapping for " + singleMatch);
+ throw new IllegalArgumentException("SynonymFilter: there is already a mapping for " + singleMatch);
}
List<Token> superset = currMap.synonyms==null ? replacement :
mergeTokens(Arrays.asList(currMap.synonyms), replacement);
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java?rev=1365868&r1=1365867&r2=1365868&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java Thu Jul 26 02:05:28 2012
@@ -17,11 +17,11 @@ package org.apache.lucene.analysis.synon
* limitations under the License.
*/
+import java.io.IOException;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.synonym.SynonymFilter;
-import org.apache.lucene.analysis.util.InitializationException;
import org.apache.lucene.util.Version;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
@@ -52,7 +52,7 @@ public class SynonymFilterFactory extend
// check if you use the new optional arg "format". this makes no sense for the old one,
// as its wired to solr's synonyms format only.
if (args.containsKey("format") && !args.get("format").equals("solr")) {
- throw new InitializationException("You must specify luceneMatchVersion >= 3.4 to use alternate synonyms formats");
+ throw new IllegalArgumentException("You must specify luceneMatchVersion >= 3.4 to use alternate synonyms formats");
}
delegator = new SlowSynonymFilterFactory();
}
@@ -66,7 +66,7 @@ public class SynonymFilterFactory extend
}
@Override
- public void inform(ResourceLoader loader) {
+ public void inform(ResourceLoader loader) throws IOException {
assert delegator != null : "init() was not called!";
((ResourceLoaderAware) delegator).inform(loader);
}
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AbstractAnalysisFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AbstractAnalysisFactory.java?rev=1365868&r1=1365867&r2=1365868&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AbstractAnalysisFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AbstractAnalysisFactory.java Thu Jul 26 02:05:28 2012
@@ -59,7 +59,7 @@ public abstract class AbstractAnalysisFa
* to inform user, that for this factory a {@link #luceneMatchVersion} is required */
protected final void assureMatchVersion() {
if (luceneMatchVersion == null) {
- throw new InitializationException("Configuration Error: Factory '" + this.getClass().getName() +
+ throw new IllegalArgumentException("Configuration Error: Factory '" + this.getClass().getName() +
"' needs a 'luceneMatchVersion' parameter");
}
}
@@ -86,7 +86,7 @@ public abstract class AbstractAnalysisFa
if (useDefault) {
return defaultVal;
}
- throw new InitializationException("Configuration Error: missing parameter '" + name + "'");
+ throw new IllegalArgumentException("Configuration Error: missing parameter '" + name + "'");
}
return Integer.parseInt(s);
}
@@ -99,7 +99,7 @@ public abstract class AbstractAnalysisFa
String s = args.get(name);
if (s==null) {
if (useDefault) return defaultVal;
- throw new InitializationException("Configuration Error: missing parameter '" + name + "'");
+ throw new IllegalArgumentException("Configuration Error: missing parameter '" + name + "'");
}
return Boolean.parseBoolean(s);
}
@@ -108,11 +108,11 @@ public abstract class AbstractAnalysisFa
try {
String pat = args.get(name);
if (null == pat) {
- throw new InitializationException("Configuration Error: missing parameter '" + name + "'");
+ throw new IllegalArgumentException("Configuration Error: missing parameter '" + name + "'");
}
return Pattern.compile(args.get(name));
} catch (PatternSyntaxException e) {
- throw new InitializationException
+ throw new IllegalArgumentException
("Configuration Error: '" + name + "' can not be parsed in " +
this.getClass().getSimpleName(), e);
}
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoaderAware.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoaderAware.java?rev=1365868&r1=1365867&r2=1365868&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoaderAware.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoaderAware.java Thu Jul 26 02:05:28 2012
@@ -17,6 +17,8 @@
package org.apache.lucene.analysis.util;
+import java.io.IOException;
+
/**
* Interface for a component that needs to be initialized by
* an implementation of {@link ResourceLoader}.
@@ -25,5 +27,5 @@ package org.apache.lucene.analysis.util;
*/
public interface ResourceLoaderAware {
- void inform(ResourceLoader loader);
+ void inform(ResourceLoader loader) throws IOException;
}
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationKeyFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationKeyFilterFactory.java?rev=1365868&r1=1365867&r2=1365868&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationKeyFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationKeyFilterFactory.java Thu Jul 26 02:05:28 2012
@@ -73,7 +73,7 @@ import org.apache.lucene.util.IOUtils;
public class CollationKeyFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent, ResourceLoaderAware {
private Collator collator;
- public void inform(ResourceLoader loader) {
+ public void inform(ResourceLoader loader) throws IOException {
String custom = args.get("custom");
String language = args.get("language");
String country = args.get("country");
@@ -82,11 +82,11 @@ public class CollationKeyFilterFactory e
String decomposition = args.get("decomposition");
if (custom == null && language == null)
- throw new InitializationException("Either custom or language is required.");
+ throw new IllegalArgumentException("Either custom or language is required.");
if (custom != null &&
(language != null || country != null || variant != null))
- throw new InitializationException("Cannot specify both language and custom. "
+ throw new IllegalArgumentException("Cannot specify both language and custom. "
+ "To tailor rules for a built-in language, see the javadocs for RuleBasedCollator. "
+ "Then save the entire customized ruleset to a file, and use with the custom parameter");
@@ -109,7 +109,7 @@ public class CollationKeyFilterFactory e
else if (strength.equalsIgnoreCase("identical"))
collator.setStrength(Collator.IDENTICAL);
else
- throw new InitializationException("Invalid strength: " + strength);
+ throw new IllegalArgumentException("Invalid strength: " + strength);
}
// set the decomposition flag, otherwise it will be the default.
@@ -121,7 +121,7 @@ public class CollationKeyFilterFactory e
else if (decomposition.equalsIgnoreCase("full"))
collator.setDecomposition(Collator.FULL_DECOMPOSITION);
else
- throw new InitializationException("Invalid decomposition: " + decomposition);
+ throw new IllegalArgumentException("Invalid decomposition: " + decomposition);
}
}
@@ -137,7 +137,7 @@ public class CollationKeyFilterFactory e
Locale locale;
if (language != null && country == null && variant != null)
- throw new InitializationException("To specify variant, country is required");
+ throw new IllegalArgumentException("To specify variant, country is required");
else if (language != null && country != null && variant != null)
locale = new Locale(language, country, variant);
else if (language != null && country != null)
@@ -152,18 +152,15 @@ public class CollationKeyFilterFactory e
* Read custom rules from a file, and create a RuleBasedCollator
* The file cannot support comments, as # might be in the rules!
*/
- private Collator createFromRules(String fileName, ResourceLoader loader) {
+ private Collator createFromRules(String fileName, ResourceLoader loader) throws IOException {
InputStream input = null;
try {
input = loader.openResource(fileName);
String rules = toUTF8String(input);
return new RuleBasedCollator(rules);
- } catch (IOException e) {
- // io error
- throw new InitializationException("IOException thrown while loading rules", e);
} catch (ParseException e) {
// invalid rules
- throw new InitializationException("ParseException thrown while parsing rules", e);
+ throw new IOException("ParseException thrown while parsing rules", e);
} finally {
IOUtils.closeWhileHandlingException(input);
}
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilterFactory.java?rev=1365868&r1=1365867&r2=1365868&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilterFactory.java Thu Jul 26 02:05:28 2012
@@ -17,7 +17,6 @@ package org.apache.lucene.analysis.charf
* limitations under the License.
*/
-import org.apache.lucene.analysis.util.InitializationException;
import org.apache.lucene.util.LuceneTestCase;
public class TestMappingCharFilterFactory extends LuceneTestCase {
@@ -29,7 +28,7 @@ public class TestMappingCharFilterFactor
f.parseString( "\\" );
fail( "escape character cannot be alone." );
}
- catch (InitializationException expected) {}
+ catch (IllegalArgumentException expected) {}
assertEquals( "unexpected escaped characters",
"\\\"\n\t\r\b\f", f.parseString( "\\\\\\\"\\n\\t\\r\\b\\f" ) );
@@ -42,7 +41,7 @@ public class TestMappingCharFilterFactor
f.parseString( "\\u000" );
fail( "invalid length check." );
}
- catch (InitializationException expected) {}
+ catch (IllegalArgumentException expected) {}
try {
f.parseString( "\\u123x" );
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAllAnalyzersHaveFactories.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAllAnalyzersHaveFactories.java?rev=1365868&r1=1365867&r2=1365868&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAllAnalyzersHaveFactories.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAllAnalyzersHaveFactories.java Thu Jul 26 02:05:28 2012
@@ -53,7 +53,6 @@ import org.apache.lucene.analysis.util.C
import org.apache.lucene.analysis.util.ResourceLoaderAware;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.util.TokenizerFactory;
-import org.apache.lucene.analysis.util.InitializationException;
import org.apache.lucene.util.LuceneTestCase;
/**
@@ -143,7 +142,7 @@ public class TestAllAnalyzersHaveFactori
if (!(instance instanceof ResourceLoaderAware)) {
assertSame(c, instance.create(new StringReader("")).getClass());
}
- } catch (InitializationException e) {
+ } catch (IllegalArgumentException e) {
// TODO: For now pass because some factories have not yet a default config that always works, some require ResourceLoader
}
} else if (TokenFilter.class.isAssignableFrom(c)) {
@@ -163,7 +162,7 @@ public class TestAllAnalyzersHaveFactori
assertSame(c, createdClazz);
}
}
- } catch (InitializationException e) {
+ } catch (IllegalArgumentException e) {
// TODO: For now pass because some factories have not yet a default config that always works, some require ResourceLoader
}
} else if (CharFilter.class.isAssignableFrom(c)) {
@@ -183,7 +182,7 @@ public class TestAllAnalyzersHaveFactori
assertSame(c, createdClazz);
}
}
- } catch (InitializationException e) {
+ } catch (IllegalArgumentException e) {
// TODO: For now pass because some factories have not yet a default config that always works, some require ResourceLoader
}
}