From 76ebd81bcc1c1090d810569262cc3be123b4c43c Mon Sep 17 00:00:00 2001 From: Matt Garner Date: Tue, 9 Apr 2019 13:49:21 +0100 Subject: [PATCH] #883: Register port now only handles auto port values. This is to avoid the httpsPortDynamic being set to true on the context initialisation, but then being updated to false when the context is refreshed. (#1040) --- .../contract/wiremock/WireMockApplicationListener.java | 10 +++++----- .../cloud/contract/wiremock/WireMockConfiguration.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockApplicationListener.java b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockApplicationListener.java index a8f3c96dee..18db81571d 100644 --- a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockApplicationListener.java +++ b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockApplicationListener.java @@ -56,8 +56,9 @@ public class WireMockApplicationListener SocketUtils.findAvailableTcpPort(10000, 12500)); source.put("wiremock.server.port-dynamic", true); } - if (environment.getProperty("wiremock.server.https-port", Integer.class, - 0) == 0) { + int httpsPortProperty = environment.getProperty("wiremock.server.https-port", + Integer.class, 0); + if (httpsPortProperty == 0) { MutablePropertySources propertySources = environment.getPropertySources(); addPropertySource(propertySources); Map source = ((MapPropertySource) propertySources @@ -66,13 +67,12 @@ public class WireMockApplicationListener SocketUtils.findAvailableTcpPort(12500, 15000)); source.put("wiremock.server.https-port-dynamic", true); } - else if (environment.getProperty("wiremock.server.https-port", Integer.class, - 0) != -1) { + else if (httpsPortProperty == -1) { MutablePropertySources propertySources = environment.getPropertySources(); addPropertySource(propertySources); Map source = ((MapPropertySource) propertySources .get("wiremock")).getSource(); - source.put("wiremock.server.https-port-dynamic", false); + source.put("wiremock.server.https-port-dynamic", true); } } diff --git a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java index ff5d170555..abebd1632a 100644 --- a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java +++ b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java @@ -272,7 +272,7 @@ class WireMockProperties { private boolean portDynamic = false; - private boolean httpsPortDynamic = true; + private boolean httpsPortDynamic = false; public int getPort() { return this.port;