[Misc] Fix a batch of SonarCloud issues (#1848)

vmassol · Kimi Code · web-flow · commit 1091ed54642a · 2026-07-27T19:08:58.000+02:00
* [Misc] Remove useless assignments to local variables (SonarQube java:S1854)

* Dead stores reported by SonarCloud; side-effecting calls kept as plain statements.

Co-Authored-By: Kimi Code &lt;noreply@moonshot.cn&gt;

* [Misc] Replace string concatenations with text blocks in encoder tests (SonarQube java:S6126)

Co-Authored-By: Kimi Code &lt;noreply@moonshot.cn&gt;

* [Misc] Fix expected/actual argument order in assertions (SonarQube java:S3415)

Co-Authored-By: Kimi Code &lt;noreply@moonshot.cn&gt;

* [Misc] Use assertEquals/assertNotEquals instead of assertTrue/assertFalse with equals() (SonarQube java:S5785)

Co-Authored-By: Kimi Code &lt;noreply@moonshot.cn&gt;

* [Misc] Use try-with-resources where semantics are preserved (SonarQube java:S2093)

* AbstractFileLoggerTail: extracted the read block into a private helper holding the
  try-with-resources (checkstyle NestedTryDepth); close order and error path unchanged.

Co-Authored-By: Kimi Code &lt;noreply@moonshot.cn&gt;

---------

Co-authored-by: Kimi Code &lt;noreply@moonshot.cn&gt;
diff --git a/xwiki-commons-core/xwiki-commons-crypto/xwiki-commons-crypto-cipher/src/test/java/org/xwiki/crypto/cipher/internal/symmetric/factory/AbstractSymmetricCipherFactoryTest.java b/xwiki-commons-core/xwiki-commons-crypto/xwiki-commons-crypto-cipher/src/test/java/org/xwiki/crypto/cipher/internal/symmetric/factory/AbstractSymmetricCipherFactoryTest.java
@@ -237,7 +237,6 @@ private byte[] getProgressive(boolean forEncryption, byte[] bytes, int size) thr
         if (forEncryption || tmp != null) {
             assertNotNull(tmp);
             System.arraycopy(tmp, 0, result, len, tmp.length);
-            len += tmp.length;
         }
 
         return result;
diff --git a/xwiki-commons-core/xwiki-commons-crypto/xwiki-commons-crypto-common/src/test/java/org/xwiki/crypto/internal/encoder/Base64BinaryStringEncoderTest.java b/xwiki-commons-core/xwiki-commons-crypto/xwiki-commons-crypto-common/src/test/java/org/xwiki/crypto/internal/encoder/Base64BinaryStringEncoderTest.java
@@ -34,10 +34,11 @@ public class Base64BinaryStringEncoderTest extends AbstractBinaryStringEncoderTe
         + "biBJbmZvcm1hdGlvbmVuLg==";
 
         WRAPPED_ENCODED_BYTES =
-        "S3J5cHRvZ3JhcGhpZSAodm9uIGdyaWVjaGlzY2g6IM66z4HPhc+Az4TPjM+CLCDi" + '\n'
-            + "gJ52ZXJib3JnZW7igJwgdW5kIM6zz4HOrM+GzrXOuc69LCDigJ5zY2hyZWliZW7i" + '\n'
-            + "gJwpIGlzdCBkaWUgV2lzc2Vuc2NoYWZ0IGRlciBWZXJzY2hsw7xzc2VsdW5nIHZv" + '\n'
-            + "biBJbmZvcm1hdGlvbmVuLg==";
+            """
+            S3J5cHRvZ3JhcGhpZSAodm9uIGdyaWVjaGlzY2g6IM66z4HPhc+Az4TPjM+CLCDi
+            gJ52ZXJib3JnZW7igJwgdW5kIM6zz4HOrM+GzrXOuc69LCDigJ5zY2hyZWliZW7i
+            gJwpIGlzdCBkaWUgV2lzc2Vuc2NoYWZ0IGRlciBWZXJzY2hsw7xzc2VsdW5nIHZv
+            biBJbmZvcm1hdGlvbmVuLg==""";
     }
 
     @InjectMockComponents
