From bb4023b494648e4ce081bed953fd5c5e6373b703 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 10 Apr 2019 14:57:39 +0200 Subject: [PATCH] Revert "#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)" This reverts commit 76ebd81bcc1c1090d810569262cc3be123b4c43c. --- .../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 18db81571d..a8f3c96dee 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,9 +56,8 @@ public class WireMockApplicationListener SocketUtils.findAvailableTcpPort(10000, 12500)); source.put("wiremock.server.port-dynamic", true); } - int httpsPortProperty = environment.getProperty("wiremock.server.https-port", - Integer.class, 0); - if (httpsPortProperty == 0) { + if (environment.getProperty("wiremock.server.https-port", Integer.class, + 0) == 0) { MutablePropertySources propertySources = environment.getPropertySources(); addPropertySource(propertySources); Map source = ((MapPropertySource) propertySources @@ -67,12 +66,13 @@ public class WireMockApplicationListener SocketUtils.findAvailableTcpPort(12500, 15000)); source.put("wiremock.server.https-port-dynamic", true); } - else if (httpsPortProperty == -1) { + else if (environment.getProperty("wiremock.server.https-port", Integer.class, + 0) != -1) { MutablePropertySources propertySources = environment.getPropertySources(); addPropertySource(propertySources); Map source = ((MapPropertySource) propertySources .get("wiremock")).getSource(); - source.put("wiremock.server.https-port-dynamic", true); + source.put("wiremock.server.https-port-dynamic", false); } } 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 abebd1632a..ff5d170555 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 = false; + private boolean httpsPortDynamic = true; public int getPort() { return this.port;