From aaf829cb093c763494c2f3d08b6e0e5d7acb3b6d Mon Sep 17 00:00:00 2001
From: raoulvdberge <raoulvdberge@gmail.com>
Date: Sun, 9 Jun 2024 11:15:06 +0200
Subject: [PATCH] fix: sonar issues

---
 .../network/impl/FakeConnectionProvider.java  |  2 +-
 .../common/support/AbstractSafeSavedData.java | 23 ++++++++++++-------
 .../common/grid/GridSortingTypesTest.java     |  4 ++--
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/FakeConnectionProvider.java b/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/FakeConnectionProvider.java
index e64f24b93..30635e346 100644
--- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/FakeConnectionProvider.java
+++ b/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/FakeConnectionProvider.java
@@ -78,6 +78,6 @@ public List<NetworkNodeContainer> sortDeterministically(final Set<NetworkNodeCon
         return containers
             .stream()
             .sorted(Comparator.comparingInt(allowed::indexOf))
-            .collect(Collectors.toList());
+            .toList();
     }
 }
diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractSafeSavedData.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractSafeSavedData.java
index 3a8ada4d6..82308ca32 100644
--- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractSafeSavedData.java
+++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/support/AbstractSafeSavedData.java
@@ -4,6 +4,7 @@
 import java.io.IOException;
 import java.nio.file.AtomicMoveNotSupportedException;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
 
 import com.mojang.logging.LogUtils;
@@ -27,17 +28,23 @@ public void save(final File file) {
         compoundTag.put("data", this.save(new CompoundTag()));
         NbtUtils.addCurrentDataVersion(compoundTag);
         try {
-            // Write to temp file first.
-            NbtIo.writeCompressed(compoundTag, tempFile);
-            // Try atomic move
-            try {
-                Files.move(tempFile, targetPath, StandardCopyOption.ATOMIC_MOVE);
-            } catch (final AtomicMoveNotSupportedException ignored) {
-                Files.move(tempFile, targetPath, StandardCopyOption.REPLACE_EXISTING);
-            }
+            doSave(compoundTag, tempFile, targetPath);
         } catch (final IOException e) {
             LOGGER.error("Could not save data {}", this, e);
         }
         setDirty(false);
     }
+
+    private void doSave(final CompoundTag compoundTag,
+                        final Path tempFile,
+                        final Path targetPath) throws IOException {
+        // Write to temp file first.
+        NbtIo.writeCompressed(compoundTag, tempFile);
+        // Try atomic move
+        try {
+            Files.move(tempFile, targetPath, StandardCopyOption.ATOMIC_MOVE);
+        } catch (final AtomicMoveNotSupportedException ignored) {
+            Files.move(tempFile, targetPath, StandardCopyOption.REPLACE_EXISTING);
+        }
+    }
 }
diff --git a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/grid/GridSortingTypesTest.java b/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/grid/GridSortingTypesTest.java
index 5257a4a34..fb32d276c 100644
--- a/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/grid/GridSortingTypesTest.java
+++ b/refinedstorage2-platform-common/src/test/java/com/refinedmods/refinedstorage2/platform/common/grid/GridSortingTypesTest.java
@@ -46,8 +46,8 @@ public Optional<String> getModName(final String modId) {
     void setUp() {
         viewBuilder = new GridViewBuilderImpl(
             FACTORY,
-            (view) -> Comparator.comparing(GridResource::getName),
-            (view) -> Comparator.comparing(GridResource::getAmount)
+            view -> Comparator.comparing(GridResource::getName),
+            view -> Comparator.comparing(GridResource::getAmount)
         );
         dirt = new ItemResource(Items.DIRT, null);
         stone = new ItemResource(Items.STONE, null);