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

Merge branch '2.1.x'

Browse Source
This commit is contained in:
Marcin Grzejszczak
2019-04-10 15:04:59 +02:00
parent 333ca12d99 bb4023b494
commit a3ff34310d
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;