diff --git a/xwiki-commons-core/xwiki-commons-crypto/xwiki-commons-crypto-common/src/test/java/org/xwiki/crypto/internal/encoder/HexBinaryStringEncoderTest.java b/xwiki-commons-core/xwiki-commons-crypto/xwiki-commons-crypto-common/src/test/java/org/xwiki/crypto/internal/encoder/HexBinaryStringEncoderTest.java
@@ -35,11 +35,13 @@ public class HexBinaryStringEncoderTest extends AbstractBinaryStringEncoderTest
                 + "7363686cc3bc7373656c756e6720766f6e20496e666f726d6174696f6e656e2e";
 
         WRAPPED_ENCODED_BYTES =
-                  "4b727970746f677261706869652028766f6e20677269656368697363683a20ce" + '\n'
-                + "bacf81cf85cf80cf84cf8ccf822c20e2809e766572626f7267656ee2809c2075" + '\n'
-                + "6e6420ceb3cf81ceaccf86ceb5ceb9cebd2c20e2809e73636872656962656ee2" + '\n'
-                + "809c2920697374206469652057697373656e7363686166742064657220566572" + '\n'
-                + "7363686cc3bc7373656c756e6720766f6e20496e666f726d6174696f6e656e2e" + '\n';
+            """
+            4b727970746f677261706869652028766f6e20677269656368697363683a20ce
+            bacf81cf85cf80cf84cf8ccf822c20e2809e766572626f7267656ee2809c2075
+            6e6420ceb3cf81ceaccf86ceb5ceb9cebd2c20e2809e73636872656962656ee2
+            809c2920697374206469652057697373656e7363686166742064657220566572
+            7363686cc3bc7373656c756e6720766f6e20496e666f726d6174696f6e656e2e
+            """;
     }
 
     @InjectMockComponents
diff --git a/xwiki-commons-core/xwiki-commons-crypto/xwiki-commons-crypto-common/src/test/java/org/xwiki/crypto/internal/encoder/UrlBase64BinaryStringEncoderTest.java b/xwiki-commons-core/xwiki-commons-crypto/xwiki-commons-crypto-common/src/test/java/org/xwiki/crypto/internal/encoder/UrlBase64BinaryStringEncoderTest.java
@@ -34,10 +34,11 @@ public class UrlBase64BinaryStringEncoderTest extends AbstractBinaryStringEncode
                 + "biBJbmZvcm1hdGlvbmVuLg..";
 
         WRAPPED_ENCODED_BYTES =
-                  "S3J5cHRvZ3JhcGhpZSAodm9uIGdyaWVjaGlzY2g6IM66z4HPhc-Az4TPjM-CLCDi" + '\n'
-                + "gJ52ZXJib3JnZW7igJwgdW5kIM6zz4HOrM-GzrXOuc69LCDigJ5zY2hyZWliZW7i" + '\n'
-                + "gJwpIGlzdCBkaWUgV2lzc2Vuc2NoYWZ0IGRlciBWZXJzY2hsw7xzc2VsdW5nIHZv" + '\n'
-                + "biBJbmZvcm1hdGlvbmVuLg..";
+            """
+            S3J5cHRvZ3JhcGhpZSAodm9uIGdyaWVjaGlzY2g6IM66z4HPhc-Az4TPjM-CLCDi
+            gJ52ZXJib3JnZW7igJwgdW5kIM6zz4HOrM-GzrXOuc69LCDigJ5zY2hyZWliZW7i
+            gJwpIGlzdCBkaWUgV2lzc2Vuc2NoYWZ0IGRlciBWZXJzY2hsw7xzc2VsdW5nIHZv
+            biBJbmZvcm1hdGlvbmVuLg..""";
     }
 
     @InjectMockComponents
