apache · dsmiley · Mar 29, 2026
diff --git a/solr/core/src/test/org/apache/solr/cloud/ShardRoutingTest.java b/solr/core/src/test/org/apache/solr/cloud/ShardRoutingTest.java
@@ -16,9 +16,12 @@
  */
 package org.apache.solr.cloud;
 
+import jakarta.servlet.Filter;
 import java.lang.invoke.MethodHandles;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.SequencedMap;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.request.UpdateRequest;
 import org.apache.solr.client.solrj.response.QueryResponse;
@@ -327,10 +330,15 @@ public void doAtomicUpdate() throws Exception {
     }
   }
 
+  @Override
+  public SequencedMap<Class<? extends Filter>, String> getExtraRequestFilters() {
+    return new LinkedHashMap<>(Map.of(JettySolrRunner.DebugFilter.class, "/*"));
+  }
+
   long getNumRequests() {
-    long n = controlJetty.getDebugFilter().getTotalRequests();
+    long n = controlJetty.getFilter(JettySolrRunner.DebugFilter.class).getTotalRequests();
     for (JettySolrRunner jetty : jettys) {
-      n += jetty.getDebugFilter().getTotalRequests();
+      n += jetty.getFilter(JettySolrRunner.DebugFilter.class).getTotalRequests();
     }
     return n;
   }

