SOLR-16396: Migrate GET /config/requestHandler to JAX-RS

changelog/unreleased/SOLR-16396-config-requestHandler.yml

@@ -0,0 +1,12 @@
+title: >
+  Migrate GET /config/requestHandler to JAX-RS; V2 path and response key
+  are now plural requestHandlers (V1 unchanged)
+type: changed
+authors:
+  - name: Jalaz Kumar
+    nick: jaykay12
+  - name: Eric Pugh
+    nick: epugh
+links:
+  - name: SOLR-16396
+    url: https://issues.apache.org/jira/browse/SOLR-16396

solr/api/src/java/org/apache/solr/client/api/endpoint/ConfigApi.java

@@ -70,6 +70,27 @@ ConfigZnodeVersionResponse getZnodeVersion(
             @Parameter(description = "Expected request-params znode version")
             int expectedParamsVersion);
 
+    // TODO: RH names contain '/' (e.g. /select, /update/json), so they cannot be a @PathParam in
+    // the current design; Keeping filtering via @QueryParam for now.
+    @GET
+    @Path("/requestHandlers")
+    @StoreApiParameters
+    @Operation(
+        summary = "Fetch request handlers (including implicit handler)",
+        tags = {"config"})
+    ConfigInfoResponse getRequestHandler(
+        @QueryParam("componentName")
+            @Parameter(description = "Name of the specific request handler")
+            String component,
+        @QueryParam("expandParams")
+            @DefaultValue("false")
+            @Parameter(description = "Expand request handler useParams and effective parameters")
+            boolean expandParams,
+        @QueryParam("meta")
+            @DefaultValue("false")
+            @Parameter(description = "Include package metadata (_packageinfo_)")
+            boolean meta);
+
     // TODO: Keep this regex in sync with GetConfig.MIGRATED_CONFIG_COMPONENTS ("searchComponents"
     // and "queryResponseWriters" here are the external, pluralized names for the internal
     // "searchComponent"/"queryResponseWriter" sections; see GetConfig#toExternalComponentName)

solr/core/src/java/org/apache/solr/cli/packagemanager/PackageUtils.java

@@ -51,6 +51,7 @@
 import org.apache.solr.filestore.ClusterFileStore;
 import org.apache.solr.filestore.DistribFileStore;
 import org.apache.solr.filestore.FileStoreAPI;
+import org.apache.solr.servlet.SolrRequestParsers;
 import org.apache.solr.util.SolrJacksonAnnotationInspector;
 import org.apache.zookeeper.server.ByteBufferInputStream;
 
@@ -160,10 +161,23 @@ public static String getJsonStringFromNonCollectionApi(
     return getJsonStringFromUrl(client, path, params, false);
   }
 
