You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2015/11/05 11:27:47 UTC
svn commit: r1712735 - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/analysis/
lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/
lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/
lucene/core/ lucene/cor...
Author: romseygeek
Date: Thu Nov 5 10:27:46 2015
New Revision: 1712735
URL: http://svn.apache.org/viewvc?rev=1712735&view=rev
Log:
LUCENE-6884: Analyzer.tokenStream() and Tokenizer.setReader() don't need to throw IOException
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/lucene/analysis/ (props changed)
lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicAnalyzer.java
lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardAnalyzer.java
lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailAnalyzer.java
lucene/dev/branches/branch_5x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPerFieldAnalyzerWrapper.java
lucene/dev/branches/branch_5x/lucene/core/ (props changed)
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/analysis/Analyzer.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/analysis/Tokenizer.java
lucene/dev/branches/branch_5x/lucene/highlighter/ (props changed)
lucene/dev/branches/branch_5x/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java
lucene/dev/branches/branch_5x/lucene/memory/ (props changed)
lucene/dev/branches/branch_5x/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
lucene/dev/branches/branch_5x/lucene/suggest/ (props changed)
lucene/dev/branches/branch_5x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggesterTest.java
lucene/dev/branches/branch_5x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/FuzzySuggesterTest.java
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/contrib/ (props changed)
lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/TokenizeTextBuilder.java
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/AbstractSpatialPrefixTreeFieldType.java
Modified: lucene/dev/branches/branch_5x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/CHANGES.txt?rev=1712735&r1=1712734&r2=1712735&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/lucene/CHANGES.txt Thu Nov 5 10:27:46 2015
@@ -66,6 +66,9 @@ API Changes
* LUCENE-6870: DisjunctionMaxQuery#add is now deprecated, clauses should all be
provided at construction time. (Adrien Grand)
+* LUCENE-6884: Analyzer.tokenStream() and Tokenizer.setReader() are no longer
+ declared as throwing IOException. (Alan Woodward)
+
Optimizations
* LUCENE-6708: TopFieldCollector does not compute the score several times on the
Modified: lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicAnalyzer.java?rev=1712735&r1=1712734&r2=1712735&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicAnalyzer.java (original)
+++ lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicAnalyzer.java Thu Nov 5 10:27:46 2015
@@ -17,6 +17,9 @@ package org.apache.lucene.analysis.stand
* limitations under the License.
*/
+import java.io.IOException;
+import java.io.Reader;
+
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.core.LowerCaseFilter;
import org.apache.lucene.analysis.core.StopAnalyzer;
@@ -25,9 +28,6 @@ import org.apache.lucene.analysis.util.C
import org.apache.lucene.analysis.util.StopwordAnalyzerBase;
import org.apache.lucene.analysis.util.WordlistLoader;
-import java.io.IOException;
-import java.io.Reader;
-
/**
* Filters {@link ClassicTokenizer} with {@link ClassicFilter}, {@link
* LowerCaseFilter} and {@link StopFilter}, using a list of
@@ -94,7 +94,7 @@ public final class ClassicAnalyzer exten
tok = new StopFilter(tok, stopwords);
return new TokenStreamComponents(src, tok) {
@Override
- protected void setReader(final Reader reader) throws IOException {
+ protected void setReader(final Reader reader) {
src.setMaxTokenLength(ClassicAnalyzer.this.maxTokenLength);
super.setReader(reader);
}
Modified: lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardAnalyzer.java?rev=1712735&r1=1712734&r2=1712735&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardAnalyzer.java (original)
+++ lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardAnalyzer.java Thu Nov 5 10:27:46 2015
@@ -17,6 +17,9 @@ package org.apache.lucene.analysis.stand
* limitations under the License.
*/
+import java.io.IOException;
+import java.io.Reader;
+
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.core.LowerCaseFilter;
@@ -28,9 +31,6 @@ import org.apache.lucene.analysis.util.S
import org.apache.lucene.analysis.util.WordlistLoader;
import org.apache.lucene.util.Version;
-import java.io.IOException;
-import java.io.Reader;
-
/**
* Filters {@link StandardTokenizer} with {@link StandardFilter}, {@link
* LowerCaseFilter} and {@link StopFilter}, using a list of
@@ -100,7 +100,7 @@ public final class StandardAnalyzer exte
tok = new StopFilter(tok, stopwords);
return new TokenStreamComponents(src, tok) {
@Override
- protected void setReader(final Reader reader) throws IOException {
+ protected void setReader(final Reader reader) {
int m = StandardAnalyzer.this.maxTokenLength;
if (src instanceof StandardTokenizer) {
((StandardTokenizer)src).setMaxTokenLength(m);
Modified: lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailAnalyzer.java?rev=1712735&r1=1712734&r2=1712735&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailAnalyzer.java (original)
+++ lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailAnalyzer.java Thu Nov 5 10:27:46 2015
@@ -17,6 +17,9 @@ package org.apache.lucene.analysis.stand
* limitations under the License.
*/
+import java.io.IOException;
+import java.io.Reader;
+
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.core.LowerCaseFilter;
@@ -27,9 +30,6 @@ import org.apache.lucene.analysis.util.C
import org.apache.lucene.analysis.util.StopwordAnalyzerBase;
import org.apache.lucene.util.Version;
-import java.io.IOException;
-import java.io.Reader;
-
/**
* Filters {@link org.apache.lucene.analysis.standard.UAX29URLEmailTokenizer}
* with {@link org.apache.lucene.analysis.standard.StandardFilter},
@@ -101,7 +101,7 @@ public final class UAX29URLEmailAnalyzer
tok = new StopFilter(tok, stopwords);
return new TokenStreamComponents(src, tok) {
@Override
- protected void setReader(final Reader reader) throws IOException {
+ protected void setReader(final Reader reader) {
int m = UAX29URLEmailAnalyzer.this.maxTokenLength;
if (src instanceof UAX29URLEmailTokenizer) {
((UAX29URLEmailTokenizer)src).setMaxTokenLength(m);
Modified: lucene/dev/branches/branch_5x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPerFieldAnalyzerWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPerFieldAnalyzerWrapper.java?rev=1712735&r1=1712734&r2=1712735&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPerFieldAnalyzerWrapper.java (original)
+++ lucene/dev/branches/branch_5x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPerFieldAnalyzerWrapper.java Thu Nov 5 10:27:46 2015
@@ -1,6 +1,5 @@
package org.apache.lucene.analysis.miscellaneous;
-import java.io.IOException;
import java.io.Reader;
import java.util.Collections;
import java.util.Map;
@@ -16,7 +15,6 @@ import org.apache.lucene.analysis.core.S
import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.util.IOUtils;
-import org.apache.lucene.util.Rethrow;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -105,11 +103,7 @@ public class TestPerFieldAnalyzerWrapper
@Override
protected TokenStreamComponents wrapComponents(String fieldName, TokenStreamComponents components) {
- try {
- assertNotSame(specialAnalyzer.tokenStream("special", text), components.getTokenStream());
- } catch (IOException e) {
- Rethrow.rethrow(e);
- }
+ assertNotSame(specialAnalyzer.tokenStream("special", text), components.getTokenStream());
TokenFilter filter = new ASCIIFoldingFilter(components.getTokenStream());
return new TokenStreamComponents(components.getTokenizer(), filter);
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/analysis/Analyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/analysis/Analyzer.java?rev=1712735&r1=1712734&r2=1712735&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/analysis/Analyzer.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/analysis/Analyzer.java Thu Nov 5 10:27:46 2015
@@ -17,16 +17,15 @@ package org.apache.lucene.analysis;
* limitations under the License.
*/
-import org.apache.lucene.store.AlreadyClosedException;
-import org.apache.lucene.util.CloseableThreadLocal;
-import org.apache.lucene.util.Version;
-
import java.io.Closeable;
-import java.io.IOException;
import java.io.Reader;
import java.util.HashMap;
import java.util.Map;
+import org.apache.lucene.store.AlreadyClosedException;
+import org.apache.lucene.util.CloseableThreadLocal;
+import org.apache.lucene.util.Version;
+
/**
* An Analyzer builds TokenStreams, which analyze text. It thus represents a
* policy for extracting index terms from text.
@@ -131,11 +130,10 @@ public abstract class Analyzer implement
* @param reader the reader the streams source reads from
* @return TokenStream for iterating the analyzed content of <code>reader</code>
* @throws AlreadyClosedException if the Analyzer is closed.
- * @throws IOException if an i/o error occurs.
* @see #tokenStream(String, String)
*/
public final TokenStream tokenStream(final String fieldName,
- final Reader reader) throws IOException {
+ final Reader reader) {
TokenStreamComponents components = reuseStrategy.getReusableComponents(this, fieldName);
final Reader r = initReader(fieldName, reader);
if (components == null) {
@@ -165,10 +163,9 @@ public abstract class Analyzer implement
* @param text the String the streams source reads from
* @return TokenStream for iterating the analyzed content of <code>reader</code>
* @throws AlreadyClosedException if the Analyzer is closed.
- * @throws IOException if an i/o error occurs (may rarely happen for strings).
* @see #tokenStream(String, Reader)
*/
- public final TokenStream tokenStream(final String fieldName, final String text) throws IOException {
+ public final TokenStream tokenStream(final String fieldName, final String text) {
TokenStreamComponents components = reuseStrategy.getReusableComponents(this, fieldName);
@SuppressWarnings("resource") final ReusableStringReader strReader =
(components == null || components.reusableStringReader == null) ?
@@ -313,10 +310,8 @@ public abstract class Analyzer implement
*
* @param reader
* a reader to reset the source component
- * @throws IOException
- * if the component's reset method throws an {@link IOException}
*/
- protected void setReader(final Reader reader) throws IOException {
+ protected void setReader(final Reader reader) {
source.setReader(reader);
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/analysis/Tokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/analysis/Tokenizer.java?rev=1712735&r1=1712734&r2=1712735&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/analysis/Tokenizer.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/analysis/Tokenizer.java Thu Nov 5 10:27:46 2015
@@ -17,12 +17,12 @@ package org.apache.lucene.analysis;
* limitations under the License.
*/
+import java.io.IOException;
+import java.io.Reader;
+
import org.apache.lucene.util.AttributeFactory;
import org.apache.lucene.util.AttributeSource;
-import java.io.Reader;
-import java.io.IOException;
-
/** A Tokenizer is a TokenStream whose input is a Reader.
<p>
This is an abstract class; subclasses must override {@link #incrementToken()}
@@ -83,7 +83,7 @@ public abstract class Tokenizer extends
/** Expert: Set a new reader on the Tokenizer. Typically, an
* analyzer (in its tokenStream method) will use
* this to re-use a previously created tokenizer. */
- public final void setReader(Reader input) throws IOException {
+ public final void setReader(Reader input) {
if (input == null) {
throw new NullPointerException("input must not be null");
} else if (this.input != ILLEGAL_STATE_READER) {
Modified: lucene/dev/branches/branch_5x/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java?rev=1712735&r1=1712734&r2=1712735&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java (original)
+++ lucene/dev/branches/branch_5x/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java Thu Nov 5 10:27:46 2015
@@ -246,11 +246,7 @@ public class TokenSources {
@Deprecated // maintenance reasons LUCENE-6445
public static TokenStream getTokenStream(String field, String contents,
Analyzer analyzer) {
- try {
- return analyzer.tokenStream(field, contents);
- } catch (IOException ex) {
- throw new RuntimeException(ex);
- }
+ return analyzer.tokenStream(field, contents);
}
}
Modified: lucene/dev/branches/branch_5x/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java?rev=1712735&r1=1712734&r2=1712735&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java (original)
+++ lucene/dev/branches/branch_5x/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java Thu Nov 5 10:27:46 2015
@@ -283,13 +283,7 @@ public class MemoryIndex {
if (analyzer == null)
throw new IllegalArgumentException("analyzer must not be null");
- TokenStream stream;
- try {
- stream = analyzer.tokenStream(fieldName, text);
- } catch (IOException ex) {
- throw new RuntimeException(ex);
- }
-
+ TokenStream stream = analyzer.tokenStream(fieldName, text);
addField(fieldName, stream, 1.0f, analyzer.getPositionIncrementGap(fieldName), analyzer.getOffsetGap(fieldName));
}
Modified: lucene/dev/branches/branch_5x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggesterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggesterTest.java?rev=1712735&r1=1712734&r2=1712735&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggesterTest.java (original)
+++ lucene/dev/branches/branch_5x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggesterTest.java Thu Nov 5 10:27:46 2015
@@ -319,7 +319,7 @@ public class AnalyzingSuggesterTest exte
}
@Override
- protected void setReader(final Reader reader) throws IOException {
+ protected void setReader(final Reader reader) {
}
};
}
@@ -386,7 +386,7 @@ public class AnalyzingSuggesterTest exte
}
@Override
- protected void setReader(final Reader reader) throws IOException {
+ protected void setReader(final Reader reader) {
}
};
}
@@ -460,7 +460,7 @@ public class AnalyzingSuggesterTest exte
}
@Override
- protected void setReader(final Reader reader) throws IOException {
+ protected void setReader(final Reader reader) {
}
};
}
@@ -980,7 +980,7 @@ public class AnalyzingSuggesterTest exte
}
@Override
- protected void setReader(final Reader reader) throws IOException {
+ protected void setReader(final Reader reader) {
}
};
}
@@ -1049,7 +1049,7 @@ public class AnalyzingSuggesterTest exte
}
@Override
- protected void setReader(final Reader reader) throws IOException {
+ protected void setReader(final Reader reader) {
}
};
}
@@ -1122,7 +1122,7 @@ public class AnalyzingSuggesterTest exte
}
@Override
- protected void setReader(final Reader reader) throws IOException {
+ protected void setReader(final Reader reader) {
}
};
}
@@ -1182,7 +1182,7 @@ public class AnalyzingSuggesterTest exte
}
@Override
- protected void setReader(final Reader reader) throws IOException {
+ protected void setReader(final Reader reader) {
}
};
}
Modified: lucene/dev/branches/branch_5x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/FuzzySuggesterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/FuzzySuggesterTest.java?rev=1712735&r1=1712734&r2=1712735&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/FuzzySuggesterTest.java (original)
+++ lucene/dev/branches/branch_5x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/FuzzySuggesterTest.java Thu Nov 5 10:27:46 2015
@@ -273,7 +273,7 @@ public class FuzzySuggesterTest extends
}
@Override
- protected void setReader(final Reader reader) throws IOException {
+ protected void setReader(final Reader reader) {
}
};
}
@@ -350,7 +350,7 @@ public class FuzzySuggesterTest extends
}
@Override
- protected void setReader(final Reader reader) throws IOException {
+ protected void setReader(final Reader reader) {
}
};
}
@@ -420,7 +420,7 @@ public class FuzzySuggesterTest extends
}
@Override
- protected void setReader(final Reader reader) throws IOException {
+ protected void setReader(final Reader reader) {
}
};
}
Modified: lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/TokenizeTextBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/TokenizeTextBuilder.java?rev=1712735&r1=1712734&r2=1712735&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/TokenizeTextBuilder.java (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/TokenizeTextBuilder.java Thu Nov 5 10:27:46 2015
@@ -81,11 +81,8 @@ public final class TokenizeTextBuilder i
}
this.analyzer = fieldType.getIndexAnalyzer();
Preconditions.checkNotNull(analyzer);
- try { // register CharTermAttribute for later (implicit) reuse
- this.token = analyzer.tokenStream("content", reader).addAttribute(CharTermAttribute.class);
- } catch (IOException e) {
- throw new MorphlineCompilationException("Cannot create token stream", config, e);
- }
+ // register CharTermAttribute for later (implicit) reuse
+ this.token = analyzer.tokenStream("content", reader).addAttribute(CharTermAttribute.class);
Preconditions.checkNotNull(token);
validateArguments();
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java?rev=1712735&r1=1712734&r2=1712735&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java Thu Nov 5 10:27:46 2015
@@ -17,37 +17,47 @@
package org.apache.solr.handler;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.commons.lang.ArrayUtils;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
-import org.apache.lucene.analysis.tokenattributes.*;
+import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
+import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
+import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
+import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute;
+import org.apache.lucene.analysis.tokenattributes.TypeAttribute;
import org.apache.lucene.analysis.util.CharFilterFactory;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.util.TokenizerFactory;
-import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.util.ArrayUtil;
import org.apache.lucene.util.Attribute;
import org.apache.lucene.util.AttributeImpl;
-import org.apache.lucene.util.AttributeSource;
import org.apache.lucene.util.AttributeReflector;
-import org.apache.lucene.util.CharsRef;
-import org.apache.lucene.util.ArrayUtil;
+import org.apache.lucene.util.AttributeSource;
+import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.CharsRefBuilder;
import org.apache.lucene.util.IOUtils;
import org.apache.solr.analysis.TokenizerChain;
+import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
-import org.apache.solr.common.SolrException;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.schema.FieldType;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.*;
-
-import org.apache.commons.lang.ArrayUtils;
-
/**
* A base class for all analysis request handlers.
*
@@ -114,11 +124,7 @@ public abstract class AnalysisRequestHan
}
TokenStream tokenStream = tfac.create();
- try {
- ((Tokenizer)tokenStream).setReader(tokenizerChain.initReader(null, new StringReader(value)));
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
+ ((Tokenizer)tokenStream).setReader(tokenizerChain.initReader(null, new StringReader(value)));
List<AttributeSource> tokens = analyzeTokenStream(tokenStream);
namedList.add(tokenStream.getClass().getName(), convertTokensToNamedLists(tokens, context));
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/AbstractSpatialPrefixTreeFieldType.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/AbstractSpatialPrefixTreeFieldType.java?rev=1712735&r1=1712734&r2=1712735&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/AbstractSpatialPrefixTreeFieldType.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/AbstractSpatialPrefixTreeFieldType.java Thu Nov 5 10:27:46 2015
@@ -85,9 +85,13 @@ public abstract class AbstractSpatialPre
return new TokenStreamComponents(new KeywordTokenizer()) {
private Shape shape = null;
- protected void setReader(final Reader reader) throws IOException {
+ protected void setReader(final Reader reader) {
source.setReader(reader);
- shape = parseShape(IOUtils.toString(reader));
+ try {
+ shape = parseShape(IOUtils.toString(reader));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
}
public TokenStream getTokenStream() {