You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2021/03/10 09:56:20 UTC
[lucene] 24/42: more cleanup
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a commit to branch jira/solr14155-1
in repository https://gitbox.apache.org/repos/asf/lucene.git
commit 44194f94d42787ac405bf3799c18276a95001083
Author: noblepaul <no...@gmail.com>
AuthorDate: Thu Jul 16 19:28:12 2020 +1000
more cleanup
---
solr/core/src/java/org/apache/solr/core/PluginBag.java | 5 +++++
solr/core/src/java/org/apache/solr/core/SolrCore.java | 4 ++--
solr/core/src/java/org/apache/solr/pkg/PackagePluginHolder.java | 6 ------
solr/core/src/java/org/apache/solr/update/UpdateHandler.java | 7 ++++---
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/core/PluginBag.java b/solr/core/src/java/org/apache/solr/core/PluginBag.java
index d2442a1..0e3069e 100644
--- a/solr/core/src/java/org/apache/solr/core/PluginBag.java
+++ b/solr/core/src/java/org/apache/solr/core/PluginBag.java
@@ -413,6 +413,11 @@ public class PluginBag<T> implements AutoCloseable {
if (pluginInfo != null) return pluginInfo.className;
return null;
}
+ public static <T> PluginBag.PluginHolder<T> createHolder(T inst, Class<T> type) {
+ SolrConfig.SolrPluginInfo plugin = SolrConfig.classVsSolrPluginInfo.get(type.getName());
+ PluginInfo info = new PluginInfo(plugin.tag, Collections.singletonMap("class", inst.getClass().getName()));
+ return new PluginHolder<T> (info,inst);
+ }
public PluginInfo getPluginInfo() {
return pluginInfo;
diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java
index 19516eb..59cdbd1 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java
@@ -668,7 +668,7 @@ public final class SolrCore implements SolrInfoBean, Closeable {
* @see SolrCoreAware
*/
public void registerFirstSearcherListener(SolrEventListener listener) {
- firstSearcherListeners.add(createHolder(listener, this, SolrEventListener.class, null));
+ firstSearcherListeners.add(createHolder(listener, SolrEventListener.class));
}
/**
@@ -679,7 +679,7 @@ public final class SolrCore implements SolrInfoBean, Closeable {
* @see SolrCoreAware
*/
public void registerNewSearcherListener(SolrEventListener listener) {
- newSearcherListeners.add(createHolder(listener, this, SolrEventListener.class, null));
+ newSearcherListeners.add(createHolder(listener, SolrEventListener.class));
}
/**
diff --git a/solr/core/src/java/org/apache/solr/pkg/PackagePluginHolder.java b/solr/core/src/java/org/apache/solr/pkg/PackagePluginHolder.java
index 50afc71..a49c92b 100644
--- a/solr/core/src/java/org/apache/solr/pkg/PackagePluginHolder.java
+++ b/solr/core/src/java/org/apache/solr/pkg/PackagePluginHolder.java
@@ -75,12 +75,6 @@ public class PackagePluginHolder<T> extends PluginBag.PluginHolder<T> {
});
}
- public static <T> PluginBag.PluginHolder<T> createHolder(T inst, SolrCore core, Class<T> type, String msg) {
- SolrConfig.SolrPluginInfo plugin = SolrConfig.classVsSolrPluginInfo.get(type.getName());
- PluginInfo info = new PluginInfo(plugin.tag, Collections.singletonMap("class", inst.getClass().getName()));
- return createHolder(info, core, type, msg);
-
- }
public static <T> PluginBag.PluginHolder<T> createHolder(PluginInfo info, SolrCore core, Class<T> type, String msg) {
if(info.cName.pkg == null) {
diff --git a/solr/core/src/java/org/apache/solr/update/UpdateHandler.java b/solr/core/src/java/org/apache/solr/update/UpdateHandler.java
index 16d64b2..174dc0d 100644
--- a/solr/core/src/java/org/apache/solr/update/UpdateHandler.java
+++ b/solr/core/src/java/org/apache/solr/update/UpdateHandler.java
@@ -30,6 +30,7 @@ import org.apache.solr.util.plugin.SolrCoreAware;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.solr.core.PluginBag.PluginHolder.createHolder;
import static org.apache.solr.pkg.PackagePluginHolder.createHolder;
/**
@@ -173,7 +174,7 @@ public abstract class UpdateHandler implements SolrInfoBean {
* @see SolrCoreAware
*/
public void registerCommitCallback( SolrEventListener listener) {
- commitCallbacks.add(createHolder(listener, core, SolrEventListener.class,null));
+ commitCallbacks.add(createHolder(listener, SolrEventListener.class));
}
/**
@@ -184,7 +185,7 @@ public abstract class UpdateHandler implements SolrInfoBean {
* @see SolrCoreAware
*/
public void registerSoftCommitCallback( SolrEventListener listener ) {
- softCommitCallbacks.add(createHolder(listener, core, SolrEventListener.class,null));
+ softCommitCallbacks.add(createHolder(listener, SolrEventListener.class));
}
/**
@@ -195,7 +196,7 @@ public abstract class UpdateHandler implements SolrInfoBean {
* @see SolrCoreAware
*/
public void registerOptimizeCallback( SolrEventListener listener ) {
- optimizeCallbacks.add(createHolder(listener, core, SolrEventListener.class, null));
+ optimizeCallbacks.add(createHolder(listener, SolrEventListener.class));
}
public abstract void split(SplitIndexCommand cmd) throws IOException;