diff --git a/solr/core/src/test/org/apache/solr/servlet/TestRequestRateLimiter.java b/solr/core/src/test/org/apache/solr/servlet/TestRequestRateLimiter.java
@@ -72,7 +72,8 @@ public void testConcurrentQueries() throws Exception {
       CollectionAdminRequest.createCollection(FIRST_COLLECTION, 1, 1).process(client);
       cluster.waitForActiveCollection(FIRST_COLLECTION, 1, 1);
 
-      RateLimitFilter rateLimitFilter = cluster.getJettySolrRunner(0).getSolrRateLimitFilter();
+      RateLimitFilter rateLimitFilter =
+          cluster.getJettySolrRunner(0).getFilter(RateLimitFilter.class);
 
       RateLimiterConfig rateLimiterConfig =
           new RateLimiterConfig(
@@ -291,7 +292,7 @@ public void testSlotBorrowing() throws Exception {
       CollectionAdminRequest.createCollection(SECOND_COLLECTION, 1, 1).process(client);
       cluster.waitForActiveCollection(SECOND_COLLECTION, 1, 1);
 
-      RateLimitFilter rateLimitFilter = cluster.getJettySolrRunner(0).getSolrRateLimitFilter();
+      var rateLimitFilter = cluster.getJettySolrRunner(0).getFilter(RateLimitFilter.class);
 
       RateLimiterConfig queryRateLimiterConfig =
           new RateLimiterConfig(

diff --git a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java
@@ -19,14 +19,17 @@
 
 import static org.hamcrest.core.StringContains.containsString;
 
+import jakarta.servlet.Filter;
 import java.io.IOException;
 import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
+import java.util.SequencedMap;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
@@ -202,9 +205,14 @@ public void test() throws Exception {
     // reorderedDBQsUsingUpdatedValueFromADroppedUpdate();
   }
 
+  @Override
+  public SequencedMap<Class<? extends Filter>, String> getExtraRequestFilters() {
+    return new LinkedHashMap<>(Map.of(JettySolrRunner.DebugFilter.class, "/*"));
+  }
+
   private void resetDelays() {
     for (JettySolrRunner j : jettys) {
-      j.getDebugFilter().unsetDelay();
+      j.getFilter(JettySolrRunner.DebugFilter.class).unsetDelay();
     }
   }
 
@@ -1236,7 +1244,7 @@ private void delayedReorderingFetchesMissingUpdateFromLeaderTest() throws Except
         .get(SHARD1)
         .get(1)
         .jetty
-        .getDebugFilter()
+        .getFilter(JettySolrRunner.DebugFilter.class)
         .addDelay("Waiting for dependant update to timeout", 1, 6000);
 
     ExecutorService threadpool =
@@ -1324,21 +1332,26 @@ private void delayedReorderingFetchesMissingUpdateFromLeaderTest() throws Except
     {
       clearIndex();
       commit();
-      shardToJetty.get(SHARD1).get(1).jetty.getDebugFilter().unsetDelay();
+      shardToJetty
+          .get(SHARD1)
+          .getFirst()
+          .jetty
+          .getFilter(JettySolrRunner.DebugFilter.class)
+          .unsetDelay();
 
       updates.add(regularDeleteRequest(1));
 
       shardToJetty
           .get(SHARD1)
           .get(1)
           .jetty
-          .getDebugFilter()
+          .getFilter(JettySolrRunner.DebugFilter.class)
           .addDelay("Waiting for dependant update to timeout", 1, 5999); // the first update
       shardToJetty
           .get(SHARD1)
           .get(1)
           .jetty
-          .getDebugFilter()
+          .getFilter(JettySolrRunner.DebugFilter.class)
           .addDelay("Waiting for dependant update to timeout", 4, 5998); // the delete update
 
       threadpool =
@@ -1635,7 +1648,7 @@ private void reorderedDBQsUsingUpdatedValueFromADroppedUpdate() throws Exception
         .get(SHARD1)
         .get(1)
         .jetty
-        .getDebugFilter()
+        .getFilter(JettySolrRunner.DebugFilter.class)
         .addDelay("Waiting for dependant update to timeout", 2, 8000);
 
     ExecutorService threadpool =

diff --git a/solr/packaging/test/test_compression.bats b/solr/packaging/test/test_compression.bats
@@ -0,0 +1,47 @@
+#!/usr/bin/env bats
+
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+load bats_helper
+
+setup_file() {
+  common_clean_setup
+  solr start -e films
+}
+
+setup() {
+  common_setup
+}
+
+teardown_file() {
+  save_home_on_failure
+  solr stop --all >/dev/null 2>&1
+}
+
+@test "server does not compress response without Accept-Encoding header" {
+  run curl -s -D - -o /dev/null "http://localhost:${SOLR_PORT}/solr/films/select?q=*:*&rows=100"
+  refute_output --partial "Content-Encoding:"
+}
+
+@test "server compresses response when Accept-Encoding: gzip is requested" {
+  run curl -s -D - -o /dev/null -H "Accept-Encoding: gzip" "http://localhost:${SOLR_PORT}/solr/films/select?q=*:*&rows=100"
+  assert_output --partial "gzip"
+}
+
+@test "compressed response can be decompressed and parsed" {
+  run curl -s --compressed "http://localhost:${SOLR_PORT}/solr/films/select?q=*:*&rows=100"
+  assert_output --partial '"status":0'
+}
diff --git a/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java b/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
@@ -37,6 +37,7 @@
 import java.util.Objects;
 import java.util.Properties;
 import java.util.Random;
+import java.util.SequencedMap;
 import java.util.Set;
 import java.util.SortedMap;
 import java.util.concurrent.ConcurrentHashMap;
@@ -439,7 +440,7 @@ public SortedMap<ServletHolder, String> getExtraServlets() {
    * Override this method to insert extra filters into the JettySolrRunners that are created using
    * createJetty()
    */
-  public SortedMap<Class<? extends Filter>, String> getExtraRequestFilters() {
+  public SequencedMap<Class<? extends Filter>, String> getExtraRequestFilters() {
     return null;
   }
 

diff --git a/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java b/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java
@@ -26,9 +26,6 @@
 import jakarta.servlet.ServletRequest;
 import jakarta.servlet.ServletResponse;
 import jakarta.servlet.UnavailableException;
-import jakarta.servlet.http.HttpServlet;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.lang.invoke.MethodHandles;
@@ -38,10 +35,12 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.NoSuchElementException;
 import java.util.Properties;
 import java.util.Random;
 import java.util.Set;
@@ -74,6 +73,7 @@
 import org.apache.solr.util.configuration.SSLConfigurationsFactory;
 import org.eclipse.jetty.alpn.server.ALPNServerConnectionFactory;
 import org.eclipse.jetty.ee10.servlet.FilterHolder;
+import org.eclipse.jetty.ee10.servlet.FilterMapping;
 import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
 import org.eclipse.jetty.ee10.servlet.ServletHolder;
 import org.eclipse.jetty.ee10.servlet.Source;
@@ -91,7 +91,6 @@
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.SslConnectionFactory;
 import org.eclipse.jetty.server.handler.GracefulHandler;
-import org.eclipse.jetty.server.handler.gzip.GzipHandler;
 import org.eclipse.jetty.session.DefaultSessionIdManager;
 import org.eclipse.jetty.util.resource.ResourceFactory;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
@@ -116,12 +115,7 @@ public class JettySolrRunner implements SolrBackend {
 
   private Server server;
 
-  volatile FilterHolder debugFilter;
-  volatile FilterHolder requiredFilter;
-  volatile FilterHolder rateLimitFilter;
-  volatile FilterHolder authFilter;
-  volatile ServletHolder solrServlet;
-  private FilterHolder tracingFilter;
+  private volatile ServletHolder solrServlet;
 
   private int jettyPort = -1;
 
@@ -131,8 +125,6 @@ public class JettySolrRunner implements SolrBackend {
 
   private volatile boolean startedBefore = false;
 
-  private List<FilterHolder> extraFilters;
-
   private int proxyPort = -1;
 
   private final boolean enableProxy;
@@ -371,7 +363,7 @@ private void init(int port) {
     {
       // Initialize the servlets
       final ServletContextHandler root =
-          new ServletContextHandler("/solr", ServletContextHandler.SESSIONS);
+          new ServletContextHandler("/solr", ServletContextHandler.NO_SESSIONS);
       root.setServer(server);
       root.setBaseResource(ResourceFactory.of(server).newResource("."));
       root.addEventListener(
@@ -397,11 +389,8 @@ public void contextInitialized(ServletContextEvent event) {
             }
           });
 
-      debugFilter = root.addFilter(DebugFilter.class, "/*", EnumSet.of(DispatcherType.REQUEST));
-      extraFilters = new ArrayList<>();
       for (Map.Entry<Class<? extends Filter>, String> entry : config.extraFilters.entrySet()) {
-        extraFilters.add(
-            root.addFilter(entry.getKey(), entry.getValue(), EnumSet.of(DispatcherType.REQUEST)));
+        root.addFilter(entry.getKey(), entry.getValue(), EnumSet.of(DispatcherType.REQUEST));
       }
 
       for (Map.Entry<ServletHolder, String> entry : config.extraServlets.entrySet()) {
@@ -410,43 +399,29 @@ public void contextInitialized(ServletContextEvent event) {
       // TODO: This needs to be driven by a parsing of web.xml eventually
       //  though we still want to avoid classpath scanning.
 
-      // required request setup
-      requiredFilter = root.getServletHandler().newFilterHolder(Source.EMBEDDED);
-      requiredFilter.setHeldClass(RequiredSolrRequestFilter.class);
-
-      // Ratelimit Requests
-      rateLimitFilter = root.getServletHandler().newFilterHolder(Source.EMBEDDED);
-      rateLimitFilter.setHeldClass(RateLimitFilter.class);
-
-      // Trace Requests
-      tracingFilter = root.getServletHandler().newFilterHolder(Source.EMBEDDED);
-      tracingFilter.setHeldClass(TracingFilter.class);
-
-      // Authenticate Requests
-      authFilter = root.getServletHandler().newFilterHolder(Source.EMBEDDED);
-      authFilter.setHeldClass(AuthenticationFilter.class);
-
-      // Map filters in same path as in web.xml
-      root.addFilter(requiredFilter, "/*", EnumSet.of(DispatcherType.REQUEST));
-      root.addFilter(rateLimitFilter, "/*", EnumSet.of(DispatcherType.REQUEST));
-      root.addFilter(tracingFilter, "/*", EnumSet.of(DispatcherType.REQUEST));
-      root.addFilter(authFilter, "/*", EnumSet.of(DispatcherType.REQUEST));
-
       // This is our main workhorse - now a servlet instead of filter
       solrServlet = root.getServletHandler().newServletHolder(Source.EMBEDDED);
+      solrServlet.setName("SolrServlet");
       solrServlet.setHeldClass(SolrServlet.class);
       root.addServlet(solrServlet, "/*");
 
-      // Default servlet as a fall-through
-      ServletHolder defaultHolder = root.getServletHandler().newServletHolder(Source.EMBEDDED);
-
-      // considered adding DefaultServlet.class here but perhaps that might grant our unit tests
-      // the power to serve static resources on the build machines? Not sure, so I'll just give a
-      // name to our existing hack. The tests passed without this, but it will ensure that if anyone
-      // ever hits the PathExcludeFilter in the unit test they get a 404 as before not a 500
-      defaultHolder.setHeldClass(Servlet404.class);
-      defaultHolder.setName("default");
-      root.addServlet(defaultHolder, "/");
+      // Map filters to SolrServlet by name (same order as web.xml)
+      for (var filterClass :
+          List.<Class<? extends Filter>>of(
+              RequiredSolrRequestFilter.class,
+              RateLimitFilter.class,
+              TracingFilter.class,
+              AuthenticationFilter.class)) {
+        FilterHolder fh = root.getServletHandler().newFilterHolder(Source.EMBEDDED);
+        fh.setName(filterClass.getSimpleName());
+        fh.setHeldClass(filterClass);
+        root.getServletHandler().addFilter(fh);
+        FilterMapping fm = new FilterMapping();
+        fm.setFilterName(fh.getName());
+        fm.setServletNames(new String[] {"SolrServlet"});
+        fm.setDispatcherTypes(EnumSet.of(DispatcherType.REQUEST));
+        root.getServletHandler().addFilterMapping(fm);
+      }
 
       // TODO: end area that should be driven by web.xml and webdefault.xml
       chain = root;
@@ -462,13 +437,7 @@ public void contextInitialized(ServletContextEvent event) {
       chain = rwh;
     }
 
-    GzipHandler gzipHandler = new GzipHandler();
-    gzipHandler.setHandler(chain);
-
-    gzipHandler.setMinGzipSize(23); // https://github.com/eclipse/jetty.project/issues/4191
-    gzipHandler.setIncludedMethods("GET");
-
-    server.setHandler(gzipHandler);
+    server.setHandler(chain);
 
     // Mimic "graceful.mod"
     GracefulHandler graceful = new GracefulHandler();
@@ -485,10 +454,15 @@ protected Handler.Wrapper injectJettyHandlers(Handler.Wrapper chain) {
   }
 
   /**
-   * @return the {@link RateLimitFilter} for this node
+   * @return the first filter implemented by the specified class, or throws an exception
    */
-  public RateLimitFilter getSolrRateLimitFilter() {
-    return (RateLimitFilter) rateLimitFilter.getFilter();
+  public <T extends Filter> T getFilter(Class<T> filterClass) {
+    return Arrays.stream(solrServlet.getServletHandler().getFilters())
+        .filter(fh -> fh.getHeldClass() == filterClass)
+        .map(fh -> filterClass.cast(fh.getFilter()))
+        .findFirst()
+        .orElseThrow(
+            () -> new NoSuchElementException("No filter of class: " + filterClass.getName()));
   }
 
   @Override
@@ -848,21 +822,9 @@ public SolrClient newClient(int connectionTimeoutMillis, int socketTimeoutMillis
         .build();
   }
 
-  public DebugFilter getDebugFilter() {
-    return (DebugFilter) debugFilter.getFilter();
-  }
-
   // --------------------------------------------------------------
   // --------------------------------------------------------------
 
-  /** This is a stupid hack to give jetty something to attach to */
-  public static class Servlet404 extends HttpServlet {
-    @Override
-    public void service(HttpServletRequest req, HttpServletResponse res) throws IOException {
-      res.sendError(404, "Can not find: " + req.getRequestURI());
-    }
-  }
-
   /** A main class that starts jetty+solr This is useful for debugging */
   public static void main(String[] args) throws Exception {
     JettySolrRunner jetty = new JettySolrRunner(".", 8983);