You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ch...@apache.org on 2012/04/30 02:31:36 UTC
svn commit: r1332035 - in /lucene/dev/trunk/solr: ./
core/src/java/org/apache/solr/analysis/
Author: chrism
Date: Mon Apr 30 00:31:36 2012
New Revision: 1332035
URL: http://svn.apache.org/viewvc?rev=1332035&view=rev
Log:
SOLR-3403: Moved Analysis Factory logging to relevant classes
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BaseCharFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BaseTokenFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BaseTokenizerFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ChineseFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/FSTSynonymFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/RussianLetterTokenizerFactory.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1332035&r1=1332034&r2=1332035&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Mon Apr 30 00:31:36 2012
@@ -532,6 +532,9 @@ Other Changes
* SOLR-1893: Refactored some common code from LRUCache and FastLRUCache into
SolrCacheBase (Tomás Fernández Löbbe via hossman)
+* SOLR-3403: Deprecated Analysis Factories now log their own deprecation messages.
+ No logging support is provided by Factory parent classes. (Chris Male)
+
Documentation
----------------------
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java?rev=1332035&r1=1332034&r2=1332035&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java Mon Apr 30 00:31:36 2012
@@ -17,6 +17,8 @@ package org.apache.solr.analysis;
*/
import org.apache.lucene.analysis.ar.ArabicLetterTokenizer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.Reader;
import java.util.Map;
@@ -29,11 +31,13 @@ import java.util.Map;
@Deprecated
public class ArabicLetterTokenizerFactory extends BaseTokenizerFactory{
+ private static final Logger log = LoggerFactory.getLogger(ArabicLetterTokenizerFactory.class);
+
@Override
public void init(Map<String,String> args) {
super.init(args);
assureMatchVersion();
- warnDeprecated("Use StandardTokenizerFactory instead.");
+ log.warn(getClass().getSimpleName() + " is deprecated. Use StandardTokenizeFactory instead.");
}
public ArabicLetterTokenizer create(Reader input) {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BaseCharFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BaseCharFilterFactory.java?rev=1332035&r1=1332034&r2=1332035&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BaseCharFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BaseCharFilterFactory.java Mon Apr 30 00:31:36 2012
@@ -17,11 +17,9 @@
package org.apache.solr.analysis;
-import java.util.Map;
-
import org.apache.lucene.util.Version;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import java.util.Map;
/**
*
@@ -30,8 +28,6 @@ import org.slf4j.LoggerFactory;
*/
public abstract class BaseCharFilterFactory implements CharFilterFactory {
- public static final Logger log = LoggerFactory.getLogger(BaseCharFilterFactory.class);
-
protected Version luceneMatchVersion;
/** The init args */
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BaseTokenFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BaseTokenFilterFactory.java?rev=1332035&r1=1332034&r2=1332035&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BaseTokenFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BaseTokenFilterFactory.java Mon Apr 30 00:31:36 2012
@@ -17,14 +17,11 @@
package org.apache.solr.analysis;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* Simple abstract implementation that handles init arg processing.
*
*
*/
public abstract class BaseTokenFilterFactory extends BaseTokenStreamFactory implements TokenFilterFactory {
- public static final Logger log = LoggerFactory.getLogger(BaseTokenFilterFactory.class);
+
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java?rev=1332035&r1=1332034&r2=1332035&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java Mon Apr 30 00:31:36 2012
@@ -17,10 +17,13 @@
package org.apache.solr.analysis;
+import org.apache.lucene.analysis.core.StopFilter;
+import org.apache.lucene.analysis.util.CharArraySet;
+import org.apache.lucene.analysis.util.WordlistLoader;
+import org.apache.lucene.util.IOUtils;
+import org.apache.lucene.util.Version;
import org.apache.solr.common.ResourceLoader;
import org.apache.solr.common.util.StrUtils;
-import org.apache.solr.core.Config;
-import org.apache.solr.schema.IndexSchema;
import java.io.IOException;
import java.io.InputStream;
@@ -31,15 +34,6 @@ import java.nio.charset.CodingErrorActio
import java.util.List;
import java.util.Map;
-import org.apache.lucene.analysis.core.StopFilter;
-import org.apache.lucene.analysis.util.CharArraySet;
-import org.apache.lucene.analysis.util.WordlistLoader;
-import org.apache.lucene.util.IOUtils;
-import org.apache.lucene.util.Version;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* Simple abstract implementation that handles init arg processing, is not really
* a factory as it implements no interface, but removes code duplication
@@ -54,8 +48,6 @@ abstract class BaseTokenStreamFactory {
/** the luceneVersion arg */
protected Version luceneMatchVersion = null;
- public static final Logger log = LoggerFactory.getLogger(BaseTokenStreamFactory.class);
-
public void init(Map<String,String> args) {
this.args=args;
}
@@ -74,10 +66,6 @@ abstract class BaseTokenStreamFactory {
}
}
- protected final void warnDeprecated(String message) {
- log.warn(getClass().getSimpleName() + " is deprecated. " + message);
- }
-
public void setLuceneMatchVersion(Version luceneMatchVersion) {
this.luceneMatchVersion = luceneMatchVersion;
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BaseTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BaseTokenizerFactory.java?rev=1332035&r1=1332034&r2=1332035&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BaseTokenizerFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BaseTokenizerFactory.java Mon Apr 30 00:31:36 2012
@@ -17,14 +17,11 @@
package org.apache.solr.analysis;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* Simple abstract implementation that handles init arg processing.
*
*
*/
public abstract class BaseTokenizerFactory extends BaseTokenStreamFactory implements TokenizerFactory {
- public static final Logger log = LoggerFactory.getLogger(BaseTokenizerFactory.class);
+
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ChineseFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ChineseFilterFactory.java?rev=1332035&r1=1332034&r2=1332035&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ChineseFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ChineseFilterFactory.java Mon Apr 30 00:31:36 2012
@@ -22,6 +22,8 @@ import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.cn.ChineseFilter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Factory for {@link ChineseFilter}
@@ -29,10 +31,13 @@ import org.apache.lucene.analysis.cn.Chi
*/
@Deprecated
public class ChineseFilterFactory extends BaseTokenFilterFactory {
+
+ private static final Logger log = LoggerFactory.getLogger(ChineseFilterFactory.class);
+
@Override
public void init(Map<String,String> args) {
super.init(args);
- warnDeprecated("Use StopFilterFactory instead.");
+ log.warn(getClass().getSimpleName() + " is deprecated. Use StopFilterFactory instead.");
}
public ChineseFilter create(TokenStream in) {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java?rev=1332035&r1=1332034&r2=1332035&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java Mon Apr 30 00:31:36 2012
@@ -23,6 +23,8 @@ import java.io.Reader;
import java.util.Map;
import org.apache.lucene.analysis.cn.ChineseTokenizer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Factory for {@link ChineseTokenizer}
@@ -30,10 +32,13 @@ import org.apache.lucene.analysis.cn.Chi
*/
@Deprecated
public class ChineseTokenizerFactory extends BaseTokenizerFactory {
+
+ private static final Logger log = LoggerFactory.getLogger(ChineseTokenizerFactory.class);
+
@Override
public void init(Map<String,String> args) {
super.init(args);
- warnDeprecated("Use StandardTokenizerFactory instead.");
+ log.warn(getClass().getSimpleName() + " is deprecated. Use StandardTokenizeFactory instead.");
}
public ChineseTokenizer create(Reader in) {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/FSTSynonymFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/FSTSynonymFilterFactory.java?rev=1332035&r1=1332034&r2=1332035&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/FSTSynonymFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/FSTSynonymFilterFactory.java Mon Apr 30 00:31:36 2012
@@ -41,6 +41,8 @@ import org.apache.lucene.util.Version;
import org.apache.solr.common.ResourceLoader;
import org.apache.solr.common.util.StrUtils;
import org.apache.solr.util.plugin.ResourceLoaderAware;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @deprecated (3.4) use {@link SynonymFilterFactory} instead. this is only a backwards compatibility
@@ -49,6 +51,9 @@ import org.apache.solr.util.plugin.Resou
// NOTE: rename this to "SynonymFilterFactory" and nuke that delegator in Lucene 5.0!
@Deprecated
final class FSTSynonymFilterFactory extends BaseTokenFilterFactory implements ResourceLoaderAware {
+
+ public static final Logger log = LoggerFactory.getLogger(FSTSynonymFilterFactory.class);
+
private SynonymMap map;
private boolean ignoreCase;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/RussianLetterTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/RussianLetterTokenizerFactory.java?rev=1332035&r1=1332034&r2=1332035&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/RussianLetterTokenizerFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/RussianLetterTokenizerFactory.java Mon Apr 30 00:31:36 2012
@@ -21,6 +21,8 @@ import java.io.Reader;
import java.util.Map;
import org.apache.lucene.analysis.ru.RussianLetterTokenizer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/** @deprecated Use {@link StandardTokenizerFactory} instead.
* This tokenizer has no Russian-specific functionality.
@@ -28,6 +30,8 @@ import org.apache.lucene.analysis.ru.Rus
@Deprecated
public class RussianLetterTokenizerFactory extends BaseTokenizerFactory {
+ private static final Logger log = LoggerFactory.getLogger(RussianLetterTokenizerFactory.class);
+
@Override
public void init(Map<String, String> args) {
super.init(args);
@@ -36,7 +40,7 @@ public class RussianLetterTokenizerFacto
"The charset parameter is no longer supported. "
+ "Please process your documents as Unicode instead.");
assureMatchVersion();
- warnDeprecated("Use StandardTokenizerFactory instead.");
+ log.warn(getClass().getSimpleName() + " is deprecated. Use StandardTokenizerFactory instead.");
}
public RussianLetterTokenizer create(Reader in) {