This is an automated email from the ASF dual-hosted git repository. dsmiley pushed a commit to branch branch_10x in repository https://gitbox.apache.org/repos/asf/solr.git
commit a11fc98e1b2bdd15f3119261fb1465872f4ddfc4 Author: Jan Høydahl <[email protected]> AuthorDate: Wed Sep 9 08:48:45 2026 +0200 SOLR-18394: Simplify JettyConfig construction (#4786) (cherry picked from commit 6e8604569fac49cd64f50a1c89f6f222d0ef7f14) --- .../java/org/apache/solr/embedded/JettyConfig.java | 84 +++++++++------------- 1 file changed, 34 insertions(+), 50 deletions(-) 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 20516d7c007..258657bedbc 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 @@ -17,6 +17,7 @@ package org.apache.solr.embedded; import jakarta.servlet.Filter; +import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; import java.util.TreeMap; @@ -40,29 +41,22 @@ public class JettyConfig { /** If true, serve the Admin UI static files and index.html like the production web.xml does. */ public final boolean enableAdminUi; - private JettyConfig( - boolean onlyHttp1, - int port, - int portRetryTime, - boolean stopAtShutdown, - Long waitForLoadingCoresToFinishMs, - Map<ServletHolder, String> extraServlets, - Map<Class<? extends Filter>, String> extraFilters, - SSLConfig sslConfig, - boolean enableV2, - boolean enableGracefulShutdown, - boolean enableAdminUi) { - this.onlyHttp1 = onlyHttp1; - this.port = port; - this.portRetryTime = portRetryTime; - this.stopAtShutdown = stopAtShutdown; - this.waitForLoadingCoresToFinishMs = waitForLoadingCoresToFinishMs; - this.extraServlets = extraServlets; - this.extraFilters = extraFilters; - this.sslConfig = sslConfig; - this.enableV2 = enableV2; - this.enableGracefulShutdown = enableGracefulShutdown; - this.enableAdminUi = enableAdminUi; + /** Snapshot of the builder that built this config; enables {@link #builder(JettyConfig)}. */ + private final Builder builder; + + private JettyConfig(Builder builder) { + this.builder = builder; + this.onlyHttp1 = builder.onlyHttp1; + this.port = builder.port; + this.portRetryTime = builder.portRetryTime; + this.stopAtShutdown = builder.stopAtShutdown; + this.waitForLoadingCoresToFinishMs = builder.waitForLoadingCoresToFinishMs; + this.extraServlets = Collections.unmodifiableMap(builder.extraServlets); + this.extraFilters = Collections.unmodifiableMap(builder.extraFilters); + this.sslConfig = builder.sslConfig; + this.enableV2 = builder.enableV2; + this.enableGracefulShutdown = builder.enableGracefulShutdown; + this.enableAdminUi = builder.enableAdminUi; } public static Builder builder() { @@ -70,23 +64,10 @@ public class JettyConfig { } public static Builder builder(JettyConfig other) { - Builder builder = new Builder(); - - builder.onlyHttp1 = other.onlyHttp1; - builder.port = other.port; - builder.portRetryTime = other.portRetryTime; - builder.stopAtShutdown = other.stopAtShutdown; - builder.waitForLoadingCoresToFinishMs = other.waitForLoadingCoresToFinishMs; - builder.extraServlets = other.extraServlets; - builder.extraFilters = other.extraFilters; - builder.sslConfig = other.sslConfig; - builder.enableV2 = other.enableV2; - builder.enableGracefulShutdown = other.enableGracefulShutdown; - builder.enableAdminUi = other.enableAdminUi; - return builder; + return other.builder.clone(); } - public static class Builder { + public static class Builder implements Cloneable { boolean onlyHttp1 = false; int port = 0; @@ -166,19 +147,22 @@ public class JettyConfig { return this; } + /** Copies the maps too, so the clone is fully independent; the SSLConfig is shared. */ + @Override + public Builder clone() { + try { + Builder clone = (Builder) super.clone(); + clone.extraServlets = new TreeMap<>(extraServlets); + clone.extraFilters = new LinkedHashMap<>(extraFilters); + return clone; + } catch (CloneNotSupportedException e) { + throw new AssertionError(e); + } + } + public JettyConfig build() { - return new JettyConfig( - onlyHttp1, - port, - portRetryTime, - stopAtShutdown, - waitForLoadingCoresToFinishMs, - extraServlets, - extraFilters, - sslConfig, - enableV2, - enableGracefulShutdown, - enableAdminUi); + // clone so later mutations of this builder don't leak into the built config's snapshot + return new JettyConfig(clone()); } } }
