[Misc] Apply mechanical SonarCloud code cleanups

vmassol · vmassol · commit 69d0f4273f1d · 2026-07-11T03:32:03.000Z
Fixes 58 SonarCloud issues across 22 modules; all changes are mechanical
and behaviour-preserving:
* java:S1128 (26) - remove unused imports.
* java:S1197 (18) - move array designators from the variable name to the type.
* java:S1116 (14) - remove redundant empty statements.

Co-Authored-By: Vincent Massol &lt;vincent@massol.net&gt;
diff --git a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/xwiki-platform-captcha-jcaptcha-api/src/test/java/org/xwiki/captcha/internal/CaptchaServiceManagerTest.java b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/xwiki-platform-captcha-jcaptcha-api/src/test/java/org/xwiki/captcha/internal/CaptchaServiceManagerTest.java
@@ -21,19 +21,15 @@
 
 import javax.inject.Named;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.xwiki.captcha.CaptchaException;
-import org.xwiki.component.phase.InitializationException;
 import org.xwiki.configuration.ConfigurationSource;
 import org.xwiki.test.junit5.mockito.ComponentTest;
 import org.xwiki.test.junit5.mockito.InjectMockComponents;
 import org.xwiki.test.junit5.mockito.MockComponent;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.when;
 
 /**
diff --git a/xwiki-platform-core/xwiki-platform-chart/xwiki-platform-chart-renderer/src/test/java/org/xwiki/chart/internal/DefaultChartGeneratorTest.java b/xwiki-platform-core/xwiki-platform-chart/xwiki-platform-chart-renderer/src/test/java/org/xwiki/chart/internal/DefaultChartGeneratorTest.java
@@ -22,7 +22,6 @@
 import java.util.Map;
 
 import org.jfree.chart.plot.Plot;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.xwiki.chart.ChartGenerator;
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-handlers/xwiki-platform-extension-handler-xar/src/main/java/org/xwiki/extension/xar/question/ConflictQuestion.java b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-handlers/xwiki-platform-extension-handler-xar/src/main/java/org/xwiki/extension/xar/question/ConflictQuestion.java
@@ -109,7 +109,7 @@ public List<GlobalAction> getActions()
         {
             return this.actions;
         }
-    };
+    }
 
     public enum GlobalAction
     {
@@ -143,7 +143,7 @@ public enum GlobalAction
          * configure default answers in the request for example.
          */
         ASK
-    };
+    }
 
     // Question datas
 
diff --git a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-streams/xwiki-platform-filter-stream-xar/src/main/java/org/xwiki/filter/xar/internal/XARDocumentModel.java b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-streams/xwiki-platform-filter-stream-xar/src/main/java/org/xwiki/filter/xar/internal/XARDocumentModel.java
@@ -99,5 +99,5 @@ ELEMENT_REVISIONS, new EventParameter(XWikiWikiDocumentFilter.PARAMETER_JRCSREVI
             new EventParameter(WikiDocumentFilter.PARAMETER_TITLE));
         DOCUMENTREVISION_PARAMETERS.put(ELEMENT_VALIDATIONSCRIPT,
             new EventParameter(WikiDocumentFilter.PARAMETER_VALIDATIONSCRIPT));
-    };
+    }
 }
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/test/java/org/xwiki/flamingo/WebHomeSheetPageTest.java b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/test/java/org/xwiki/flamingo/WebHomeSheetPageTest.java
@@ -27,7 +27,6 @@
 import org.jsoup.nodes.Element;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.xwiki.localization.macro.internal.TranslationMacro;
 import org.xwiki.model.reference.DocumentReference;
 import org.xwiki.model.script.ModelScriptService;
 import org.xwiki.query.Query;
diff --git a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/test/java/org/xwiki/help/XWikiSyntaxMacrosListPageTest.java b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/test/java/org/xwiki/help/XWikiSyntaxMacrosListPageTest.java
@@ -30,7 +30,6 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.xwiki.context.internal.concurrent.DefaultContextStoreManager;
-import org.xwiki.localization.macro.internal.TranslationMacro;
 import org.xwiki.model.reference.DocumentReference;
 import org.xwiki.query.Query;
 import org.xwiki.query.script.QueryManagerScriptService;
