Remove google event bus

FAForever · Nov 18, 2023 · 9c9a89f · 9c9a89f
1 parent 0e84328
commit 9c9a89f
Show file tree

Hide file tree

Showing 135 changed files with 785 additions and 1,158 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/src/lombok.config b/src/lombok.config
@@ -2,3 +2,4 @@ lombok.accessors.chain=true
 config.stopBubbling=true
 lombok.anyConstructor.addConstructorProperties=true
 lombok.copyableAnnotations+=org.springframework.beans.factory.annotation.Qualifier
+lombok.copyableannotations+=org.springframework.context.annotation.Lazy
diff --git a/src/main/java/com/faforever/client/avatar/AvatarService.java b/src/main/java/com/faforever/client/avatar/AvatarService.java
@@ -1,15 +1,13 @@
 package com.faforever.client.avatar;
 
-import com.faforever.client.avatar.event.AvatarChangedEvent;
 import com.faforever.client.domain.AvatarBean;
 import com.faforever.client.mapstruct.AvatarMapper;
 import com.faforever.client.mapstruct.CycleAvoidingMappingContext;
+import com.faforever.client.player.PlayerService;
 import com.faforever.client.remote.AssetService;
 import com.faforever.client.remote.FafServerAccessor;
-import com.google.common.eventbus.EventBus;
 import javafx.scene.image.Image;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.InitializingBean;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -23,11 +21,11 @@
 @Lazy
 @Service
 @RequiredArgsConstructor
