Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-260: removing the param map from init. the method signature is now: init(T plugin, Node node) 

The few places that use the param map can generate it from DOMUtils

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@552709 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Ryan McKinley 2007-07-03 08:16:21 +00:00
parent aa948a9cac
commit 7e8857ff47
5 changed files with 22 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/java/org/apache/solr/core/RequestHandlers.java
View File

@ -130,9 +130,9 @@ final class RequestHandlers {
new AbstractPluginLoader<SolrRequestHandler>( "[solrconfig.xml] requestHandler", true )
{
@Override
protected SolrRequestHandler create( String name, String className, Map<String,String> params, Node node ) throws Exception
{
String startup = params.get( "startup" );
protected SolrRequestHandler create( String name, String className, Node node ) throws Exception
{
String startup = DOMUtil.getAttr( node, "startup" );
if( startup != null ) {
if( "lazy".equals( startup ) ) {
log.info("adding lazy requestHandler: " + className );
@ -143,7 +143,7 @@ final class RequestHandlers {
throw new Exception( "Unknown startup value: '"+startup+"' for: "+className );
}
}
return super.create( name, className, params, node );
return super.create( name, className, node );
}
@Override
@ -152,7 +152,7 @@ final class RequestHandlers {
}
@Override
protected void init(SolrRequestHandler plugin, Map<String, String> params, Node node ) throws Exception {
protected void init(SolrRequestHandler plugin, Node node ) throws Exception {
plugin.init( DOMUtil.childNodesToNamedList(node) );
}
};

5
src/java/org/apache/solr/schema/IndexSchema.java
View File

@ -312,7 +312,7 @@ public final class IndexSchema {
AbstractPluginLoader<FieldType> loader = new AbstractPluginLoader<FieldType>( "[schema.xml] fieldType" ) {
@Override
protected FieldType create( String name, String className, Map<String,String> params, Node node ) throws Exception
protected FieldType create( String name, String className, Node node ) throws Exception
{
FieldType ft = (FieldType)Config.newInstance(className);
ft.setTypeName(name);
@ -336,7 +336,8 @@ public final class IndexSchema {
}
@Override
protected void init(FieldType plugin, Map<String, String> params, Node node) throws Exception {
protected void init(FieldType plugin, Node node) throws Exception {
Map<String,String> params = DOMUtil.toMapExcept( node.getAttributes(), "name","class" );
plugin.setArgs(schema, params );
}

34
src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java
View File

@ -19,7 +19,6 @@ package org.apache.solr.util.plugin;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.logging.Logger;
import org.apache.solr.common.SolrException;
@ -67,18 +66,16 @@ public abstract class AbstractPluginLoader<T>
/**
* Create a plugin from an XML configuration. Plugins are defined using:
* <plugin name="name1" class="solr.ClassName" arg1="val1">
* <plugin name="name1" class="solr.ClassName">
* ...
* </plugin>
*
* @param name - The registered name. In the above example: "name1"
* @param className - class name for requested plugin. In the above example: "solr.ClassName"
* @param params - the parameters specified in the XML. In the example above,
* this would be a map containing [name=name1, class=solr.ClassName, arg1=val1]
* @param node - the XML node defining this plugin
*/
@SuppressWarnings("unchecked")
protected T create( String name, String className, Map<String,String> params, Node node ) throws Exception
protected T create( String name, String className, Node node ) throws Exception
{
return (T) Config.newInstance( className, getDefaultPackages() );
}
@ -90,18 +87,12 @@ public abstract class AbstractPluginLoader<T>
abstract protected T register( String name, T plugin ) throws Exception;
/**
* Initialize the plugin. For example, given the configuration:
*
* <plugin name="name1" class="solr.ClassName" arg1="val1">
* ...
* </plugin>
* Initialize the plugin.
*
* @param plugin - the plugin to initialize
* @param params - the parameters specified in the XML. In the example above,
* this would be a map containing [name=name1, class=solr.ClassName, arg1=val1]
* @param node - the XML node defining this plugin
*/
abstract protected void init( T plugin, Map<String,String> params, Node node ) throws Exception;
abstract protected void init( T plugin, Node node ) throws Exception;
/**
* Given a NodeList from XML in the form:
@ -142,19 +133,16 @@ public abstract class AbstractPluginLoader<T>
String name = DOMUtil.getAttr(node,"name", type);
String className = DOMUtil.getAttr(node,"class", type);
String defaultStr = DOMUtil.getAttr(node,"default", null );
Map<String,String> params = DOMUtil.toMapExcept( node.getAttributes(),
"name","class" );
T plugin = create(name, className, params, node );
T plugin = create(name, className, node );
log.info("created "+name+": " + plugin.getClass().getName() );
// Either initialize now or wait till everything has been registered
if( preRegister ) {
info.add( new PluginInitInfo( plugin, params, node ) );
info.add( new PluginInitInfo( plugin, node ) );
}
else {
init( plugin, params, node );
init( plugin, node );
}
T old = register( name, plugin );
@ -181,7 +169,7 @@ public abstract class AbstractPluginLoader<T>
// If everything needs to be registered *first*, this will initialize later
for( PluginInitInfo pinfo : info ) {
try {
init( pinfo.plugin, pinfo.params, pinfo.node );
init( pinfo.plugin, pinfo.node );
}
catch( Exception ex ) {
SolrConfig.severeErrors.add( ex );
@ -199,13 +187,11 @@ public abstract class AbstractPluginLoader<T>
private class PluginInitInfo
{
final T plugin;
final Map<String,String> params;
final Node node;
PluginInitInfo( T plugin, Map<String,String> params, Node node )
PluginInitInfo( T plugin, Node node )
{
this.plugin = plugin;
this.params = params;
this.node = node;
}
}

4
src/java/org/apache/solr/util/plugin/MapPluginLoader.java
View File

@ -19,6 +19,7 @@ package org.apache.solr.util.plugin;
import java.util.Map;
import org.apache.solr.common.util.DOMUtil;
import org.w3c.dom.Node;
/**
@ -38,7 +39,8 @@ public class MapPluginLoader<T extends MapInitializedPlugin> extends AbstractPlu
}
@Override
protected void init(T plugin, Map<String, String> params, Node node) throws Exception {
protected void init(T plugin, Node node) throws Exception {
Map<String,String> params = DOMUtil.toMapExcept( node.getAttributes(), "name","class" );
plugin.init( params );
}

2
src/java/org/apache/solr/util/plugin/NamedListPluginLoader.java
View File

@ -38,7 +38,7 @@ public class NamedListPluginLoader<T extends NamedListInitializedPlugin> extends
}
@Override
protected void init(T plugin, Map<String, String> params, Node node) throws Exception {
protected void init(T plugin,Node node) throws Exception {
plugin.init( DOMUtil.childNodesToNamedList(node) );
}