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

Tighten up the conditions on WebSocketMessagingAutoConfiguration 

See gh-2445
This commit is contained in:
Andy Wilkinson 2015-09-29 17:24:14 +01:00
parent fa040c9e26
commit 1e50d988ab
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/WebSocketMessagingAutoConfiguration.java
View File

@ -29,6 +29,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.messaging.converter.DefaultContentTypeResolver; import org.springframework.messaging.converter.DefaultContentTypeResolver;
import org.springframework.messaging.converter.MappingJackson2MessageConverter; import org.springframework.messaging.converter.MappingJackson2MessageConverter;
import org.springframework.messaging.converter.MessageConverter; import org.springframework.messaging.converter.MessageConverter;
import org.springframework.messaging.simp.config.AbstractMessageBrokerConfiguration;
import org.springframework.util.MimeTypeUtils; import org.springframework.util.MimeTypeUtils;
import org.springframework.web.socket.config.annotation.AbstractWebSocketMessageBrokerConfigurer; import org.springframework.web.socket.config.annotation.AbstractWebSocketMessageBrokerConfigurer;
import org.springframework.web.socket.config.annotation.DelegatingWebSocketMessageBrokerConfiguration; import org.springframework.web.socket.config.annotation.DelegatingWebSocketMessageBrokerConfiguration;
@ -51,7 +52,7 @@ public class WebSocketMessagingAutoConfiguration {
@Configuration @Configuration
@ConditionalOnBean({ DelegatingWebSocketMessageBrokerConfiguration.class, @ConditionalOnBean({ DelegatingWebSocketMessageBrokerConfiguration.class,
ObjectMapper.class }) ObjectMapper.class })
@ConditionalOnClass(ObjectMapper.class) @ConditionalOnClass({ ObjectMapper.class, AbstractMessageBrokerConfiguration.class })
static class WebSocketMessageConverterConfiguration extends static class WebSocketMessageConverterConfiguration extends
AbstractWebSocketMessageBrokerConfigurer { AbstractWebSocketMessageBrokerConfigurer {