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/02/09 20:59:53 UTC
svn commit: r1242497 [3/3] - in /lucene/dev/trunk: lucene/ lucene/contrib/
modules/analysis/
modules/analysis/common/src/java/org/apache/lucene/analysis/ar/
modules/analysis/common/src/java/org/apache/lucene/analysis/bg/
modules/analysis/common/src/jav...
Modified: lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/ro/TestRomanianAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/ro/TestRomanianAnalyzer.java?rev=1242497&r1=1242496&r2=1242497&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/ro/TestRomanianAnalyzer.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/ro/TestRomanianAnalyzer.java Thu Feb 9 19:59:50 2012
@@ -18,11 +18,10 @@ package org.apache.lucene.analysis.ro;
*/
import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
+import org.apache.lucene.analysis.util.CharArraySet;
public class TestRomanianAnalyzer extends BaseTokenStreamTestCase {
/** This test fails with NPE when the
@@ -43,8 +42,7 @@ public class TestRomanianAnalyzer extend
/** test use of exclusion set */
public void testExclude() throws IOException {
- Set<String> exclusionSet = new HashSet<String>();
- exclusionSet.add("absenţa");
+ CharArraySet exclusionSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("absenţa"), false);
Analyzer a = new RomanianAnalyzer(TEST_VERSION_CURRENT,
RomanianAnalyzer.getDefaultStopSet(), exclusionSet);
checkOneTermReuse(a, "absenţa", "absenţa");
Modified: lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishAnalyzer.java?rev=1242497&r1=1242496&r2=1242497&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishAnalyzer.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishAnalyzer.java Thu Feb 9 19:59:50 2012
@@ -18,12 +18,10 @@ package org.apache.lucene.analysis.sv;
*/
import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
-import org.apache.lucene.analysis.hu.HungarianAnalyzer;
+import org.apache.lucene.analysis.util.CharArraySet;
public class TestSwedishAnalyzer extends BaseTokenStreamTestCase {
/** This test fails with NPE when the
@@ -44,8 +42,7 @@ public class TestSwedishAnalyzer extends
/** test use of exclusion set */
public void testExclude() throws IOException {
- Set<String> exclusionSet = new HashSet<String>();
- exclusionSet.add("jaktkarlarne");
+ CharArraySet exclusionSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("jaktkarlarne"), false);
Analyzer a = new SwedishAnalyzer(TEST_VERSION_CURRENT,
SwedishAnalyzer.getDefaultStopSet(), exclusionSet);
checkOneTermReuse(a, "jaktkarlarne", "jaktkarlarne");
Modified: lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishAnalyzer.java?rev=1242497&r1=1242496&r2=1242497&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishAnalyzer.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishAnalyzer.java Thu Feb 9 19:59:50 2012
@@ -18,11 +18,10 @@ package org.apache.lucene.analysis.tr;
*/
import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
+import org.apache.lucene.analysis.util.CharArraySet;
public class TestTurkishAnalyzer extends BaseTokenStreamTestCase {
/** This test fails with NPE when the
@@ -43,8 +42,7 @@ public class TestTurkishAnalyzer extends
/** test use of exclusion set */
public void testExclude() throws IOException {
- Set<String> exclusionSet = new HashSet<String>();
- exclusionSet.add("aÄacı");
+ CharArraySet exclusionSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("aÄacı"), false);
Analyzer a = new TurkishAnalyzer(TEST_VERSION_CURRENT,
TurkishAnalyzer.getDefaultStopSet(), exclusionSet);
checkOneTermReuse(a, "aÄacı", "aÄacı");
Modified: lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/KuromojiAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/KuromojiAnalyzer.java?rev=1242497&r1=1242496&r2=1242497&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/KuromojiAnalyzer.java (original)
+++ lucene/dev/trunk/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/KuromojiAnalyzer.java Thu Feb 9 19:59:50 2012
@@ -39,13 +39,13 @@ public class KuromojiAnalyzer extends St
this(matchVersion, new Segmenter(), DefaultSetHolder.DEFAULT_STOP_SET, DefaultSetHolder.DEFAULT_STOP_TAGS);
}
- public KuromojiAnalyzer(Version matchVersion, Segmenter segmenter, Set<?> stopwords, Set<String> stoptags) {
+ public KuromojiAnalyzer(Version matchVersion, Segmenter segmenter, CharArraySet stopwords, Set<String> stoptags) {
super(matchVersion, stopwords);
this.segmenter = segmenter;
this.stoptags = stoptags;
}
- public static Set<?> getDefaultStopSet(){
+ public static CharArraySet getDefaultStopSet(){
return DefaultSetHolder.DEFAULT_STOP_SET;
}
@@ -58,7 +58,7 @@ public class KuromojiAnalyzer extends St
* outer class accesses the static final set the first time.
*/
private static class DefaultSetHolder {
- static final Set<?> DEFAULT_STOP_SET;
+ static final CharArraySet DEFAULT_STOP_SET;
static final Set<String> DEFAULT_STOP_TAGS;
static {
Modified: lucene/dev/trunk/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseAnalyzer.java?rev=1242497&r1=1242496&r2=1242497&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseAnalyzer.java (original)
+++ lucene/dev/trunk/modules/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseAnalyzer.java Thu Feb 9 19:59:50 2012
@@ -18,10 +18,7 @@
package org.apache.lucene.analysis.cn.smart;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
import java.io.Reader;
-import java.util.Collections;
import java.util.Set;
import org.apache.lucene.analysis.Analyzer;
@@ -58,7 +55,7 @@ import org.apache.lucene.util.Version;
*/
public final class SmartChineseAnalyzer extends Analyzer {
- private final Set<?> stopWords;
+ private final CharArraySet stopWords;
private static final String DEFAULT_STOPWORD_FILE = "stopwords.txt";
@@ -120,7 +117,7 @@ public final class SmartChineseAnalyzer
*/
public SmartChineseAnalyzer(Version matchVersion, boolean useDefaultStopWords) {
stopWords = useDefaultStopWords ? DefaultSetHolder.DEFAULT_STOP_SET
- : Collections.EMPTY_SET;
+ : CharArraySet.EMPTY_SET;
this.matchVersion = matchVersion;
}
@@ -133,8 +130,8 @@ public final class SmartChineseAnalyzer
* </p>
* @param stopWords {@link Set} of stopwords to use.
*/
- public SmartChineseAnalyzer(Version matchVersion, Set stopWords) {
- this.stopWords = stopWords==null?Collections.EMPTY_SET:stopWords;
+ public SmartChineseAnalyzer(Version matchVersion, CharArraySet stopWords) {
+ this.stopWords = stopWords==null?CharArraySet.EMPTY_SET:stopWords;
this.matchVersion = matchVersion;
}
@@ -147,7 +144,7 @@ public final class SmartChineseAnalyzer
// The porter stemming is too strict, this is not a bug, this is a feature:)
result = new PorterStemFilter(result);
if (!stopWords.isEmpty()) {
- result = new StopFilter(matchVersion, result, stopWords, false);
+ result = new StopFilter(matchVersion, result, stopWords);
}
return new TokenStreamComponents(tokenizer, result);
}
Modified: lucene/dev/trunk/modules/analysis/stempel/src/java/org/apache/lucene/analysis/pl/PolishAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/stempel/src/java/org/apache/lucene/analysis/pl/PolishAnalyzer.java?rev=1242497&r1=1242496&r2=1242497&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/stempel/src/java/org/apache/lucene/analysis/pl/PolishAnalyzer.java (original)
+++ lucene/dev/trunk/modules/analysis/stempel/src/java/org/apache/lucene/analysis/pl/PolishAnalyzer.java Thu Feb 9 19:59:50 2012
@@ -19,7 +19,6 @@ package org.apache.lucene.analysis.pl;
import java.io.IOException;
import java.io.Reader;
-import java.util.Set;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.core.LowerCaseFilter;
@@ -42,7 +41,7 @@ import org.egothor.stemmer.Trie;
* {@link Analyzer} for Polish.
*/
public final class PolishAnalyzer extends StopwordAnalyzerBase {
- private final Set<?> stemExclusionSet;
+ private final CharArraySet stemExclusionSet;
private final Trie stemTable;
/** File containing default Polish stopwords. */
@@ -55,7 +54,7 @@ public final class PolishAnalyzer extend
* Returns an unmodifiable instance of the default stop words set.
* @return default stop words set.
*/
- public static Set<?> getDefaultStopSet(){
+ public static CharArraySet getDefaultStopSet(){
return DefaultsHolder.DEFAULT_STOP_SET;
}
@@ -64,7 +63,7 @@ public final class PolishAnalyzer extend
* accesses the static final set the first time.;
*/
private static class DefaultsHolder {
- static final Set<?> DEFAULT_STOP_SET;
+ static final CharArraySet DEFAULT_STOP_SET;
static final Trie DEFAULT_TABLE;
static {
@@ -100,7 +99,7 @@ public final class PolishAnalyzer extend
* @param matchVersion lucene compatibility version
* @param stopwords a stopword set
*/
- public PolishAnalyzer(Version matchVersion, Set<?> stopwords) {
+ public PolishAnalyzer(Version matchVersion, CharArraySet stopwords) {
this(matchVersion, stopwords, CharArraySet.EMPTY_SET);
}
@@ -113,7 +112,7 @@ public final class PolishAnalyzer extend
* @param stopwords a stopword set
* @param stemExclusionSet a set of terms not to be stemmed
*/
- public PolishAnalyzer(Version matchVersion, Set<?> stopwords, Set<?> stemExclusionSet) {
+ public PolishAnalyzer(Version matchVersion, CharArraySet stopwords, CharArraySet stemExclusionSet) {
super(matchVersion, stopwords);
this.stemTable = DefaultsHolder.DEFAULT_TABLE;
this.stemExclusionSet = CharArraySet.unmodifiableSet(CharArraySet.copy(
Modified: lucene/dev/trunk/modules/analysis/stempel/src/test/org/apache/lucene/analysis/pl/TestPolishAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/stempel/src/test/org/apache/lucene/analysis/pl/TestPolishAnalyzer.java?rev=1242497&r1=1242496&r2=1242497&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/stempel/src/test/org/apache/lucene/analysis/pl/TestPolishAnalyzer.java (original)
+++ lucene/dev/trunk/modules/analysis/stempel/src/test/org/apache/lucene/analysis/pl/TestPolishAnalyzer.java Thu Feb 9 19:59:50 2012
@@ -18,11 +18,10 @@ package org.apache.lucene.analysis.pl;
*/
import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
+import org.apache.lucene.analysis.util.CharArraySet;
public class TestPolishAnalyzer extends BaseTokenStreamTestCase {
/** This test fails with NPE when the
@@ -43,8 +42,7 @@ public class TestPolishAnalyzer extends
/** test use of exclusion set */
public void testExclude() throws IOException {
- Set<String> exclusionSet = new HashSet<String>();
- exclusionSet.add("studenta");
+ CharArraySet exclusionSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("studenta"), false);;
Analyzer a = new PolishAnalyzer(TEST_VERSION_CURRENT,
PolishAnalyzer.getDefaultStopSet(), exclusionSet);
checkOneTermReuse(a, "studenta", "studenta");
Modified: lucene/dev/trunk/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrStopwordsCarrot2LexicalDataFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrStopwordsCarrot2LexicalDataFactory.java?rev=1242497&r1=1242496&r2=1242497&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrStopwordsCarrot2LexicalDataFactory.java (original)
+++ lucene/dev/trunk/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrStopwordsCarrot2LexicalDataFactory.java Thu Feb 9 19:59:50 2012
@@ -93,15 +93,14 @@ public class SolrStopwordsCarrot2Lexical
.getTokenFilterFactories();
for (TokenFilterFactory factory : filterFactories) {
if (factory instanceof StopFilterFactory) {
- // StopFilterFactory holds the stop words in a CharArraySet, but
- // the getStopWords() method returns a Set<?>, so we need to cast.
+ // StopFilterFactory holds the stop words in a CharArraySet
solrStopWords.put(fieldName,
- (CharArraySet) ((StopFilterFactory) factory).getStopWords());
+ ((StopFilterFactory) factory).getStopWords());
}
if (factory instanceof CommonGramsFilterFactory) {
solrStopWords.put(fieldName,
- (CharArraySet) ((CommonGramsFilterFactory) factory)
+ ((CommonGramsFilterFactory) factory)
.getCommonWords());
}
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CommonGramsFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CommonGramsFilterFactory.java?rev=1242497&r1=1242496&r2=1242497&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CommonGramsFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CommonGramsFilterFactory.java Thu Feb 9 19:59:50 2012
@@ -17,7 +17,6 @@
package org.apache.solr.analysis;
import java.io.IOException;
-import java.util.Set;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.commongrams.CommonGramsFilter;
@@ -71,12 +70,12 @@ public class CommonGramsFilterFactory ex
return ignoreCase;
}
- public Set<?> getCommonWords() {
+ public CharArraySet getCommonWords() {
return commonWords;
}
public CommonGramsFilter create(TokenStream input) {
- CommonGramsFilter commonGrams = new CommonGramsFilter(luceneMatchVersion, input, commonWords, ignoreCase);
+ CommonGramsFilter commonGrams = new CommonGramsFilter(luceneMatchVersion, input, commonWords);
return commonGrams;
}
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CommonGramsQueryFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CommonGramsQueryFilterFactory.java?rev=1242497&r1=1242496&r2=1242497&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CommonGramsQueryFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CommonGramsQueryFilterFactory.java Thu Feb 9 19:59:50 2012
@@ -18,7 +18,6 @@ package org.apache.solr.analysis;
import java.io.IOException;
import java.util.Map;
-import java.util.Set;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.commongrams.CommonGramsFilter;
@@ -80,7 +79,7 @@ public class CommonGramsQueryFilterFacto
return ignoreCase;
}
- public Set<?> getCommonWords() {
+ public CharArraySet getCommonWords() {
return commonWords;
}
@@ -88,8 +87,7 @@ public class CommonGramsQueryFilterFacto
* Create a CommonGramsFilter and wrap it with a CommonGramsQueryFilter
*/
public CommonGramsQueryFilter create(TokenStream input) {
- CommonGramsFilter commonGrams = new CommonGramsFilter(luceneMatchVersion, input, commonWords,
- ignoreCase);
+ CommonGramsFilter commonGrams = new CommonGramsFilter(luceneMatchVersion, input, commonWords);
CommonGramsQueryFilter commonGramsQuery = new CommonGramsQueryFilter(
commonGrams);
return commonGramsQuery;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/StopFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/StopFilterFactory.java?rev=1242497&r1=1242496&r2=1242497&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/StopFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/StopFilterFactory.java Thu Feb 9 19:59:50 2012
@@ -25,7 +25,6 @@ import org.apache.lucene.analysis.core.S
import org.apache.lucene.analysis.util.CharArraySet;
import java.util.Map;
-import java.util.Set;
import java.io.IOException;
/**
@@ -81,13 +80,13 @@ public class StopFilterFactory extends B
return ignoreCase;
}
- public Set<?> getStopWords() {
+ public CharArraySet getStopWords() {
return stopWords;
}
@Override
public TokenStream create(TokenStream input) {
- StopFilter stopFilter = new StopFilter(luceneMatchVersion,input,stopWords,ignoreCase);
+ StopFilter stopFilter = new StopFilter(luceneMatchVersion,input,stopWords);
stopFilter.setEnablePositionIncrements(enablePositionIncrements);
return stopFilter;
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/CommonGramsFilterFactoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/CommonGramsFilterFactoryTest.java?rev=1242497&r1=1242496&r2=1242497&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/CommonGramsFilterFactoryTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/CommonGramsFilterFactoryTest.java Thu Feb 9 19:59:50 2012
@@ -20,11 +20,11 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
+import org.apache.lucene.analysis.util.CharArraySet;
import org.apache.solr.common.ResourceLoader;
import org.apache.solr.core.SolrResourceLoader;
import java.io.StringReader;
-import java.util.Set;
import java.util.Map;
import java.util.HashMap;
@@ -44,7 +44,7 @@ public class CommonGramsFilterFactoryTes
args.put("ignoreCase", "true");
factory.init(args);
factory.inform(loader);
- Set<?> words = factory.getCommonWords();
+ CharArraySet words = factory.getCommonWords();
assertTrue("words is null and it shouldn't be", words != null);
assertTrue("words Size: " + words.size() + " is not: " + 2,
words.size() == 2);
@@ -89,7 +89,7 @@ public class CommonGramsFilterFactoryTes
Map<String, String> args = new HashMap<String, String>(DEFAULT_VERSION_PARAM);
factory.init(args);
factory.inform(loader);
- Set<?> words = factory.getCommonWords();
+ CharArraySet words = factory.getCommonWords();
assertTrue("words is null and it shouldn't be", words != null);
assertTrue(words.contains("the"));
Tokenizer tokenizer = new MockTokenizer(new StringReader("testing the factory"), MockTokenizer.WHITESPACE, false);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/CommonGramsQueryFilterFactoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/CommonGramsQueryFilterFactoryTest.java?rev=1242497&r1=1242496&r2=1242497&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/CommonGramsQueryFilterFactoryTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/CommonGramsQueryFilterFactoryTest.java Thu Feb 9 19:59:50 2012
@@ -19,11 +19,11 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
+import org.apache.lucene.analysis.util.CharArraySet;
import org.apache.solr.common.ResourceLoader;
import org.apache.solr.core.SolrResourceLoader;
import java.io.StringReader;
-import java.util.Set;
import java.util.Map;
import java.util.HashMap;
@@ -43,7 +43,7 @@ public class CommonGramsQueryFilterFacto
args.put("ignoreCase", "true");
factory.init(args);
factory.inform(loader);
- Set<?> words = factory.getCommonWords();
+ CharArraySet words = factory.getCommonWords();
assertTrue("words is null and it shouldn't be", words != null);
assertTrue("words Size: " + words.size() + " is not: " + 2,
words.size() == 2);
@@ -88,7 +88,7 @@ public class CommonGramsQueryFilterFacto
Map<String, String> args = new HashMap<String, String>(DEFAULT_VERSION_PARAM);
factory.init(args);
factory.inform(loader);
- Set<?> words = factory.getCommonWords();
+ CharArraySet words = factory.getCommonWords();
assertTrue("words is null and it shouldn't be", words != null);
assertTrue(words.contains("the"));
Tokenizer tokenizer = new MockTokenizer(new StringReader("testing the factory"), MockTokenizer.WHITESPACE, false);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestKeepFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestKeepFilterFactory.java?rev=1242497&r1=1242496&r2=1242497&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestKeepFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestKeepFilterFactory.java Thu Feb 9 19:59:50 2012
@@ -16,10 +16,10 @@ package org.apache.solr.analysis;
* limitations under the License.
*/
+import org.apache.lucene.analysis.util.CharArraySet;
import org.apache.solr.common.ResourceLoader;
import org.apache.solr.core.SolrResourceLoader;
-import java.util.Set;
import java.util.Map;
import java.util.HashMap;
@@ -38,7 +38,7 @@ public class TestKeepFilterFactory exten
args.put("ignoreCase", "true");
factory.init(args);
factory.inform(loader);
- Set<?> words = factory.getWords();
+ CharArraySet words = factory.getWords();
assertTrue("words is null and it shouldn't be", words != null);
assertTrue("words Size: " + words.size() + " is not: " + 2, words.size() == 2);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestStopFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestStopFilterFactory.java?rev=1242497&r1=1242496&r2=1242497&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestStopFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestStopFilterFactory.java Thu Feb 9 19:59:50 2012
@@ -17,10 +17,10 @@ package org.apache.solr.analysis;
*/
+import org.apache.lucene.analysis.util.CharArraySet;
import org.apache.solr.common.ResourceLoader;
import org.apache.solr.core.SolrResourceLoader;
-import java.util.Set;
import java.util.Map;
import java.util.HashMap;
@@ -39,7 +39,7 @@ public class TestStopFilterFactory exten
args.put("ignoreCase", "true");
factory.init(args);
factory.inform(loader);
- Set<?> words = factory.getStopWords();
+ CharArraySet words = factory.getStopWords();
assertTrue("words is null and it shouldn't be", words != null);
assertTrue("words Size: " + words.size() + " is not: " + 2, words.size() == 2);
assertTrue(factory.isIgnoreCase() + " does not equal: " + true, factory.isIgnoreCase() == true);