chore: refactor controller prototype and remove circular references

Author: DropSnorz

owlplug-client/src/main/java/com/owlplug/auth/controllers/AccountController.java

@@ -32,9 +32,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
 
-@Controller
+@Controller()
+@Scope("prototype")
 public class AccountController extends AbstractDialogController {
 
   private final Logger log = LoggerFactory.getLogger(this.getClass());

owlplug-client/src/main/java/com/owlplug/core/controllers/MainController.java

@@ -33,6 +33,7 @@
 import com.owlplug.core.components.TaskRunner;
 import com.owlplug.core.controllers.dialogs.CrashRecoveryDialogController;
 import com.owlplug.core.controllers.dialogs.WelcomeDialogController;
+import com.owlplug.core.events.OptionRefreshEvent;
 import com.owlplug.core.utils.PlatformUtils;
 import com.owlplug.explore.controllers.ExploreController;
 import com.owlplug.explore.services.ExploreService;
@@ -59,6 +60,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Controller;
 
 @Controller
@@ -67,16 +69,12 @@ public class MainController extends BaseController {
   private final Logger log = LoggerFactory.getLogger(this.getClass());
 
   @Autowired
-  private LazyViewRegistry viewRegistry;
+  private ApplicationEventPublisher publisher;
   @Autowired
-  private AccountController accountController;
+  private LazyViewRegistry viewRegistry;
   @Autowired
   private CrashRecoveryDialogController crashRecoveryDialogController;
   @Autowired
-  private WelcomeDialogController welcomeDialogController;
-  @Autowired
-  private OptionsController optionsController;
-  @Autowired
   private ExploreController exploreController;
   @Autowired
   private AuthenticationService authenticationService;
@@ -135,6 +133,7 @@ public void initialize() {
 
     accountComboBox.getSelectionModel().selectedItemProperty().addListener((options, oldValue, newValue) -> {
       if (newValue instanceof AccountMenuItem) {
+        AccountController accountController = new AccountController();
         accountController.show();
         // Delay comboBox selector change
         Platform.runLater(() -> accountComboBox.setValue(oldValue));
@@ -183,11 +182,14 @@ public void dispatchPostInitialize() {
       log.info("Previous execution not terminated safely, opening crash recovery dialog");
       crashRecoveryDialogController.show();
     } else if (this.getPreferences().getBoolean(ApplicationDefaults.FIRST_LAUNCH_KEY, true)) {
-      welcomeDialogController.show();
+      WelcomeDialogController dialog = new WelcomeDialogController();
+      dialog.show();
       exploreService.syncSources();
     }
     this.getPreferences().putBoolean(ApplicationDefaults.FIRST_LAUNCH_KEY, false);
-    optionsController.refreshView();
+
+    // Refresh Options view
+    publisher.publishEvent(new OptionRefreshEvent());
 
     this.getTelemetryService().event("/Startup", p -> {
       p.put("osName", System.getProperty("os.name"));

owlplug-client/src/main/java/com/owlplug/core/controllers/OptionsController.java

@@ -23,13 +23,15 @@
 import com.owlplug.core.components.ApplicationDefaults;
 import com.owlplug.core.controllers.dialogs.DonateDialogController;
 import com.owlplug.core.controllers.fragments.PluginPathFragmentController;
+import com.owlplug.core.events.OptionRefreshEvent;
 import com.owlplug.core.model.OperatingSystem;
 import com.owlplug.core.services.OptionsService;
 import com.owlplug.core.ui.SlidingLabel;
 import com.owlplug.core.utils.PlatformUtils;
 import com.owlplug.host.loaders.NativePluginLoader;
 import com.owlplug.plugin.controllers.dialogs.ListDirectoryDialogController;
 import com.owlplug.plugin.services.NativeHostService;
+import javafx.application.Platform;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
@@ -42,9 +44,12 @@
 import javafx.scene.layout.VBox;
 import javafx.scene.text.TextFlow;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Controller;
 
 @Controller
+@Scope("prototype")
 public class OptionsController extends BaseController {
 
   @Autowired
@@ -262,6 +267,11 @@ public void initialize() {
     refreshView();
   }
 
+  @EventListener
+  public void handle(OptionRefreshEvent event) {
+    Platform.runLater(this::refreshView);
+  }
+
   public void refreshView() {
 
     vst2PluginPathFragment.refresh();

owlplug-client/src/main/java/com/owlplug/core/controllers/dialogs/WelcomeDialogController.java

@@ -23,18 +23,23 @@
 import com.owlplug.core.components.LazyViewRegistry;
 import com.owlplug.core.controllers.OptionsController;
 import com.owlplug.core.controllers.fragments.PluginPathFragmentController;
+import com.owlplug.core.events.OptionRefreshEvent;
 import com.owlplug.core.model.OperatingSystem;
 import com.owlplug.plugin.components.PluginTaskFactory;
 import com.owlplug.plugin.controllers.dialogs.ListDirectoryDialogController;
+import javafx.application.Platform;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.VBox;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Controller;
 
 @Controller
+@Scope("prototype")
 public class WelcomeDialogController extends AbstractDialogController {
 
   @Autowired
@@ -58,7 +63,7 @@ public class WelcomeDialogController extends AbstractDialogController {
   private PluginPathFragmentController auPluginPathFragment;
   private PluginPathFragmentController lv2PluginPathFragment;
 
-  WelcomeDialogController() {
+  public WelcomeDialogController() {
     super(700, 300);
     this.setOverlayClose(false);
   }
@@ -109,6 +114,11 @@ public void initialize() {
 
   }
 
+  @EventListener
+  public void handle(OptionRefreshEvent event) {
+    Platform.runLater(this::refreshView);
+  }
+
   public void refreshView() {
     vst2PluginPathFragment.refresh();
     vst3PluginPathFragment.refresh();

owlplug-client/src/main/java/com/owlplug/core/events/ExploreRefreshEvent.java

@@ -0,0 +1,22 @@
+/* OwlPlug
+ * Copyright (C) 2021 Arthur <dropsnorz@gmail.com>
+ *
+ * This file is part of OwlPlug.
+ *
+ * OwlPlug is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3
+ * as published by the Free Software Foundation.
+ *
+ * OwlPlug is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with OwlPlug.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.owlplug.core.events;
+
+public class ExploreRefreshEvent {
+}

owlplug-client/src/main/java/com/owlplug/core/events/OptionRefreshEvent.java

@@ -0,0 +1,22 @@
+/* OwlPlug
+ * Copyright (C) 2021 Arthur <dropsnorz@gmail.com>
+ *
+ * This file is part of OwlPlug.
+ *
+ * OwlPlug is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3
+ * as published by the Free Software Foundation.
+ *
+ * OwlPlug is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with OwlPlug.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.owlplug.core.events;
+
+public class OptionRefreshEvent {
+}

owlplug-client/src/main/java/com/owlplug/core/events/PluginDisplayEvent.java

@@ -0,0 +1,22 @@
+/* OwlPlug
+ * Copyright (C) 2021 Arthur <dropsnorz@gmail.com>
+ *
+ * This file is part of OwlPlug.
+ *
+ * OwlPlug is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3
+ * as published by the Free Software Foundation.
+ *
+ * OwlPlug is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with OwlPlug.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.owlplug.core.events;
+
+public class PluginDisplayEvent {
+}

owlplug-client/src/main/java/com/owlplug/core/events/PluginRefreshEvent.java

@@ -0,0 +1,22 @@
+/* OwlPlug
+ * Copyright (C) 2021 Arthur <dropsnorz@gmail.com>
+ *
+ * This file is part of OwlPlug.
+ *
+ * OwlPlug is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3
+ * as published by the Free Software Foundation.
+ *
+ * OwlPlug is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with OwlPlug.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.owlplug.core.events;
+
+public class PluginRefreshEvent {
+}

owlplug-client/src/main/java/com/owlplug/explore/controllers/ExploreController.java

@@ -60,9 +60,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
 
 @Controller
+@Scope("prototype")
 public class ExploreController extends BaseController {
 
   private final Logger log = LoggerFactory.getLogger(this.getClass());
@@ -75,7 +77,7 @@ public class ExploreController extends BaseController {
   private ImageCache imageCache;
   @Autowired
   private LazyViewRegistry viewRegistry;
-  @Autowired
+  @FXML
   private PackageInfoController packageInfoController;
   @Autowired
   private MainController mainController;

owlplug-client/src/main/java/com/owlplug/explore/controllers/NewSourceDialogController.java

@@ -33,9 +33,11 @@
 import javafx.scene.control.TextField;
 import javafx.scene.image.ImageView;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
 
 @Controller
+@Scope("prototype")
 public class NewSourceDialogController extends AbstractDialogController implements IEntityCreateOrUpdate<RemoteSource> {
 
   @Autowired