You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ds...@apache.org on 2024/03/01 02:42:31 UTC
(solr) branch branch_9x updated: Tests: JettyConfig.Builder.sslConfig now self inits (#2318)
This is an automated email from the ASF dual-hosted git repository.
dsmiley pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new e693fb22a2a Tests: JettyConfig.Builder.sslConfig now self inits (#2318)
e693fb22a2a is described below
commit e693fb22a2a85a2aa33df8d7671a6fb332fd3dab
Author: David Smiley <ds...@apache.org>
AuthorDate: Thu Feb 29 14:22:25 2024 -0500
Tests: JettyConfig.Builder.sslConfig now self inits (#2318)
-- from SolrTestCaseJ4.sslConfig. Instead of creator of JettyConfig remembering to set this all over the place.
Don't need SolrTestCaseJ4.buildJettyConfig()
(cherry picked from commit 8bfab45afa47abe6958511f96b838977a5a502f0)
---
solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java | 4 +++-
.../org/apache/solr/cloud/ConcurrentCreateRoutedAliasTest.java | 5 ++++-
.../org/apache/solr/cloud/TestConfigSetsAPIExclusivity.java | 5 ++++-
.../test/org/apache/solr/cloud/TestConfigSetsAPIZkFailure.java | 3 ++-
.../src/test/org/apache/solr/cloud/TestRequestForwarding.java | 5 ++++-
.../apache/solr/cloud/TestWaitForStateWithJettyShutdowns.java | 7 +++++--
.../collections/ConcurrentDeleteAndCreateCollectionTest.java | 5 ++++-
.../test/org/apache/solr/handler/PingRequestHandlerTest.java | 4 +++-
.../src/test/org/apache/solr/handler/V2StandaloneTest.java | 5 ++++-
.../org/apache/solr/handler/admin/CoreAdminHandlerTest.java | 10 +++++++---
.../org/apache/solr/handler/admin/DaemonStreamApiTest.java | 5 ++++-
.../org/apache/solr/handler/component/SearchHandlerTest.java | 10 +++++++---
.../src/test/org/apache/solr/response/TestRawTransformer.java | 5 ++++-
.../src/test/org/apache/solr/search/stats/TestDistribIDF.java | 5 ++++-
.../test/org/apache/solr/security/BasicAuthStandaloneTest.java | 5 ++++-
.../security/hadoop/TestSolrCloudWithDelegationTokens.java | 5 ++++-
.../security/hadoop/TestSolrCloudWithSecureImpersonation.java | 5 ++++-
.../ltr/src/test/org/apache/solr/ltr/TestLTROnSolrCloud.java | 6 +++---
.../org/apache/solr/client/solrj/TestLBHttp2SolrClient.java | 3 +--
.../org/apache/solr/client/solrj/TestLBHttpSolrClient.java | 3 +--
.../apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java | 1 -
.../impl/ConcurrentUpdateHttp2SolrClientBadInputTest.java | 4 +---
.../client/solrj/impl/ConcurrentUpdateHttp2SolrClientTest.java | 1 -
.../solrj/impl/ConcurrentUpdateSolrClientBadInputTest.java | 4 +---
.../solr/client/solrj/impl/ConcurrentUpdateSolrClientTest.java | 5 +----
.../solr/client/solrj/impl/Http2SolrClientProxyTest.java | 5 +----
.../org/apache/solr/client/solrj/impl/Http2SolrClientTest.java | 1 -
.../solr/client/solrj/impl/HttpSolrClientBadInputTest.java | 4 +---
.../solr/client/solrj/impl/LBHttpSolrClientBadInputTest.java | 4 +---
.../solr/client/solrj/impl/TestCloudSolrClientConnections.java | 10 +++++++---
.../java/org/apache/solr/BaseDistributedSearchTestCase.java | 1 -
.../src/java/org/apache/solr/SolrJettyTestBase.java | 6 +-----
.../src/java/org/apache/solr/SolrTestCaseHS.java | 7 +------
.../src/java/org/apache/solr/SolrTestCaseJ4.java | 8 --------
.../org/apache/solr/cloud/AbstractFullDistribZkTestBase.java | 3 ---
.../src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java | 4 ----
.../src/java/org/apache/solr/embedded/JettyConfig.java | 4 +++-
.../src/java/org/apache/solr/util/SolrJettyTestRule.java | 8 +-------
.../src/test/org/apache/solr/embedded/TestJettySolrRunner.java | 2 +-
39 files changed, 96 insertions(+), 91 deletions(-)
diff --git a/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java b/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java
index c7973ff7e93..4cd708ab370 100644
--- a/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java
+++ b/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java
@@ -24,6 +24,7 @@ import java.util.Properties;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
+import org.apache.solr.embedded.JettyConfig;
import org.junit.BeforeClass;
/**
@@ -73,7 +74,8 @@ public class TestSolrCoreProperties extends SolrJettyTestBase {
nodeProperties.setProperty("solr.data.dir", createTempDir().toFile().getCanonicalPath());
}
- solrClientTestRule.startSolr(homeDir, nodeProperties, buildJettyConfig("/solr"));
+ solrClientTestRule.startSolr(
+ homeDir, nodeProperties, JettyConfig.builder().setContext("/solr").build());
// createJetty(homeDir.getAbsolutePath(), null, null);
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/ConcurrentCreateRoutedAliasTest.java b/solr/core/src/test/org/apache/solr/cloud/ConcurrentCreateRoutedAliasTest.java
index 3046181c193..6dff04ddb0d 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ConcurrentCreateRoutedAliasTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ConcurrentCreateRoutedAliasTest.java
@@ -24,6 +24,7 @@ import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.client.solrj.response.CollectionAdminResponse;
import org.apache.solr.common.util.IOUtils;
+import org.apache.solr.embedded.JettyConfig;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -44,7 +45,9 @@ public class ConcurrentCreateRoutedAliasTest extends SolrTestCaseJ4 {
@Before
public void setUp() throws Exception {
super.setUp();
- solrCluster = new MiniSolrCloudCluster(4, createTempDir(), buildJettyConfig("/solr"));
+ solrCluster =
+ new MiniSolrCloudCluster(
+ 4, createTempDir(), JettyConfig.builder().setContext("/solr").build());
}
@Override
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIExclusivity.java b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIExclusivity.java
index 7e1e48bd568..22234b6b20c 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIExclusivity.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIExclusivity.java
@@ -26,6 +26,7 @@ import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.request.ConfigSetAdminRequest;
import org.apache.solr.client.solrj.request.ConfigSetAdminRequest.Create;
import org.apache.solr.client.solrj.request.ConfigSetAdminRequest.Delete;
+import org.apache.solr.embedded.JettyConfig;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -49,7 +50,9 @@ public class TestConfigSetsAPIExclusivity extends SolrTestCaseJ4 {
@Before
public void setUp() throws Exception {
super.setUp();
- solrCluster = new MiniSolrCloudCluster(1, createTempDir(), buildJettyConfig("/solr"));
+ solrCluster =
+ new MiniSolrCloudCluster(
+ 1, createTempDir(), JettyConfig.builder().setContext("/solr").build());
}
@Override
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIZkFailure.java b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIZkFailure.java
index bbf0138a713..1bbfe87919e 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIZkFailure.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIZkFailure.java
@@ -43,6 +43,7 @@ import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.util.Utils;
import org.apache.solr.core.ConfigSetProperties;
import org.apache.solr.core.ConfigSetService;
+import org.apache.solr.embedded.JettyConfig;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.KeeperException.NoNodeException;
import org.apache.zookeeper.Watcher;
@@ -86,7 +87,7 @@ public class TestConfigSetsAPIZkFailure extends SolrTestCaseJ4 {
1,
testDir,
MiniSolrCloudCluster.DEFAULT_CLOUD_SOLR_XML,
- buildJettyConfig("/solr"),
+ JettyConfig.builder().setContext("/solr").build(),
zkTestServer,
true);
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestRequestForwarding.java b/solr/core/src/test/org/apache/solr/cloud/TestRequestForwarding.java
index 7a719262fe1..e0f542cf523 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestRequestForwarding.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestRequestForwarding.java
@@ -21,6 +21,7 @@ import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.client.solrj.response.CollectionAdminResponse;
+import org.apache.solr.embedded.JettyConfig;
import org.apache.solr.embedded.JettySolrRunner;
import org.junit.Test;
@@ -34,7 +35,9 @@ public class TestRequestForwarding extends SolrTestCaseJ4 {
super.setUp();
System.setProperty("solr.test.sys.prop1", "propone");
System.setProperty("solr.test.sys.prop2", "proptwo");
- solrCluster = new MiniSolrCloudCluster(3, createTempDir(), buildJettyConfig("/solr"));
+ solrCluster =
+ new MiniSolrCloudCluster(
+ 3, createTempDir(), JettyConfig.builder().setContext("/solr").build());
solrCluster.uploadConfigSet(TEST_PATH().resolve("collection1/conf"), "conf1");
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestWaitForStateWithJettyShutdowns.java b/solr/core/src/test/org/apache/solr/cloud/TestWaitForStateWithJettyShutdowns.java
index 66296cb2440..055ad1db264 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestWaitForStateWithJettyShutdowns.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestWaitForStateWithJettyShutdowns.java
@@ -32,6 +32,7 @@ import org.apache.solr.common.cloud.CollectionStatePredicate;
import org.apache.solr.common.cloud.DocCollection;
import org.apache.solr.common.util.ExecutorUtil;
import org.apache.solr.common.util.SolrNamedThreadFactory;
+import org.apache.solr.embedded.JettyConfig;
import org.apache.solr.embedded.JettySolrRunner;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,7 +43,8 @@ public class TestWaitForStateWithJettyShutdowns extends SolrTestCaseJ4 {
public void testWaitForStateAfterShutDown() throws Exception {
final String col_name = "test_col";
final MiniSolrCloudCluster cluster =
- new MiniSolrCloudCluster(1, createTempDir(), buildJettyConfig("/solr"));
+ new MiniSolrCloudCluster(
+ 1, createTempDir(), JettyConfig.builder().setContext("/solr").build());
try {
log.info("Create our collection");
CollectionAdminRequest.createCollection(col_name, "_default", 1, 1)
@@ -76,7 +78,8 @@ public class TestWaitForStateWithJettyShutdowns extends SolrTestCaseJ4 {
ExecutorUtil.newMDCAwareFixedThreadPool(
1, new SolrNamedThreadFactory("background_executor"));
final MiniSolrCloudCluster cluster =
- new MiniSolrCloudCluster(1, createTempDir(), buildJettyConfig("/solr"));
+ new MiniSolrCloudCluster(
+ 1, createTempDir(), JettyConfig.builder().setContext("/solr").build());
try {
log.info("Create our collection");
CollectionAdminRequest.createCollection(col_name, "_default", 1, 1)
diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/ConcurrentDeleteAndCreateCollectionTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/ConcurrentDeleteAndCreateCollectionTest.java
index 51678f06d5f..d0c704c4604 100644
--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/ConcurrentDeleteAndCreateCollectionTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/ConcurrentDeleteAndCreateCollectionTest.java
@@ -29,6 +29,7 @@ import org.apache.solr.client.solrj.response.CollectionAdminResponse;
import org.apache.solr.cloud.MiniSolrCloudCluster;
import org.apache.solr.common.util.IOUtils;
import org.apache.solr.common.util.TimeSource;
+import org.apache.solr.embedded.JettyConfig;
import org.apache.solr.util.TimeOut;
import org.junit.After;
import org.junit.Before;
@@ -46,7 +47,9 @@ public class ConcurrentDeleteAndCreateCollectionTest extends SolrTestCaseJ4 {
@Before
public void setUp() throws Exception {
super.setUp();
- solrCluster = new MiniSolrCloudCluster(1, createTempDir(), buildJettyConfig("/solr"));
+ solrCluster =
+ new MiniSolrCloudCluster(
+ 1, createTempDir(), JettyConfig.builder().setContext("/solr").build());
}
@Override
diff --git a/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java
index 859a07e3e15..e86badd91b8 100644
--- a/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java
@@ -31,6 +31,7 @@ import org.apache.solr.cloud.MiniSolrCloudCluster;
import org.apache.solr.cloud.SolrCloudTestCase;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.NamedList;
+import org.apache.solr.embedded.JettyConfig;
import org.apache.solr.embedded.JettySolrRunner;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
@@ -169,7 +170,8 @@ public class PingRequestHandlerTest extends SolrTestCaseJ4 {
public void testPingInClusterWithNoHealthCheck() throws Exception {
MiniSolrCloudCluster miniCluster =
- new MiniSolrCloudCluster(NUM_SERVERS, createTempDir(), buildJettyConfig("/solr"));
+ new MiniSolrCloudCluster(
+ NUM_SERVERS, createTempDir(), JettyConfig.builder().setContext("/solr").build());
final CloudSolrClient cloudSolrClient = miniCluster.getSolrClient();
diff --git a/solr/core/src/test/org/apache/solr/handler/V2StandaloneTest.java b/solr/core/src/test/org/apache/solr/handler/V2StandaloneTest.java
index a5672d42b3d..77df46a76f8 100644
--- a/solr/core/src/test/org/apache/solr/handler/V2StandaloneTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/V2StandaloneTest.java
@@ -24,6 +24,7 @@ import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.request.V2Request;
import org.apache.solr.common.util.NamedList;
+import org.apache.solr.embedded.JettyConfig;
import org.apache.solr.embedded.JettySolrRunner;
import org.junit.Test;
@@ -37,7 +38,9 @@ public class V2StandaloneTest extends SolrTestCaseJ4 {
Files.copy(Path.of(TEST_HOME(), "solr.xml"), solrHomeTmp.resolve("solr.xml"));
JettySolrRunner jetty =
- new JettySolrRunner(solrHomeTmp.toAbsolutePath().toString(), buildJettyConfig("/solr"));
+ new JettySolrRunner(
+ solrHomeTmp.toAbsolutePath().toString(),
+ JettyConfig.builder().setContext("/solr").build());
jetty.start();
try (SolrClient client = getHttpSolrClient(buildUrl(jetty.getLocalPort(), "/solr/"))) {
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java
index a175d0e072e..1dcf847253f 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java
@@ -42,6 +42,7 @@ import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.CoreDescriptor;
import org.apache.solr.core.SolrCore;
+import org.apache.solr.embedded.JettyConfig;
import org.apache.solr.embedded.JettySolrRunner;
import org.apache.solr.response.SolrQueryResponse;
import org.junit.BeforeClass;
@@ -302,7 +303,8 @@ public class CoreAdminHandlerTest extends SolrTestCaseJ4 {
JettySolrRunner runner =
new JettySolrRunner(
- solrHomeDirectory.toAbsolutePath().toString(), buildJettyConfig("/solr"));
+ solrHomeDirectory.toAbsolutePath().toString(),
+ JettyConfig.builder().setContext("/solr").build());
runner.start();
try (SolrClient client =
@@ -376,7 +378,8 @@ public class CoreAdminHandlerTest extends SolrTestCaseJ4 {
Files.writeString(corex.resolve("core.properties"), "", StandardCharsets.UTF_8);
JettySolrRunner runner =
new JettySolrRunner(
- solrHomeDirectory.toAbsolutePath().toString(), buildJettyConfig("/solr"));
+ solrHomeDirectory.toAbsolutePath().toString(),
+ JettyConfig.builder().setContext("/solr").build());
runner.start();
try (SolrClient client =
@@ -441,7 +444,8 @@ public class CoreAdminHandlerTest extends SolrTestCaseJ4 {
Files.writeString(corex.resolve("core.properties"), "", StandardCharsets.UTF_8);
JettySolrRunner runner =
new JettySolrRunner(
- solrHomeDirectory.toAbsolutePath().toString(), buildJettyConfig("/solr"));
+ solrHomeDirectory.toAbsolutePath().toString(),
+ JettyConfig.builder().setContext("/solr").build());
runner.start();
try (SolrClient client =
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/DaemonStreamApiTest.java b/solr/core/src/test/org/apache/solr/handler/admin/DaemonStreamApiTest.java
index 015c78a199a..bb93c221d1d 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/DaemonStreamApiTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/DaemonStreamApiTest.java
@@ -33,6 +33,7 @@ import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.cloud.MiniSolrCloudCluster;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.TimeSource;
+import org.apache.solr.embedded.JettyConfig;
import org.apache.solr.util.TimeOut;
import org.junit.After;
import org.junit.Before;
@@ -65,7 +66,9 @@ public class DaemonStreamApiTest extends SolrTestCaseJ4 {
@Before
public void setUp() throws Exception {
super.setUp();
- cluster = new MiniSolrCloudCluster(1, createTempDir(), buildJettyConfig("/solr"));
+ cluster =
+ new MiniSolrCloudCluster(
+ 1, createTempDir(), JettyConfig.builder().setContext("/solr").build());
url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + CHECKPOINT_COLL;
diff --git a/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java
index 95d89a7259a..8ce8a6489ed 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java
@@ -36,6 +36,7 @@ import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.params.ShardParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrCore;
+import org.apache.solr.embedded.JettyConfig;
import org.apache.solr.embedded.JettySolrRunner;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -125,7 +126,8 @@ public class SearchHandlerTest extends SolrTestCaseJ4 {
@Test
public void testZkConnected() throws Exception {
MiniSolrCloudCluster miniCluster =
- new MiniSolrCloudCluster(5, createTempDir(), buildJettyConfig("/solr"));
+ new MiniSolrCloudCluster(
+ 5, createTempDir(), JettyConfig.builder().setContext("/solr").build());
final CloudSolrClient cloudSolrClient = miniCluster.getSolrClient();
@@ -173,7 +175,8 @@ public class SearchHandlerTest extends SolrTestCaseJ4 {
@Test
public void testRequireZkConnected() throws Exception {
MiniSolrCloudCluster miniCluster =
- new MiniSolrCloudCluster(5, createTempDir(), buildJettyConfig("/solr"));
+ new MiniSolrCloudCluster(
+ 5, createTempDir(), JettyConfig.builder().setContext("/solr").build());
final CloudSolrClient cloudSolrClient = miniCluster.getSolrClient();
@@ -227,7 +230,8 @@ public class SearchHandlerTest extends SolrTestCaseJ4 {
@Test
public void testRequireZkConnectedDistrib() throws Exception {
MiniSolrCloudCluster miniCluster =
- new MiniSolrCloudCluster(2, createTempDir(), buildJettyConfig("/solr"));
+ new MiniSolrCloudCluster(
+ 2, createTempDir(), JettyConfig.builder().setContext("/solr").build());
final CloudSolrClient cloudSolrClient = miniCluster.getSolrClient();
diff --git a/solr/core/src/test/org/apache/solr/response/TestRawTransformer.java b/solr/core/src/test/org/apache/solr/response/TestRawTransformer.java
index b3bf805af8e..8e42ff8b0ff 100644
--- a/solr/core/src/test/org/apache/solr/response/TestRawTransformer.java
+++ b/solr/core/src/test/org/apache/solr/response/TestRawTransformer.java
@@ -34,6 +34,7 @@ import org.apache.solr.cloud.MiniSolrCloudCluster;
import org.apache.solr.cloud.SolrCloudTestCase;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.params.ModifiableSolrParams;
+import org.apache.solr.embedded.JettyConfig;
import org.apache.solr.embedded.JettySolrRunner;
import org.junit.After;
import org.junit.AfterClass;
@@ -93,7 +94,9 @@ public class TestRawTransformer extends SolrCloudTestCase {
nodeProperties.setProperty("solr.data.dir", h.getCore().getDataDir());
JSR =
new JettySolrRunner(
- homeDir.toAbsolutePath().toString(), nodeProperties, buildJettyConfig("/solr"));
+ homeDir.toAbsolutePath().toString(),
+ nodeProperties,
+ JettyConfig.builder().setContext("/solr").build());
}
private static void initCloud() throws Exception {
diff --git a/solr/core/src/test/org/apache/solr/search/stats/TestDistribIDF.java b/solr/core/src/test/org/apache/solr/search/stats/TestDistribIDF.java
index 2613d4d4c3e..7c6d2cf90d7 100644
--- a/solr/core/src/test/org/apache/solr/search/stats/TestDistribIDF.java
+++ b/solr/core/src/test/org/apache/solr/search/stats/TestDistribIDF.java
@@ -33,6 +33,7 @@ import org.apache.solr.common.cloud.CompositeIdRouter;
import org.apache.solr.common.cloud.ImplicitDocRouter;
import org.apache.solr.common.params.ShardParams;
import org.apache.solr.common.util.NamedList;
+import org.apache.solr.embedded.JettyConfig;
import org.apache.solr.embedded.JettySolrRunner;
import org.junit.Test;
import org.slf4j.Logger;
@@ -53,7 +54,9 @@ public class TestDistribIDF extends SolrTestCaseJ4 {
}
super.setUp();
- solrCluster = new MiniSolrCloudCluster(3, createTempDir(), buildJettyConfig("/solr"));
+ solrCluster =
+ new MiniSolrCloudCluster(
+ 3, createTempDir(), JettyConfig.builder().setContext("/solr").build());
// set some system properties for use by tests
System.setProperty("solr.test.sys.prop1", "propone");
System.setProperty("solr.test.sys.prop2", "proptwo");
diff --git a/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java b/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java
index dad37ef47b8..90e73504de2 100644
--- a/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java
+++ b/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java
@@ -41,6 +41,7 @@ import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.impl.HttpClientUtil;
import org.apache.solr.common.params.MapSolrParams;
import org.apache.solr.common.util.Utils;
+import org.apache.solr.embedded.JettyConfig;
import org.apache.solr.embedded.JettySolrRunner;
import org.apache.solr.handler.admin.SecurityConfHandler;
import org.apache.solr.handler.admin.SecurityConfHandlerLocalForTesting;
@@ -202,7 +203,9 @@ public class BasicAuthStandaloneTest extends SolrTestCaseJ4 {
nodeProperties.setProperty("solr.data.dir", instance.getDataDir().toString());
JettySolrRunner jetty =
new JettySolrRunner(
- instance.getHomeDir().toString(), nodeProperties, buildJettyConfig("/solr"));
+ instance.getHomeDir().toString(),
+ nodeProperties,
+ JettyConfig.builder().setContext("/solr").build());
jetty.start();
return jetty;
}
diff --git a/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestSolrCloudWithDelegationTokens.java b/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestSolrCloudWithDelegationTokens.java
index 7d3fce1ef23..c19cf49270b 100644
--- a/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestSolrCloudWithDelegationTokens.java
+++ b/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestSolrCloudWithDelegationTokens.java
@@ -46,6 +46,7 @@ import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.params.SolrParams;
+import org.apache.solr.embedded.JettyConfig;
import org.apache.solr.embedded.JettySolrRunner;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -67,7 +68,9 @@ public class TestSolrCloudWithDelegationTokens extends SolrTestCaseJ4 {
System.setProperty(KerberosPlugin.DELEGATION_TOKEN_ENABLED, "true");
System.setProperty("solr.kerberos.cookie.domain", "127.0.0.1");
- miniCluster = new MiniSolrCloudCluster(NUM_SERVERS, createTempDir(), buildJettyConfig("/solr"));
+ miniCluster =
+ new MiniSolrCloudCluster(
+ NUM_SERVERS, createTempDir(), JettyConfig.builder().setContext("/solr").build());
JettySolrRunner runnerPrimary = miniCluster.getJettySolrRunners().get(0);
solrClientPrimary = new HttpSolrClient.Builder(runnerPrimary.getBaseUrl().toString()).build();
JettySolrRunner runnerSecondary = miniCluster.getJettySolrRunners().get(1);
diff --git a/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestSolrCloudWithSecureImpersonation.java b/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestSolrCloudWithSecureImpersonation.java
index 25c49f2ebde..c104783ab6a 100644
--- a/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestSolrCloudWithSecureImpersonation.java
+++ b/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/TestSolrCloudWithSecureImpersonation.java
@@ -40,6 +40,7 @@ import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.EnvUtils;
import org.apache.solr.common.util.IOUtils;
import org.apache.solr.core.CoreContainer;
+import org.apache.solr.embedded.JettyConfig;
import org.apache.solr.embedded.JettySolrRunner;
import org.apache.solr.handler.admin.CollectionsHandler;
import org.apache.solr.request.SolrQueryRequest;
@@ -113,7 +114,9 @@ public class TestSolrCloudWithSecureImpersonation extends SolrTestCaseJ4 {
SolrRequestParsers.DEFAULT.setAddRequestHeadersToContext(true);
System.setProperty("collectionsHandler", ImpersonatorCollectionsHandler.class.getName());
- miniCluster = new MiniSolrCloudCluster(NUM_SERVERS, createTempDir(), buildJettyConfig("/solr"));
+ miniCluster =
+ new MiniSolrCloudCluster(
+ NUM_SERVERS, createTempDir(), JettyConfig.builder().setContext("/solr").build());
JettySolrRunner runner = miniCluster.getJettySolrRunners().get(0);
solrClient = new HttpSolrClient.Builder(runner.getBaseUrl().toString()).build();
}
diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTROnSolrCloud.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTROnSolrCloud.java
index ce5aa367d39..f0f0366b62d 100644
--- a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTROnSolrCloud.java
+++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTROnSolrCloud.java
@@ -323,9 +323,9 @@ public class TestLTROnSolrCloud extends TestRerankBase {
}
private void setupSolrCluster(int numShards, int numReplicas, int numServers) throws Exception {
- JettyConfig jc = buildJettyConfig("/solr");
- jc = JettyConfig.builder(jc).build();
- solrCluster = new MiniSolrCloudCluster(numServers, tmpSolrHome, jc);
+ solrCluster =
+ new MiniSolrCloudCluster(
+ numServers, tmpSolrHome, JettyConfig.builder().setContext("/solr").build());
Path configDir = tmpSolrHome.resolve("collection1/conf");
solrCluster.uploadConfigSet(configDir, "conf1");
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttp2SolrClient.java b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttp2SolrClient.java
index 2d5535e150d..289277cd6bc 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttp2SolrClient.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttp2SolrClient.java
@@ -329,8 +329,7 @@ public class TestLBHttp2SolrClient extends SolrTestCaseJ4 {
props.setProperty("solrconfig", "bad_solrconfig.xml");
props.setProperty("solr.data.dir", getDataDir());
- JettyConfig jettyConfig =
- JettyConfig.builder(buildJettyConfig("/solr")).setPort(port).build();
+ JettyConfig jettyConfig = JettyConfig.builder().setContext("/solr").setPort(port).build();
jetty = new JettySolrRunner(getHomeDir(), props, jettyConfig);
jetty.start();
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java
index 2f0e7164d23..e25b9c11a0e 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java
@@ -334,8 +334,7 @@ public class TestLBHttpSolrClient extends SolrTestCaseJ4 {
props.setProperty("solrconfig", "bad_solrconfig.xml");
props.setProperty("solr.data.dir", getDataDir());
- JettyConfig jettyConfig =
- JettyConfig.builder(buildJettyConfig("/solr")).setPort(port).build();
+ JettyConfig jettyConfig = JettyConfig.builder().setContext("/solr").setPort(port).build();
jetty = new JettySolrRunner(getHomeDir(), props, jettyConfig);
jetty.start();
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java
index d881e077045..f326274bc3d 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java
@@ -200,7 +200,6 @@ public class BasicHttpSolrClientTest extends SolrJettyTestBase {
.withServlet(new ServletHolder(RedirectServlet.class), "/redirect/*")
.withServlet(new ServletHolder(SlowServlet.class), "/slow/*")
.withServlet(new ServletHolder(DebugServlet.class), "/debug/*")
- .withSSLConfig(sslConfig.buildServerSSLConfig())
.build();
createAndStartJetty(legacyExampleCollection1SolrHome(), jettyConfig);
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientBadInputTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientBadInputTest.java
index 8ca9d6b938d..1b21772d88c 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientBadInputTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientBadInputTest.java
@@ -35,9 +35,7 @@ public class ConcurrentUpdateHttp2SolrClientBadInputTest extends SolrJettyTestBa
@BeforeClass
public static void beforeTest() throws Exception {
- JettyConfig jettyConfig =
- JettyConfig.builder().withSSLConfig(sslConfig.buildServerSSLConfig()).build();
- createAndStartJetty(legacyExampleCollection1SolrHome(), jettyConfig);
+ createAndStartJetty(legacyExampleCollection1SolrHome(), JettyConfig.builder().build());
}
@Test
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientTest.java
index 713ee22a926..6d745a6058f 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateHttp2SolrClientTest.java
@@ -42,7 +42,6 @@ public class ConcurrentUpdateHttp2SolrClientTest extends SolrJettyTestBase {
JettyConfig.builder()
.withServlet(
new ServletHolder(ConcurrentUpdateSolrClientTest.TestServlet.class), "/cuss/*")
- .withSSLConfig(sslConfig.buildServerSSLConfig())
.build();
createAndStartJetty(legacyExampleCollection1SolrHome(), jettyConfig);
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientBadInputTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientBadInputTest.java
index 45520dd49c4..c5dceedd7c4 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientBadInputTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientBadInputTest.java
@@ -35,9 +35,7 @@ public class ConcurrentUpdateSolrClientBadInputTest extends SolrJettyTestBase {
@BeforeClass
public static void beforeTest() throws Exception {
- JettyConfig jettyConfig =
- JettyConfig.builder().withSSLConfig(sslConfig.buildServerSSLConfig()).build();
- createAndStartJetty(legacyExampleCollection1SolrHome(), jettyConfig);
+ createAndStartJetty(legacyExampleCollection1SolrHome(), JettyConfig.builder().build());
}
@Test
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientTest.java
index 28052321a69..cc49c05994e 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientTest.java
@@ -129,10 +129,7 @@ public class ConcurrentUpdateSolrClientTest extends SolrJettyTestBase {
@BeforeClass
public static void beforeTest() throws Exception {
JettyConfig jettyConfig =
- JettyConfig.builder()
- .withServlet(new ServletHolder(TestServlet.class), "/cuss/*")
- .withSSLConfig(sslConfig.buildServerSSLConfig())
- .build();
+ JettyConfig.builder().withServlet(new ServletHolder(TestServlet.class), "/cuss/*").build();
createAndStartJetty(legacyExampleCollection1SolrHome(), jettyConfig);
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientProxyTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientProxyTest.java
index 9b398160193..7333ecfbeec 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientProxyTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientProxyTest.java
@@ -39,10 +39,7 @@ public class Http2SolrClientProxyTest extends SolrTestCaseJ4 {
RandomizedTest.assumeFalse(sslConfig.isSSLMode());
solrClientTestRule.enableProxy();
- solrClientTestRule.startSolr(
- createTempDir(),
- new Properties(),
- JettyConfig.builder().withSSLConfig(sslConfig.buildServerSSLConfig()).build());
+ solrClientTestRule.startSolr(createTempDir(), new Properties(), JettyConfig.builder().build());
// Actually only need extremely minimal configSet but just use the default
solrClientTestRule
.newCollection()
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java
index a021357d923..51fd3c5ca65 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java
@@ -192,7 +192,6 @@ public class Http2SolrClientTest extends SolrJettyTestBase {
.withServlet(
new ServletHolder(BasicHttpSolrClientTest.SlowServlet.class), SLOW_SERVLET_REGEX)
.withServlet(new ServletHolder(DebugServlet.class), DEBUG_SERVLET_REGEX)
- .withSSLConfig(sslConfig.buildServerSSLConfig())
.build();
createAndStartJetty(legacyExampleCollection1SolrHome(), jettyConfig);
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientBadInputTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientBadInputTest.java
index 2afa39725e4..1b064ef16ae 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientBadInputTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpSolrClientBadInputTest.java
@@ -34,9 +34,7 @@ public class HttpSolrClientBadInputTest extends SolrJettyTestBase {
@BeforeClass
public static void beforeTest() throws Exception {
- JettyConfig jettyConfig =
- JettyConfig.builder().withSSLConfig(sslConfig.buildServerSSLConfig()).build();
- createAndStartJetty(legacyExampleCollection1SolrHome(), jettyConfig);
+ createAndStartJetty(legacyExampleCollection1SolrHome(), JettyConfig.builder().build());
}
@Test
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientBadInputTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientBadInputTest.java
index 0432c26add5..cb2dbbedf10 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientBadInputTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientBadInputTest.java
@@ -33,9 +33,7 @@ public class LBHttpSolrClientBadInputTest extends SolrJettyTestBase {
@BeforeClass
public static void beforeTest() throws Exception {
- JettyConfig jettyConfig =
- JettyConfig.builder().withSSLConfig(sslConfig.buildServerSSLConfig()).build();
- createAndStartJetty(legacyExampleCollection1SolrHome(), jettyConfig);
+ createAndStartJetty(legacyExampleCollection1SolrHome(), JettyConfig.builder().build());
}
@Test
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/TestCloudSolrClientConnections.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/TestCloudSolrClientConnections.java
index 20853430218..832f6b541e1 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/TestCloudSolrClientConnections.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/TestCloudSolrClientConnections.java
@@ -24,6 +24,7 @@ import org.apache.solr.cloud.MiniSolrCloudCluster;
import org.apache.solr.common.AlreadyClosedException;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.cloud.ZkStateReader;
+import org.apache.solr.embedded.JettyConfig;
import org.junit.Test;
public class TestCloudSolrClientConnections extends SolrTestCaseJ4 {
@@ -33,7 +34,8 @@ public class TestCloudSolrClientConnections extends SolrTestCaseJ4 {
// Start by creating a cluster with no jetties
MiniSolrCloudCluster cluster =
- new MiniSolrCloudCluster(0, createTempDir(), buildJettyConfig("/solr"));
+ new MiniSolrCloudCluster(
+ 0, createTempDir(), JettyConfig.builder().setContext("/solr").build());
try {
CloudSolrClient client = cluster.getSolrClient();
@@ -62,7 +64,8 @@ public class TestCloudSolrClientConnections extends SolrTestCaseJ4 {
Path configPath = getFile("solrj").toPath().resolve("solr/configsets/configset-2/conf");
MiniSolrCloudCluster cluster =
- new MiniSolrCloudCluster(0, createTempDir(), buildJettyConfig("/solr"));
+ new MiniSolrCloudCluster(
+ 0, createTempDir(), JettyConfig.builder().setContext("/solr").build());
try {
CloudSolrClient client = cluster.getSolrClient();
SolrException e =
@@ -94,7 +97,8 @@ public class TestCloudSolrClientConnections extends SolrTestCaseJ4 {
public void testAlreadyClosedClusterStateProvider() throws Exception {
final MiniSolrCloudCluster cluster =
- new MiniSolrCloudCluster(1, createTempDir(), buildJettyConfig("/solr"));
+ new MiniSolrCloudCluster(
+ 1, createTempDir(), JettyConfig.builder().setContext("/solr").build());
// from a client perspective the behavior of ZkClientClusterStateProvider should be
// consistent regardless of wether it's constructed with a zkhost or an existing ZkStateReader
try {
diff --git a/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java b/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
index 2ed947f7274..30e07e8f0fc 100644
--- a/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
+++ b/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
@@ -511,7 +511,6 @@ public abstract class BaseDistributedSearchTestCase extends SolrTestCaseJ4 {
.setContext(context)
.withFilters(getExtraRequestFilters())
.withServlets(getExtraServlets())
- .withSSLConfig(sslConfig.buildServerSSLConfig())
.build());
return jetty;
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java b/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java
index 0c79872afe8..28d76df53b9 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java
@@ -51,7 +51,6 @@ public abstract class SolrJettyTestBase extends SolrTestCaseJ4 {
.setContext(context)
.stopAtShutdown(stopAtShutdown)
.withServlets(extraServlets)
- .withSSLConfig(sslConfig.buildServerSSLConfig())
.build();
Properties nodeProps = new Properties();
@@ -77,10 +76,7 @@ public abstract class SolrJettyTestBase extends SolrTestCaseJ4 {
}
protected static JettySolrRunner createAndStartJetty(String solrHome) throws Exception {
- return createAndStartJetty(
- solrHome,
- new Properties(),
- JettyConfig.builder().withSSLConfig(sslConfig.buildServerSSLConfig()).build());
+ return createAndStartJetty(solrHome, new Properties(), JettyConfig.builder().build());
}
protected static JettySolrRunner createAndStartJetty(
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseHS.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseHS.java
index 10af664c228..b4340ec852c 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseHS.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseHS.java
@@ -504,12 +504,7 @@ public class SolrTestCaseHS extends SolrTestCaseJ4 {
if (jetty == null) {
JettyConfig jettyConfig =
- JettyConfig.builder()
- .stopAtShutdown(true)
- .setContext("/solr")
- .setPort(port)
- .withSSLConfig(sslConfig.buildServerSSLConfig())
- .build();
+ JettyConfig.builder().stopAtShutdown(true).setContext("/solr").setPort(port).build();
Properties nodeProperties = new Properties();
nodeProperties.setProperty("solrconfig", solrconfigFile);
nodeProperties.setProperty(CoreDescriptor.CORE_SCHEMA, schemaFile);
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
index 74a5bd28cde..d3e5db2e976 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
@@ -126,7 +126,6 @@ import org.apache.solr.core.NodeConfig;
import org.apache.solr.core.SolrConfig;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrXmlConfig;
-import org.apache.solr.embedded.JettyConfig;
import org.apache.solr.embedded.JettySolrRunner;
import org.apache.solr.handler.UpdateRequestHandler;
import org.apache.solr.request.LocalSolrQueryRequest;
@@ -526,13 +525,6 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase {
return result;
}
- protected static JettyConfig buildJettyConfig(String context) {
- return JettyConfig.builder()
- .setContext(context)
- .withSSLConfig(sslConfig.buildServerSSLConfig())
- .build();
- }
-
protected static String buildUrl(final int port, final String context) {
return (isSSLMode() ? "https" : "http") + "://127.0.0.1:" + port + context;
}
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
index 3e2a4c114cb..75ad621e871 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
@@ -735,7 +735,6 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes
.stopAtShutdown(false)
.withServlets(getExtraServlets())
.withFilters(getExtraRequestFilters())
- .withSSLConfig(sslConfig.buildServerSSLConfig())
.build();
Properties props = new Properties();
@@ -781,7 +780,6 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes
.stopAtShutdown(false)
.withServlets(getExtraServlets())
.withFilters(getExtraRequestFilters())
- .withSSLConfig(sslConfig.buildServerSSLConfig())
.build();
Properties props = new Properties();
@@ -820,7 +818,6 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes
.stopAtShutdown(false)
.withServlets(getExtraServlets())
.withFilters(getExtraRequestFilters())
- .withSSLConfig(sslConfig.buildServerSSLConfig())
.build();
Properties props = new Properties();
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java b/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
index 6995df5dddd..4b9c70b20bc 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
@@ -1125,10 +1125,6 @@ public class MiniSolrCloudCluster {
this.baseDir = baseDir;
jettyConfigBuilder = JettyConfig.builder().setContext("/solr");
- if (SolrTestCaseJ4.sslConfig != null) {
- jettyConfigBuilder =
- jettyConfigBuilder.withSSLConfig(SolrTestCaseJ4.sslConfig.buildServerSSLConfig());
- }
}
/** Use a JettyConfig.Builder to configure the cluster's jetty servers */
diff --git a/solr/test-framework/src/java/org/apache/solr/embedded/JettyConfig.java b/solr/test-framework/src/java/org/apache/solr/embedded/JettyConfig.java
index b03b1c234db..cc863035318 100644
--- a/solr/test-framework/src/java/org/apache/solr/embedded/JettyConfig.java
+++ b/solr/test-framework/src/java/org/apache/solr/embedded/JettyConfig.java
@@ -20,6 +20,7 @@ import java.util.LinkedHashMap;
import java.util.Map;
import java.util.TreeMap;
import javax.servlet.Filter;
+import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.embedded.SSLConfig;
import org.eclipse.jetty.servlet.ServletHolder;
@@ -89,7 +90,8 @@ public class JettyConfig {
Long waitForLoadingCoresToFinishMs = 300000L;
Map<ServletHolder, String> extraServlets = new TreeMap<>();
Map<Class<? extends Filter>, String> extraFilters = new LinkedHashMap<>();
- SSLConfig sslConfig = null;
+ SSLConfig sslConfig =
+ SolrTestCaseJ4.sslConfig != null ? SolrTestCaseJ4.sslConfig.buildServerSSLConfig() : null;
int portRetryTime = 60;
public Builder useOnlyHttp1(boolean useOnlyHttp1) {
diff --git a/solr/test-framework/src/java/org/apache/solr/util/SolrJettyTestRule.java b/solr/test-framework/src/java/org/apache/solr/util/SolrJettyTestRule.java
index d0311f6e4f6..9d05b0af949 100644
--- a/solr/test-framework/src/java/org/apache/solr/util/SolrJettyTestRule.java
+++ b/solr/test-framework/src/java/org/apache/solr/util/SolrJettyTestRule.java
@@ -20,7 +20,6 @@ import java.lang.invoke.MethodHandles;
import java.nio.file.Path;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.impl.HttpSolrClient;
import org.apache.solr.common.util.IOUtils;
@@ -70,12 +69,7 @@ public class SolrJettyTestRule extends SolrClientTestRule {
@Override
public void startSolr(Path solrHome) {
- startSolr(
- solrHome,
- new Properties(),
- JettyConfig.builder()
- .withSSLConfig(SolrTestCaseJ4.sslConfig.buildServerSSLConfig())
- .build());
+ startSolr(solrHome, new Properties(), JettyConfig.builder().build());
}
/**
diff --git a/solr/test-framework/src/test/org/apache/solr/embedded/TestJettySolrRunner.java b/solr/test-framework/src/test/org/apache/solr/embedded/TestJettySolrRunner.java
index 2fc1299a734..991763523cc 100644
--- a/solr/test-framework/src/test/org/apache/solr/embedded/TestJettySolrRunner.java
+++ b/solr/test-framework/src/test/org/apache/solr/embedded/TestJettySolrRunner.java
@@ -48,7 +48,7 @@ public class TestJettySolrRunner extends SolrTestCaseJ4 {
.replace("COREROOT", coresDir.toString());
Files.write(solrHome.resolve("solr.xml"), solrxml.getBytes(StandardCharsets.UTF_8));
- JettyConfig jettyConfig = buildJettyConfig("/solr");
+ JettyConfig jettyConfig = JettyConfig.builder().setContext("/solr").build();
JettySolrRunner runner =
new JettySolrRunner(solrHome.toString(), new Properties(), jettyConfig);