-public class AvatarService implements InitializingBean {
+public class AvatarService {
 
   private final FafServerAccessor fafServerAccessor;
   private final AssetService assetService;
-  private final EventBus eventBus;
+  private final PlayerService playerService;
   private final AvatarMapper avatarMapper;
 
   @Cacheable(value = AVATARS, sync = true)
@@ -45,11 +43,6 @@ public CompletableFuture<List<AvatarBean>> getAvailableAvatars() {
 
   public void changeAvatar(AvatarBean avatar) {
     fafServerAccessor.selectAvatar(avatar.getUrl());
-    eventBus.post(new AvatarChangedEvent(avatar));
-  }
-
-  @Override
-  public void afterPropertiesSet() throws Exception {
-    eventBus.register(this);
+    playerService.getCurrentPlayer().setAvatar(avatar);
   }
 }
diff --git a/src/main/java/com/faforever/client/chat/AbstractChatTabController.java b/src/main/java/com/faforever/client/chat/AbstractChatTabController.java
@@ -14,6 +14,7 @@
 import com.faforever.client.i18n.I18n;
 import com.faforever.client.main.event.NavigateEvent;
 import com.faforever.client.main.event.NavigationItem;
+import com.faforever.client.navigation.NavigationHandler;
 import com.faforever.client.notification.NotificationService;
 import com.faforever.client.notification.TransientNotification;
 import com.faforever.client.player.CountryFlagService;
@@ -29,7 +30,6 @@
 import com.faforever.client.util.TimeService;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Joiner;
-import com.google.common.eventbus.EventBus;
 import com.google.common.io.CharStreams;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
@@ -131,13 +131,13 @@ public abstract class AbstractChatTabController implements Controller<Tab> {
   protected final I18n i18n;
   protected final NotificationService notificationService;
   protected final UiService uiService;
-  protected final EventBus eventBus;
   protected final WebViewConfigurer webViewConfigurer;
   protected final EmoticonService emoticonService;
   protected final CountryFlagService countryFlagService;
   protected final ChatPrefs chatPrefs;
   protected final NotificationPrefs notificationPrefs;
   protected final FxApplicationThreadExecutor fxApplicationThreadExecutor;
+  protected final NavigationHandler navigationHandler;
 
   /**
    * Messages that arrived before the web view was ready. Those are appended as soon as it is ready.
@@ -615,7 +615,7 @@ protected void showNotificationIfNecessary(ChatMessage chatMessage) {
 
     if (notificationPrefs.isPrivateMessageToastEnabled()) {
       notificationService.addNotification(new TransientNotification(chatMessage.username(), chatMessage.message(), IdenticonUtil.createIdenticon(identIconSource), event -> {
-        eventBus.post(new NavigateEvent(NavigationItem.CHAT));
+        navigationHandler.navigateTo(new NavigateEvent(NavigationItem.CHAT));
         stage.toFront();
         getRoot().getTabPane().getSelectionModel().select(getRoot());
       }));

diff --git a/src/main/java/com/faforever/client/chat/ChannelTabController.java b/src/main/java/com/faforever/client/chat/ChannelTabController.java
@@ -10,6 +10,7 @@
 import com.faforever.client.fx.SimpleInvalidationListener;
 import com.faforever.client.fx.WebViewConfigurer;
 import com.faforever.client.i18n.I18n;
+import com.faforever.client.navigation.NavigationHandler;
 import com.faforever.client.notification.NotificationService;
 import com.faforever.client.player.CountryFlagService;
 import com.faforever.client.player.PlayerService;
@@ -18,7 +19,6 @@
 import com.faforever.client.theme.UiService;
 import com.faforever.client.user.LoginService;
 import com.faforever.client.util.TimeService;
-import com.google.common.eventbus.EventBus;
 import javafx.beans.binding.BooleanExpression;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
@@ -94,12 +94,15 @@ public class ChannelTabController extends AbstractChatTabController {
   public ChannelTabController(WebViewConfigurer webViewConfigurer, LoginService loginService, ChatService chatService,
                               PlayerService playerService,
                               AudioService audioService, TimeService timeService, I18n i18n,
-                              NotificationService notificationService, UiService uiService, EventBus eventBus,
+                              NotificationService notificationService, UiService uiService,
+                              NavigationHandler navigationHandler,
                               CountryFlagService countryFlagService, EmoticonService emoticonService,
                               PlatformService platformService, ChatPrefs chatPrefs,
                               NotificationPrefs notificationPrefs,
                               FxApplicationThreadExecutor fxApplicationThreadExecutor) {
-    super(loginService, chatService, playerService, timeService, i18n, notificationService, uiService, eventBus, webViewConfigurer, emoticonService, countryFlagService, chatPrefs, notificationPrefs, fxApplicationThreadExecutor);
+    super(loginService, chatService, playerService, timeService, i18n, notificationService, uiService,
+          webViewConfigurer, emoticonService, countryFlagService, chatPrefs, notificationPrefs,
+          fxApplicationThreadExecutor, navigationHandler);
     this.platformService = platformService;
     this.audioService = audioService;
   }

diff --git a/src/main/java/com/faforever/client/chat/ChatService.java b/src/main/java/com/faforever/client/chat/ChatService.java
@@ -54,7 +54,7 @@ public interface ChatService {
    */
   void incrementUnreadMessagesCount(int delta);
 
-  void onInitiatePrivateChat(InitiatePrivateChatEvent event);
+  void onInitiatePrivateChat(String username);
 
   Set<ChatChannel> getChannels();
 }
diff --git a/src/main/java/com/faforever/client/chat/ChatUserItemController.java b/src/main/java/com/faforever/client/chat/ChatUserItemController.java
@@ -38,7 +38,6 @@
 import com.faforever.client.preferences.ChatPrefs;
 import com.faforever.client.theme.UiService;
 import com.faforever.commons.lobby.GameStatus;
-import com.google.common.eventbus.EventBus;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanExpression;
 import javafx.beans.property.ObjectProperty;
@@ -71,10 +70,10 @@ public class ChatUserItemController implements Controller<Node> {
   private final I18n i18n;
   private final UiService uiService;
   private final MapService mapService;
+  private final ChatService chatService;
   private final MapGeneratorService mapGeneratorService;
   private final CountryFlagService countryFlagService;
   private final AvatarService avatarService;
-  private final EventBus eventBus;
   private final ContextMenuBuilder contextMenuBuilder;
   private final ChatPrefs chatPrefs;
   private final ImageViewHelper imageViewHelper;
@@ -186,7 +185,7 @@ public void onContextMenuRequested(ContextMenuEvent event) {
   public void onItemClicked(MouseEvent mouseEvent) {
     ChatChannelUser chatChannelUser = chatUser.get();
     if (chatChannelUser != null && mouseEvent.getButton() == MouseButton.PRIMARY && mouseEvent.getClickCount() == 2) {
-      eventBus.post(new InitiatePrivateChatEvent(chatChannelUser.getUsername()));
+      chatService.onInitiatePrivateChat(chatChannelUser.getUsername());
     }
   }
 

diff --git a/src/main/java/com/faforever/client/chat/InitiatePrivateChatEvent.java b/src/main/java/com/faforever/client/chat/InitiatePrivateChatEvent.java
diff --git a/src/main/java/com/faforever/client/chat/KittehChatService.java b/src/main/java/com/faforever/client/chat/KittehChatService.java
@@ -7,18 +7,16 @@
 import com.faforever.client.fx.JavaFxUtil;
 import com.faforever.client.fx.SimpleChangeListener;
 import com.faforever.client.net.ConnectionState;
-import com.faforever.client.player.PlayerOnlineEvent;
 import com.faforever.client.player.PlayerService;
 import com.faforever.client.player.SocialStatus;
 import com.faforever.client.preferences.ChatPrefs;
 import com.faforever.client.remote.FafServerAccessor;
+import com.faforever.client.ui.tray.TrayIconManager;
 import com.faforever.client.ui.tray.event.UpdateApplicationBadgeEvent;
 import com.faforever.client.user.LoginService;
 import com.faforever.commons.lobby.Player.LeaderboardStats;
 import com.faforever.commons.lobby.SocialInfo;
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
 import javafx.beans.InvalidationListener;
 import javafx.beans.WeakInvalidationListener;
 import javafx.beans.property.ObjectProperty;
@@ -94,11 +92,11 @@ public class KittehChatService implements ChatService, InitializingBean, Disposa
   private static final Set<Character> MODERATOR_PREFIXES = Set.of('~', '&', '@', '%');
   private final LoginService loginService;
   private final FafServerAccessor fafServerAccessor;
-  private final EventBus eventBus;
   private final ClientProperties clientProperties;
   private final PlayerService playerService;
   private final ChatPrefs chatPrefs;
   private final FxApplicationThreadExecutor fxApplicationThreadExecutor;
+  private final TrayIconManager trayIconManager;
   @Qualifier("userWebClient")
   private final ObjectFactory<WebClient> userWebClientFactory;
 
@@ -124,8 +122,6 @@ public class KittehChatService implements ChatService, InitializingBean, Disposa
 
   @Override
   public void afterPropertiesSet() {
-    eventBus.register(this);
-
     loginService.loggedInProperty().addListener((SimpleChangeListener<Boolean>) loggedIn -> {
       if (loggedIn) {
         connect();
@@ -141,6 +137,7 @@ public void afterPropertiesSet() {
       }
     });
 
+    playerService.addPlayerOnlineListener(this::onPlayerOnline);
     JavaFxUtil.addListener(chatPrefs.groupToColorProperty(), new WeakInvalidationListener(userColorsListener));
     JavaFxUtil.addListener(chatPrefs.chatColorModeProperty(), new WeakInvalidationListener(userColorsListener));
   }
@@ -191,10 +188,8 @@ private ChatChannelUser initializeUserForChannel(String username, ChatChannel ch
     return chatChannelUser;
   }
 
-  @Subscribe
-  public void onPlayerOnline(PlayerOnlineEvent event) {
-    PlayerBean player = event.player();
-
+  @VisibleForTesting
+  void onPlayerOnline(PlayerBean player) {
     channels.values()
         .stream()
         .map(channel -> channel.getUser(player.getUsername()))
@@ -546,13 +541,12 @@ public void whois(String username) {
 
   @Override
   public void incrementUnreadMessagesCount(int delta) {
-    eventBus.post(UpdateApplicationBadgeEvent.ofDelta(delta));
+    trayIconManager.onSetApplicationBadgeEvent(UpdateApplicationBadgeEvent.ofDelta(delta));
   }
 
   @Override
-  @Subscribe
-  public void onInitiatePrivateChat(InitiatePrivateChatEvent event) {
-    getOrCreateChannel(event.username());
+  public void onInitiatePrivateChat(String username) {
+    getOrCreateChannel(username);
   }
 
   @Override

diff --git a/src/main/java/com/faforever/client/chat/MatchmakingChatController.java b/src/main/java/com/faforever/client/chat/MatchmakingChatController.java
@@ -1,11 +1,11 @@
 package com.faforever.client.chat;
 
 import com.faforever.client.chat.emoticons.EmoticonService;
-import com.faforever.client.chat.event.UnreadPartyMessageEvent;
-import com.faforever.client.discord.JoinDiscordEvent;
+import com.faforever.client.discord.JoinDiscordEventHandler;
 import com.faforever.client.fx.FxApplicationThreadExecutor;
 import com.faforever.client.fx.WebViewConfigurer;
 import com.faforever.client.i18n.I18n;
+import com.faforever.client.navigation.NavigationHandler;
 import com.faforever.client.notification.NotificationService;
 import com.faforever.client.player.CountryFlagService;
 import com.faforever.client.player.PlayerService;
@@ -15,7 +15,6 @@
 import com.faforever.client.user.LoginService;
 import com.faforever.client.util.TimeService;
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.eventbus.EventBus;
 import javafx.beans.binding.BooleanExpression;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.ListChangeListener;
@@ -30,6 +29,7 @@
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
+import java.net.URISyntaxException;
 import java.time.Instant;
 import java.util.Arrays;
 import java.util.List;
@@ -38,6 +38,8 @@
 @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class MatchmakingChatController extends AbstractChatTabController {
 
+  private final JoinDiscordEventHandler joinDiscordEventHandler;
+
   public Tab matchmakingChatTabRoot;
   public WebView messagesWebView;
   public TextField messageTextField;
@@ -57,13 +59,18 @@ public class MatchmakingChatController extends AbstractChatTabController {
   // TODO cut dependencies
   public MatchmakingChatController(LoginService loginService,
                                    PlayerService playerService, TimeService timeService, I18n i18n,
-                                   NotificationService notificationService, UiService uiService, EventBus eventBus,
+                                   NotificationService notificationService, UiService uiService,
+                                   NavigationHandler navigationHandler,
                                    ChatService chatService,
                                    WebViewConfigurer webViewConfigurer, CountryFlagService countryFlagService,
                                    EmoticonService emoticonService, ChatPrefs chatPrefs,
                                    NotificationPrefs notificationPrefs,
-                                   FxApplicationThreadExecutor fxApplicationThreadExecutor) {
-    super(loginService, chatService, playerService, timeService, i18n, notificationService, uiService, eventBus, webViewConfigurer, emoticonService, countryFlagService, chatPrefs, notificationPrefs, fxApplicationThreadExecutor);
+                                   FxApplicationThreadExecutor fxApplicationThreadExecutor,
+                                   JoinDiscordEventHandler joinDiscordEventHandler) {
+    super(loginService, chatService, playerService, timeService, i18n, notificationService, uiService,
+          webViewConfigurer, emoticonService, countryFlagService, chatPrefs, notificationPrefs,
+          fxApplicationThreadExecutor, navigationHandler);
+    this.joinDiscordEventHandler = joinDiscordEventHandler;
   }
 
   @Override
@@ -117,17 +124,8 @@ protected WebView getMessagesWebView() {
     return messagesWebView;
   }
 
-  @Override
-  protected void onChatMessage(ChatMessage chatMessage) {
-    super.onChatMessage(chatMessage);
-
-    if (!hasFocus()) {
-      eventBus.post(new UnreadPartyMessageEvent(chatMessage));
-    }
-  }
-
-  public void onDiscordButtonClicked() {
-    eventBus.post(new JoinDiscordEvent(discordLink.getText()));
+  public void onDiscordButtonClicked() throws URISyntaxException {
+    joinDiscordEventHandler.onJoin(discordLink.getText());
   }
 
   @VisibleForTesting

diff --git a/src/main/java/com/faforever/client/chat/PrivateChatTabController.java b/src/main/java/com/faforever/client/chat/PrivateChatTabController.java
@@ -3,12 +3,12 @@
 import com.faforever.client.audio.AudioService;
 import com.faforever.client.avatar.AvatarService;
 import com.faforever.client.chat.emoticons.EmoticonService;
-import com.faforever.client.chat.event.UnreadPrivateMessageEvent;
 import com.faforever.client.domain.PlayerBean;
 import com.faforever.client.fx.FxApplicationThreadExecutor;
 import com.faforever.client.fx.JavaFxUtil;
 import com.faforever.client.fx.WebViewConfigurer;
 import com.faforever.client.i18n.I18n;
+import com.faforever.client.navigation.NavigationHandler;
 import com.faforever.client.notification.NotificationService;
 import com.faforever.client.player.CountryFlagService;
 import com.faforever.client.player.PlayerService;
@@ -19,7 +19,6 @@
 import com.faforever.client.user.LoginService;
 import com.faforever.client.util.TimeService;
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.eventbus.EventBus;
 import javafx.beans.binding.BooleanExpression;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.ListChangeListener;
@@ -65,13 +64,16 @@ public class PrivateChatTabController extends AbstractChatTabController {
   // TODO cut dependencies
   public PrivateChatTabController(LoginService loginService,
                                   PlayerService playerService, TimeService timeService, I18n i18n,
-                                  NotificationService notificationService, UiService uiService, EventBus eventBus,
+                                  NotificationService notificationService, UiService uiService,
+                                  NavigationHandler navigationHandler,
                                   AudioService audioService, ChatService chatService,
                                   WebViewConfigurer webViewConfigurer, CountryFlagService countryFlagService,
                                   EmoticonService emoticonService, AvatarService avatarService, ChatPrefs chatPrefs,
                                   NotificationPrefs notificationPrefs,
                                   FxApplicationThreadExecutor fxApplicationThreadExecutor) {
-    super(loginService, chatService, playerService, timeService, i18n, notificationService, uiService, eventBus, webViewConfigurer, emoticonService, countryFlagService, chatPrefs, notificationPrefs, fxApplicationThreadExecutor);
+    super(loginService, chatService, playerService, timeService, i18n, notificationService, uiService,
+          webViewConfigurer, emoticonService, countryFlagService, chatPrefs, notificationPrefs,
+          fxApplicationThreadExecutor, navigationHandler);
     this.avatarService = avatarService;
     this.audioService = audioService;
   }
@@ -154,7 +156,6 @@ public void onChatMessage(ChatMessage chatMessage) {
       showNotificationIfNecessary(chatMessage);
       setUnread(true);
       incrementUnreadMessagesCount();
-      eventBus.post(new UnreadPrivateMessageEvent(chatMessage));
     }
   }