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/17 13:09:27 UTC
svn commit: r1362446 [2/2] - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/analysis/common/src/java/
lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/
lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/ lucene/ana...
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/analysis/HTMLStripCharFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/analysis/HTMLStripCharFilterFactory.java?rev=1362446&r1=1362445&r2=1362446&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/analysis/HTMLStripCharFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/analysis/HTMLStripCharFilterFactory.java Tue Jul 17 11:09:24 2012
@@ -18,10 +18,10 @@ package org.apache.solr.analysis;
* limitations under the License.
*/
-import org.apache.lucene.analysis.CharStream;
import org.apache.lucene.analysis.charfilter.HTMLStripCharFilter;
import org.apache.lucene.analysis.util.CharFilterFactory;
+import java.io.Reader;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
@@ -44,7 +44,7 @@ import java.util.regex.Pattern;
Set<String> escapedTags = null;
Pattern TAG_NAME_PATTERN = Pattern.compile("[^\\s,]+");
- public HTMLStripCharFilter create(CharStream input) {
+ public HTMLStripCharFilter create(Reader input) {
HTMLStripCharFilter charFilter;
if (null == escapedTags) {
charFilter = new HTMLStripCharFilter(input);
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/analysis/JapaneseIterationMarkCharFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/analysis/JapaneseIterationMarkCharFilterFactory.java?rev=1362446&r1=1362445&r2=1362446&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/analysis/JapaneseIterationMarkCharFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/analysis/JapaneseIterationMarkCharFilterFactory.java Tue Jul 17 11:09:24 2012
@@ -17,12 +17,13 @@ package org.apache.solr.analysis;
* limitations under the License.
*/
-import org.apache.lucene.analysis.CharStream;
+import org.apache.lucene.analysis.CharFilter;
import org.apache.lucene.analysis.ja.JapaneseIterationMarkCharFilter;
import org.apache.lucene.analysis.util.AbstractAnalysisFactory;
import org.apache.lucene.analysis.util.CharFilterFactory;
import org.apache.lucene.analysis.util.MultiTermAwareComponent;
+import java.io.Reader;
import java.util.Map;
/**
@@ -46,7 +47,7 @@ public class JapaneseIterationMarkCharFi
private boolean normalizeKana = true;
@Override
- public CharStream create(CharStream input) {
+ public CharFilter create(Reader input) {
return new JapaneseIterationMarkCharFilter(input, normalizeKanji, normalizeKana);
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/analysis/LegacyHTMLStripCharFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/analysis/LegacyHTMLStripCharFilter.java?rev=1362446&r1=1362445&r2=1362446&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/analysis/LegacyHTMLStripCharFilter.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/analysis/LegacyHTMLStripCharFilter.java Tue Jul 17 11:09:24 2012
@@ -26,8 +26,6 @@ import java.util.HashMap;
import java.util.Set;
import org.apache.lucene.analysis.charfilter.BaseCharFilter;
-import org.apache.lucene.analysis.CharReader;
-import org.apache.lucene.analysis.CharStream;
/**
* <p>
@@ -72,21 +70,21 @@ public class LegacyHTMLStripCharFilter e
public static void main(String[] args) throws IOException {
Reader in = new LegacyHTMLStripCharFilter(
- CharReader.get(new InputStreamReader(System.in, Charset.defaultCharset())));
+ new InputStreamReader(System.in, Charset.defaultCharset()));
int ch;
while ( (ch=in.read()) != -1 ) System.out.print((char)ch);
}
- public LegacyHTMLStripCharFilter(CharStream source) {
- super(source.markSupported() ? source : CharReader.get(new BufferedReader(source)));
+ public LegacyHTMLStripCharFilter(Reader source) {
+ super(source.markSupported() ? source : new BufferedReader(source));
}
- public LegacyHTMLStripCharFilter(CharStream source, Set<String> escapedTags){
+ public LegacyHTMLStripCharFilter(Reader source, Set<String> escapedTags){
this(source);
this.escapedTags = escapedTags;
}
- public LegacyHTMLStripCharFilter(CharStream source, Set<String> escapedTags, int readAheadLimit){
+ public LegacyHTMLStripCharFilter(Reader source, Set<String> escapedTags, int readAheadLimit){
this(source);
this.escapedTags = escapedTags;
this.readAheadLimit = readAheadLimit;
@@ -105,7 +103,7 @@ public class LegacyHTMLStripCharFilter e
return ch;
}
numRead++;
- return input.read();
+ return in.read();
}
private int nextSkipWS() throws IOException {
@@ -120,7 +118,7 @@ public class LegacyHTMLStripCharFilter e
return pushed.charAt(len-1);
}
numRead++;
- int ch = input.read();
+ int ch = in.read();
push(ch);
return ch;
}
@@ -182,11 +180,11 @@ public class LegacyHTMLStripCharFilter e
private void saveState() throws IOException {
lastMark = numRead;
- input.mark(readAheadLimit);
+ in.mark(readAheadLimit);
}
private void restoreState() throws IOException {
- input.reset();
+ in.reset();
pushed.setLength(0);
}
@@ -775,12 +773,6 @@ public class LegacyHTMLStripCharFilter e
return i;
}
- @Override
- public void close() throws IOException {
- input.close();
- }
-
-
private static final HashMap<String,Character> entityTable;
static {
entityTable = new HashMap<String,Character>();
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/analysis/LegacyHTMLStripCharFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/analysis/LegacyHTMLStripCharFilterFactory.java?rev=1362446&r1=1362445&r2=1362446&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/analysis/LegacyHTMLStripCharFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/analysis/LegacyHTMLStripCharFilterFactory.java Tue Jul 17 11:09:24 2012
@@ -18,7 +18,8 @@ package org.apache.solr.analysis;
* limitations under the License.
*/
-import org.apache.lucene.analysis.CharStream;
+import java.io.Reader;
+
import org.apache.lucene.analysis.util.CharFilterFactory;
/**
@@ -52,7 +53,7 @@ import org.apache.lucene.analysis.util.C
@Deprecated
public class LegacyHTMLStripCharFilterFactory extends CharFilterFactory {
- public LegacyHTMLStripCharFilter create(CharStream input) {
+ public LegacyHTMLStripCharFilter create(Reader input) {
return new LegacyHTMLStripCharFilter(input);
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/analysis/MappingCharFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/analysis/MappingCharFilterFactory.java?rev=1362446&r1=1362445&r2=1362446&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/analysis/MappingCharFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/analysis/MappingCharFilterFactory.java Tue Jul 17 11:09:24 2012
@@ -19,12 +19,13 @@ package org.apache.solr.analysis;
import java.io.File;
import java.io.IOException;
+import java.io.Reader;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.lucene.analysis.CharStream;
+import org.apache.lucene.analysis.CharFilter;
import org.apache.lucene.analysis.charfilter.MappingCharFilter;
import org.apache.lucene.analysis.charfilter.NormalizeCharMap;
import org.apache.lucene.analysis.util.*;
@@ -78,7 +79,7 @@ public class MappingCharFilterFactory ex
}
}
- public CharStream create(CharStream input) {
+ public CharFilter create(Reader input) {
return new MappingCharFilter(normMap,input);
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/analysis/PatternReplaceCharFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/analysis/PatternReplaceCharFilterFactory.java?rev=1362446&r1=1362445&r2=1362446&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/analysis/PatternReplaceCharFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/analysis/PatternReplaceCharFilterFactory.java Tue Jul 17 11:09:24 2012
@@ -17,10 +17,11 @@
package org.apache.solr.analysis;
+import java.io.Reader;
import java.util.Map;
import java.util.regex.Pattern;
-import org.apache.lucene.analysis.CharStream;
+import org.apache.lucene.analysis.CharFilter;
import org.apache.lucene.analysis.pattern.PatternReplaceCharFilter;
import org.apache.lucene.analysis.util.CharFilterFactory;
@@ -57,7 +58,7 @@ public class PatternReplaceCharFilterFac
blockDelimiters = args.get( "blockDelimiters" );
}
- public CharStream create(CharStream input) {
+ public CharFilter create(Reader input) {
return new PatternReplaceCharFilter( p, replacement, maxBlockChars, blockDelimiters, input );
}
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/analysis/PersianCharFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/analysis/PersianCharFilterFactory.java?rev=1362446&r1=1362445&r2=1362446&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/analysis/PersianCharFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/analysis/PersianCharFilterFactory.java Tue Jul 17 11:09:24 2012
@@ -17,7 +17,9 @@ package org.apache.solr.analysis;
* limitations under the License.
*/
-import org.apache.lucene.analysis.CharStream;
+import java.io.Reader;
+
+import org.apache.lucene.analysis.CharFilter;
import org.apache.lucene.analysis.fa.PersianCharFilter;
import org.apache.lucene.analysis.util.AbstractAnalysisFactory;
import org.apache.lucene.analysis.util.CharFilterFactory;
@@ -37,7 +39,7 @@ import org.apache.lucene.analysis.util.M
public class PersianCharFilterFactory extends CharFilterFactory implements MultiTermAwareComponent {
@Override
- public CharStream create(CharStream input) {
+ public CharFilter create(Reader input) {
return new PersianCharFilter(input);
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/analysis/TokenizerChain.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/analysis/TokenizerChain.java?rev=1362446&r1=1362445&r2=1362446&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/analysis/TokenizerChain.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/analysis/TokenizerChain.java Tue Jul 17 11:09:24 2012
@@ -50,7 +50,7 @@ public final class TokenizerChain extend
@Override
public Reader initReader(String fieldName, Reader reader) {
if (charFilters != null && charFilters.length > 0) {
- CharStream cs = CharReader.get( reader );
+ Reader cs = reader;
for (CharFilterFactory charFilter : charFilters) {
cs = charFilter.create(cs);
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java?rev=1362446&r1=1362445&r2=1362446&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java Tue Jul 17 11:09:24 2012
@@ -18,8 +18,6 @@
package org.apache.solr.handler;
import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.CharReader;
-import org.apache.lucene.analysis.CharStream;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.*;
import org.apache.lucene.analysis.util.CharFilterFactory;
@@ -41,6 +39,7 @@ import org.apache.solr.response.SolrQuer
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;
@@ -106,7 +105,7 @@ public abstract class AnalysisRequestHan
if( cfiltfacs != null ){
String source = value;
for(CharFilterFactory cfiltfac : cfiltfacs ){
- CharStream reader = CharReader.get(new StringReader(source));
+ Reader reader = new StringReader(source);
reader = cfiltfac.create(reader);
source = writeCharStream(namedList, reader);
}
@@ -287,7 +286,7 @@ public abstract class AnalysisRequestHan
return tokensNamedLists;
}
- private String writeCharStream(NamedList<Object> out, CharStream input ){
+ private String writeCharStream(NamedList<Object> out, Reader input ){
final int BUFFER_SIZE = 1024;
char[] buf = new char[BUFFER_SIZE];
int len = 0;
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/HTMLStripFieldUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/HTMLStripFieldUpdateProcessorFactory.java?rev=1362446&r1=1362445&r2=1362446&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/HTMLStripFieldUpdateProcessorFactory.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/HTMLStripFieldUpdateProcessorFactory.java Tue Jul 17 11:09:24 2012
@@ -21,7 +21,6 @@ import org.apache.solr.core.SolrCore;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
-import org.apache.lucene.analysis.CharReader;
import org.apache.lucene.analysis.charfilter.HTMLStripCharFilter;
import org.apache.commons.io.IOUtils;
@@ -69,7 +68,7 @@ public final class HTMLStripFieldUpdateP
Reader in = null;
try {
in = new HTMLStripCharFilter
- (CharReader.get(new StringReader(s.toString())));
+ (new StringReader(s.toString()));
IOUtils.copy(in, result);
return result.toString();
} catch (IOException e) {
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/analysis/LegacyHTMLStripCharFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/analysis/LegacyHTMLStripCharFilterTest.java?rev=1362446&r1=1362445&r2=1362446&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/analysis/LegacyHTMLStripCharFilterTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/analysis/LegacyHTMLStripCharFilterTest.java Tue Jul 17 11:09:24 2012
@@ -28,7 +28,6 @@ import java.util.Set;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
-import org.apache.lucene.analysis.CharReader;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.util._TestUtil;
@@ -45,7 +44,7 @@ public class LegacyHTMLStripCharFilterTe
String gold = " this is some text here is a link and " +
"another link . " +
"This is an entity: & plus a <. Here is an &. ";
- LegacyHTMLStripCharFilter reader = new LegacyHTMLStripCharFilter(CharReader.get(new StringReader(html)));
+ LegacyHTMLStripCharFilter reader = new LegacyHTMLStripCharFilter(new StringReader(html));
StringBuilder builder = new StringBuilder();
int ch = -1;
char [] goldArray = gold.toCharArray();
@@ -63,7 +62,7 @@ public class LegacyHTMLStripCharFilterTe
//Some sanity checks, but not a full-fledged check
public void testHTML() throws Exception {
InputStream stream = getClass().getResourceAsStream("htmlStripReaderTest.html");
- LegacyHTMLStripCharFilter reader = new LegacyHTMLStripCharFilter(CharReader.get(new InputStreamReader(stream, "UTF-8")));
+ LegacyHTMLStripCharFilter reader = new LegacyHTMLStripCharFilter(new InputStreamReader(stream, "UTF-8"));
StringBuilder builder = new StringBuilder();
int ch = -1;
while ((ch = reader.read()) != -1){
@@ -83,7 +82,7 @@ public class LegacyHTMLStripCharFilterTe
String gold = "\u0393";
Set<String> set = new HashSet<String>();
set.add("reserved");
- Reader reader = new LegacyHTMLStripCharFilter(CharReader.get(new StringReader(test)), set);
+ Reader reader = new LegacyHTMLStripCharFilter(new StringReader(test), set);
StringBuilder builder = new StringBuilder();
int ch = 0;
while ((ch = reader.read()) != -1){
@@ -100,7 +99,7 @@ public class LegacyHTMLStripCharFilterTe
String gold = " <foo> \u00DCbermensch = \u0393 bar \u0393";
Set<String> set = new HashSet<String>();
set.add("reserved");
- Reader reader = new LegacyHTMLStripCharFilter(CharReader.get(new StringReader(test)), set);
+ Reader reader = new LegacyHTMLStripCharFilter(new StringReader(test), set);
StringBuilder builder = new StringBuilder();
int ch = 0;
while ((ch = reader.read()) != -1){
@@ -117,7 +116,7 @@ public class LegacyHTMLStripCharFilterTe
String gold = " <junk/> ! @ and â";
Set<String> set = new HashSet<String>();
set.add("reserved");
- Reader reader = new LegacyHTMLStripCharFilter(CharReader.get(new StringReader(test)), set);
+ Reader reader = new LegacyHTMLStripCharFilter(new StringReader(test), set);
StringBuilder builder = new StringBuilder();
int ch = 0;
while ((ch = reader.read()) != -1){
@@ -133,7 +132,7 @@ public class LegacyHTMLStripCharFilterTe
String test = "aaa bbb <reserved ccc=\"ddddd\"> eeee </reserved> ffff <reserved ggg=\"hhhh\"/> <other/>";
Set<String> set = new HashSet<String>();
set.add("reserved");
- Reader reader = new LegacyHTMLStripCharFilter(CharReader.get(new StringReader(test)), set);
+ Reader reader = new LegacyHTMLStripCharFilter(new StringReader(test), set);
StringBuilder builder = new StringBuilder();
int ch = 0;
while ((ch = reader.read()) != -1){
@@ -150,7 +149,7 @@ public class LegacyHTMLStripCharFilterTe
public void testMalformedHTML() throws Exception {
String test = "a <a hr<ef=aa<a>> </close</a>";
String gold = "a <a hr<ef=aa > </close ";
- Reader reader = new LegacyHTMLStripCharFilter(CharReader.get(new StringReader(test)));
+ Reader reader = new LegacyHTMLStripCharFilter(new StringReader(test));
StringBuilder builder = new StringBuilder();
int ch = 0;
while ((ch = reader.read()) != -1){
@@ -199,7 +198,7 @@ public class LegacyHTMLStripCharFilterTe
private void processBuffer(String test, String assertMsg) throws IOException {
// System.out.println("-------------------processBuffer----------");
- Reader reader = new LegacyHTMLStripCharFilter(CharReader.get(new BufferedReader(new StringReader(test))));//force the use of BufferedReader
+ Reader reader = new LegacyHTMLStripCharFilter(new BufferedReader(new StringReader(test)));//force the use of BufferedReader
int ch = 0;
StringBuilder builder = new StringBuilder();
try {
@@ -216,7 +215,7 @@ public class LegacyHTMLStripCharFilterTe
String test = "<!--- three dashes, still a valid comment ---> ";
String gold = " ";
- Reader reader = new LegacyHTMLStripCharFilter(CharReader.get(new BufferedReader(new StringReader(test))));//force the use of BufferedReader
+ Reader reader = new LegacyHTMLStripCharFilter(new BufferedReader(new StringReader(test)));//force the use of BufferedReader
int ch = 0;
StringBuilder builder = new StringBuilder();
try {
@@ -231,7 +230,7 @@ public class LegacyHTMLStripCharFilterTe
public void doTestOffsets(String in) throws Exception {
- LegacyHTMLStripCharFilter reader = new LegacyHTMLStripCharFilter(CharReader.get(new BufferedReader(new StringReader(in))));
+ LegacyHTMLStripCharFilter reader = new LegacyHTMLStripCharFilter(new BufferedReader(new StringReader(in)));
int ch = 0;
int off = 0; // offset in the reader
int strOff = -1; // offset in the original string
@@ -268,7 +267,7 @@ public class LegacyHTMLStripCharFilterTe
@Override
protected Reader initReader(String fieldName, Reader reader) {
- return new LegacyHTMLStripCharFilter(CharReader.get(new BufferedReader(reader)));
+ return new LegacyHTMLStripCharFilter(new BufferedReader(reader));
}
};
@@ -280,7 +279,7 @@ public class LegacyHTMLStripCharFilterTe
int maxNumElements = 10000;
String text = _TestUtil.randomHtmlishString(random(), maxNumElements);
Reader reader
- = new LegacyHTMLStripCharFilter(CharReader.get(new StringReader(text)));
+ = new LegacyHTMLStripCharFilter(new StringReader(text));
while (reader.read() != -1);
}
@@ -315,7 +314,7 @@ public class LegacyHTMLStripCharFilterTe
}
}
Reader reader = new LegacyHTMLStripCharFilter
- (CharReader.get(new StringReader(text.toString())));
+ (new StringReader(text.toString()));
while (reader.read() != -1);
}
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/analysis/TestArabicFilters.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/analysis/TestArabicFilters.java?rev=1362446&r1=1362445&r2=1362446&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/analysis/TestArabicFilters.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/analysis/TestArabicFilters.java Tue Jul 17 11:09:24 2012
@@ -23,7 +23,6 @@ import java.util.Collections;
import java.util.Map;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
-import org.apache.lucene.analysis.CharReader;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
@@ -92,7 +91,7 @@ public class TestArabicFilters extends B
tokenizerFactory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
Map<String, String> args = Collections.emptyMap();
tokenizerFactory.init(args);
- TokenStream stream = tokenizerFactory.create(charfilterFactory.create(CharReader.get(reader)));
+ TokenStream stream = tokenizerFactory.create(charfilterFactory.create(reader));
assertTokenStreamContents(stream, new String[] { "Ù
Û", "Ø®Ùرد" });
}
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/analysis/TestHTMLStripCharFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/analysis/TestHTMLStripCharFilterFactory.java?rev=1362446&r1=1362445&r2=1362446&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/analysis/TestHTMLStripCharFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/analysis/TestHTMLStripCharFilterFactory.java Tue Jul 17 11:09:24 2012
@@ -38,7 +38,7 @@ public class TestHTMLStripCharFilterFact
Map<String,String> args = new HashMap<String,String>();
args.put("escapedTags", "a, Title");
factory.init(args);
- CharStream cs = factory.create(CharReader.get(new StringReader(text)));
+ CharFilter cs = factory.create(new StringReader(text));
TokenStream ts = new MockTokenizer(cs, MockTokenizer.WHITESPACE, false);
assertTokenStreamContents(ts,
new String[] { "this", "is", "only", "a", "test." },
@@ -53,7 +53,7 @@ public class TestHTMLStripCharFilterFact
HTMLStripCharFilterFactory factory = new HTMLStripCharFilterFactory();
Map<String,String> args = new HashMap<String,String>();
factory.init(args);
- CharStream cs = factory.create(CharReader.get(new StringReader(text)));
+ CharFilter cs = factory.create(new StringReader(text));
TokenStream ts = new MockTokenizer(cs, MockTokenizer.WHITESPACE, false);
assertTokenStreamContents(ts,
new String[] { "this", "is", "only", "a", "test." },
@@ -69,7 +69,7 @@ public class TestHTMLStripCharFilterFact
Map<String,String> args = new HashMap<String,String>();
args.put("escapedTags", "U i");
factory.init(args);
- CharStream cs = factory.create(CharReader.get(new StringReader(text)));
+ CharFilter cs = factory.create(new StringReader(text));
TokenStream ts = new MockTokenizer(cs, MockTokenizer.WHITESPACE, false);
assertTokenStreamContents(ts,
new String[] { "<u>this</u>", "is", "only", "a", "<I>test</I>." },
@@ -85,7 +85,7 @@ public class TestHTMLStripCharFilterFact
Map<String,String> args = new HashMap<String,String>();
args.put("escapedTags", ",, , ");
factory.init(args);
- CharStream cs = factory.create(CharReader.get(new StringReader(text)));
+ CharFilter cs = factory.create(new StringReader(text));
TokenStream ts = new MockTokenizer(cs, MockTokenizer.WHITESPACE, false);
assertTokenStreamContents(ts,
new String[] { "this", "is", "only", "a", "test." },
@@ -101,7 +101,7 @@ public class TestHTMLStripCharFilterFact
Map<String,String> args = new HashMap<String,String>();
args.put("escapedTags", "");
factory.init(args);
- CharStream cs = factory.create(CharReader.get(new StringReader(text)));
+ CharFilter cs = factory.create(new StringReader(text));
TokenStream ts = new MockTokenizer(cs, MockTokenizer.WHITESPACE, false);
assertTokenStreamContents(ts,
new String[] { "this", "is", "only", "a", "test." },
@@ -117,7 +117,7 @@ public class TestHTMLStripCharFilterFact
Map<String,String> args = new HashMap<String,String>();
args.put("escapedTags", ", B\r\n\t");
factory.init(args);
- CharStream cs = factory.create(CharReader.get(new StringReader(text)));
+ CharFilter cs = factory.create(new StringReader(text));
TokenStream ts = new MockTokenizer(cs, MockTokenizer.WHITESPACE, false);
assertTokenStreamContents(ts,
new String[] { "this", "is", "<b>only</b>", "a", "test." },
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/analysis/TestJapaneseIterationMarkCharFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/analysis/TestJapaneseIterationMarkCharFilterFactory.java?rev=1362446&r1=1362445&r2=1362446&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/analysis/TestJapaneseIterationMarkCharFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/analysis/TestJapaneseIterationMarkCharFilterFactory.java Tue Jul 17 11:09:24 2012
@@ -18,8 +18,7 @@ package org.apache.solr.analysis;
*/
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
-import org.apache.lucene.analysis.CharReader;
-import org.apache.lucene.analysis.CharStream;
+import org.apache.lucene.analysis.CharFilter;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.solr.core.SolrResourceLoader;
@@ -38,7 +37,7 @@ public class TestJapaneseIterationMarkCh
public void testIterationMarksWithKeywordTokenizer() throws IOException {
final String text = "æã
馬鹿ã
ã
ããã¨ããããããã¹ã¾";
JapaneseIterationMarkCharFilterFactory filterFactory = new JapaneseIterationMarkCharFilterFactory();
- CharStream filter = filterFactory.create(CharReader.get(new StringReader(text)));
+ CharFilter filter = filterFactory.create(new StringReader(text));
TokenStream tokenStream = new MockTokenizer(filter, MockTokenizer.KEYWORD, false);
assertTokenStreamContents(tokenStream, new String[]{"ææ馬鹿馬鹿ããã¨ããã©ãããã¹ãº"});
}
@@ -53,8 +52,8 @@ public class TestJapaneseIterationMarkCh
Map<String, String> filterArgs = Collections.emptyMap();
filterFactory.init(filterArgs);
- CharStream filter = filterFactory.create(
- CharReader.get(new StringReader("æã
馬鹿ã
ã
ããã¨ããããããã¹ã¾"))
+ CharFilter filter = filterFactory.create(
+ new StringReader("æã
馬鹿ã
ã
ããã¨ããããããã¹ã¾")
);
TokenStream tokenStream = tokenizerFactory.create(filter);
assertTokenStreamContents(tokenStream, new String[]{"ææ", "馬鹿馬鹿ãã", "ã¨ããã©ãã", "ã", "ã¹ãº"});
@@ -72,8 +71,8 @@ public class TestJapaneseIterationMarkCh
filterArgs.put("normalizeKana", "false");
filterFactory.init(filterArgs);
- CharStream filter = filterFactory.create(
- CharReader.get(new StringReader("æã
馬鹿ã
ã
ããã¨ããããããã¹ã¾"))
+ CharFilter filter = filterFactory.create(
+ new StringReader("æã
馬鹿ã
ã
ããã¨ããããããã¹ã¾")
);
TokenStream tokenStream = tokenizerFactory.create(filter);
assertTokenStreamContents(tokenStream, new String[]{"ææ", "馬鹿馬鹿ãã", "ã¨ãã", "ã", "ã", "ã", "ãã¹", "ã¾"});
@@ -91,8 +90,8 @@ public class TestJapaneseIterationMarkCh
filterArgs.put("normalizeKana", "true");
filterFactory.init(filterArgs);
- CharStream filter = filterFactory.create(
- CharReader.get(new StringReader("æã
馬鹿ã
ã
ããã¨ããããããã¹ã¾"))
+ CharFilter filter = filterFactory.create(
+ new StringReader("æã
馬鹿ã
ã
ããã¨ããããããã¹ã¾")
);
TokenStream tokenStream = tokenizerFactory.create(filter);
assertTokenStreamContents(tokenStream, new String[]{"æã
", "馬鹿", "ã
", "ã
", "ãã", "ã¨ããã©ãã", "ã", "ã¹ãº"});
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/analysis/TestPatternReplaceCharFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/analysis/TestPatternReplaceCharFilterFactory.java?rev=1362446&r1=1362445&r2=1362446&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/analysis/TestPatternReplaceCharFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/analysis/TestPatternReplaceCharFilterFactory.java Tue Jul 17 11:09:24 2012
@@ -39,8 +39,8 @@ public class TestPatternReplaceCharFilte
args.put("pattern", "(aa)\\s+(bb)\\s+(cc)");
args.put("replacement", "$1$2$3");
factory.init(args);
- CharStream cs = factory.create(
- CharReader.get( new StringReader( BLOCK ) ) );
+ CharFilter cs = factory.create(
+ new StringReader( BLOCK ) );
TokenStream ts = new MockTokenizer(cs, MockTokenizer.WHITESPACE, false);
assertTokenStreamContents(ts,
new String[] { "this", "is", "test." },
@@ -56,8 +56,8 @@ public class TestPatternReplaceCharFilte
Map<String,String> args = new HashMap<String,String>();
args.put("pattern", "(aa)\\s+(bb)\\s+(cc)");
factory.init(args);
- CharStream cs = factory.create(
- CharReader.get( new StringReader( BLOCK ) ) );
+ CharFilter cs = factory.create(
+ new StringReader( BLOCK ) );
TokenStream ts = new MockTokenizer(cs, MockTokenizer.WHITESPACE, false);
ts.reset();
assertFalse(ts.incrementToken());
@@ -75,8 +75,8 @@ public class TestPatternReplaceCharFilte
args.put("pattern", "(aa)\\s+(bb)\\s+(cc)");
args.put("replacement", "$1#$2#$3");
factory.init(args);
- CharStream cs = factory.create(
- CharReader.get( new StringReader( BLOCK ) ) );
+ CharFilter cs = factory.create(
+ new StringReader( BLOCK ) );
TokenStream ts = new MockTokenizer(cs, MockTokenizer.WHITESPACE, false);
assertTokenStreamContents(ts,
new String[] { "aa#bb#cc" },
Modified: lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/analysis/MockCharFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/analysis/MockCharFilterFactory.java?rev=1362446&r1=1362445&r2=1362446&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/analysis/MockCharFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/analysis/MockCharFilterFactory.java Tue Jul 17 11:09:24 2012
@@ -17,9 +17,10 @@ package org.apache.solr.analysis;
* limitations under the License.
*/
+import java.io.Reader;
import java.util.Map;
-import org.apache.lucene.analysis.CharStream;
+import org.apache.lucene.analysis.CharFilter;
import org.apache.lucene.analysis.MockCharFilter;
import org.apache.lucene.analysis.util.CharFilterFactory;
@@ -40,7 +41,7 @@ public class MockCharFilterFactory exten
}
@Override
- public CharStream create(CharStream input) {
+ public CharFilter create(Reader input) {
return new MockCharFilter(input, remainder);
}
}