Commit 1e50d988 authored by Andy Wilkinson's avatar Andy Wilkinson

Tighten up the conditions on WebSocketMessagingAutoConfiguration

See gh-2445
parent fa040c9e
......@@ -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 {
@Configuration
@ConditionalOnBean({ DelegatingWebSocketMessageBrokerConfiguration.class,
ObjectMapper.class })
@ConditionalOnClass(ObjectMapper.class)
@ConditionalOnClass({ ObjectMapper.class, AbstractMessageBrokerConfiguration.class })
static class WebSocketMessageConverterConfiguration extends
AbstractWebSocketMessageBrokerConfigurer {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment