Made HttpServerFactory an extension point

Author: tomakehurst

src/main/java/com/github/tomakehurst/wiremock/WireMockServer.java

@@ -71,7 +71,12 @@ public WireMockServer(Options options) {
  wireMockApp = new WireMockApp(options, this);
 
  this.stubRequestHandler = wireMockApp.buildStubRequestHandler();
- HttpServerFactory httpServerFactory = options.httpServerFactory();
+
+ HttpServerFactory httpServerFactory =
+ wireMockApp.getExtensions().ofType(HttpServerFactory.class).values().stream()
+ .findFirst()
+ .orElse(options.httpServerFactory());
+
  httpServer =
  httpServerFactory.buildHttpServer(
  options, wireMockApp.buildAdminRequestHandler(), stubRequestHandler);

src/main/java/com/github/tomakehurst/wiremock/core/WireMockApp.java

@@ -483,6 +483,10 @@ public Options getOptions() {
  return options;
  }
 
+ public Extensions getExtensions() {
+ return extensions;
+ }
+
  @Override
  public void shutdownServer() {
  stores.stop();

src/main/java/com/github/tomakehurst/wiremock/http/HttpServerFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2021 Thomas Akehurst
+ * Copyright (C) 2014-2023 Thomas Akehurst
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,14 @@
 package com.github.tomakehurst.wiremock.http;
 
 import com.github.tomakehurst.wiremock.core.Options;
+import com.github.tomakehurst.wiremock.extension.Extension;
 
-public interface HttpServerFactory {
+public interface HttpServerFactory extends Extension {
+
+ @Override
+ default String getName() {
+ return "http-server-factory";
+ }
 
  HttpServer buildHttpServer(
  Options options,

src/main/java/com/github/tomakehurst/wiremock/jetty/JettyHttpServer.java

@@ -334,6 +334,7 @@ private ServletContextHandler addMockServiceContext(
  }
 
  protected void decorateMockServiceContextBeforeConfig(ServletContextHandler mockServiceContext) {}
+
  protected void decorateMockServiceContextAfterConfig(ServletContextHandler mockServiceContext) {}
 
  private ServletContextHandler addAdminContext(
@@ -385,8 +386,11 @@ private ServletContextHandler addAdminContext(
  return adminContext;
  }
 
- protected void decorateAdminServiceContextBeforeConfig(ServletContextHandler adminServiceContext) {}
- protected void decorateAdminServiceContextAfterConfig(ServletContextHandler adminServiceContext) {}
+ protected void decorateAdminServiceContextBeforeConfig(
+ ServletContextHandler adminServiceContext) {}
+
+ protected void decorateAdminServiceContextAfterConfig(
+ ServletContextHandler adminServiceContext) {}
 
  private void addCorsFilter(ServletContextHandler context) {
  context.addFilter(buildCorsFilter(), "/*", EnumSet.of(DispatcherType.REQUEST));

src/test/java/com/github/tomakehurst/wiremock/WireMockServerTests.java

@@ -62,7 +62,7 @@ public void returnsOptionsWhenCallingGetOptions() {
 
  @Test
  public void addFilenameTemplateAsOptionAndValidFormat() {
- Options options = options().filenameTemplate("{{{request.url}}}-{{{request.url}}}.json");
+ Options options = options().dynamicPort().filenameTemplate("{{{request.url}}}-{{{request.url}}}.json");
  WireMockServer wireMockServer = new WireMockServer(options);
  wireMockServer.start();
  assertThat(wireMockServer.getOptions(), is(options));