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 2011/01/17 19:38:24 UTC
svn commit: r1060039 - in /lucene/dev/branches/branch_3x: ./ lucene/ solr/
solr/src/java/org/apache/solr/analysis/
Author: rmuir
Date: Mon Jan 17 18:38:23 2011
New Revision: 1060039
URL: http://svn.apache.org/viewvc?rev=1060039&view=rev
Log:
SOLR-2259: warn if you are using a deprecated analysis factory
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ChineseFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/DutchStemFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/EnglishPorterFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/FrenchStemFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ISOLatin1AccentFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/RussianLetterTokenizerFactory.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/RussianLowerCaseFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/RussianStemFilterFactory.java
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java?rev=1060039&r1=1060038&r2=1060039&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java Mon Jan 17 18:38:23 2011
@@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.ar.ArabicLetterTokenizer;
import java.io.Reader;
+import java.util.Map;
/**
@@ -28,8 +29,13 @@ import java.io.Reader;
@Deprecated
public class ArabicLetterTokenizerFactory extends BaseTokenizerFactory{
- public ArabicLetterTokenizer create(Reader input) {
+ public void init(Map<String,String> args) {
+ super.init(args);
assureMatchVersion();
+ warnDeprecated("Use StandardTokenizerFactory instead.");
+ }
+
+ public ArabicLetterTokenizer create(Reader input) {
return new ArabicLetterTokenizer(luceneMatchVersion, input);
}
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java?rev=1060039&r1=1060038&r2=1060039&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java Mon Jan 17 18:38:23 2011
@@ -75,6 +75,10 @@ abstract class BaseTokenStreamFactory {
}
}
+ protected final void warnDeprecated(String message) {
+ log.warn(getClass().getSimpleName() + " is deprecated. " + message);
+ }
+
// TODO: move these somewhere that tokenizers and others
// can also use them...
protected int getInt(String name) {
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ChineseFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ChineseFilterFactory.java?rev=1060039&r1=1060038&r2=1060039&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ChineseFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ChineseFilterFactory.java Mon Jan 17 18:38:23 2011
@@ -18,6 +18,8 @@
package org.apache.solr.analysis;
+import java.util.Map;
+
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.cn.ChineseFilter;
@@ -27,6 +29,11 @@ import org.apache.lucene.analysis.cn.Chi
*/
@Deprecated
public class ChineseFilterFactory extends BaseTokenFilterFactory {
+ public void init(Map<String,String> args) {
+ super.init(args);
+ warnDeprecated("Use StopFilterFactory instead.");
+ }
+
public ChineseFilter create(TokenStream in) {
return new ChineseFilter(in);
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java?rev=1060039&r1=1060038&r2=1060039&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java Mon Jan 17 18:38:23 2011
@@ -20,6 +20,8 @@
package org.apache.solr.analysis;
import java.io.Reader;
+import java.util.Map;
+
import org.apache.lucene.analysis.cn.ChineseTokenizer;
/**
@@ -28,6 +30,11 @@ import org.apache.lucene.analysis.cn.Chi
*/
@Deprecated
public class ChineseTokenizerFactory extends BaseTokenizerFactory {
+ public void init(Map<String,String> args) {
+ super.init(args);
+ warnDeprecated("Use StandardTokenizerFactory instead.");
+ }
+
public ChineseTokenizer create(Reader in) {
return new ChineseTokenizer(in);
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/DutchStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/DutchStemFilterFactory.java?rev=1060039&r1=1060038&r2=1060039&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/DutchStemFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/DutchStemFilterFactory.java Mon Jan 17 18:38:23 2011
@@ -19,6 +19,8 @@
package org.apache.solr.analysis;
+import java.util.Map;
+
import org.apache.lucene.analysis.snowball.SnowballFilter;
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
@@ -29,6 +31,12 @@ import org.apache.lucene.analysis.TokenS
*/
@Deprecated
public class DutchStemFilterFactory extends BaseTokenFilterFactory {
+
+ public void init(Map<String,String> args) {
+ super.init(args);
+ warnDeprecated("use SnowballPorterFilterFactory with 'Dutch' instead");
+ }
+
public TokenFilter create(TokenStream _in) {
return new SnowballFilter(_in, new org.tartarus.snowball.ext.DutchStemmer());
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/EnglishPorterFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/EnglishPorterFilterFactory.java?rev=1060039&r1=1060038&r2=1060039&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/EnglishPorterFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/EnglishPorterFilterFactory.java Mon Jan 17 18:38:23 2011
@@ -26,6 +26,7 @@ import org.apache.solr.common.ResourceLo
import org.apache.solr.util.plugin.ResourceLoaderAware;
import java.io.IOException;
+import java.util.Map;
/**
* @version $Id$
@@ -36,6 +37,11 @@ import java.io.IOException;
public class EnglishPorterFilterFactory extends BaseTokenFilterFactory implements ResourceLoaderAware {
public static final String PROTECTED_TOKENS = "protected";
+ public void init(Map<String,String> args) {
+ super.init(args);
+ warnDeprecated("use PorterStemFilterFactory (Porter1) or SnowballPorterFilterFactory with 'English' (Porter2) instead");
+ }
+
public void inform(ResourceLoader loader) {
String wordFiles = args.get(PROTECTED_TOKENS);
if (wordFiles != null) {
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/FrenchStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/FrenchStemFilterFactory.java?rev=1060039&r1=1060038&r2=1060039&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/FrenchStemFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/FrenchStemFilterFactory.java Mon Jan 17 18:38:23 2011
@@ -19,6 +19,8 @@
package org.apache.solr.analysis;
+import java.util.Map;
+
import org.apache.lucene.analysis.snowball.SnowballFilter;
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
@@ -29,6 +31,11 @@ import org.apache.lucene.analysis.TokenS
*/
@Deprecated
public class FrenchStemFilterFactory extends BaseTokenFilterFactory {
+ public void init(Map<String,String> args) {
+ super.init(args);
+ warnDeprecated("use SnowballPorterFilterFactory with 'French' instead");
+ }
+
public TokenFilter create(TokenStream in) {
return new SnowballFilter(in, new org.tartarus.snowball.ext.FrenchStemmer());
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ISOLatin1AccentFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ISOLatin1AccentFilterFactory.java?rev=1060039&r1=1060038&r2=1060039&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ISOLatin1AccentFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ISOLatin1AccentFilterFactory.java Mon Jan 17 18:38:23 2011
@@ -17,6 +17,8 @@
package org.apache.solr.analysis;
+import java.util.Map;
+
import org.apache.lucene.analysis.ISOLatin1AccentFilter;
import org.apache.lucene.analysis.TokenStream;
@@ -26,6 +28,11 @@ import org.apache.lucene.analysis.TokenS
*/
@Deprecated
public class ISOLatin1AccentFilterFactory extends BaseTokenFilterFactory {
+ public void init(Map<String,String> args) {
+ super.init(args);
+ warnDeprecated("use ASCIIFoldingFilterFactory instead");
+ }
+
public ISOLatin1AccentFilter create(TokenStream input) {
return new ISOLatin1AccentFilter(input);
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/RussianLetterTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/RussianLetterTokenizerFactory.java?rev=1060039&r1=1060038&r2=1060039&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/RussianLetterTokenizerFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/RussianLetterTokenizerFactory.java Mon Jan 17 18:38:23 2011
@@ -37,10 +37,11 @@ public class RussianLetterTokenizerFacto
throw new SolrException(ErrorCode.SERVER_ERROR,
"The charset parameter is no longer supported. "
+ "Please process your documents as Unicode instead.");
+ assureMatchVersion();
+ warnDeprecated("Use StandardTokenizerFactory instead.");
}
public RussianLetterTokenizer create(Reader in) {
- assureMatchVersion();
return new RussianLetterTokenizer(luceneMatchVersion,in);
}
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/RussianLowerCaseFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/RussianLowerCaseFilterFactory.java?rev=1060039&r1=1060038&r2=1060039&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/RussianLowerCaseFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/RussianLowerCaseFilterFactory.java Mon Jan 17 18:38:23 2011
@@ -39,6 +39,7 @@ public class RussianLowerCaseFilterFacto
throw new SolrException(ErrorCode.SERVER_ERROR,
"The charset parameter is no longer supported. "
+ "Please process your documents as Unicode instead.");
+ warnDeprecated("Use LowerCaseFilterFactory instead");
}
public TokenFilter create(TokenStream in) {
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/RussianStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/RussianStemFilterFactory.java?rev=1060039&r1=1060038&r2=1060039&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/RussianStemFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/RussianStemFilterFactory.java Mon Jan 17 18:38:23 2011
@@ -19,6 +19,8 @@
package org.apache.solr.analysis;
+import java.util.Map;
+
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.snowball.SnowballFilter;
@@ -30,6 +32,11 @@ import org.apache.lucene.analysis.snowba
@Deprecated
public class RussianStemFilterFactory extends BaseTokenFilterFactory {
+ public void init(Map<String,String> args) {
+ super.init(args);
+ warnDeprecated("use SnowballPorterFilterFactory with 'Russian' instead");
+ }
+
public TokenFilter create(TokenStream in) {
return new SnowballFilter(in, new org.tartarus.snowball.ext.RussianStemmer());
}