Browse Source

Tighten up the conditions on WebSocketMessagingAutoConfiguration

See gh-2445
pull/4054/head
Andy Wilkinson 10 years ago
parent
commit
1e50d988ab
  1. 3
      spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/WebSocketMessagingAutoConfiguration.java

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

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

Loading…
Cancel
Save