diff --git a/xwiki-commons-core/xwiki-commons-crypto/xwiki-commons-crypto-pkix/src/test/java/org/xwiki/crypto/signer/internal/cms/DefaultCMSSignedDataTest.java b/xwiki-commons-core/xwiki-commons-crypto/xwiki-commons-crypto-pkix/src/test/java/org/xwiki/crypto/signer/internal/cms/DefaultCMSSignedDataTest.java
@@ -253,7 +253,7 @@ void testPreCalculatedSignature() throws Exception
                 .addSignature(result.getSignatures().iterator().next())
         );
 
-        result = this.verifier.verify(signature2, text, Arrays.asList(v3Cert, v3InterCaCert, v3CaCert));
+        this.verifier.verify(signature2, text, Arrays.asList(v3Cert, v3InterCaCert, v3CaCert));
 
         assertArrayEquals(signature, signature2);
     }
diff --git a/xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-api/src/test/java/org/xwiki/extension/test/ExtensionPackager.java b/xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-api/src/test/java/org/xwiki/extension/test/ExtensionPackager.java
@@ -157,8 +157,7 @@ public void generateExtension(String classPackageFolder, URL descriptorUrl) thro
         // Make sure the folder exists
         packageFile.getParentFile().mkdirs();
 
-        FileOutputStream fos = new FileOutputStream(packageFile);
-        try {
+        try (FileOutputStream fos = new FileOutputStream(packageFile)) {
             ZipOutputStream zos;
             if (type.equals("jar")) {
                 Manifest manifest = new Manifest();
@@ -187,8 +186,6 @@ public void generateExtension(String classPackageFolder, URL descriptorUrl) thro
 
             // Register the extension
             this.extensionsFiles.put(new ExtensionId(id, version), packageFile);
-        } finally {
-            fos.close();
         }
     }
 
diff --git a/xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-api/src/test/java/org/xwiki/extension/test/FileExtensionRepository.java b/xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-api/src/test/java/org/xwiki/extension/test/FileExtensionRepository.java
@@ -167,20 +167,13 @@ public boolean accept(File dir, String name)
                     return name.startsWith(id + '-') && name.endsWith(".xed");
                 }
             })) {
-                FileInputStream fis = null;
-                try {
-                    fis = new FileInputStream(file);
-
+                try (FileInputStream fis = new FileInputStream(file)) {
                     DefaultLocalExtension localExtension =
                         this.extensionSerializer.loadLocalExtensionDescriptor(null, fis);
 
                     if (localExtension.getId().getId().equals(id)) {
                         versions.add(localExtension.getId().getVersion());
                     }
-                } finally {
-                    if (fis != null) {
-                        fis.close();
-                    }
                 }
             }
         } catch (Exception e) {
diff --git a/xwiki-commons-core/xwiki-commons-filter/xwiki-commons-filter-api/src/test/java/org/xwiki/filter/internal/AbstractFilterDescriptorManagerTest.java b/xwiki-commons-core/xwiki-commons-filter/xwiki-commons-filter-api/src/test/java/org/xwiki/filter/internal/AbstractFilterDescriptorManagerTest.java
@@ -91,8 +91,7 @@ void containerWithParameters()
 
         assertNotNull(filterElement);
 
-        FilterElementParameterDescriptor<?> parameter0 = filterElement.getParameters()[0];
-        parameter0 = filterElement.getParameter("param0");
+        FilterElementParameterDescriptor<?> parameter0 = filterElement.getParameter("param0");
 
         assertEquals("param0", parameter0.getName());
         assertEquals(0, parameter0.getIndex());
@@ -106,8 +105,7 @@ void containerWithNamedParameters()
 
         assertNotNull(filterElement);
 
-        FilterElementParameterDescriptor<?> parameter0 = filterElement.getParameters()[0];
-        parameter0 = filterElement.getParameter("namedParam");
+        FilterElementParameterDescriptor<?> parameter0 = filterElement.getParameter("namedParam");
 
         assertNotNull(parameter0);
 
@@ -124,8 +122,7 @@ void nameInheritance()
 
         assertNotNull(filterElement);
 
-        FilterElementParameterDescriptor<?> parameter0 = filterElement.getParameters()[0];
-        parameter0 = filterElement.getParameter("namedParam");
+        FilterElementParameterDescriptor<?> parameter0 = filterElement.getParameter("namedParam");
 
         assertNotNull(parameter0);
 
diff --git a/xwiki-commons-core/xwiki-commons-filter/xwiki-commons-filter-test/src/main/java/org/xwiki/filter/test/integration/TestDataParser.java b/xwiki-commons-core/xwiki-commons-filter/xwiki-commons-filter-test/src/main/java/org/xwiki/filter/test/integration/TestDataParser.java
@@ -111,11 +111,9 @@ public TestResourceData parse(InputStream source, String resourceName) throws IO
         TestResourceData data = new TestResourceData();
 
         // Resources should always be encoded as UTF-8, to reduce the dependency on the system encoding
-        BufferedReader reader = new BufferedReader(new InputStreamReader(source, UTF8));
-
         // Read each line and look for lines starting with ".". When this happens it means we've found a separate
         // test case.
-        try {
+        try (BufferedReader reader = new BufferedReader(new InputStreamReader(source, UTF8))) {
             String action = null;
             String typeId = null;
             boolean skip = false;
@@ -168,9 +166,6 @@ public TestResourceData parse(InputStream source, String resourceName) throws IO
             if (!skip) {
                 saveData(data, action, typeId, buffer, configuration);
             }
-
-        } finally {
-            reader.close();
         }
 
         return data;
diff --git a/xwiki-commons-core/xwiki-commons-filter/xwiki-commons-filter-test/src/main/java/org/xwiki/filter/test/internal/ZIPFileAssertComparator.java b/xwiki-commons-core/xwiki-commons-filter/xwiki-commons-filter-test/src/main/java/org/xwiki/filter/test/internal/ZIPFileAssertComparator.java
@@ -66,9 +66,7 @@ private static Map<String, byte[]> unzip(File filename) throws IOException
     {
         Map<String, byte[]> zipContent = new HashMap<>();
 
-        ZipFile zipFile = new ZipFile(filename);
-
-        try {
+        try (ZipFile zipFile = new ZipFile(filename)) {
             Enumeration<ZipArchiveEntry> entries = zipFile.getEntries();
             while (entries.hasMoreElements()) {
                 ZipArchiveEntry entry = entries.nextElement();
@@ -80,8 +78,6 @@ private static Map<String, byte[]> unzip(File filename) throws IOException
                     inputStream.close();
                 }
             }
-        } finally {
-            zipFile.close();
         }
 
         return zipContent;
diff --git a/xwiki-commons-core/xwiki-commons-logging/xwiki-commons-logging-api/src/test/java/org/xwiki/logging/event/LogEventTest.java b/xwiki-commons-core/xwiki-commons-logging/xwiki-commons-logging-api/src/test/java/org/xwiki/logging/event/LogEventTest.java
@@ -40,19 +40,19 @@ void testGetMessageElements()
     {
         LogEvent logEvent = new LogEvent(null, LogLevel.ERROR, "", null, null);
 
-        assertEquals(logEvent.getMessageElements(), Arrays.asList(""));
+        assertEquals(Arrays.asList(""), logEvent.getMessageElements());
 
         logEvent = new LogEvent(null, LogLevel.ERROR, "", ArrayUtils.EMPTY_OBJECT_ARRAY, null);
 
-        assertEquals(logEvent.getMessageElements(), Arrays.asList(""));
+        assertEquals(Arrays.asList(""), logEvent.getMessageElements());
 
         logEvent = new LogEvent(null, LogLevel.ERROR, "message", ArrayUtils.EMPTY_OBJECT_ARRAY, null);
 
-        assertEquals(logEvent.getMessageElements(), Arrays.asList("message"));
+        assertEquals(Arrays.asList("message"), logEvent.getMessageElements());
 
         logEvent = new LogEvent(null, LogLevel.ERROR, "message {}", new Object[]{ "" }, null);
 
-        assertEquals(logEvent.getMessageElements(), Arrays.asList("message ", ""));
+        assertEquals(Arrays.asList("message ", ""), logEvent.getMessageElements());
     }
 
     @Test
@@ -64,6 +64,6 @@ void testLogLogger()
 
         logEvent.log(queue);
 
-        assertEquals(logEvent.getMessage(), "message");
+        assertEquals("message", logEvent.getMessage());
     }
 }
diff --git a/xwiki-commons-core/xwiki-commons-logging/xwiki-commons-logging-api/src/test/java/org/xwiki/logging/marker/TranslationMarkerTest.java b/xwiki-commons-core/xwiki-commons-logging/xwiki-commons-logging-api/src/test/java/org/xwiki/logging/marker/TranslationMarkerTest.java
@@ -26,6 +26,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
@@ -108,8 +109,8 @@ void testHashCode()
         Marker otherMarker = MarkerFactory.getMarker("name");
 
         assertEquals(equalsTMarker.hashCode(), this.marker.hashCode());
-        assertFalse(this.marker.hashCode() == otherTMarker.hashCode());
-        assertFalse(this.marker.hashCode() == otherMarker.hashCode());
+        assertNotEquals(this.marker.hashCode(), otherTMarker.hashCode());
+        assertNotEquals(this.marker.hashCode(), otherMarker.hashCode());
     }
 
     @Test
