Added protocol service bean to configuration

ep2p · Dec 12, 2020 · 35a9066 · 35a9066
1 parent 20b684a
commit 35a9066
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>lab.idioglossia</groupId>
 	<artifactId>row-server-starter</artifactId>
-	<version>2.0.1-RELEASE</version>
+	<version>2.0.2-RELEASE</version>
 	<name>Springboot Rest Over Websocket Starter</name>
 	<description>Spring boot starter for Rest Over Websocket</description>
 	<developers>

diff --git a/src/main/java/lab/idioglossia/row/server/config/RowConfiguration.java b/src/main/java/lab/idioglossia/row/server/config/RowConfiguration.java
@@ -128,11 +128,16 @@ public RowWsListener rowWsListener(){
         return new RowWsListener.DummyRowWsListener();
     }
 
+    @Bean("protocolService")
+    @DependsOn("rowFilterChain")
+    public ProtocolService protocolService(RowFilterChain rowFilterChain){
+        return new ProtocolService(rowFilterChain);
+    }
 
     @Bean("rowWebSocketHandler")
-    @DependsOn({"rowSessionRegistry", "rowFilterChain", "rowWsListener", "subscriptionRegistry"})
-    public WebSocketHandler rowWebSocketHandler(RowSessionRegistry rowSessionRegistry, RowFilterChain rowFilterChain, RowWsListener rowWsListener, SubscriptionRegistry subscriptionRegistry){
-        return new RowWebSocketHandler(rowSessionRegistry, webSocketProperties, rowFilterChain, rowWsListener, subscriptionRegistry, handlerProperties.isTrackHeartbeats());
+    @DependsOn({"rowSessionRegistry", "protocolService", "rowWsListener", "subscriptionRegistry"})
+    public WebSocketHandler rowWebSocketHandler(RowSessionRegistry rowSessionRegistry, ProtocolService protocolService, RowWsListener rowWsListener, SubscriptionRegistry subscriptionRegistry){
+        return new RowWebSocketHandler(rowSessionRegistry, webSocketProperties, rowWsListener, subscriptionRegistry, protocolService, handlerProperties.isTrackHeartbeats());
     }
 
     @Bean("subscriptionRegistry")

diff --git a/src/main/java/lab/idioglossia/row/server/ws/RowWebSocketHandler.java b/src/main/java/lab/idioglossia/row/server/ws/RowWebSocketHandler.java
@@ -3,7 +3,6 @@
 import lab.idioglossia.row.server.config.Naming;
 import lab.idioglossia.row.server.config.properties.WebSocketProperties;
 import lab.idioglossia.row.server.domain.RowWebsocketSession;
-import lab.idioglossia.row.server.filter.RowFilterChain;
 import lab.idioglossia.row.server.repository.RowSessionRegistry;
 import lab.idioglossia.row.server.repository.SubscriptionRegistry;
 import lab.idioglossia.row.server.service.ProtocolService;
@@ -20,18 +19,18 @@
 public class RowWebSocketHandler extends TextWebSocketHandler {
     private final RowSessionRegistry rowSessionRegistry;
     private final WebSocketProperties webSocketProperties;
-    private final ProtocolService protocolService;
     private final RowWsListener rowWsListener;
     private final SubscriptionRegistry subscriptionRegistry;
+    private final ProtocolService protocolService;
     private final boolean trackHeartbeats;
 
-    public RowWebSocketHandler(RowSessionRegistry rowSessionRegistry, WebSocketProperties webSocketProperties, RowFilterChain rowFilterChain, RowWsListener rowWsListener, SubscriptionRegistry subscriptionRegistry, boolean trackHeartbeats) {
+    public RowWebSocketHandler(RowSessionRegistry rowSessionRegistry, WebSocketProperties webSocketProperties, RowWsListener rowWsListener, SubscriptionRegistry subscriptionRegistry, ProtocolService protocolService, boolean trackHeartbeats) {
         this.rowSessionRegistry = rowSessionRegistry;
         this.webSocketProperties = webSocketProperties;
         this.rowWsListener = rowWsListener;
         this.subscriptionRegistry = subscriptionRegistry;
+        this.protocolService = protocolService;
         this.trackHeartbeats = trackHeartbeats;
-        protocolService = new ProtocolService(rowFilterChain);
     }
 
     @Override
@@ -80,7 +79,7 @@ public boolean supportsPartialMessages() {
 
     //--------------------
 
-    private void updateHeartbeat(WebSocketSession session) {
+    public void updateHeartbeat(WebSocketSession session) {
         if(trackHeartbeats)
             session.getAttributes().put(Naming.IN_HEARTBEAT_ATTRIBUTE_NAME, new Date());
     }