Merge branch 'develop' into dependabot/gradle/de.undercouch.download-…

…5.4.0

src/main/java/com/faforever/client/config/FeaturedModUpdaterConfig.java

@@ -1,15 +1,15 @@
 package com.faforever.client.config;
 
 import com.faforever.client.mod.ModService;
+import com.faforever.client.patch.GameBinariesUpdateTask;
 import com.faforever.client.patch.GameUpdater;
 import com.faforever.client.patch.GameUpdaterImpl;
 import com.faforever.client.patch.SimpleHttpFeaturedModUpdater;
 import com.faforever.client.preferences.DataPrefs;
 import com.faforever.client.preferences.ForgedAlliancePrefs;
-import com.faforever.client.preferences.PreferencesService;
 import com.faforever.client.task.TaskService;
 import lombok.AllArgsConstructor;
-import org.springframework.context.ApplicationContext;
+import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -18,16 +18,15 @@
 public class FeaturedModUpdaterConfig {
 
   private final ModService modService;
-  private final ApplicationContext applicationContext;
+  private final ObjectFactory<GameBinariesUpdateTask> gameBinariesUpdateTaskFactory;
   private final TaskService taskService;
   private final SimpleHttpFeaturedModUpdater httpFeaturedModUpdater;
-  private final PreferencesService preferencesService;
   private final DataPrefs dataPrefs;
   private final ForgedAlliancePrefs forgedAlliancePrefs;
 
   @Bean
   GameUpdater gameUpdater() {
-    return new GameUpdaterImpl(modService, applicationContext, taskService, preferencesService, dataPrefs, forgedAlliancePrefs)
+    return new GameUpdaterImpl(modService, taskService, dataPrefs, forgedAlliancePrefs, gameBinariesUpdateTaskFactory)
         .addFeaturedModUpdater(httpFeaturedModUpdater);
   }
 }

src/main/java/com/faforever/client/fa/relay/ice/IceAdapterImpl.java

@@ -34,7 +34,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.context.ApplicationContext;
+import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
@@ -65,13 +65,13 @@ public class IceAdapterImpl implements IceAdapter, InitializingBean, DisposableB
   private static final Logger advancedLogger = LoggerFactory.getLogger("faf-ice-adapter-advanced");
 
   private final OperatingSystem operatingSystem;
-  private final ApplicationContext applicationContext;
   private final PlayerService playerService;
   private final EventBus eventBus;
   private final FafServerAccessor fafServerAccessor;
   private final IceServerMapper iceServerMapper;
   private final Preferences preferences;
   private final ForgedAlliancePrefs forgedAlliancePrefs;
+  private final ObjectFactory<IceAdapterCallbacks> iceAdapterCallbacksFactory;
 
   private final IceAdapterApi iceAdapterProxy = newIceAdapterProxy();
   private GameType gameType;
@@ -134,7 +134,7 @@ public CompletableFuture<Integer> start(int gameId) {
         throw new CompletionException(e);
       }
 
-      IceAdapterCallbacks iceAdapterCallbacks = applicationContext.getBean(IceAdapterCallbacks.class);
+      IceAdapterCallbacks iceAdapterCallbacks = iceAdapterCallbacksFactory.getObject();
       initializeIceAdapterConnection(adapterPort, iceAdapterCallbacks);
 
       return gpgPort;

src/main/java/com/faforever/client/fx/WebViewConfigurer.java

@@ -1,7 +1,6 @@
 package com.faforever.client.fx;
 
 import com.faforever.client.config.ClientProperties;
-import com.faforever.client.preferences.PreferencesService;
 import com.faforever.client.theme.UiService;
 import javafx.concurrent.Worker.State;
 import javafx.event.EventHandler;
@@ -12,8 +11,8 @@
 import javafx.scene.web.WebView;
 import lombok.RequiredArgsConstructor;
 import netscape.javascript.JSObject;