@@ -120,7 +121,7 @@ void testEquals()
         Marker otherMarker = MarkerFactory.getMarker("name");
 
         assertEquals(equalsTMarker, this.marker);
-        assertFalse(this.marker.equals(otherTMarker));
-        assertFalse(this.marker.equals(otherMarker));
+        assertNotEquals(this.marker, otherTMarker);
+        assertNotEquals(this.marker, otherMarker);
     }
 }
diff --git a/xwiki-commons-core/xwiki-commons-logging/xwiki-commons-logging-api/src/test/java/org/xwiki/logging/test/Utils.java b/xwiki-commons-core/xwiki-commons-logging/xwiki-commons-logging-api/src/test/java/org/xwiki/logging/test/Utils.java
@@ -99,7 +99,7 @@ public static void populateLogger(Logger logger)
         logger.error(MarkerFactory.getMarker("marker" + index), "msg{}", index++);
         logger.error(MarkerFactory.getMarker("marker" + index), "{}{}", "msg", index++);
         logger.error(MarkerFactory.getMarker("marker" + index), "{}{}{}{}", "m", "s", "g", index++);
-        logger.error(MarkerFactory.getMarker("marker" + index), "msg" + index, new Exception("msg" + index++));
+        logger.error(MarkerFactory.getMarker("marker" + index), "msg" + index, new Exception("msg" + index));
         logger.error(LogEvent.MARKER_END, "ERROR");
     }
 
