SOLR-18188: RestTestHarness overhaul, add URLUtil.buildURI

solr/core/build.gradle

@@ -203,7 +203,6 @@ dependencies {
     exclude group: "net.bytebuddy", module: "byte-buddy-agent"
   })
   testImplementation libs.apache.httpcomponents.httpclient
-  testImplementation libs.apache.httpcomponents.httpcore
 
   testImplementation libs.opentelemetry.sdk.testing
   testImplementation libs.dropwizard.metrics.core

solr/core/src/test/org/apache/solr/core/TestConfigSetImmutable.java

@@ -61,11 +61,6 @@ public void before() throws Exception {
   @After
   public void after() throws Exception {
     solrTestRule.reset();
-
-    if (restTestHarness != null) {
-      restTestHarness.close();
-    }
-    restTestHarness = null;
   }
 
   @Test

solr/core/src/test/org/apache/solr/core/TestCustomStream.java

@@ -36,18 +36,14 @@ public void testDynamicLoadingCustomStream() throws Exception {
     TestSolrConfigHandler.runConfigCommand(client, "/config", payload);
     TestSolrConfigHandler.testForResponseElement(
         client,
-        null,
         "/config/overlay",
-        null,
         Arrays.asList("overlay", "expressible", "hello", "class"),
         "org.apache.solr.core.HelloStream",
         10);
 
     TestSolrConfigHandler.testForResponseElement(
         client,
-        null,
         "/stream?expr=hello()",
-        null,
         Arrays.asList("result-set", "docs[0]", "msg"),
         "Hello World!",
         10);

solr/core/src/test/org/apache/solr/core/TestSetPropertyConfigApis.java

@@ -290,15 +290,13 @@ private static void processAndAssertSuccess(final CollectionAdminRequest.Create
   private static void setUserProperties(
       final String collectionName, final Map<String, String> props) throws Exception {
 
-    try (RestTestHarness harness = makeRestHarness(collectionName)) {
-      final String cmd =
-          "{ 'set-user-property' : { "
-              + props.entrySet().stream()
-                  .map(e -> "'" + e.getKey() + "':'" + e.getValue() + "'")
-                  .collect(Collectors.joining(","))
-              + "}} ";
-      runConfigCommand(harness, cmd);
-    }
+    final String cmd =
+        "{ 'set-user-property' : { "
+            + props.entrySet().stream()
+                .map(e -> "'" + e.getKey() + "':'" + e.getValue() + "'")
+                .collect(Collectors.joining(","))
+            + "}} ";
+    runConfigCommand(makeRestHarness(collectionName), cmd);
   }
 
   /**
@@ -345,8 +343,7 @@ public void postClose(SolrCore core) {
   }
 
   private static RestTestHarness makeRestHarness(final String collectionName) {
-    return new RestTestHarness(
-        () -> cluster.getRandomJetty(random()).getBaseUrl().toString() + "/" + collectionName);
+    return cluster.getRandomJetty(random()).getRestClient(collectionName);
   }
 
   private static void runConfigCommand(RestTestHarness harness, String json) throws IOException {