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

Upgrade to Jetty 9.4.1.v20170120

Browse Source 
Closes gh-7750
This commit is contained in:
Andy Wilkinson
2017-01-24 12:38:24 +00:00
parent e3235f2370
commit 013d45a4d7
4 changed files with 9 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/jetty/echo/CustomContainerWebSocketsApplicationTests.java
View File

@@ -22,11 +22,9 @@ import java.util.concurrent.atomic.AtomicReference;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.eclipse.jetty.websocket.jsr356.ClientContainer;
import org.junit.Test;
import org.junit.runner.RunWith;
import samples.websocket.jetty.SampleJettyWebSocketsApplication;
import samples.websocket.jetty.client.FixedClientContainer;
import samples.websocket.jetty.client.GreetingService;
import samples.websocket.jetty.client.SimpleClientWebSocketHandler;
import samples.websocket.jetty.client.SimpleGreetingService;
@@ -125,18 +123,18 @@ public class CustomContainerWebSocketsApplicationTests {
}
@Bean
public WebSocketConnectionManager wsConnectionManager() throws Exception {
public WebSocketConnectionManager wsConnectionManager() {
WebSocketConnectionManager manager = new WebSocketConnectionManager(client(),
handler(), this.webSocketUri);
manager.setAutoStartup(true);
return manager;
}
@Bean
public StandardWebSocketClient client() throws Exception {
ClientContainer container = new FixedClientContainer();
container.start();
return new StandardWebSocketClient(container);
public StandardWebSocketClient client() {
return new StandardWebSocketClient();
}
@Bean