@@ -111,7 +111,7 @@ public static void validateLogger(Iterator<LogEvent> logs)
         index = validateLogger(index, LogLevel.DEBUG, logs);
         index = validateLogger(index, LogLevel.INFO, logs);
         index = validateLogger(index, LogLevel.WARN, logs);
-        index = validateLogger(index, LogLevel.ERROR, logs);
+        validateLogger(index, LogLevel.ERROR, logs);
     }
 
     private static int validateLogger(int index, LogLevel level, Iterator<LogEvent> logs)
diff --git a/xwiki-commons-core/xwiki-commons-logging/xwiki-commons-logging-common/src/main/java/org/xwiki/logging/internal/tail/AbstractFileLoggerTail.java b/xwiki-commons-core/xwiki-commons-logging/xwiki-commons-logging-common/src/main/java/org/xwiki/logging/internal/tail/AbstractFileLoggerTail.java
@@ -322,15 +322,7 @@ private LogEvent getLogEvent(int index, IndexEntry indexEntry)
                 boolean open = open();
 
                 try {
-                    this.logStore.seek(indexEntry.position);
-
-                    Long toPosition =
-                        this.index.size() > index + 1 ? this.index.get(index + 1).position : this.logStore.length();
-
-                    BoundedInputStream stream = new BoundedInputStream(new InputStreamDataInput(this.logStore),
-                        toPosition - indexEntry.position);
-
-                    return read(stream);
+                    return readLogEvent(index, indexEntry);
                 } finally {
                     close(open);
                 }
