SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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)"

Browse Source 
This reverts commit 76ebd81bcc.
This commit is contained in:
Marcin Grzejszczak
2019-04-10 14:57:39 +02:00
parent 76ebd81bcc
commit bb4023b494
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockApplicationListener.java
View File

@@ -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<String, Object> 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<String, Object> source = ((MapPropertySource) propertySources
.get("wiremock")).getSource();
source.put("wiremock.server.https-port-dynamic", true);
source.put("wiremock.server.https-port-dynamic", false);
}
}

2
spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java
View File

@@ -272,7 +272,7 @@ class WireMockProperties {
private boolean portDynamic = false;
private boolean httpsPortDynamic = false;
private boolean httpsPortDynamic = true;
public int getPort() {
return this.port;