From acb3c911cb5ed22be658d1d60605f503ebefef67 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Wed, 6 Dec 2023 21:55:39 +0100
Subject: [PATCH] Cleanup (universal suppressions in updater classes; typos)

GitOrigin-RevId: 94867a6042d9f25327efd8e6b9ddf7c9be30dc19
---
 updater/src/com/intellij/updater/Bootstrap.java      | 5 +++--
 updater/src/com/intellij/updater/Patch.java          | 2 +-
 updater/src/com/intellij/updater/Runner.java         | 5 +++--
 updater/src/com/intellij/updater/SwingUpdaterUI.java | 2 +-
 updater/src/com/intellij/updater/Utils.java          | 4 ++--
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/updater/src/com/intellij/updater/Bootstrap.java b/updater/src/com/intellij/updater/Bootstrap.java
index 5eaa08eba524..3a3eac9139c5 100644
--- a/updater/src/com/intellij/updater/Bootstrap.java
+++ b/updater/src/com/intellij/updater/Bootstrap.java
@@ -47,8 +47,9 @@ public final class Bootstrap {
 
     Locale.setDefault(Locale.ENGLISH);
 
-    //noinspection SSBasedInspection
-    Runner.main(runnerArgs.toArray(new String[0]));
+    @SuppressWarnings({"SSBasedInspection", "RedundantSuppression"})
+    var array = runnerArgs.toArray(new String[0]);
+    Runner.main(array);
   }
 
   private static boolean isMac() {
diff --git a/updater/src/com/intellij/updater/Patch.java b/updater/src/com/intellij/updater/Patch.java
index 9caf822db5cf..e205cdbe9405 100644
--- a/updater/src/com/intellij/updater/Patch.java
+++ b/updater/src/com/intellij/updater/Patch.java
@@ -280,7 +280,7 @@ public class Patch {
         forEach(actionsToApply, UpdaterUI.message("backing.up.files"), ui, action -> action.backup(toDir, _backupDir));
       }
       else {
-        //noinspection SSBasedInspection
+        @SuppressWarnings({"SSBasedInspection", "RedundantSuppression"})
         List<PatchAction> specialActions = actionsToApply.stream().filter(PatchAction::mandatoryBackup).collect(Collectors.toList());
         if (!specialActions.isEmpty()) {
           backupDir = Utils.getTempFile("partial_backup");
diff --git a/updater/src/com/intellij/updater/Runner.java b/updater/src/com/intellij/updater/Runner.java
index 7d9f6591c3b4..34b39de15b6e 100644
--- a/updater/src/com/intellij/updater/Runner.java
+++ b/updater/src/com/intellij/updater/Runner.java
@@ -41,8 +41,9 @@ public final class Runner {
           effectiveArgs.add(arg);
         }
       }
-      //noinspection SSBasedInspection
-      _main(effectiveArgs.toArray(new String[0]));
+      @SuppressWarnings({"SSBasedInspection", "RedundantSuppression"})
+      var array = effectiveArgs.toArray(new String[0]);
+      _main(array);
     }
     catch (Throwable t) {
       LOG.log(Level.SEVERE, "internal error", t);
diff --git a/updater/src/com/intellij/updater/SwingUpdaterUI.java b/updater/src/com/intellij/updater/SwingUpdaterUI.java
index 59969cf8aa9a..e39e0c7a3bb5 100644
--- a/updater/src/com/intellij/updater/SwingUpdaterUI.java
+++ b/updater/src/com/intellij/updater/SwingUpdaterUI.java
@@ -148,7 +148,7 @@ public class SwingUpdaterUI implements UpdaterUI {
   }
 
   @Override
-  @SuppressWarnings("SSBasedInspection")
+  @SuppressWarnings({"SSBasedInspection", "RedundantSuppression"})
   public Map<String, ValidationResult.Option> askUser(List<ValidationResult> validationResults) throws OperationCancelledException {
     boolean canProceed = validationResults.stream().noneMatch(r -> r.options.contains(ValidationResult.Option.NONE));
     Map<String, ValidationResult.Option> result = new HashMap<>();
diff --git a/updater/src/com/intellij/updater/Utils.java b/updater/src/com/intellij/updater/Utils.java
index e7ae9ef513af..a76560d347ae 100644
--- a/updater/src/com/intellij/updater/Utils.java
+++ b/updater/src/com/intellij/updater/Utils.java
@@ -288,11 +288,11 @@ public final class Utils {
     return new BufferedInputStream(zipFile.getInputStream(entry));
   }
 
-  // always collect files and folders - to avoid cases such as IDEA-152249
+  // always collect files and folders to avoid cases such as IDEA-152249
   public static LinkedHashSet<String> collectRelativePaths(Path root) throws IOException {
     LinkedHashSet<String> result = new LinkedHashSet<>();
 
-    Files.walkFileTree(root, new SimpleFileVisitor<Path>() {
+    Files.walkFileTree(root, new SimpleFileVisitor<>() {
       @Override
       public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
         if (dir != root) {