Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make argument ordering consistent across web server initialized events

Browse Source
This commit is contained in:
Andy Wilkinson
2017-05-03 17:09:02 +01:00
parent 328bbaf17f
commit bc4a11dd7b
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot/src/main/java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContext.java
View File

@@ -143,7 +143,7 @@ public class ServletWebServerApplicationContext extends GenericWebApplicationCon
super.finishRefresh();
WebServer webServer = startWebServer();
if (webServer != null) {
publishEvent(new ServletWebServerInitializedEvent(this, webServer));
publishEvent(new ServletWebServerInitializedEvent(webServer, this));
}
}

2
spring-boot/src/main/java/org/springframework/boot/web/servlet/context/ServletWebServerInitializedEvent.java
View File

@@ -37,7 +37,7 @@ public class ServletWebServerInitializedEvent extends WebServerInitializedEvent
private final ServletWebServerApplicationContext applicationContext;
public ServletWebServerInitializedEvent(
ServletWebServerApplicationContext applicationContext, WebServer source) {
WebServer source, ServletWebServerApplicationContext applicationContext) {
super(source);
this.applicationContext = applicationContext;
}

2
spring-boot/src/test/java/org/springframework/boot/system/EmbeddedServerPortFileWriterTests.java
View File

@@ -67,7 +67,7 @@ public class EmbeddedServerPortFileWriterTests {
WebServer source = mock(WebServer.class);
given(source.getPort()).willReturn(port);
ServletWebServerInitializedEvent event = new ServletWebServerInitializedEvent(
applicationContext, source);
source, applicationContext);
return event;
};
BiFunction<String, Integer, ? extends WebServerInitializedEvent> reactiveEvent = (