-  /** Returns JSON string from a given Solr URL */
+  /**
+   * repository.json's verify/setup command templates embed their query string directly in {@code
+   * path} (e.g. {@code .../requestHandlers?componentName=x&meta=true}). The HTTP client always
+   * appends its own query string afterward with a leading {@code ?}, and a URL with two {@code ?}
+   * characters is parsed as a single query string on the wire -- so the last templated parameter
+   * silently absorbs the client's params as part of its own value instead of being read correctly.
+   */
   private static String getJsonStringFromUrl(
       SolrClient client, String path, SolrParams params, boolean isCollectionApi) {
     try {
+      int queryIndex = path.indexOf('?');
+      if (queryIndex >= 0) {
+        ModifiableSolrParams merged = new ModifiableSolrParams(params);
+        merged.add(SolrRequestParsers.parseQueryString(path.substring(queryIndex + 1)));
+        params = merged;
+        path = path.substring(0, queryIndex);
+      }
       GenericSolrRequest request =
           new GenericSolrRequest(SolrRequest.METHOD.GET, path, params)
               .setRequiresCollection(isCollectionApi);

solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java

@@ -21,10 +21,7 @@
 import static org.apache.solr.core.ConfigOverlay.NOT_EDITABLE;
 import static org.apache.solr.core.ConfigOverlay.ZNODEVER;
 import static org.apache.solr.core.ConfigSetProperties.IMMUTABLE_CONFIGSET_ARG;
-import static org.apache.solr.core.PluginInfo.APPENDS;
 import static org.apache.solr.core.PluginInfo.DEFAULTS;
-import static org.apache.solr.core.PluginInfo.INVARIANTS;
-import static org.apache.solr.core.RequestParams.USEPARAM;
 import static org.apache.solr.core.SolrConfig.PluginOpts.REQUIRE_CLASS;
 import static org.apache.solr.core.SolrConfig.PluginOpts.REQUIRE_NAME;
 import static org.apache.solr.core.SolrConfig.PluginOpts.REQUIRE_NAME_IN_OVERLAY;
@@ -69,7 +66,6 @@
 import org.apache.solr.common.cloud.Replica;
 import org.apache.solr.common.cloud.Slice;
 import org.apache.solr.common.params.CommonParams;
-import org.apache.solr.common.params.MapSolrParams;
 import org.apache.solr.common.params.ModifiableSolrParams;
 import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.common.util.CommandOperation;
@@ -97,7 +93,6 @@
 import org.apache.solr.security.AuthorizationContext;
 import org.apache.solr.security.PermissionNameProvider;
 import org.apache.solr.util.RTimer;
-import org.apache.solr.util.SolrPluginUtils;
 import org.apache.solr.util.plugin.SolrCoreAware;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -221,6 +216,15 @@ private void handleGET() {
                     .getZnodeVersion(
                         req.getParams().getInt(ConfigOverlay.NAME, -1),
                         req.getParams().getInt(RequestParams.NAME, -1)));
+          } else if (SolrRequestHandler.TYPE.equals(parts.get(1))) {
+            V2ApiUtils.squashIntoSolrResponseWithoutHeader(
+                resp,
+                new GetConfig(req)
+                    .getRequestHandler(
+                        parts.get(1),
+                        req.getParams().get("componentName"),
+                        req.getParams().getBool("expandParams", false),
+                        req.getParams().getBool("meta", false)));
           } else if (GetConfig.MIGRATED_CONFIG_COMPONENTS.contains(parts.get(1))) {
             String componentName = req.getParams().get("componentName");
             GetConfig getConfig = new GetConfig(req);
@@ -231,7 +235,8 @@ private void handleGET() {
                     : getConfig.getConfigComponentByName(
                         parts.get(1), componentName, req.getParams().getBool("meta", false)));
           } else {
-            Map<String, Object> m = getConfigDetails(parts.get(1), req);
+            Map<String, Object> m =
+                Utils.convertToMap(req.getCore().getSolrConfig(), new LinkedHashMap<>());
             Map<String, Object> val = new LinkedHashMap<>();
             val.put(parts.get(1), m.get(parts.get(1)));
             String componentName = req.getParams().get("componentName");
@@ -245,79 +250,6 @@ private void handleGET() {
       }
     }
 
-    private Map<String, Object> getConfigDetails(String componentType, SolrQueryRequest req) {
-      String componentName = componentType == null ? null : req.getParams().get("componentName");
-      boolean showParams = req.getParams().getBool("expandParams", false);
-      Map<String, Object> map =
-          Utils.convertToMap(this.req.getCore().getSolrConfig(), new LinkedHashMap<>());
-      if (componentType != null && !SolrRequestHandler.TYPE.equals(componentType)) return map;
-
-      @SuppressWarnings({"unchecked"})
-      Map<String, Object> reqHandlers =
-          (Map<String, Object>)
-              map.computeIfAbsent(SolrRequestHandler.TYPE, k -> new LinkedHashMap<>());
-      List<PluginInfo> plugins = this.req.getCore().getImplicitHandlers();
-      for (PluginInfo plugin : plugins) {
-        if (SolrRequestHandler.TYPE.equals(plugin.type)) {
-          if (!reqHandlers.containsKey(plugin.name)) {
-            reqHandlers.put(plugin.name, plugin);
-          }
-        }
-      }
-      if (!showParams) return map;
-      for (Map.Entry<String, Object> e : reqHandlers.entrySet()) {
-        if (componentName == null || e.getKey().equals(componentName)) {
-          Map<String, Object> m = expandUseParams(req, e.getValue());
-          e.setValue(m);
-        }
-      }
-
-      return map;
-    }
-
-    @SuppressWarnings({"unchecked"})
-    private Map<String, Object> expandUseParams(SolrQueryRequest req, Object plugin) {
-
-      Map<String, Object> pluginInfo = null;
-      if (plugin instanceof Map) {
-        pluginInfo = (Map) plugin;
-      } else if (plugin instanceof PluginInfo) {
-        pluginInfo = Utils.convertToMap((PluginInfo) plugin, new LinkedHashMap<>());
-      }
-      String useParams = (String) pluginInfo.get(USEPARAM);
-      String useParamsInReq = req.getOriginalParams().get(USEPARAM);
-      if (useParams != null || useParamsInReq != null) {
-        Map<String, Object> m = new LinkedHashMap<>();
-        pluginInfo.put("_useParamsExpanded_", m);
-        List<String> params = new ArrayList<>();
-        if (useParams != null) params.addAll(StrUtils.splitSmart(useParams, ','));
-        if (useParamsInReq != null) params.addAll(StrUtils.splitSmart(useParamsInReq, ','));
-        for (String param : params) {
-          RequestParams.ParamSet p =
-              this.req.getCore().getSolrConfig().getRequestParams().getParams(param);
-          if (p != null) {
-            m.put(param, p);
-          } else {
-            m.put(param, "[NOT AVAILABLE]");
-          }
-        }
-
-        SolrQueryRequest r = req.subRequest(req.getOriginalParams());
-        r.getContext().put(USEPARAM, useParams);
-        NamedList<?> nl = new PluginInfo(SolrRequestHandler.TYPE, pluginInfo).initArgs;
-        SolrPluginUtils.setDefaults(
-            r,
-            getSolrParamsFromNamedList(nl, DEFAULTS),
-            getSolrParamsFromNamedList(nl, APPENDS),
-            getSolrParamsFromNamedList(nl, INVARIANTS));
-        // SolrParams.wrapDefaults(maskUseParams, req.getParams())
-
-        MapSolrParams mask = new MapSolrParams(Map.of("componentName", "", "expandParams", ""));
-        pluginInfo.put("_effectiveParams_", SolrParams.wrapDefaults(mask, r.getParams()));
-      }
-      return pluginInfo;
-    }
-
     private void handlePOST() throws IOException {
       List<CommandOperation> ops = ApiBag.readCommands(req.getContentStreams(), resp.getValues());
       if (ops == null) return;

solr/core/src/java/org/apache/solr/handler/admin/api/GetConfig.java

@@ -68,6 +68,8 @@ public class GetConfig extends JerseyResource implements ConfigApi.Get {
           "searchComponent",
           "queryResponseWriter");
 
+  public static final String REQUEST_HANDLERS = "requestHandlers";
+
   // v2-only renames: external (URL/response-key) component name -> internal SolrConfig section
   // name. v1's GET /config/{component} keeps using the internal names unchanged.
   private static final Map<String, String> EXTERNAL_TO_INTERNAL_COMPONENT_NAME =
@@ -99,7 +101,7 @@ public GetConfig(SolrQueryRequest solrQueryRequest) {
   @PermissionName(CONFIG_READ_PERM)
   public ConfigInfoResponse getConfig(boolean expandParams) {
     final var response = instantiateJerseyResponse(ConfigInfoResponse.class);
-    response.config = buildConfigMap(solrQueryRequest, expandParams);
+    response.config = buildConfigMap(expandParams);
     return response;
   }
 
@@ -129,13 +131,41 @@ public ConfigZnodeVersionResponse getZnodeVersion(
     return response;
   }
 
+  @Override
+  @PermissionName(CONFIG_READ_PERM)
+  public ConfigInfoResponse getRequestHandler(
+      String componentName, boolean expandParams, boolean meta) {
+    return getRequestHandler(REQUEST_HANDLERS, componentName, expandParams, meta);
+  }
+
+  @SuppressWarnings("unchecked")
+  public ConfigInfoResponse getRequestHandler(
+      String sectionName, String componentName, boolean expandParams, boolean meta) {
+    final var response = instantiateJerseyResponse(ConfigInfoResponse.class);
+
+    Map<String, Object> reqHandlersMap =
+        (Map<String, Object>)
+            solrConfigAsMap().computeIfAbsent(SolrRequestHandler.TYPE, k -> new LinkedHashMap<>());
+    Map<String, Object> configMap = new LinkedHashMap<>();
+    configMap.put(
+        sectionName, requestHandlersWithImplicits(reqHandlersMap, expandParams, componentName));
+    if (componentName != null) {
+      filterByComponentName(configMap, sectionName, componentName, meta, solrQueryRequest);
+    }
+
+    response.config = jsonSafeCopy(configMap);
+    return response;
+  }
+
   @Override
   @PermissionName(CONFIG_READ_PERM)
   public ConfigInfoResponse getConfigComponent(String component) {
     final var response = instantiateJerseyResponse(ConfigInfoResponse.class);
-    Map<String, Object> section = new LinkedHashMap<>();
-    section.put(component, solrConfigAsMap().get(toInternalComponentName(component)));
-    response.config = jsonSafeCopy(section);
+
+    Map<String, Object> configMap = new LinkedHashMap<>();
+    configMap.put(component, solrConfigAsMap().get(toInternalComponentName(component)));
+
+    response.config = jsonSafeCopy(configMap);
     return response;
   }
 
@@ -144,10 +174,11 @@ public ConfigInfoResponse getConfigComponent(String component) {
   public ConfigInfoResponse getConfigComponentByName(
       String component, String componentName, boolean meta) {
     final var response = instantiateJerseyResponse(ConfigInfoResponse.class);
-    Map<String, Object> section = new LinkedHashMap<>();
-    section.put(component, solrConfigAsMap().get(toInternalComponentName(component)));
-    filterByComponentName(section, component, componentName, meta, solrQueryRequest);
-    response.config = jsonSafeCopy(section);
+
+    Map<String, Object> configMap = new LinkedHashMap<>();
+    configMap.put(component, solrConfigAsMap().get(toInternalComponentName(component)));
+    filterByComponentName(configMap, component, componentName, meta, solrQueryRequest);
+    response.config = jsonSafeCopy(configMap);
     return response;
   }
 
@@ -161,12 +192,12 @@ public ConfigInfoResponse getConfigComponentByName(
    */
   @SuppressWarnings({"unchecked", "rawtypes"})
   public static void filterByComponentName(
-      Map<String, Object> section,
+      Map<String, Object> configMap,
       String component,
       String componentName,
       boolean meta,
       SolrQueryRequest req) {
-    Map pluginNameVsPluginInfo = (Map) section.get(component);
+    Map pluginNameVsPluginInfo = (Map) configMap.get(component);
     if (pluginNameVsPluginInfo == null) {
       return;
     }
@@ -183,7 +214,7 @@ public static void filterByComponentName(
 
     Map<String, Object> pluginInfo =
         o instanceof MapWriter ? new SimpleOrderedMap<>((MapWriter) o) : (Map<String, Object>) o;
-    section.put(
+    configMap.put(
         component,
         pluginNameVsPluginInfo instanceof MapWriter
             ? pluginInfo
@@ -227,29 +258,39 @@ private NullKeyTolerantMap jsonSafeCopy(Map<String, Object> map) {
     return jsonSafeCopy;
   }
 
-  @SuppressWarnings({"unchecked"})
-  private Map<String, Object> buildConfigMap(
-      SolrQueryRequest solrQueryRequest, boolean expandParams) {
-
+  @SuppressWarnings("unchecked")
+  private Map<String, Object> buildConfigMap(boolean expandParams) {
     Map<String, Object> configMap = solrConfigAsMap();
-
-    Map<String, Object> reqHandlers =
+    Map<String, Object> reqHandlersMap =
         (Map<String, Object>)
             configMap.computeIfAbsent(SolrRequestHandler.TYPE, k -> new LinkedHashMap<>());
+    requestHandlersWithImplicits(reqHandlersMap, expandParams, null);
+    return jsonSafeCopy(configMap);
+  }
+
+  /**
+   * Merges implicit handlers into {@code reqHandlersMap} (mutated in place and returned), expanding
+   * useParams for {@code expandOnlyComponentName} (or all entries if null) when {@code
+   * expandParams}.
+   */
+  private Map<String, Object> requestHandlersWithImplicits(
+      Map<String, Object> reqHandlersMap, boolean expandParams, String expandOnlyComponentName) {
     List<PluginInfo> plugins = solrQueryRequest.getCore().getImplicitHandlers();
     for (PluginInfo plugin : plugins) {
-      if (SolrRequestHandler.TYPE.equals(plugin.type) && !reqHandlers.containsKey(plugin.name)) {
-        reqHandlers.put(plugin.name, plugin);
+      if (SolrRequestHandler.TYPE.equals(plugin.type) && !reqHandlersMap.containsKey(plugin.name)) {
+        reqHandlersMap.put(plugin.name, plugin);
       }
     }
 
     if (expandParams) {
-      for (Map.Entry<String, Object> entry : reqHandlers.entrySet()) {
-        entry.setValue(expandUseParams(solrQueryRequest, entry.getValue()));
+      for (Map.Entry<String, Object> entry : reqHandlersMap.entrySet()) {
+        if (expandOnlyComponentName == null || expandOnlyComponentName.equals(entry.getKey())) {
+          entry.setValue(expandUseParams(solrQueryRequest, entry.getValue()));
+        }
       }
     }
 
-    return jsonSafeCopy(configMap);
+    return reqHandlersMap;
   }
 
   @SuppressWarnings({"unchecked", "rawtypes"})

solr/core/src/java/org/apache/solr/handler/admin/api/GetConfigAPI.java

@@ -61,7 +61,6 @@ public void getSingleParamSet(SolrQueryRequest req, SolrQueryResponse rsp) {
   @EndPoint(
       path = {
         "/config/luceneMatchVersion",
-        "/config/requestHandler",
         "/config/initParams",
         "/config/listener",
         "/config/requestDispatcher",