root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Make argument ordering consistent across web server initialized events

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
Show Stats 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(); super.finishRefresh();
WebServer webServer = startWebServer(); WebServer webServer = startWebServer();
if (webServer != null) { 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; private final ServletWebServerApplicationContext applicationContext;
public ServletWebServerInitializedEvent( public ServletWebServerInitializedEvent(
ServletWebServerApplicationContext applicationContext, WebServer source) { WebServer source, ServletWebServerApplicationContext applicationContext) {
super(source); super(source);
this.applicationContext = applicationContext; 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); WebServer source = mock(WebServer.class);
given(source.getPort()).willReturn(port); given(source.getPort()).willReturn(port);
ServletWebServerInitializedEvent event = new ServletWebServerInitializedEvent( ServletWebServerInitializedEvent event = new ServletWebServerInitializedEvent(
applicationContext, source); source, applicationContext);
return event; return event;
}; };
BiFunction<String, Integer, ? extends WebServerInitializedEvent> reactiveEvent = ( BiFunction<String, Integer, ? extends WebServerInitializedEvent> reactiveEvent = (