Fix Sonar issues.

refinedmods · Jul 24, 2022 · 5161975 · 5161975
1 parent cd55249
commit 5161975
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 11 deletions.
diff --git a/...va/com/refinedmods/refinedstorage2/api/network/node/importer/ImporterNetworkNodeTest.java b/...va/com/refinedmods/refinedstorage2/api/network/node/importer/ImporterNetworkNodeTest.java
@@ -310,6 +310,48 @@ void shouldRespectAllowlist(@InjectNetworkStorageChannel final StorageChannel<St
         );
     }
 
+    @Test
+    void shouldRespectAllowlistWithNormalizer(
+        @InjectNetworkStorageChannel final StorageChannel<String> storageChannel
+    ) {
+        // Arrange
+        sut.setFilterMode(FilterMode.ALLOW);
+        sut.setFilterTemplates(Set.of("A"));
+        sut.setNormalizer(value -> value instanceof String str && str.startsWith("A") ? "A" : value);
+
+        storageChannel.addSource(new InMemoryStorageImpl<>());
+
+        final FakeImporterSource source = new FakeImporterSource("B", "A1", "A2")
+            .add("B", 10)
+            .add("A1", 1)
+            .add("A2", 1);
+
+        final ImporterTransferStrategy strategy = new ImporterTransferStrategyImpl<>(
+            source,
+            NetworkTestFixtures.STORAGE_CHANNEL_TYPE,
+            10
+        );
+        sut.setTransferStrategy(strategy);
+
+        // Act
+        sut.update();
+        // cooldown
+        sut.update();
+        sut.update();
+        sut.update();
+        // Act 2
+        sut.update();
+
+        // Assert
+        assertThat(storageChannel.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactlyInAnyOrder(
+            new ResourceAmount<>("A1", 1),
+            new ResourceAmount<>("A2", 1)
+        );
+        assertThat(source.getAll()).usingRecursiveFieldByFieldElementComparator().containsExactly(
+            new ResourceAmount<>("B", 10)
+        );
+    }
+
     @Test
     void shouldRespectAllowlistWithoutAlternative(
         @InjectNetworkStorageChannel final StorageChannel<String> storageChannel

diff --git a/.../refinedmods/refinedstorage2/platform/common/containermenu/AbstractBaseContainerMenu.java b/.../refinedmods/refinedstorage2/platform/common/containermenu/AbstractBaseContainerMenu.java
@@ -29,10 +29,13 @@ public <T> ClientProperty<T> getProperty(final PropertyType<T> type) {
     }
 
     public void receivePropertyChangeFromClient(final ResourceLocation id, final int newValue) {
-        for (final PropertyType<?> type : propertyMap.keySet()) {
-            if (type.id().equals(id)) {
-                ((ServerProperty<?>) propertyMap.get(type)).set(newValue);
+        for (final Map.Entry<PropertyType<?>, Property<?>> entry : propertyMap.entrySet()) {
+            final PropertyType<?> type = entry.getKey();
+            if (!type.id().equals(id)) {
+                continue;
             }
+            final Property<?> property = entry.getValue();
+            ((ServerProperty<?>) property).set(newValue);
         }
     }
 

diff --git a/...com/refinedmods/refinedstorage2/platform/common/containermenu/property/PropertyTypes.java b/...com/refinedmods/refinedstorage2/platform/common/containermenu/property/PropertyTypes.java
@@ -36,7 +36,7 @@ public final class PropertyTypes {
 
     public static final PropertyType<Boolean> EXACT_MODE = new PropertyType<>(
         createIdentifier("exact_mode"),
-        value -> value ? 1 : 0,
+        value -> Boolean.TRUE.equals(value) ? 1 : 0,
         value -> value == 1
     );
 

diff --git a/...orage2/platform/common/containermenu/storage/block/AbstractStorageBlockContainerMenu.java b/...orage2/platform/common/containermenu/storage/block/AbstractStorageBlockContainerMenu.java
@@ -33,9 +33,10 @@ protected AbstractStorageBlockContainerMenu(final MenuType<?> type,
         this.stored = buf.readLong();
         this.capacity = buf.readLong();
 
-        addSlots(player, new FilteredResourceFilterContainer(
-            PlatformApi.INSTANCE.getResourceTypeRegistry(), 9, () -> {
-        }, resourceType));
+        addSlots(
+            player,
+            new FilteredResourceFilterContainer(PlatformApi.INSTANCE.getResourceTypeRegistry(), 9, resourceType)
+        );
 
         initializeResourceFilterSlots(buf);
     }

diff --git a/...finedstorage2/platform/common/containermenu/storage/diskdrive/DiskDriveContainerMenu.java b/...finedstorage2/platform/common/containermenu/storage/diskdrive/DiskDriveContainerMenu.java
@@ -45,8 +45,7 @@ public DiskDriveContainerMenu(final int syncId, final Inventory playerInventory,
         addSlots(
             playerInventory.player,
             new SimpleContainer(DiskDriveNetworkNode.DISK_COUNT),
-            new ResourceFilterContainer(PlatformApi.INSTANCE.getResourceTypeRegistry(), 9, () -> {
-            })
+            new ResourceFilterContainer(PlatformApi.INSTANCE.getResourceTypeRegistry(), 9)
         );
 
         initializeResourceFilterSlots(buf);

diff --git a/...nedstorage2/platform/common/internal/resource/filter/FilteredResourceFilterContainer.java b/...nedstorage2/platform/common/internal/resource/filter/FilteredResourceFilterContainer.java
@@ -9,6 +9,13 @@
 public class FilteredResourceFilterContainer extends ResourceFilterContainer {
     private final ResourceType allowedType;
 
+    public FilteredResourceFilterContainer(final OrderedRegistry<ResourceLocation, ResourceType> resourceTypeRegistry,
+                                           final int size,
+                                           final ResourceType allowedType) {
+        this(resourceTypeRegistry, size, () -> {
+        }, allowedType);
+    }
+
     public FilteredResourceFilterContainer(final OrderedRegistry<ResourceLocation, ResourceType> resourceTypeRegistry,
                                            final int size,
                                            final Runnable listener,

diff --git a/.../refinedmods/refinedstorage2/platform/common/screen/widget/ExactModeSideButtonWidget.java b/.../refinedmods/refinedstorage2/platform/common/screen/widget/ExactModeSideButtonWidget.java
@@ -40,7 +40,7 @@ private List<Component> calculateTooltip(final boolean exactMode) {
 
     @Override
     protected int getXTexture() {
-        return property.getValue() ? 0 : 16;
+        return Boolean.TRUE.equals(property.getValue()) ? 0 : 16;
     }
 
     @Override
@@ -52,7 +52,7 @@ protected int getYTexture() {
     public void onTooltip(final Button button, final PoseStack poseStack, final int mouseX, final int mouseY) {
         tooltipRenderer.render(
             poseStack,
-            property.getValue() ? tooltipWhenOn : tooltipWhenOff,
+            Boolean.TRUE.equals(property.getValue()) ? tooltipWhenOn : tooltipWhenOff,
             mouseX,
             mouseY
         );