[sling-org-apache-sling-feature-cpconverter] branch feature/convert-initial-content updated: fix some Sonar issues

[kwin]

This is an automated email from the ASF dual-hosted git repository.

kwin pushed a commit to branch feature/convert-initial-content
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git


The following commit(s) were added to 
refs/heads/feature/convert-initial-content by this push:
     new d0165e5  fix some Sonar issues
d0165e5 is described below

commit d0165e5ebe85ca21b2596cad2d6bfb8e43e05c70
Author: Konrad Windszus <k...@apache.org>
AuthorDate: Tue Apr 20 18:57:00 2021 +0200

    fix some Sonar issues
---
 .../feature/cpconverter/handlers/BundleEntryHandler.java      | 11 ++++++-----
 .../cpconverter/vltpkg/DefaultPackagesEventsEmitter.java      |  3 ++-
 .../sling/feature/cpconverter/vltpkg/VaultPackageUtils.java   |  6 +++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/feature/cpconverter/handlers/BundleEntryHandler.java
 
b/src/main/java/org/apache/sling/feature/cpconverter/handlers/BundleEntryHandler.java
index 34d4783..419ac0f 100644
--- 
a/src/main/java/org/apache/sling/feature/cpconverter/handlers/BundleEntryHandler.java
+++ 
b/src/main/java/org/apache/sling/feature/cpconverter/handlers/BundleEntryHandler.java
@@ -274,7 +274,7 @@ public final class BundleEntryHandler extends 
AbstractRegexEntryHandler {
             }
         }
 
-        // does entry in initial content need to be extracted into feature 
model (e.g. for OSGi configurations)
+        // does entry in initial content need to be extracted into feature 
model (e.g. for OSGi configurations)?
         EntryHandler entryHandler = 
converter.getHandlersManager().getEntryHandlerByEntryPath(contentPackagePath);
         if (entryHandler != null) {
             if (tmpInputFile == null) {
@@ -283,9 +283,10 @@ public final class BundleEntryHandler extends 
AbstractRegexEntryHandler {
                     IOUtils.copy(bundleFileInputStream, tmpBundleOutput);
                 }
             }
-            // TODO: map path to imitate content-package structure
-            SingleFileArchive archive = new 
SingleFileArchive(tmpInputFile.toFile(), contentPackagePath);
-            entryHandler.handle(repositoryPath, archive, archive.getRoot(), 
converter);
+            // TODO: map path to imitate content-package structure (e.g. for 
CNDs)
+            try (SingleFileArchive archive = new 
SingleFileArchive(tmpInputFile.toFile(), contentPackagePath)) {
+                entryHandler.handle(repositoryPath, archive, 
archive.getRoot(), converter);
+            }
             Files.delete(tmpInputFile);
         } else {
             // ... otherwise add it to the content package
@@ -394,7 +395,7 @@ public final class BundleEntryHandler extends 
AbstractRegexEntryHandler {
         for (java.util.Map.Entry<PackageType, VaultPackageAssembler> entry : 
packageAssemblers.entrySet()) {
             File packageFile = entry.getValue().createPackage(false);
             converter.processContentPackageArchive(packageFile, runMode);
-            packageFile.delete();
+            Files.delete(packageFile.toPath());
         }
     }
 
diff --git 
a/src/main/java/org/apache/sling/feature/cpconverter/vltpkg/DefaultPackagesEventsEmitter.java
 
b/src/main/java/org/apache/sling/feature/cpconverter/vltpkg/DefaultPackagesEventsEmitter.java
index b881302..3b2433c 100644
--- 
a/src/main/java/org/apache/sling/feature/cpconverter/vltpkg/DefaultPackagesEventsEmitter.java
+++ 
b/src/main/java/org/apache/sling/feature/cpconverter/vltpkg/DefaultPackagesEventsEmitter.java
@@ -27,6 +27,7 @@ import java.io.Writer;
 import java.net.URI;
 import java.util.Calendar;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -299,7 +300,7 @@ public final class DefaultPackagesEventsEmitter implements 
PackagesEventsEmitter
 
             @Override
             public @NotNull Map<PackageId, URI> getDependenciesLocations() {
-                return null;
+                return Collections.emptyMap();
             }
 
             @Override
diff --git 
a/src/main/java/org/apache/sling/feature/cpconverter/vltpkg/VaultPackageUtils.java
 
b/src/main/java/org/apache/sling/feature/cpconverter/vltpkg/VaultPackageUtils.java
index 26155e1..d5aea4b 100644
--- 
a/src/main/java/org/apache/sling/feature/cpconverter/vltpkg/VaultPackageUtils.java
+++ 
b/src/main/java/org/apache/sling/feature/cpconverter/vltpkg/VaultPackageUtils.java
@@ -53,16 +53,16 @@ public class VaultPackageUtils {
                     continue;
                 }
                 String root = p.getRoot();
-                PackageType newPackageType = detectPackageType(root);
+                @NotNull PackageType newPackageType = detectPackageType(root);
                 if (packageType != null && packageType != newPackageType) {
+                    // bail out once we ended up with mixed
                     return PackageType.MIXED;
                 } else {
                     packageType = newPackageType;
                 }
-                // bail out once we ended up with mixed
             }
         }
-        return packageType;
+        return packageType != null ? packageType : PackageType.MIXED;
     }
 
     public static @NotNull PackageType detectPackageType(String path) {