diff --git a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-ui/src/test/java/org/xwiki/image/style/AdministrationPageTest.java b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-ui/src/test/java/org/xwiki/image/style/AdministrationPageTest.java
@@ -28,7 +28,6 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.xwiki.csrf.script.CSRFTokenScriptService;
-import org.xwiki.localization.macro.internal.TranslationMacro;
 import org.xwiki.model.reference.DocumentReference;
 import org.xwiki.model.script.ModelScriptService;
 import org.xwiki.script.service.ScriptService;
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-filters/xwiki-platform-legacy-notifications-filters-api/src/main/java/org/xwiki/notifications/filters/internal/LegacyDefaultNotificationFilterManager.java b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-filters/xwiki-platform-legacy-notifications-filters-api/src/main/java/org/xwiki/notifications/filters/internal/LegacyDefaultNotificationFilterManager.java
@@ -21,33 +21,19 @@
 
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.stream.Stream;
 
 import javax.inject.Inject;
-import javax.inject.Named;
 import javax.inject.Singleton;
 
 import org.xwiki.component.annotation.Component;
-import org.xwiki.component.manager.ComponentLookupException;
-import org.xwiki.component.manager.ComponentManager;
-import org.xwiki.model.ModelContext;
 import org.xwiki.model.reference.DocumentReference;
-import org.xwiki.model.reference.WikiReference;
 import org.xwiki.notifications.NotificationConfiguration;
 import org.xwiki.notifications.NotificationException;
 import org.xwiki.notifications.filters.NotificationFilter;
-import org.xwiki.notifications.filters.NotificationFilterDisplayer;
 import org.xwiki.notifications.filters.NotificationFilterManager;
-import org.xwiki.notifications.filters.NotificationFilterPreference;
-import org.xwiki.notifications.preferences.NotificationPreference;
-import org.xwiki.rendering.block.Block;
-import org.xwiki.wiki.descriptor.WikiDescriptorManager;
 
 /**
  * Default implementation of {@link NotificationFilterManager}.
diff --git a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-api/src/main/java/org/xwiki/localization/internal/AbstractTranslationBundle.java b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-api/src/main/java/org/xwiki/localization/internal/AbstractTranslationBundle.java
@@ -44,7 +44,7 @@ public abstract class AbstractTranslationBundle implements TranslationBundle
         public Translation getTranslation(String key, Locale locale)
         {
             return null;
-        };
+        }
     };
 
     /**
diff --git a/xwiki-platform-core/xwiki-platform-logging/xwiki-platform-logging-ui/src/test/java/org/xwiki/logging/LoggingAdminPageTest.java b/xwiki-platform-core/xwiki-platform-logging/xwiki-platform-logging-ui/src/test/java/org/xwiki/logging/LoggingAdminPageTest.java
@@ -26,7 +26,6 @@
 import org.junit.jupiter.api.Test;
 import org.xwiki.icon.IconManager;
 import org.xwiki.livedata.internal.macro.LiveDataMacroComponentList;
-import org.xwiki.localization.macro.internal.TranslationMacro;
 import org.xwiki.model.reference.DocumentReference;
 import org.xwiki.properties.internal.converter.EnumConverter;
 import org.xwiki.rendering.RenderingScriptServiceComponentList;
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/livedata/custom/NotificationCustomFiltersLiveDataConfigurationProvider.java b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/livedata/custom/NotificationCustomFiltersLiveDataConfigurationProvider.java
@@ -115,7 +115,7 @@ String getFieldName()
         {
             return this.fieldName;
         }
-    };
+    }
 
     @Inject
     private ContextualLocalizationManager l10n;
diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/internal/objects/classes/XClassMigratorListener.java b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/internal/objects/classes/XClassMigratorListener.java
@@ -91,7 +91,7 @@ public class XClassMigratorListener extends AbstractEventListener
     @Inject
     private Logger logger;
 
-    private record PropertyToUpdate(PropertyClass newPropertyClass, BaseProperty<?> newProperty) { };
+    private record PropertyToUpdate(PropertyClass newPropertyClass, BaseProperty<?> newProperty) { }
 
     /**
      * Set up the listener.
diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/plugin/packaging/Package.java b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/plugin/packaging/Package.java
@@ -496,7 +496,7 @@ public String exportToDir(File dir, XWikiContext context) throws IOException, XW
      * @throws IOException while reading the ZipFile
      * @throws XWikiException when package content is broken
      */
