add @qualifier where necessary (#74)

zyro23 · Nov 4, 2024 · 933a450 · 933a450
1 parent 02f6217
commit 933a450
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/src/main/groovy/grails/plugin/springwebsocket/DefaultWebSocketConfig.groovy b/src/main/groovy/grails/plugin/springwebsocket/DefaultWebSocketConfig.groovy
@@ -1,6 +1,7 @@
 package grails.plugin.springwebsocket
 
 import groovy.transform.CompileStatic
+import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.messaging.MessageChannel
@@ -18,8 +19,8 @@ class DefaultWebSocketConfig implements WebSocketMessageBrokerConfigurer {
 
     @Override
     void configureMessageBroker(MessageBrokerRegistry messageBrokerRegistry) {
-        messageBrokerRegistry.enableSimpleBroker "/queue", "/topic"
-        messageBrokerRegistry.setApplicationDestinationPrefixes "/app"
+        messageBrokerRegistry.enableSimpleBroker("/queue", "/topic")
+        messageBrokerRegistry.setApplicationDestinationPrefixes("/app")
     }
 
     @Override
@@ -29,20 +30,20 @@ class DefaultWebSocketConfig implements WebSocketMessageBrokerConfigurer {
 
     @Bean
     GrailsSimpAnnotationMethodMessageHandler grailsSimpAnnotationMethodMessageHandler(
-            SubscribableChannel clientInboundChannel,
-            MessageChannel clientOutboundChannel,
+            @Qualifier("clientInboundChannel") SubscribableChannel clientInboundChannel,
+            @Qualifier("clientOutboundChannel") MessageChannel clientOutboundChannel,
             SimpMessageSendingOperations brokerMessagingTemplate) {
-        def handler = new GrailsSimpAnnotationMethodMessageHandler(clientInboundChannel, clientOutboundChannel, brokerMessagingTemplate)
+        GrailsSimpAnnotationMethodMessageHandler handler = new GrailsSimpAnnotationMethodMessageHandler(clientInboundChannel, clientOutboundChannel, brokerMessagingTemplate)
         handler.destinationPrefixes = ["/app"]
         return handler
     }
 
     @Bean
     GrailsWebSocketAnnotationMethodMessageHandler grailsWebSocketAnnotationMethodMessageHandler(
-            SubscribableChannel clientInboundChannel,
-            MessageChannel clientOutboundChannel,
+            @Qualifier("clientInboundChannel") SubscribableChannel clientInboundChannel,
+            @Qualifier("clientOutboundChannel") MessageChannel clientOutboundChannel,
             SimpMessageSendingOperations brokerMessagingTemplate) {
-        def handler = new GrailsWebSocketAnnotationMethodMessageHandler(clientInboundChannel, clientOutboundChannel, brokerMessagingTemplate)
+        GrailsWebSocketAnnotationMethodMessageHandler handler = new GrailsWebSocketAnnotationMethodMessageHandler(clientInboundChannel, clientOutboundChannel, brokerMessagingTemplate)
         handler.destinationPrefixes = ["/app"]
         return handler
     }

diff --git a/src/main/templates/grails/plugin/springwebsocket/WebSocketConfig.groovy b/src/main/templates/grails/plugin/springwebsocket/WebSocketConfig.groovy
@@ -3,6 +3,7 @@ package ${model.packageName}
 import grails.plugin.springwebsocket.GrailsSimpAnnotationMethodMessageHandler
 import grails.plugin.springwebsocket.GrailsWebSocketAnnotationMethodMessageHandler
 import groovy.transform.CompileStatic
+import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.messaging.MessageChannel
@@ -20,8 +21,8 @@ class ${model.className} implements WebSocketMessageBrokerConfigurer {
 
     @Override
     void configureMessageBroker(MessageBrokerRegistry messageBrokerRegistry) {
-        messageBrokerRegistry.enableSimpleBroker "/queue", "/topic"
-        messageBrokerRegistry.setApplicationDestinationPrefixes "/app"
+        messageBrokerRegistry.enableSimpleBroker("/queue", "/topic")
+        messageBrokerRegistry.setApplicationDestinationPrefixes("/app")
     }
 
     @Override
@@ -31,20 +32,20 @@ class ${model.className} implements WebSocketMessageBrokerConfigurer {
 
     @Bean
     GrailsSimpAnnotationMethodMessageHandler grailsSimpAnnotationMethodMessageHandler(
-            SubscribableChannel clientInboundChannel,
-            MessageChannel clientOutboundChannel,
+            @Qualifier("clientInboundChannel") SubscribableChannel clientInboundChannel,
+            @Qualifier("clientOutboundChannel") MessageChannel clientOutboundChannel,
             SimpMessageSendingOperations brokerMessagingTemplate) {
-        def handler = new GrailsSimpAnnotationMethodMessageHandler(clientInboundChannel, clientOutboundChannel, brokerMessagingTemplate)
+        GrailsSimpAnnotationMethodMessageHandler handler = new GrailsSimpAnnotationMethodMessageHandler(clientInboundChannel, clientOutboundChannel, brokerMessagingTemplate)
         handler.destinationPrefixes = ["/app"]
         return handler
     }
 
     @Bean
     GrailsWebSocketAnnotationMethodMessageHandler grailsWebSocketAnnotationMethodMessageHandler(
-            SubscribableChannel clientInboundChannel,
-            MessageChannel clientOutboundChannel,
+            @Qualifier("clientInboundChannel") SubscribableChannel clientInboundChannel,
+            @Qualifier("clientOutboundChannel") MessageChannel clientOutboundChannel,
             SimpMessageSendingOperations brokerMessagingTemplate) {
-        def handler = new GrailsWebSocketAnnotationMethodMessageHandler(clientInboundChannel, clientOutboundChannel, brokerMessagingTemplate)
+        GrailsWebSocketAnnotationMethodMessageHandler handler = new GrailsWebSocketAnnotationMethodMessageHandler(clientInboundChannel, clientOutboundChannel, brokerMessagingTemplate)
         handler.destinationPrefixes = ["/app"]
         return handler
     }