XCOMMONS-3451: Realtime editing doesn't support clustering

Author: tmortagne

xwiki-commons-core/xwiki-commons-netflux/src/main/java/org/xwiki/netflux/internal/Bot.java

@@ -22,6 +22,7 @@
 import java.util.List;
 
 import org.xwiki.component.annotation.Role;
+import org.xwiki.netflux.internal.user.local.LocalUser;
 
 /**
  * Represents a fake user that joins a {@link Channel} to perform a specific task.
@@ -57,7 +58,7 @@ default boolean onJoinChannel(Channel channel)
      * @param sender the user who sent the message
      * @param message the message that was sent
      */
-    default void onUserMessage(User sender, List<Object> message)
+    default void onUserMessage(LocalUser sender, List<Object> message)
     {
         // Do nothing by default
     }

xwiki-commons-core/xwiki-commons-netflux/src/main/java/org/xwiki/netflux/internal/Channel.java

@@ -22,7 +22,6 @@
 import java.util.Deque;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
-import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
@@ -88,14 +87,6 @@ public Map<String, Bot> getBots()
         return this.bots;
     }
 
-    /**
-     * @return the list of users that are currently connected to this channel
-     */
-    public List<User> getConnectedUsers()
-    {
-        return this.users.values().stream().filter(user -> user.getSession() != null && user.isConnected()).toList();
-    }
-
     /**
      * @return the channel messages
      */

xwiki-commons-core/xwiki-commons-netflux/src/main/java/org/xwiki/netflux/internal/ChannelStore.java

@@ -106,7 +106,7 @@ public void prune()
         try {
             long currentTime = System.currentTimeMillis();
             for (Channel channel : this.channelByKey.values()) {
-                if (channel.getConnectedUsers().isEmpty()
+                if (channel.getUsers().isEmpty()
                     && (currentTime - channel.getCreationDate()) > (1000 * 60 * 60 * 2)) {
                     remove(channel);
                 }

xwiki-commons-core/xwiki-commons-netflux/src/main/java/org/xwiki/netflux/internal/HistoryKeeper.java

@@ -30,6 +30,8 @@
 
 import org.slf4j.Logger;
 import org.xwiki.component.annotation.Component;
+import org.xwiki.netflux.internal.user.UserHandler;
+import org.xwiki.netflux.internal.user.local.LocalUser;
 
 /**
  * Holds the key of the history keeper fake user that is added to all Netflux channels.
@@ -51,6 +53,10 @@ public class HistoryKeeper extends AbstractBot
     @Inject
     private MessageBuilder messageBuilder;
 
+    @Inject
+    @SuppressWarnings("rawtypes")
+    private UserHandler userHandler;
+
     @Override
     public String getId()
     {
@@ -60,7 +66,7 @@ public String getId()
     }
 
     @Override
-    public void onUserMessage(User sender, List<Object> message)
+    public void onUserMessage(LocalUser sender, List<Object> message)
     {
         // The history keeper responds only to GET_HISTORY messages.
 
@@ -99,7 +105,7 @@ private void sendChannelHistory(User user, String channelKey)
 
         try {
             for (String msg : (Iterable<String>) messages::iterator) {
-                user.getSession().getBasicRemote().sendText(msg);
+                this.userHandler.sendText(user, msg);
             }
         } catch (Exception e) {
             this.logger.debug("Failed to send channel history.", e);