+import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 import org.w3c.dom.Document;
@@ -32,8 +31,8 @@ public class WebViewConfigurer {
   private static final double ZOOM_STEP = 0.2d;
 
   private final UiService uiService;
-  private final ApplicationContext applicationContext;
   private final ClientProperties clientProperties;
+  private final ObjectFactory<BrowserCallback> browserCallbackFactory;
 
   public void configureWebView(WebView webView) {
     WebEngine engine = webView.getEngine();
@@ -50,7 +49,7 @@ public void configureWebView(WebView webView) {
       }
     });
 
-    BrowserCallback browserCallback = applicationContext.getBean(BrowserCallback.class);
+    BrowserCallback browserCallback = browserCallbackFactory.getObject();
     EventHandler<MouseEvent> moveHandler = event -> {
       browserCallback.setLastMouseX(event.getScreenX());
       browserCallback.setLastMouseY(event.getScreenY());

src/main/java/com/faforever/client/game/VaultPathHandler.java

@@ -16,7 +16,7 @@
 import javafx.scene.control.CheckBox;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.ApplicationContext;
+import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.stereotype.Component;
 
 import java.nio.file.Path;
@@ -29,11 +29,11 @@ public class VaultPathHandler {
 
   private final PlatformService platformService;
   private final TaskService taskService;
-  private final ApplicationContext applicationContext;
   private final PreferencesService preferencesService;
   private final NotificationService notificationService;
   private final I18n i18n;
   private final ForgedAlliancePrefs forgedAlliancePrefs;
+  private final ObjectFactory<MoveDirectoryTask> moveDirectoryTaskFactory;
 
   public void verifyVaultPathAndShowWarning() {
     if (preferencesService.isVaultBasePathInvalidForAscii()) {
@@ -61,7 +61,7 @@ private void showWarning() {
   public void onVaultPathUpdated(Path newPath) {
     log.info("User changed vault directory to: `{}`", newPath);
 
-    MoveDirectoryTask moveDirectoryTask = applicationContext.getBean(MoveDirectoryTask.class);
+    MoveDirectoryTask moveDirectoryTask = moveDirectoryTaskFactory.getObject();
     moveDirectoryTask.setOldDirectory(forgedAlliancePrefs.getVaultBaseDirectory());
     moveDirectoryTask.setNewDirectory(newPath);
     moveDirectoryTask.setAfterCopyAction(() -> forgedAlliancePrefs.setVaultBaseDirectory(newPath));

src/main/java/com/faforever/client/map/MapService.java

@@ -60,9 +60,9 @@
 import org.luaj.vm2.LuaValue;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
-import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
@@ -113,7 +113,6 @@ public class MapService implements InitializingBean, DisposableBean {
 
   private final NotificationService notificationService;
   private final TaskService taskService;
-  private final ApplicationContext applicationContext;
   private final FafApiAccessor fafApiAccessor;
   private final AssetService assetService;
   private final I18n i18n;
@@ -126,6 +125,9 @@ public class MapService implements InitializingBean, DisposableBean {
   private final ClientProperties clientProperties;
   private final ForgedAlliancePrefs forgedAlliancePrefs;
   private final Preferences preferences;
+  private final ObjectFactory<MapUploadTask> mapUploadTaskFactory;
+  private final ObjectFactory<DownloadMapTask> downloadMapTaskFactory;
+  private final ObjectFactory<UninstallMapTask> uninstallMapTaskFactory;
 
   private final ObservableMap<String, MapVersionBean> mapsByFolderName = FXCollections.observableHashMap();
   @Getter
@@ -420,7 +422,7 @@ public CompletableFuture<Void> uninstallMap(MapVersionBean mapVersion) {
     if (isOfficialMap(mapVersion.getFolderName())) {
       throw new IllegalArgumentException("Attempt to uninstall an official map");
     }
-    UninstallMapTask task = applicationContext.getBean(UninstallMapTask.class);
+    UninstallMapTask task = uninstallMapTaskFactory.getObject();
     task.setMap(mapVersion);
     return taskService.submitTask(task).getFuture();
   }
@@ -451,7 +453,7 @@ public Path getPathForMapCaseInsensitive(String approxName) {
   }
 
   public CompletableTask<Void> uploadMap(Path mapPath, boolean ranked) {
-    MapUploadTask mapUploadTask = applicationContext.getBean(MapUploadTask.class);
+    MapUploadTask mapUploadTask = mapUploadTaskFactory.getObject();
     mapUploadTask.setMapPath(mapPath);
     mapUploadTask.setRanked(ranked);
 
@@ -507,7 +509,7 @@ private CompletableFuture<Void> downloadAndInstallMap(String folderName, URL dow
       return CompletableFuture.completedFuture(null);
     }
 
-    DownloadMapTask task = applicationContext.getBean(DownloadMapTask.class);
+    DownloadMapTask task = downloadMapTaskFactory.getObject();
     task.setMapUrl(downloadUrl);
     task.setFolderName(folderName);
 

src/main/java/com/faforever/client/map/generator/MapGeneratorService.java

@@ -12,8 +12,8 @@
 import org.apache.maven.artifact.versioning.ComparableVersion;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.cache.annotation.Cacheable;
-import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
@@ -50,22 +50,29 @@ public class MapGeneratorService implements DisposableBean {
   private static final Pattern VERSION_PATTERN = Pattern.compile("\\d\\d?\\d?\\.\\d\\d?\\d?\\.\\d\\d?\\d?");
   protected static final Pattern GENERATED_MAP_PATTERN = Pattern.compile("neroxis_map_generator_(" + VERSION_PATTERN + ")_(.*)");
 
-  private final ApplicationContext applicationContext;
   private final TaskService taskService;
   private final ClientProperties clientProperties;
   private final ForgedAlliancePrefs forgedAlliancePrefs;
   private final DataPrefs dataPrefs;
   private final WebClient webClient;
+  private final ObjectFactory<GenerateMapTask> generateMapTaskFactory;
+  private final ObjectFactory<DownloadMapGeneratorTask> downloadMapGeneratorTaskFactory;
+  private final ObjectFactory<GeneratorOptionsTask> generatorOptionsTaskFactory;
 
   private ComparableVersion defaultGeneratorVersion;
 
-  public MapGeneratorService(ApplicationContext applicationContext, TaskService taskService, ClientProperties clientProperties, ForgedAlliancePrefs forgedAlliancePrefs, DataPrefs dataPrefs, Builder webClientBuilder) {
-    this.applicationContext = applicationContext;
+  public MapGeneratorService(TaskService taskService, ClientProperties clientProperties, ForgedAlliancePrefs forgedAlliancePrefs, DataPrefs dataPrefs, Builder webClientBuilder,
+                             ObjectFactory<GenerateMapTask> generateMapTaskFactory,
+                             ObjectFactory<DownloadMapGeneratorTask> downloadMapGeneratorTaskFactory,
+                             ObjectFactory<GeneratorOptionsTask> generatorOptionsTaskFactory) {
     this.taskService = taskService;
     this.clientProperties = clientProperties;
     this.forgedAlliancePrefs = forgedAlliancePrefs;
     this.dataPrefs = dataPrefs;
-    webClient = webClientBuilder.build();
+    this.webClient = webClientBuilder.build();
+    this.generateMapTaskFactory = generateMapTaskFactory;
+    this.downloadMapGeneratorTaskFactory = downloadMapGeneratorTaskFactory;
+    this.generatorOptionsTaskFactory = generatorOptionsTaskFactory;
   }
 
   @Override
@@ -128,7 +135,7 @@ public CompletableFuture<String> generateMap(String mapName) {
 
     CompletableFuture<Void> downloadGeneratorFuture = downloadGeneratorIfNecessary(version);
 
-    GenerateMapTask generateMapTask = applicationContext.getBean(GenerateMapTask.class);
+    GenerateMapTask generateMapTask = generateMapTaskFactory.getObject();
     generateMapTask.setVersion(version);
     generateMapTask.setSeed(seed);
     generateMapTask.setMapName(mapName);
@@ -142,7 +149,7 @@ public CompletableFuture<String> generateMap(GeneratorOptions generatorOptions)
 
     CompletableFuture<Void> downloadGeneratorFuture = downloadGeneratorIfNecessary(defaultGeneratorVersion);
 
-    GenerateMapTask generateMapTask = applicationContext.getBean(GenerateMapTask.class);
+    GenerateMapTask generateMapTask = generateMapTaskFactory.getObject();
     generateMapTask.setVersion(defaultGeneratorVersion);
     generateMapTask.setGeneratorExecutableFile(generatorExecutablePath);
     generateMapTask.setGeneratorOptions(generatorOptions);
@@ -170,7 +177,7 @@ public CompletableFuture<Void> downloadGeneratorIfNecessary(ComparableVersion ve
       }
 
       log.info("Downloading MapGenerator version: {}", version);
-      DownloadMapGeneratorTask downloadMapGeneratorTask = applicationContext.getBean(DownloadMapGeneratorTask.class);
+      DownloadMapGeneratorTask downloadMapGeneratorTask = downloadMapGeneratorTaskFactory.getObject();
       downloadMapGeneratorTask.setVersion(version);
       return taskService.submitTask(downloadMapGeneratorTask).getFuture();
     } else {
@@ -187,7 +194,7 @@ public CompletableFuture<Void> getNewestGenerator() {
 
   public CompletableFuture<List<String>> getGeneratorStyles() {
     Assert.checkNullIllegalState(defaultGeneratorVersion, "Generator version not set");
-    GeneratorOptionsTask generatorOptionsTask = applicationContext.getBean(GeneratorOptionsTask.class);
+    GeneratorOptionsTask generatorOptionsTask = generatorOptionsTaskFactory.getObject();
     Path generatorExecutablePath = getGeneratorExecutablePath(defaultGeneratorVersion);
     generatorOptionsTask.setVersion(defaultGeneratorVersion);
     generatorOptionsTask.setQuery("--styles");

src/main/java/com/faforever/client/mod/ModService.java

@@ -45,8 +45,8 @@
 import org.jetbrains.annotations.Nullable;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.cache.annotation.Cacheable;
-import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
@@ -105,7 +105,6 @@ public class ModService implements InitializingBean, DisposableBean {
 
   private final FafApiAccessor fafApiAccessor;
   private final TaskService taskService;
-  private final ApplicationContext applicationContext;
   private final NotificationService notificationService;
   private final I18n i18n;
   private final PlatformService platformService;
@@ -115,6 +114,9 @@ public class ModService implements InitializingBean, DisposableBean {
   private final ModMapper modMapper;
   private final ForgedAlliancePrefs forgedAlliancePrefs;
   private final Preferences preferences;
+  private final ObjectFactory<ModUploadTask> modUploadTaskFactory;
+  private final ObjectFactory<DownloadModTask> downloadModTaskFactory;
+  private final ObjectFactory<UninstallModTask> uninstallModTaskFactory;
 
   private final ModReader modReader = new ModReader();
 
@@ -234,7 +236,7 @@ public CompletableFuture<Void> downloadAndInstallMod(URL url) {
 
   public CompletableFuture<Void> downloadAndInstallMod(URL url, @Nullable DoubleProperty progressProperty,
                                                        @Nullable StringProperty titleProperty) {
-    DownloadModTask task = applicationContext.getBean(DownloadModTask.class);
+    DownloadModTask task = downloadModTaskFactory.getObject();
     task.setUrl(url);
     if (progressProperty != null) {
       progressProperty.bind(task.progressProperty());
@@ -273,7 +275,7 @@ public boolean isInstalled(String uid) {
   }
 
   public CompletableFuture<Void> uninstallMod(ModVersionBean modVersion) {
-    UninstallModTask task = applicationContext.getBean(UninstallModTask.class);
+    UninstallModTask task = uninstallModTaskFactory.getObject();
     task.setMod(modVersion);
     return taskService.submitTask(task).getFuture();
   }
@@ -306,7 +308,7 @@ public ModVersionBean extractModInfo(InputStream inputStream, Path basePath) {
   }
 
   public CompletableTask<Void> uploadMod(Path modPath) {
-    ModUploadTask modUploadTask = applicationContext.getBean(ModUploadTask.class);
+    ModUploadTask modUploadTask = modUploadTaskFactory.getObject();
     modUploadTask.setModPath(modPath);
 
     return taskService.submitTask(modUploadTask);

src/main/java/com/faforever/client/patch/GameUpdaterImpl.java

@@ -6,15 +6,14 @@
 import com.faforever.client.mod.ModService;
 import com.faforever.client.preferences.DataPrefs;
 import com.faforever.client.preferences.ForgedAlliancePrefs;
-import com.faforever.client.preferences.PreferencesService;
 import com.faforever.client.task.TaskService;
 import com.faforever.client.update.Version;
 import com.faforever.client.util.ConcurrentUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.maven.artifact.versioning.ComparableVersion;
 import org.jetbrains.annotations.Nullable;
-import org.springframework.context.ApplicationContext;
+import org.springframework.beans.factory.ObjectFactory;
 
 import java.io.IOException;
 import java.nio.file.AccessDeniedException;
@@ -47,11 +46,10 @@ public class GameUpdaterImpl implements GameUpdater {
 
   private final List<FeaturedModUpdater> featuredModUpdaters = new ArrayList<>();
   private final ModService modService;
-  private final ApplicationContext applicationContext;
   private final TaskService taskService;
-  private final PreferencesService preferencesService;
   private final DataPrefs dataPrefs;
   private final ForgedAlliancePrefs forgedAlliancePrefs;
+  private final ObjectFactory<GameBinariesUpdateTask> gameBinariesUpdateTaskFactory;
 
   private ComparableVersion gameVersion;
   private String gameType;
@@ -155,7 +153,7 @@ private CompletableFuture<PatchResult> updateFeaturedMod(FeaturedModBean feature
   }
 
   private CompletableFuture<Void> updateGameBinaries(ComparableVersion version) {
-    GameBinariesUpdateTask binariesUpdateTask = applicationContext.getBean(GameBinariesUpdateTaskImpl.class);
+    GameBinariesUpdateTask binariesUpdateTask = gameBinariesUpdateTaskFactory.getObject();
     binariesUpdateTask.setVersion(version);
     gameVersion = version;
     return taskService.submitTask(binariesUpdateTask).getFuture();

src/main/java/com/faforever/client/patch/SimpleHttpFeaturedModUpdater.java

@@ -4,7 +4,7 @@
 import com.faforever.client.task.TaskService;
 import lombok.RequiredArgsConstructor;
 import org.jetbrains.annotations.Nullable;
-import org.springframework.context.ApplicationContext;
+import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
@@ -17,11 +17,11 @@
 public class SimpleHttpFeaturedModUpdater implements FeaturedModUpdater {
 
   private final TaskService taskService;
-  private final ApplicationContext applicationContext;
+  private final ObjectFactory<SimpleHttpFeaturedModUpdaterTask> simpleHttpFeaturedModUpdaterTaskFactory;
 
   @Override
   public CompletableFuture<PatchResult> updateMod(FeaturedModBean featuredMod, @Nullable Integer version) {
-    SimpleHttpFeaturedModUpdaterTask task = applicationContext.getBean(SimpleHttpFeaturedModUpdaterTask.class);
+    SimpleHttpFeaturedModUpdaterTask task = simpleHttpFeaturedModUpdaterTaskFactory.getObject();
     task.setVersion(version);
     task.setFeaturedMod(featuredMod);