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

Merge branch '2.2.x'

Browse Source
This commit is contained in:
Marcin Grzejszczak
2020-12-09 11:02:31 +01:00
parent 9f78dad62d 3ccee094c4
commit 0bb87d592e
1 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -141,11 +141,8 @@ public class WireMockConfiguration implements SmartLifecycle {
}
private void printRegistrationLog() {
int httpPort = this.server.isRunning() ? this.server.port() : -1;
int httpsPort = this.server.isRunning() && this.server.getOptions().httpsSettings().enabled()
? this.server.httpsPort() : -1;
log.debug("Registering WireMock [" + this.server + "] at http port [" + httpPort + "] and https port ["
+ httpsPort + "]");
log.debug("Registering WireMock [" + this.server + "] at http port [" + httpPort()
+ "] and https port [" + httpsPort() + "]");
}
private void reRegisterServer() {
@@ -162,20 +159,14 @@ public class WireMockConfiguration implements SmartLifecycle {
else if (this.server == null) {
this.server = new WireMockServer(this.options);
if (log.isDebugEnabled()) {
int httpPort = this.server.isRunning() ? this.server.port() : -1;
int httpsPort = this.server.isRunning() && this.server.getOptions().httpsSettings().enabled()
? this.server.httpsPort() : -1;
log.debug("Created new server [" + this.server + "] at http port [" + httpPort + "] and https port ["
+ httpsPort + "]");
log.debug("Created new server [" + this.server + "] at http port ["
+ httpPort() + "] and https port [" + httpsPort() + "]");
}
}
start();
if (log.isDebugEnabled()) {
int httpPort = this.server.isRunning() ? this.server.port() : -1;
int httpsPort = this.server.isRunning() && this.server.getOptions().httpsSettings().enabled()
? this.server.httpsPort() : -1;
log.debug("Started server [" + this.server + "] at http port [" + httpPort + "] and https port ["
+ httpsPort + "]");
log.debug("Started server [" + this.server + "] at http port [" + httpPort()
+ "] and https port [" + httpsPort() + "]");
}
logRegisteredMappings();
}
@@ -260,12 +251,9 @@ public class WireMockConfiguration implements SmartLifecycle {
@Override
public void start() {
if (isRunning()) {
int httpPort = this.server.isRunning() ? this.server.port() : -1;
int httpsPort = this.server.isRunning() && this.server.getOptions().httpsSettings().enabled()
? this.server.httpsPort() : -1;
if (log.isDebugEnabled()) {
log.debug("Server [" + this.server + "] is already running at http port [" + httpPort
+ "] / https port [" + httpsPort + "]");
log.debug("Server [" + this.server + "] is already running at http port ["
+ httpPort() + "] / https port [" + httpsPort() + "]");
}
updateCurrentServer();
return;
@@ -274,18 +262,26 @@ public class WireMockConfiguration implements SmartLifecycle {
updateCurrentServer();
}
private int httpPort() {
return this.server.isRunning() ? this.server.port() : -1;
}
private void updateCurrentServer() {
WireMock.configureFor(new WireMock(this.server));
this.running = true;
if (log.isDebugEnabled() && this.server.isRunning()) {
int httpPort = this.server.isRunning() ? this.server.port() : -1;
int httpsPort = this.server.isRunning() && this.server.getOptions().httpsSettings().enabled()
? this.server.httpsPort() : -1;
log.debug("Server [" + this.server + "] is already running at http port [" + httpPort + "] / https port ["
+ httpsPort + "]. It has [" + this.server.getStubMappings().size() + "] mappings registered");
log.debug("Server [" + this.server + "] is already running at http port ["
+ httpPort() + "] / https port [" + httpsPort() + "]. It has ["
+ this.server.getStubMappings().size() + "] mappings registered");
}
}
private int httpsPort() {
return this.server.isRunning()
&& this.server.getOptions().httpsSettings().enabled()
? this.server.httpsPort() : -1;
}
@Override
public void stop() {
if (this.running) {