@@ -342,6 +334,19 @@ private LogEvent getLogEvent(int index, IndexEntry indexEntry)
         }
     }
 
+    private LogEvent readLogEvent(int index, IndexEntry indexEntry) throws IOException
+    {
+        this.logStore.seek(indexEntry.position);
+
+        Long toPosition = this.index.size() > index + 1 ? this.index.get(index + 1).position : this.logStore.length();
+
+        try (BoundedInputStream stream = new BoundedInputStream(new InputStreamDataInput(this.logStore),
+            toPosition - indexEntry.position))
+        {
+            return read(stream);
+        }
+    }
+
     private void checkChanged()
     {
         // Make sure the log still exist and is not empty
diff --git a/xwiki-commons-core/xwiki-commons-observation/xwiki-commons-observation-api/src/test/java/org/xwiki/observation/event/ActionExecutionEventTest.java b/xwiki-commons-core/xwiki-commons-observation/xwiki-commons-observation-api/src/test/java/org/xwiki/observation/event/ActionExecutionEventTest.java
@@ -53,8 +53,8 @@ void testActionExecutionEventString()
         assertEquals(event, event);
         assertEquals(event, new ActionExecutionEvent("action"));
 
-        assertFalse(event.equals(new ActionExecutionEvent("action2")));
-        assertFalse(event.equals(AllEvent.ALLEVENT));
+        assertNotEquals(event, new ActionExecutionEvent("action2"));
+        assertNotEquals(event, AllEvent.ALLEVENT);
 
         // hashcode
 
diff --git a/xwiki-commons-core/xwiki-commons-observation/xwiki-commons-observation-api/src/test/java/org/xwiki/observation/event/CancelableEventTest.java b/xwiki-commons-core/xwiki-commons-observation/xwiki-commons-observation-api/src/test/java/org/xwiki/observation/event/CancelableEventTest.java
@@ -75,14 +75,14 @@ void matchesEqualsHashcodeWhenDefaultConstructor()
         assertEquals(event, event);
         assertEquals(event, new TestCancelableEvent());
 
-        assertFalse(event.equals(new TestCancelableEvent("name")));
-        assertFalse(event.equals(new TestCancelableEvent(new FixedNameEventFilter("name"))));
-        assertFalse(event.equals(new TestCancelableEvent2()));
+        assertNotEquals(event, new TestCancelableEvent("name"));
+        assertNotEquals(event, new TestCancelableEvent(new FixedNameEventFilter("name")));
+        assertNotEquals(event, new TestCancelableEvent2());
 
         // hashcode
 
         assertEquals(event.hashCode(), new TestCancelableEvent().hashCode());
-        assertFalse(event.equals(new TestCancelableEvent2()));
+        assertNotEquals(event, new TestCancelableEvent2());
 
         assertNotEquals(event.hashCode(), new TestCancelableEvent("name").hashCode());
         assertNotEquals(event.hashCode(), new TestCancelableEvent(new FixedNameEventFilter("name")).hashCode());
@@ -106,14 +106,14 @@ void matchesEqualsHashcodeWhenNull()
         assertEquals(event, event);
         assertEquals(event, new TestCancelableEvent());
 
-        assertFalse(event.equals(new TestCancelableEvent("name")));
-        assertFalse(event.equals(new TestCancelableEvent(new FixedNameEventFilter("name"))));
-        assertFalse(event.equals(new TestCancelableEvent2()));
+        assertNotEquals(event, new TestCancelableEvent("name"));
+        assertNotEquals(event, new TestCancelableEvent(new FixedNameEventFilter("name")));
+        assertNotEquals(event, new TestCancelableEvent2());
 
         // hashcode
 
         assertEquals(event.hashCode(), new TestCancelableEvent().hashCode());
-        assertFalse(event.equals(new TestCancelableEvent2()));
+        assertNotEquals(event, new TestCancelableEvent2());
 
         assertNotEquals(event.hashCode(), new TestCancelableEvent("name").hashCode());
         assertNotEquals(event.hashCode(), new TestCancelableEvent(new FixedNameEventFilter("name")).hashCode());
@@ -140,10 +140,10 @@ void matchesEqualsHashcodeWhenFixedNameEvenFilterConstructor()
         assertEquals(event, new TestCancelableEvent("name"));
         assertEquals(event, new TestCancelableEvent(new FixedNameEventFilter("name")));
 
-        assertFalse(event.equals(null));
-        assertFalse(event.equals(new TestCancelableEvent("name2")));
-        assertFalse(event.equals(new TestCancelableEvent(new FixedNameEventFilter("name2"))));
-        assertFalse(event.equals(new TestCancelableEvent2()));
+        assertNotEquals(null, event);
+        assertNotEquals(event, new TestCancelableEvent("name2"));
+        assertNotEquals(event, new TestCancelableEvent(new FixedNameEventFilter("name2")));
+        assertNotEquals(event, new TestCancelableEvent2());
 
         // hashcode
 
@@ -175,10 +175,10 @@ void matchesEqualsHashcodeWhenStringConstructor()
         assertEquals(event, new TestCancelableEvent("name"));
         assertEquals(event, new TestCancelableEvent(new FixedNameEventFilter("name")));
 
-        assertFalse(event.equals(null));
-        assertFalse(event.equals(new TestCancelableEvent("name2")));
-        assertFalse(event.equals(new TestCancelableEvent(new FixedNameEventFilter("name2"))));
-        assertFalse(event.equals(new TestCancelableEvent2()));
+        assertNotEquals(null, event);
+        assertNotEquals(event, new TestCancelableEvent("name2"));
+        assertNotEquals(event, new TestCancelableEvent(new FixedNameEventFilter("name2")));
+        assertNotEquals(event, new TestCancelableEvent2());
 
         // hashcode
 
diff --git a/xwiki-commons-core/xwiki-commons-observation/xwiki-commons-observation-api/src/test/java/org/xwiki/observation/filter/AlwaysMatchingEventFilterTest.java b/xwiki-commons-core/xwiki-commons-observation/xwiki-commons-observation-api/src/test/java/org/xwiki/observation/filter/AlwaysMatchingEventFilterTest.java
@@ -24,7 +24,7 @@
 import org.xwiki.observation.event.filter.FixedNameEventFilter;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
@@ -45,8 +45,8 @@ void testGetFilter()
     @Test
     void testEquals()
     {
-        assertFalse(this.filter.equals(null));
-        assertFalse(this.filter.equals(new FixedNameEventFilter("filter")));
+        assertNotEquals(null, this.filter);
+        assertNotEquals(this.filter, new FixedNameEventFilter("filter"));
 
         assertEquals(this.filter, this.filter);
     }
diff --git a/xwiki-commons-core/xwiki-commons-observation/xwiki-commons-observation-api/src/test/java/org/xwiki/observation/filter/FixedNameEventFilterTest.java b/xwiki-commons-core/xwiki-commons-observation/xwiki-commons-observation-api/src/test/java/org/xwiki/observation/filter/FixedNameEventFilterTest.java
diff --git a/xwiki-commons-core/xwiki-commons-store/xwiki-commons-store-blob/xwiki-commons-store-blob-api/src/test/java/org/xwiki/store/blob/BlobRangeOptionTest.java b/xwiki-commons-core/xwiki-commons-store/xwiki-commons-store-blob/xwiki-commons-store-blob-api/src/test/java/org/xwiki/store/blob/BlobRangeOptionTest.java
diff --git a/xwiki-commons-core/xwiki-commons-store/xwiki-commons-store-blob/xwiki-commons-store-blob-filesystem/src/test/java/org/xwiki/store/blob/internal/FileSystemBlobStoreTest.java b/xwiki-commons-core/xwiki-commons-store/xwiki-commons-store-blob/xwiki-commons-store-blob-filesystem/src/test/java/org/xwiki/store/blob/internal/FileSystemBlobStoreTest.java

Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,6 @@ private byte[] getProgressive(boolean forEncryption, byte[] bytes, int size) thr`
`237`	`237`	`if (forEncryption \|\| tmp != null) {`
`238`	`238`	`assertNotNull(tmp);`
`239`	`239`	`System.arraycopy(tmp, 0, result, len, tmp.length);`
`240`		`- len += tmp.length;`
`241`	`240`	`}`
`242`	`241`
`243`	`242`	`return result;`
Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ void testPreCalculatedSignature() throws Exception`
`253`	`253`	`.addSignature(result.getSignatures().iterator().next())`
`254`	`254`	`);`
`255`	`255`
`256`		`- result = this.verifier.verify(signature2, text, Arrays.asList(v3Cert, v3InterCaCert, v3CaCert));`
	`256`	`+ this.verifier.verify(signature2, text, Arrays.asList(v3Cert, v3InterCaCert, v3CaCert));`
`257`	`257`
`258`	`258`	`assertArrayEquals(signature, signature2);`
`259`	`259`	`}`
Original file line number	Diff line number	Diff line change
`@@ -167,20 +167,13 @@ public boolean accept(File dir, String name)`
`167`	`167`	`return name.startsWith(id + '-') && name.endsWith(".xed");`
`168`	`168`	`}`
`169`	`169`	`})) {`
`170`		`- FileInputStream fis = null;`
`171`		`- try {`
`172`		`- fis = new FileInputStream(file);`
`173`		`-`
	`170`	`+ try (FileInputStream fis = new FileInputStream(file)) {`
`174`	`171`	`DefaultLocalExtension localExtension =`
`175`	`172`	`this.extensionSerializer.loadLocalExtensionDescriptor(null, fis);`
`176`	`173`
`177`	`174`	`if (localExtension.getId().getId().equals(id)) {`
`178`	`175`	`versions.add(localExtension.getId().getVersion());`
`179`	`176`	`}`
`180`		`- } finally {`
`181`		`- if (fis != null) {`
`182`		`- fis.close();`
`183`		`- }`
`184`	`177`	`}`
`185`	`178`	`}`
`186`	`179`	`} catch (Exception e) {`
Original file line number	Diff line number	Diff line change
`@@ -66,9 +66,7 @@ private static Map<String, byte[]> unzip(File filename) throws IOException`
`66`	`66`	`{`
`67`	`67`	`Map<String, byte[]> zipContent = new HashMap<>();`
`68`	`68`
`69`		`- ZipFile zipFile = new ZipFile(filename);`
`70`		`-`
`71`		`- try {`
	`69`	`+ try (ZipFile zipFile = new ZipFile(filename)) {`
`72`	`70`	`Enumeration<ZipArchiveEntry> entries = zipFile.getEntries();`
`73`	`71`	`while (entries.hasMoreElements()) {`
`74`	`72`	`ZipArchiveEntry entry = entries.nextElement();`
`@@ -80,8 +78,6 @@ private static Map<String, byte[]> unzip(File filename) throws IOException`
`80`	`78`	`inputStream.close();`
`81`	`79`	`}`
`82`	`80`	`}`
`83`		`- } finally {`
`84`		`- zipFile.close();`
`85`	`81`	`}`
`86`	`82`
`87`	`83`	`return zipContent;`