From 7bb2d0f32c382b1e558429cef63b122c6bf7a10b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andris=20Horv=C3=A1th?= Date: Wed, 11 Mar 2026 21:37:21 +0000 Subject: [PATCH 1/2] chore: disable HTTP for HTTPS only config --- .../spring/internal/WireMockServerCreator.java | 1 + .../spring/internal/WireMockSpringJunitExtension.java | 11 +++++++---- .../src/test/java/usecases/HttpsOnlyTest.java | 7 +++++++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/wiremock-spring-boot/src/main/java/org/wiremock/spring/internal/WireMockServerCreator.java b/wiremock-spring-boot/src/main/java/org/wiremock/spring/internal/WireMockServerCreator.java index c24da67..1ef56e6 100644 --- a/wiremock-spring-boot/src/main/java/org/wiremock/spring/internal/WireMockServerCreator.java +++ b/wiremock-spring-boot/src/main/java/org/wiremock/spring/internal/WireMockServerCreator.java @@ -45,6 +45,7 @@ public WireMockServer createWireMockServer( final int serverHttpPort = portResolver.getServerHttpPortProperty(options); final boolean httpEnabled = serverHttpPort != PORT_DISABLED; + serverOptions.httpDisabled(!httpEnabled); if (httpEnabled) { serverOptions.port(serverHttpPort); } diff --git a/wiremock-spring-boot/src/main/java/org/wiremock/spring/internal/WireMockSpringJunitExtension.java b/wiremock-spring-boot/src/main/java/org/wiremock/spring/internal/WireMockSpringJunitExtension.java index 507e429..839a629 100644 --- a/wiremock-spring-boot/src/main/java/org/wiremock/spring/internal/WireMockSpringJunitExtension.java +++ b/wiremock-spring-boot/src/main/java/org/wiremock/spring/internal/WireMockSpringJunitExtension.java @@ -88,18 +88,21 @@ private void configureWireMockForDefaultInstance(final ExtensionContext extensio } } if (wiremock != null) { + final boolean isHttps = wiremock.isHttpsEnabled(); + final int port = isHttps ? wiremock.httpsPort() : wiremock.port(); + LOGGER.info( "Configuring WireMock for default instance, '" + wireMockName + "' on '" - + wiremock.port() + + port + "'."); final String host = "localhost"; - if (wiremock.isHttpsEnabled()) { + if (isHttps) { WireMock.configureFor( - WireMock.create().https().host(host).port(wiremock.httpsPort()).build()); + WireMock.create().https().host(host).port(port).build()); } else { - WireMock.configureFor(WireMock.create().http().host(host).port(wiremock.port()).build()); + WireMock.configureFor(WireMock.create().http().host(host).port(port).build()); } } } diff --git a/wiremock-spring-boot/src/test/java/usecases/HttpsOnlyTest.java b/wiremock-spring-boot/src/test/java/usecases/HttpsOnlyTest.java index 790625d..b800bd1 100644 --- a/wiremock-spring-boot/src/test/java/usecases/HttpsOnlyTest.java +++ b/wiremock-spring-boot/src/test/java/usecases/HttpsOnlyTest.java @@ -5,6 +5,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.anyUrl; import static com.github.tomakehurst.wiremock.client.WireMock.get; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import com.github.tomakehurst.wiremock.WireMockServer; import com.github.tomakehurst.wiremock.client.WireMock; @@ -59,4 +60,10 @@ void testDefaultClient() { assertThat(WireMock.findAll(anyRequestedFor(anyUrl()))).hasSize(1); } + + @Test + void testHttpDisabled() { + assertThat(wiremock.isHttpEnabled()).isFalse(); + assertThatThrownBy(() -> wiremock.port()).isExactlyInstanceOf(IllegalStateException.class); + } } From 87ae2fac48353d59b3dbcad866357b40fd8cd276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andris=20Horv=C3=A1th?= Date: Wed, 11 Mar 2026 21:48:42 +0000 Subject: [PATCH 2/2] chore: fix continuation indent --- .../wiremock/spring/internal/WireMockSpringJunitExtension.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiremock-spring-boot/src/main/java/org/wiremock/spring/internal/WireMockSpringJunitExtension.java b/wiremock-spring-boot/src/main/java/org/wiremock/spring/internal/WireMockSpringJunitExtension.java index 839a629..70eede4 100644 --- a/wiremock-spring-boot/src/main/java/org/wiremock/spring/internal/WireMockSpringJunitExtension.java +++ b/wiremock-spring-boot/src/main/java/org/wiremock/spring/internal/WireMockSpringJunitExtension.java @@ -100,7 +100,7 @@ private void configureWireMockForDefaultInstance(final ExtensionContext extensio final String host = "localhost"; if (isHttps) { WireMock.configureFor( - WireMock.create().https().host(host).port(port).build()); + WireMock.create().https().host(host).port(port).build()); } else { WireMock.configureFor(WireMock.create().http().host(host).port(port).build()); }