From 6983e9785f36ca0b27c73af101ef3ff0b7fde349 Mon Sep 17 00:00:00 2001 From: Eric Pugh Date: Tue, 3 Feb 2026 21:05:13 -0500 Subject: [PATCH 1/3] Remove deprecated code --- .../org/apache/solr/handler/GraphHandler.java | 40 ------------------- 1 file changed, 40 deletions(-) diff --git a/solr/core/src/java/org/apache/solr/handler/GraphHandler.java b/solr/core/src/java/org/apache/solr/handler/GraphHandler.java index 07667983f5a7..7288878fab74 100644 --- a/solr/core/src/java/org/apache/solr/handler/GraphHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/GraphHandler.java @@ -19,10 +19,8 @@ import java.io.IOException; import java.lang.invoke.MethodHandles; -import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import org.apache.solr.client.solrj.io.SolrClientCache; import org.apache.solr.client.solrj.io.Tuple; import org.apache.solr.client.solrj.io.comp.StreamComparator; @@ -32,16 +30,12 @@ import org.apache.solr.client.solrj.io.stream.TupleStream; import org.apache.solr.client.solrj.io.stream.expr.DefaultStreamFactory; import org.apache.solr.client.solrj.io.stream.expr.Explanation; -import org.apache.solr.client.solrj.io.stream.expr.Expressible; import org.apache.solr.client.solrj.io.stream.expr.StreamFactory; import org.apache.solr.common.params.CommonParams; import org.apache.solr.common.params.ModifiableSolrParams; import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.params.StreamParams; -import org.apache.solr.common.util.NamedList; import org.apache.solr.core.CoreContainer; -import org.apache.solr.core.PluginInfo; -import org.apache.solr.core.SolrConfig; import org.apache.solr.core.SolrCore; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.response.SolrQueryResponse; @@ -60,12 +54,6 @@ * *

To add additional functions, just define them as plugins in solrconfig.xml via {@code * } - * - *

The @deprecated configuration method as of Solr 8.5 is {@code org.apache.solr.client.solrj.io.stream.ReducerStreamorg.apache.solr.client.solrj.io.stream.RecordCountStream } - * - * @since 6.1.0 */ public class GraphHandler extends RequestHandlerBase implements SolrCoreAware, PermissionNameProvider { @@ -97,34 +85,6 @@ public void inform(SolrCore core) { // This pulls all the overrides and additions from the config StreamHandler.addExpressiblePlugins(streamFactory, core); - - // Check deprecated approach. - Object functionMappingsObj = initArgs.get("streamFunctions"); - if (null != functionMappingsObj) { - log.warn( - "solrconfig.xml: is deprecated for adding additional streaming functions to GraphHandler."); - NamedList functionMappings = (NamedList) functionMappingsObj; - for (Entry functionMapping : functionMappings) { - String key = functionMapping.getKey(); - PluginInfo pluginInfo = - new PluginInfo(key, Collections.singletonMap("class", functionMapping.getValue())); - - if (pluginInfo.pkgName == null) { - Class clazz = - core.getResourceLoader() - .findClass((String) functionMapping.getValue(), Expressible.class); - streamFactory.withFunctionName(key, clazz); - } else { - @SuppressWarnings("resource") - StreamHandler.ExpressibleHolder holder = - new StreamHandler.ExpressibleHolder( - pluginInfo, - core, - SolrConfig.classVsSolrPluginInfo.get(Expressible.class.getName())); - streamFactory.withFunctionName(key, holder); - } - } - } } @Override From 8668d15e8f2df58738646f92a4c8cf8b330ae00f Mon Sep 17 00:00:00 2001 From: Eric Pugh Date: Tue, 3 Feb 2026 21:07:27 -0500 Subject: [PATCH 2/3] Doc the removal --- ...0-remove-deprecated-graphhandler-registration-support.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelog/unreleased/PR#4100-remove-deprecated-graphhandler-registration-support.yml diff --git a/changelog/unreleased/PR#4100-remove-deprecated-graphhandler-registration-support.yml b/changelog/unreleased/PR#4100-remove-deprecated-graphhandler-registration-support.yml new file mode 100644 index 000000000000..dced25fd7cc5 --- /dev/null +++ b/changelog/unreleased/PR#4100-remove-deprecated-graphhandler-registration-support.yml @@ -0,0 +1,5 @@ +# See https://github.com/apache/solr/blob/main/dev-docs/changelog.adoc +title: Remove deprecated streamFunctions in GraphHandler for registering streaming expressions. +type: removed # added, changed, fixed, deprecated, removed, dependency_update, security, other +authors: + - name: Eric Pugh From 4afd8a56fca2a3480cdcd26367424a5f9f8d0489 Mon Sep 17 00:00:00 2001 From: Eric Pugh Date: Wed, 4 Feb 2026 10:08:29 -0500 Subject: [PATCH 3/3] add pr link --- ...100-remove-deprecated-graphhandler-registration-support.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changelog/unreleased/PR#4100-remove-deprecated-graphhandler-registration-support.yml b/changelog/unreleased/PR#4100-remove-deprecated-graphhandler-registration-support.yml index dced25fd7cc5..c18a1a5fbd8f 100644 --- a/changelog/unreleased/PR#4100-remove-deprecated-graphhandler-registration-support.yml +++ b/changelog/unreleased/PR#4100-remove-deprecated-graphhandler-registration-support.yml @@ -3,3 +3,6 @@ title: Remove deprecated streamFunctions in GraphHandler for registering streami type: removed # added, changed, fixed, deprecated, removed, dependency_update, security, other authors: - name: Eric Pugh +links: + - name: PR#4100 + url: https://github.com/apache/solr/pull/4100