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/27 14:29:43 UTC
svn commit: r1366365 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/analysis/
lucene/analysis/common/src/java/org/apache/lucene/analysis/util/
lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/
lucene/analysis/common/src/test/...
Author: rmuir
Date: Fri Jul 27 12:29:42 2012
New Revision: 1366365
URL: http://svn.apache.org/viewvc?rev=1366365&view=rev
Log:
LUCENE-4260: factor subPackages out of the resourceloader interface
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/ (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceAsStreamResourceLoader.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoader.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballPorterFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymMap.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/StringMockResourceLoader.java
lucene/dev/branches/branch_4x/lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyFilterFactory.java
lucene/dev/branches/branch_4x/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/StringMockResourceLoader.java
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java
lucene/dev/branches/branch_4x/solr/test-framework/ (props changed)
lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/analysis/StringMockSolrResourceLoader.java
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceAsStreamResourceLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceAsStreamResourceLoader.java?rev=1366365&r1=1366364&r2=1366365&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceAsStreamResourceLoader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceAsStreamResourceLoader.java Fri Jul 27 12:29:42 2012
@@ -36,9 +36,8 @@ public class ResourceAsStreamResourceLoa
return clazz.getResourceAsStream(resource);
}
- // TODO: do this subpackages thing... wtf is that?
@Override
- public <T> T newInstance(String cname, Class<T> expectedType, String... subpackages) {
+ public <T> T newInstance(String cname, Class<T> expectedType) {
try {
Class<? extends T> clazz = Class.forName(cname).asSubclass(expectedType);
return clazz.newInstance();
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoader.java?rev=1366365&r1=1366364&r2=1366365&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoader.java Fri Jul 27 12:29:42 2012
@@ -33,5 +33,6 @@ public interface ResourceLoader {
/**
* Creates a class of the name and expected type
*/
- public <T> T newInstance(String cname, Class<T> expectedType, String ... subpackages);
+ // TODO: fix exception handling
+ public <T> T newInstance(String cname, Class<T> expectedType);
}
\ No newline at end of file
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballPorterFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballPorterFilterFactory.java?rev=1366365&r1=1366364&r2=1366365&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballPorterFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballPorterFilterFactory.java Fri Jul 27 12:29:42 2012
@@ -67,26 +67,6 @@ public class TestSnowballPorterFilterFac
}
return sb.toString();
}
-
- class LinesMockSolrResourceLoader implements ResourceLoader {
- List<String> lines;
-
- LinesMockSolrResourceLoader(List<String> lines) {
- this.lines = lines;
- }
-
- public List<String> getLines(String resource) throws IOException {
- return lines;
- }
-
- public <T> T newInstance(String cname, Class<T> expectedType, String... subpackages) {
- return null;
- }
-
- public InputStream openResource(String resource) throws IOException {
- return null;
- }
- }
/**
* Test the protected words mechanism of SnowballPorterFilterFactory
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymMap.java?rev=1366365&r1=1366364&r2=1366365&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymMap.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymMap.java Fri Jul 27 12:29:42 2012
@@ -275,7 +275,7 @@ public class TestSynonymMap extends Luce
ff.inform( new ResourceLoader() {
@Override
- public <T> T newInstance(String cname, Class<T> expectedType, String... subpackages) {
+ public <T> T newInstance(String cname, Class<T> expectedType) {
throw new RuntimeException("stub");
}
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/StringMockResourceLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/StringMockResourceLoader.java?rev=1366365&r1=1366364&r2=1366365&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/StringMockResourceLoader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/StringMockResourceLoader.java Fri Jul 27 12:29:42 2012
@@ -29,8 +29,7 @@ public class StringMockResourceLoader im
this.text = text;
}
- // TODO: do this subpackages thing... wtf is that?
- public <T> T newInstance(String cname, Class<T> expectedType, String... subpackages) {
+ public <T> T newInstance(String cname, Class<T> expectedType) {
try {
Class<? extends T> clazz = Class.forName(cname).asSubclass(expectedType);
return clazz.newInstance();
Modified: lucene/dev/branches/branch_4x/lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyFilterFactory.java?rev=1366365&r1=1366364&r2=1366365&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyFilterFactory.java Fri Jul 27 12:29:42 2012
@@ -287,11 +287,7 @@ public class TestICUCollationKeyFilterFa
this.text = text;
}
- public List<String> getLines(String resource) throws IOException {
- return null;
- }
-
- public <T> T newInstance(String cname, Class<T> expectedType, String... subpackages) {
+ public <T> T newInstance(String cname, Class<T> expectedType) {
return null;
}
Modified: lucene/dev/branches/branch_4x/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/StringMockResourceLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/StringMockResourceLoader.java?rev=1366365&r1=1366364&r2=1366365&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/StringMockResourceLoader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/StringMockResourceLoader.java Fri Jul 27 12:29:42 2012
@@ -33,8 +33,7 @@ class StringMockResourceLoader implement
this.text = text;
}
- // TODO: do this subpackages thing... wtf is that?
- public <T> T newInstance(String cname, Class<T> expectedType, String... subpackages) {
+ public <T> T newInstance(String cname, Class<T> expectedType) {
try {
Class<? extends T> clazz = Class.forName(cname).asSubclass(expectedType);
return clazz.newInstance();
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java?rev=1366365&r1=1366364&r2=1366365&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java Fri Jul 27 12:29:42 2012
@@ -448,6 +448,12 @@ public class SolrResourceLoader implemen
}
}
}
+
+ static final String empty[] = new String[0];
+
+ public <T> T newInstance(String name, Class<T> expectedType) {
+ return newInstance(name, expectedType, empty);
+ }
public <T> T newInstance(String cname, Class<T> expectedType, String ... subpackages) {
Class<? extends T> clazz = findClass(cname, expectedType, subpackages);
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java?rev=1366365&r1=1366364&r2=1366365&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java Fri Jul 27 12:29:42 2012
@@ -73,7 +73,7 @@ public final class FieldTypePluginLoader
@Override
- protected FieldType create( ResourceLoader loader,
+ protected FieldType create( SolrResourceLoader loader,
String name,
String className,
Node node ) throws Exception {
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/IndexSchema.java?rev=1366365&r1=1366364&r2=1366365&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/IndexSchema.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/IndexSchema.java Fri Jul 27 12:29:42 2012
@@ -698,7 +698,7 @@ public final class IndexSchema {
return newArr;
}
- static SimilarityFactory readSimilarity(ResourceLoader loader, Node node) {
+ static SimilarityFactory readSimilarity(SolrResourceLoader loader, Node node) {
if (node==null) {
return null;
} else {
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java?rev=1366365&r1=1366364&r2=1366365&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java Fri Jul 27 12:29:42 2012
@@ -22,11 +22,11 @@ import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.util.DOMUtil;
import org.apache.solr.core.SolrConfig;
+import org.apache.solr.core.SolrResourceLoader;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -81,7 +81,7 @@ public abstract class AbstractPluginLoad
* @param node - the XML node defining this plugin
*/
@SuppressWarnings("unchecked")
- protected T create( ResourceLoader loader, String name, String className, Node node ) throws Exception
+ protected T create( SolrResourceLoader loader, String name, String className, Node node ) throws Exception
{
return loader.newInstance(className, pluginClassType, getDefaultPackages());
}
@@ -124,7 +124,7 @@ public abstract class AbstractPluginLoad
* If a default element is defined, it will be returned from this function.
*
*/
- public T load( ResourceLoader loader, NodeList nodes )
+ public T load( SolrResourceLoader loader, NodeList nodes )
{
List<PluginInitInfo> info = new ArrayList<PluginInitInfo>();
T defaultPlugin = null;
@@ -204,7 +204,7 @@ public abstract class AbstractPluginLoad
* The created class for the plugin will be returned from this function.
*
*/
- public T loadSingle(ResourceLoader loader, Node node) {
+ public T loadSingle(SolrResourceLoader loader, Node node) {
List<PluginInitInfo> info = new ArrayList<PluginInitInfo>();
T plugin = null;
Modified: lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/analysis/StringMockSolrResourceLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/analysis/StringMockSolrResourceLoader.java?rev=1366365&r1=1366364&r2=1366365&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/analysis/StringMockSolrResourceLoader.java (original)
+++ lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/analysis/StringMockSolrResourceLoader.java Fri Jul 27 12:29:42 2012
@@ -32,7 +32,7 @@ class StringMockSolrResourceLoader imple
this.text = text;
}
- public <T> T newInstance(String cname, Class<T> expectedType, String... subpackages) {
+ public <T> T newInstance(String cname, Class<T> expectedType) {
return null;
}