-    public String Import(byte file[], XWikiContext context) throws IOException, XWikiException
+    public String Import(byte[] file, XWikiContext context) throws IOException, XWikiException
     {
         return Import(new ByteArrayInputStream(file), context);
     }
diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/plugin/packaging/PackageAPI.java b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/plugin/packaging/PackageAPI.java
@@ -235,7 +235,7 @@ public String export() throws IOException, XWikiException
      *         message is placed in the velocity context under the <code>import_error</code> key,
      * @since 2.2M1
      */
-    public boolean importPackageFromByteArray(byte data[])
+    public boolean importPackageFromByteArray(byte[] data)
     {
         try {
             this.pack.Import(data, getXWikiContext());
@@ -258,7 +258,7 @@ public boolean importPackageFromByteArray(byte data[])
      * @throws IOException while reading the ZipFile
      * @throws XWikiException when package content is broken
      */
-    public String Import(byte file[]) throws IOException, XWikiException
+    public String Import(byte[] file) throws IOException, XWikiException
     {
         return this.pack.Import(file, getXWikiContext());
     }
diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/util/TOCGenerator.java b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/util/TOCGenerator.java
@@ -44,7 +44,7 @@ public static Map<String, Map<String, Object>> generateTOC(String content, int i
 
         LinkedHashMap<String, Map<String, Object>> tocData = new LinkedHashMap<>();
 
-        int previousNumbers[] = { 0, 0, 0, 0, 0, 0, 0 };
+        int[] previousNumbers = { 0, 0, 0, 0, 0, 0, 0 };
 
         Pattern pattern = Pattern.compile("(?-s)^[ \\t]*+(1(\\.1){0,5}+)[ \\t]++(.++)$", Pattern.MULTILINE);
         Matcher matcher = pattern.matcher(content);
diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/includeservletasstring/BufferOutputStream.java b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/includeservletasstring/BufferOutputStream.java
@@ -42,7 +42,7 @@ public void write(int b) throws IOException
     }
 
     @Override
-    public void write(byte b[]) throws IOException
+    public void write(byte[] b) throws IOException
     {
         this.buffer.write(b);
     }
diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/objects/BaseObjectTest.java b/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/objects/BaseObjectTest.java
@@ -246,7 +246,7 @@ void setString() throws XWikiException
         object.setXClassReference(classReference);
         object.setOwnerDocument(ownerDocument);
 
-        XWikiContext context = this.oldcore.getXWikiContext();;
+        XWikiContext context = this.oldcore.getXWikiContext();
         String fieldName = "myField";
         String value = "myValue";
 
@@ -298,7 +298,7 @@ void setObject() throws XWikiException
         object.setXClassReference(classReference);
         object.setOwnerDocument(ownerDocument);
 
-        XWikiContext context = this.oldcore.getXWikiContext();;
+        XWikiContext context = this.oldcore.getXWikiContext();
         String fieldName = "myField";
         Object value = 4545;
 
diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/plugin/packaging/AbstractPackageTest.java b/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/plugin/packaging/AbstractPackageTest.java
@@ -60,7 +60,7 @@ public abstract class AbstractPackageTest
      * @param extension the extension id and version or null if none should be added
      * @return the XAR file as a byte array.
      */
-    protected byte[] createZipFile(XWikiDocument docs[], String[] encodings, String packageXmlEncoding,
+    protected byte[] createZipFile(XWikiDocument[] docs, String[] encodings, String packageXmlEncoding,
         ExtensionId extension) throws Exception
     {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -91,7 +91,7 @@ protected byte[] createZipFile(XWikiDocument docs[], String[] encodings, String
      * @param extension the extension id and version or null if none should be added
      * @return the XAR file as a byte array.
      */
-    protected byte[] createZipFile(XWikiDocument docs[], String[] encodings, ExtensionId extension) throws Exception
+    protected byte[] createZipFile(XWikiDocument[] docs, String[] encodings, ExtensionId extension) throws Exception
     {
         return createZipFile(docs, encodings, "ISO-8859-1", extension);
     }
@@ -104,7 +104,7 @@ protected byte[] createZipFile(XWikiDocument docs[], String[] encodings, Extensi
      * @param packageXmlEncoding The encoding of package.xml
      * @return the XAR file as a byte array.
      */
-    protected byte[] createZipFileUsingCommonsCompress(XWikiDocument docs[], String[] encodings,
+    protected byte[] createZipFileUsingCommonsCompress(XWikiDocument[] docs, String[] encodings,
         String packageXmlEncoding, ExtensionId extension) throws Exception
     {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -136,7 +136,7 @@ protected byte[] createZipFileUsingCommonsCompress(XWikiDocument docs[], String[
      * @param extension the extension id and version or null if none should be added
      * @return the XAR file as a byte array.
      */
-    protected byte[] createZipFileUsingCommonsCompress(XWikiDocument docs[], String[] encodings, ExtensionId extension)
+    protected byte[] createZipFileUsingCommonsCompress(XWikiDocument[] docs, String[] encodings, ExtensionId extension)
         throws Exception
     {
         return createZipFileUsingCommonsCompress(docs, encodings, "ISO-8859-1", extension);
@@ -164,7 +164,7 @@ private byte[] getEncodedByteArray(String content, String charset) throws IOExce
         return ostr.toByteArray();
     }
 
-    private String getPackageXML(XWikiDocument docs[], String encoding, ExtensionId extension)
+    private String getPackageXML(XWikiDocument[] docs, String encoding, ExtensionId extension)
     {
         StringBuilder sb = new StringBuilder();
         sb.append("<?xml version=\"1.0\" encoding=\"" + encoding + "\"?>\n");
diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/plugin/packaging/PackageTest.java b/xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/plugin/packaging/PackageTest.java
@@ -60,7 +60,7 @@ public void testImportWithHeterogeneousEncodingInFiles() throws Exception
         doc2.setTitle(docTitle);
         doc2.setContent(docContent);
 
-        XWikiDocument docs[] = { doc1, doc2 };
+        XWikiDocument[] docs = { doc1, doc2 };
 
         this.pack.Import(this.createZipFile(docs, new String[] { "ISO-8859-1", "UTF-8" }, null),
             this.oldcore.getXWikiContext());
@@ -86,7 +86,7 @@ public void testImportWithHeterogeneousEncodingInFilesUsingCommonsCompress() thr
         doc2.setTitle(docTitle);
         doc2.setContent(docContent);
 
-        XWikiDocument docs[] = { doc1, doc2 };
+        XWikiDocument[] docs = { doc1, doc2 };
 
         this.pack.Import(this.createZipFileUsingCommonsCompress(docs, new String[] { "ISO-8859-1", "UTF-8" }, null),
             this.oldcore.getXWikiContext());
diff --git a/xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-xwql/src/main/java/org/xwiki/query/xwql/internal/QueryAnalyzer.java b/xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-xwql/src/main/java/org/xwiki/query/xwql/internal/QueryAnalyzer.java
@@ -64,7 +64,7 @@ public void caseAAbstractSchemaName(AAbstractSchemaName node)
     @Override
     public void caseAXObjectDecl(AXObjectDecl node)
     {
-        String path[] = splitPath(node.getId().toString());
+        String[] path = splitPath(node.getId().toString());
         if (path.length != 2) {
             throw new InvalidQueryException("docalias.object('classname') expected, but got:" + node.toString());
         }
@@ -88,7 +88,7 @@ public void caseAXObjectDecl(AXObjectDecl node)
     @Override
     public void caseAPath(APath node)
     {
-        String path[] = splitPath(node.toString());
+        String[] path = splitPath(node.toString());
         QueryContext.ObjectInfo obj = context.getObject(path[0]);
         if (path.length >= 2 && obj != null) {
             obj.addProperty(path[1], node);
@@ -99,7 +99,7 @@ public void caseAPath(APath node)
     public void outAXPath(AXPath node)
     {
         QueryContext.ObjectInfo obj = context.getObject(node.getXObjectDecl());
-        String path[] = splitPath(node.getProperty().toString());
+        String[] path = splitPath(node.getProperty().toString());
         obj.addProperty(path[0], node);
         super.outAXPath(node);
     }
diff --git a/xwiki-platform-core/xwiki-platform-refactoring/xwiki-platform-refactoring-api/src/main/java/org/xwiki/refactoring/job/question/EntitySelection.java b/xwiki-platform-core/xwiki-platform-refactoring/xwiki-platform-refactoring-api/src/main/java/org/xwiki/refactoring/job/question/EntitySelection.java
@@ -53,7 +53,7 @@ public enum State
          * Default state. By default, UNKNOWN is considered as selected: see {@link #isSelected()}.
          */
         UNKNOWN
-    };
+    }
 
     /**
      * Reference to the entity to select for the refactoring.
diff --git a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/src/main/java/org/xwiki/repository/internal/resources/ExtensionVersionsRESTResource.java b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/src/main/java/org/xwiki/repository/internal/resources/ExtensionVersionsRESTResource.java
@@ -77,7 +77,7 @@ public ExtensionVersions getExtensionVersions(@PathParam("extensionId") String e
                 IterableResult<Version> versions = repository.resolveVersions(extensionId, 0, -1);
 
                 String extensionName = this.extensionStore.getExtensionName(extensionDocument);
-                String extensionType = this.extensionStore.getExtensionType(extensionDocument);;
+                String extensionType = this.extensionStore.getExtensionType(extensionDocument);
 
                 for (Version version : versions) {
                     extensions.getExtensionVersionSummaries()
diff --git a/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-api/src/test/java/org/xwiki/resource/ResourceReferenceHandlerTest.java b/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-api/src/test/java/org/xwiki/resource/ResourceReferenceHandlerTest.java
@@ -52,7 +52,7 @@ public void handle(ResourceReference reference, ResourceReferenceHandlerChain ch
             ResourceReferenceHandlerException
         {
         }
-    };
+    }
 
     @Test
     void priority()
diff --git a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/xwiki-platform-security-authorization-api/src/main/java/org/xwiki/security/authorization/AuthorizationManager.java b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/xwiki-platform-security-authorization-api/src/main/java/org/xwiki/security/authorization/AuthorizationManager.java
@@ -132,5 +132,5 @@ default Right register(RightDescription rightDescription, Set<Right> impliedByRi
      */
     default void unregister(Right right) throws AuthorizationException
     {
-    };
+    }
 }
diff --git a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/xwiki-platform-security-authorization-api/src/test/java/org/xwiki/security/authorization/testwikis/internal/entities/DefaultTestWiki.java b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/xwiki-platform-security-authorization-api/src/test/java/org/xwiki/security/authorization/testwikis/internal/entities/DefaultTestWiki.java
@@ -71,7 +71,6 @@ public DefaultTestWiki(EntityReference reference, boolean isMainWiki, EntityRefe
         this.owner = (owner != null) ? new DocumentReference(owner)
                 : new DocumentReference(XWikiConstants.SUPERADMIN, new SpaceReference(XWikiConstants.XWIKI_SPACE,
                     getWikiReference()));
-        ;
         this.description = description;
 
         if (isMainWiki) {
diff --git a/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-ui/src/test/java/org/xwiki/skin/XWikiSkinsSheetPageTest.java b/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-ui/src/test/java/org/xwiki/skin/XWikiSkinsSheetPageTest.java
@@ -35,7 +35,6 @@
 import org.xwiki.edit.internal.DefaultEditorManager;
 import org.xwiki.edit.internal.PureTextSyntaxContentEditor;
 import org.xwiki.icon.IconManagerScriptService;
-import org.xwiki.localization.macro.internal.TranslationMacro;
 import org.xwiki.model.reference.DocumentReference;
 import org.xwiki.model.script.ModelScriptService;
 import org.xwiki.rendering.RenderingScriptServiceComponentList;
diff --git a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-merge/xwiki-platform-store-merge-api/src/main/java/com/xpn/xwiki/doc/merge/MergeConfiguration.java b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-merge/xwiki-platform-store-merge-api/src/main/java/com/xpn/xwiki/doc/merge/MergeConfiguration.java
@@ -49,7 +49,7 @@ public enum ConflictFallbackVersion
          * Next version.
          */
         NEXT
-    };
+    }
 
     /**
      * @see #isProvidedVersionsModifiables()
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/xwiki-platform-wiki-ui-mainwiki/src/test/java/org/xwiki/wiki/DeleteWikiPageTest.java b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/xwiki-platform-wiki-ui-mainwiki/src/test/java/org/xwiki/wiki/DeleteWikiPageTest.java
@@ -21,7 +21,6 @@
 
 import org.jsoup.nodes.Document;
 import org.junit.jupiter.api.Test;
-import org.xwiki.localization.macro.internal.TranslationMacro;
 import org.xwiki.model.reference.DocumentReference;
 import org.xwiki.rendering.RenderingScriptServiceComponentList;
 import org.xwiki.rendering.internal.configuration.DefaultExtendedRenderingConfiguration;
diff --git a/xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-ui/src/test/java/org/xwiki/xclass/ClassSheetPageTest.java b/xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-ui/src/test/java/org/xwiki/xclass/ClassSheetPageTest.java
@@ -31,7 +31,6 @@
 import org.junit.jupiter.api.Test;
 import org.xwiki.icon.IconManager;
 import org.xwiki.livedata.internal.macro.LiveDataMacroComponentList;
-import org.xwiki.localization.macro.internal.TranslationMacro;
 import org.xwiki.model.reference.DocumentReference;
 import org.xwiki.model.script.ModelScriptService;
 import org.xwiki.rendering.RenderingScriptServiceComponentList;
diff --git a/xwiki-platform-core/xwiki-platform-zipexplorer/src/test/java/com/xpn/xwiki/plugin/zipexplorer/ZipExplorerTest.java b/xwiki-platform-core/xwiki-platform-zipexplorer/src/test/java/com/xpn/xwiki/plugin/zipexplorer/ZipExplorerTest.java
@@ -84,15 +84,15 @@ public void setUp(MockitoComponentManager componentManager) throws Exception
     @Test
     void isZipFile() throws Exception
     {
-        byte txtbuf[] = { 0x00, 0x01, 0x02, 0x03, 0x06, 0x07 };
+        byte[] txtbuf = { 0x00, 0x01, 0x02, 0x03, 0x06, 0x07 };
         ByteArrayInputStream txtBais = new ByteArrayInputStream(txtbuf);
         assertFalse(this.plugin.isZipFile(txtBais));
 
-        byte tinybuf[] = { 0x00 };
+        byte[] tinybuf = { 0x00 };
         ByteArrayInputStream tinyBais = new ByteArrayInputStream(tinybuf);
         assertFalse(this.plugin.isZipFile(tinyBais));
 
-        byte zipbuf[] = createZipFile("test");
+        byte[] zipbuf = createZipFile("test");
         ByteArrayInputStream zipBais = new ByteArrayInputStream(zipbuf);
         assertTrue(this.plugin.isZipFile(zipBais));
     }

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public List<GlobalAction> getActions()`
`109`	`109`	`{`
`110`	`110`	`return this.actions;`
`111`	`111`	`}`
`112`		`- };`
	`112`	`+ }`
`113`	`113`
`114`	`114`	`public enum GlobalAction`
`115`	`115`	`{`
`@@ -143,7 +143,7 @@ public enum GlobalAction`
`143`	`143`	`* configure default answers in the request for example.`
`144`	`144`	`*/`
`145`	`145`	`ASK`
`146`		`- };`
	`146`	`+ }`
`147`	`147`
`148`	`148`	`// Question datas`
`149`	`149`
Original file line number	Diff line number	Diff line change
`@@ -99,5 +99,5 @@ ELEMENT_REVISIONS, new EventParameter(XWikiWikiDocumentFilter.PARAMETER_JRCSREVI`
`99`	`99`	`new EventParameter(WikiDocumentFilter.PARAMETER_TITLE));`
`100`	`100`	`DOCUMENTREVISION_PARAMETERS.put(ELEMENT_VALIDATIONSCRIPT,`
`101`	`101`	`new EventParameter(WikiDocumentFilter.PARAMETER_VALIDATIONSCRIPT));`
`102`		`- };`
	`102`	`+ }`
`103`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public abstract class AbstractTranslationBundle implements TranslationBundle`
`44`	`44`	`public Translation getTranslation(String key, Locale locale)`
`45`	`45`	`{`
`46`	`46`	`return null;`
`47`		`- };`
	`47`	`+ }`
`48`	`48`	`};`
`49`	`49`
`50`	`50`	`/**`