File tree Expand file tree Collapse file tree 5 files changed +16
-16
lines changed
spring-integration-stomp/src/test/java/org/springframework/integration/stomp
spring-integration-websocket/src/test/java/org/springframework/integration/websocket Expand file tree Collapse file tree 5 files changed +16
-16
lines changed Original file line number Diff line number Diff line change @@ -123,16 +123,16 @@ subprojects { subproject ->
123
123
mysqlVersion = ' 6.0.6'
124
124
pahoMqttClientVersion = ' 1.2.0'
125
125
postgresVersion = ' 42.0.0'
126
- reactorNettyVersion = ' 0.7.2 .RELEASE'
127
- reactorVersion = ' 3.1.2 .RELEASE'
126
+ reactorNettyVersion = ' 0.7.3 .RELEASE'
127
+ reactorVersion = ' 3.1.3 .RELEASE'
128
128
romeToolsVersion = ' 1.8.0'
129
129
servletApiVersion = ' 4.0.0'
130
130
smackVersion = ' 4.2.2'
131
131
springAmqpVersion = project. hasProperty(' springAmqpVersion' ) ? project. springAmqpVersion : ' 2.0.1.RELEASE'
132
- springDataJpaVersion = ' 2.0.2 .RELEASE'
133
- springDataMongoVersion = ' 2.0.2 .RELEASE'
134
- springDataRedisVersion = ' 2.0.2 .RELEASE'
135
- springGemfireVersion = ' 2.0.2 .RELEASE'
132
+ springDataJpaVersion = ' 2.0.3 .RELEASE'
133
+ springDataMongoVersion = ' 2.0.3 .RELEASE'
134
+ springDataRedisVersion = ' 2.0.3 .RELEASE'
135
+ springGemfireVersion = ' 2.0.3 .RELEASE'
136
136
springSecurityVersion = ' 5.0.0.RELEASE'
137
137
springSocialTwitterVersion = ' 1.1.2.RELEASE'
138
138
springRetryVersion = ' 1.2.1.RELEASE'
Original file line number Diff line number Diff line change 77
77
import org .springframework .web .socket .WebSocketHttpHeaders ;
78
78
import org .springframework .web .socket .client .WebSocketClient ;
79
79
import org .springframework .web .socket .client .standard .StandardWebSocketClient ;
80
- import org .springframework .web .socket .config .annotation .AbstractWebSocketMessageBrokerConfigurer ;
81
80
import org .springframework .web .socket .config .annotation .EnableWebSocketMessageBroker ;
82
81
import org .springframework .web .socket .config .annotation .StompEndpointRegistry ;
82
+ import org .springframework .web .socket .config .annotation .WebSocketMessageBrokerConfigurer ;
83
83
import org .springframework .web .socket .messaging .SessionSubscribeEvent ;
84
84
import org .springframework .web .socket .messaging .WebSocketStompClient ;
85
85
import org .springframework .web .socket .server .HandshakeInterceptor ;
@@ -321,7 +321,7 @@ public ApplicationListener<ApplicationEvent> stompEventListener() {
321
321
322
322
@ Configuration
323
323
@ EnableWebSocketMessageBroker
324
- static class ServerConfig extends AbstractWebSocketMessageBrokerConfigurer {
324
+ static class ServerConfig implements WebSocketMessageBrokerConfigurer {
325
325
326
326
@ Bean
327
327
public DefaultHandshakeHandler handshakeHandler () {
Original file line number Diff line number Diff line change 79
79
import org .springframework .test .context .junit4 .SpringJUnit4ClassRunner ;
80
80
import org .springframework .web .socket .client .WebSocketClient ;
81
81
import org .springframework .web .socket .client .standard .StandardWebSocketClient ;
82
- import org .springframework .web .socket .config .annotation .AbstractWebSocketMessageBrokerConfigurer ;
83
82
import org .springframework .web .socket .config .annotation .EnableWebSocketMessageBroker ;
84
83
import org .springframework .web .socket .config .annotation .StompEndpointRegistry ;
84
+ import org .springframework .web .socket .config .annotation .WebSocketMessageBrokerConfigurer ;
85
85
import org .springframework .web .socket .messaging .WebSocketStompClient ;
86
86
import org .springframework .web .socket .server .standard .TomcatRequestUpgradeStrategy ;
87
87
import org .springframework .web .socket .server .support .DefaultHandshakeHandler ;
@@ -252,7 +252,7 @@ public void handle() {
252
252
basePackageClasses = StompMessageHandlerWebSocketIntegrationTests .class ,
253
253
useDefaultFilters = false ,
254
254
includeFilters = @ ComponentScan .Filter (IntegrationTestController .class ))
255
- static class ServerConfig extends AbstractWebSocketMessageBrokerConfigurer {
255
+ static class ServerConfig implements WebSocketMessageBrokerConfigurer {
256
256
257
257
@ Bean
258
258
public DefaultHandshakeHandler handshakeHandler () {
Original file line number Diff line number Diff line change 1
1
/*
2
- * Copyright 2014-2017 the original author or authors.
2
+ * Copyright 2014-2018 the original author or authors.
3
3
*
4
4
* Licensed under the Apache License, Version 2.0 (the "License");
5
5
* you may not use this file except in compliance with the License.
88
88
import org .springframework .util .MultiValueMap ;
89
89
import org .springframework .web .socket .client .WebSocketClient ;
90
90
import org .springframework .web .socket .client .standard .StandardWebSocketClient ;
91
- import org .springframework .web .socket .config .annotation .AbstractWebSocketMessageBrokerConfigurer ;
92
91
import org .springframework .web .socket .config .annotation .EnableWebSocketMessageBroker ;
93
92
import org .springframework .web .socket .config .annotation .StompEndpointRegistry ;
93
+ import org .springframework .web .socket .config .annotation .WebSocketMessageBrokerConfigurer ;
94
94
import org .springframework .web .socket .messaging .AbstractSubProtocolEvent ;
95
95
import org .springframework .web .socket .messaging .SessionConnectedEvent ;
96
96
import org .springframework .web .socket .messaging .SessionSubscribeEvent ;
@@ -462,7 +462,7 @@ interface WebSocketGateway {
462
462
useDefaultFilters = false ,
463
463
includeFilters = @ ComponentScan .Filter (IntegrationTestController .class ))
464
464
@ IntegrationComponentScan
465
- static class ServerConfig extends AbstractWebSocketMessageBrokerConfigurer {
465
+ static class ServerConfig implements WebSocketMessageBrokerConfigurer {
466
466
467
467
private static final ExpressionParser expressionParser = new SpelExpressionParser ();
468
468
Original file line number Diff line number Diff line change 1
1
/*
2
- * Copyright 2014-2017 the original author or authors.
2
+ * Copyright 2014-2018 the original author or authors.
3
3
*
4
4
* Licensed under the Apache License, Version 2.0 (the "License");
5
5
* you may not use this file except in compliance with the License.
82
82
import org .springframework .web .socket .WebSocketSession ;
83
83
import org .springframework .web .socket .client .WebSocketClient ;
84
84
import org .springframework .web .socket .client .standard .StandardWebSocketClient ;
85
- import org .springframework .web .socket .config .annotation .AbstractWebSocketMessageBrokerConfigurer ;
86
85
import org .springframework .web .socket .config .annotation .EnableWebSocketMessageBroker ;
87
86
import org .springframework .web .socket .config .annotation .StompEndpointRegistry ;
87
+ import org .springframework .web .socket .config .annotation .WebSocketMessageBrokerConfigurer ;
88
88
import org .springframework .web .socket .handler .WebSocketHandlerDecorator ;
89
89
import org .springframework .web .socket .handler .WebSocketHandlerDecoratorFactory ;
90
90
import org .springframework .web .socket .messaging .StompSubProtocolHandler ;
@@ -244,7 +244,7 @@ public MessageHandler webSocketOutboundMessageHandler() {
244
244
@ Configuration
245
245
@ EnableIntegration
246
246
@ EnableWebSocketMessageBroker
247
- static class ServerConfig extends AbstractWebSocketMessageBrokerConfigurer {
247
+ static class ServerConfig implements WebSocketMessageBrokerConfigurer {
248
248
249
249
@ Override
250
250
public void registerStompEndpoints (StompEndpointRegistry registry ) {
You can’t perform that action at this time.
0 commit comments