SOLR-18168: Simplify JettySolrRunner (#4262)

* Remove GzipHandler from JettySolrRunner.  Migrate the test to BATS.
* Refactor JettySolrRunner filter access to use generic getFilter(). Broaden getExtraRequestFilters() return type from SortedMap to SequencedMap.
* Remove Servlet404.
* Move/Rename DebugFilter to ServletFixtures as DelayFilter

Author: dsmiley

solr/core/src/test/org/apache/solr/cloud/ShardRoutingTest.java

@@ -16,14 +16,18 @@
  */
 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;
 import org.apache.solr.common.params.ShardParams;
 import org.apache.solr.embedded.JettySolrRunner;
+import org.apache.solr.util.ServletFixtures;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -327,10 +331,15 @@ public void doAtomicUpdate() throws Exception {
     }
   }
 
+  @Override
+  public SequencedMap<Class<? extends Filter>, String> getExtraRequestFilters() {
+    return new LinkedHashMap<>(Map.of(ServletFixtures.DelayServlet.class, "/*"));
+  }
+
   long getNumRequests() {
-    long n = controlJetty.getDebugFilter().getTotalRequests();
+    long n = controlJetty.getFilter(ServletFixtures.DelayServlet.class).getTotalRequests();
     for (JettySolrRunner jetty : jettys) {
-      n += jetty.getDebugFilter().getTotalRequests();
+      n += jetty.getFilter(ServletFixtures.DelayServlet.class).getTotalRequests();
     }
     return n;
   }

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(

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;
@@ -62,6 +65,7 @@
 import org.apache.solr.index.NoMergePolicyFactory;
 import org.apache.solr.update.processor.DistributedUpdateProcessor;
 import org.apache.solr.util.RefCounted;
+import org.apache.solr.util.ServletFixtures;
 import org.apache.solr.util.TimeOut;
 import org.apache.zookeeper.KeeperException;
 import org.junit.BeforeClass;
@@ -202,9 +206,14 @@ public void test() throws Exception {
     // reorderedDBQsUsingUpdatedValueFromADroppedUpdate();
   }
 
+  @Override
+  public SequencedMap<Class<? extends Filter>, String> getExtraRequestFilters() {
+    return new LinkedHashMap<>(Map.of(ServletFixtures.DelayServlet.class, "/*"));
+  }
+
   private void resetDelays() {
     for (JettySolrRunner j : jettys) {
-      j.getDebugFilter().unsetDelay();
+      j.getFilter(ServletFixtures.DelayServlet.class).unsetDelay();
     }
   }
 
@@ -1236,7 +1245,7 @@ private void delayedReorderingFetchesMissingUpdateFromLeaderTest() throws Except
         .get(SHARD1)
         .get(1)
         .jetty
-        .getDebugFilter()
+        .getFilter(ServletFixtures.DelayServlet.class)
         .addDelay("Waiting for dependant update to timeout", 1, 6000);
 
     ExecutorService threadpool =
@@ -1324,21 +1333,26 @@ private void delayedReorderingFetchesMissingUpdateFromLeaderTest() throws Except
     {
       clearIndex();
       commit();
-      shardToJetty.get(SHARD1).get(1).jetty.getDebugFilter().unsetDelay();
+      shardToJetty
+          .get(SHARD1)
+          .getFirst()
+          .jetty
+          .getFilter(ServletFixtures.DelayServlet.class)
+          .unsetDelay();
 
       updates.add(regularDeleteRequest(1));
 
       shardToJetty
           .get(SHARD1)
           .get(1)
           .jetty
-          .getDebugFilter()
+          .getFilter(ServletFixtures.DelayServlet.class)
           .addDelay("Waiting for dependant update to timeout", 1, 5999); // the first update
       shardToJetty
           .get(SHARD1)
           .get(1)
           .jetty
-          .getDebugFilter()
+          .getFilter(ServletFixtures.DelayServlet.class)
           .addDelay("Waiting for dependant update to timeout", 4, 5998); // the delete update
 
       threadpool =
@@ -1635,7 +1649,7 @@ private void reorderedDBQsUsingUpdatedValueFromADroppedUpdate() throws Exception
         .get(SHARD1)
         .get(1)
         .jetty
-        .getDebugFilter()
+        .getFilter(ServletFixtures.DelayServlet.class)
         .addDelay("Waiting for dependant update to timeout", 2, 8000);
 
     ExecutorService threadpool =

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'
+}

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;
   }