[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.

Author: vmassol

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();
         }
     }
 

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) {

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;

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;

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