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 18:50:04 UTC
svn commit: r1060023 - in /lucene/dev/trunk/solr/src/java/org/apache/solr/analysis: ArabicLetterTokenizerFactory.java BaseTokenStreamFactory.java ChineseFilterFactory.java ChineseTokenizerFactory.java RussianLetterTokenizerFactory.java

Author: rmuir
Date: Mon Jan 17 17:50:04 2011
New Revision: 1060023

URL: http://svn.apache.org/viewvc?rev=1060023&view=rev
Log:
SOLR-2259: warn if you are using a deprecated analysis factory

Modified:
    lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/ChineseFilterFactory.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/RussianLetterTokenizerFactory.java

Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java?rev=1060023&r1=1060022&r2=1060023&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java Mon Jan 17 17:50:04 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/trunk/solr/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java?rev=1060023&r1=1060022&r2=1060023&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java Mon Jan 17 17:50:04 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/trunk/solr/src/java/org/apache/solr/analysis/ChineseFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/ChineseFilterFactory.java?rev=1060023&r1=1060022&r2=1060023&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/ChineseFilterFactory.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/ChineseFilterFactory.java Mon Jan 17 17:50:04 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/trunk/solr/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java?rev=1060023&r1=1060022&r2=1060023&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java Mon Jan 17 17:50:04 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/trunk/solr/src/java/org/apache/solr/analysis/RussianLetterTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/RussianLetterTokenizerFactory.java?rev=1060023&r1=1060022&r2=1060023&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/RussianLetterTokenizerFactory.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/RussianLetterTokenizerFactory.java Mon Jan 17 17:50:04 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);
   }
 }