You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by si...@apache.org on 2019/05/09 12:48:17 UTC
[sling-org-apache-sling-feature-cpconverter] 01/03: added check
when content-package(s) path(s) point to a wrong location added re-ordering
log minor output format
This is an automated email from the ASF dual-hosted git repository.
simonetripodi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git
commit 59f03c608bdf59848c62e0e7712710f29d68ef62
Author: stripodi <st...@simos-mbp>
AuthorDate: Thu May 9 13:02:23 2019 +0200
added check when content-package(s) path(s) point to a wrong location
added re-ordering log
minor output format
---
.../ContentPackage2FeatureModelConverterLauncher.java | 16 +++++++++++-----
.../sling/feature/cpconverter/cli/ShutDownHook.java | 2 --
...ContentPackage2FeatureModelConverterLauncherTest.java | 8 ++------
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/apache/sling/feature/cpconverter/cli/ContentPackage2FeatureModelConverterLauncher.java b/src/main/java/org/apache/sling/feature/cpconverter/cli/ContentPackage2FeatureModelConverterLauncher.java
index fd5ef42..ca6d468 100644
--- a/src/main/java/org/apache/sling/feature/cpconverter/cli/ContentPackage2FeatureModelConverterLauncher.java
+++ b/src/main/java/org/apache/sling/feature/cpconverter/cli/ContentPackage2FeatureModelConverterLauncher.java
@@ -139,7 +139,11 @@ public final class ContentPackage2FeatureModelConverterLauncher implements Runna
converter.setResourceFilter(filter);
}
- List<File> orderedContentPackages = order(contentPackages, logger);
+ logger.info("Ordering input content-package(s) {}...", contentPackages);
+
+ List<File> orderedContentPackages = order(contentPackages);
+
+ logger.info("New content-package(s) order: {}", orderedContentPackages);
for (File contentPackage : orderedContentPackages) {
converter.convert(contentPackage);
@@ -158,20 +162,22 @@ public final class ContentPackage2FeatureModelConverterLauncher implements Runna
logger.error("Unable to convert content-package {}: {}", contentPackages, t.getMessage());
}
- logger.info( "" );
+ logger.info( "+-----------------------------------------------------+" );
System.exit(1);
}
-
- logger.info( "+-----------------------------------------------------+" );
}
- protected List<File> order(List<File> contentPackages, final Logger logger) throws Exception {
+ protected List<File> order(List<File> contentPackages) throws Exception {
Map<PackageId, File> idFileMap = new LinkedHashMap<>();
Map<ZipVaultPackage, File> packageFileMapping = new HashMap<>();
Map<PackageId, ZipVaultPackage> idPackageMapping = new HashMap<>();
for (File file : contentPackages) {
+ if (!file.exists() || file.isDirectory()) {
+ throw new Exception("File " + file + " does not exist or it is a directory");
+ }
+
try {
ZipVaultPackage pack = new ZipVaultPackage(file, false, true);
packageFileMapping.put(pack, file);
diff --git a/src/main/java/org/apache/sling/feature/cpconverter/cli/ShutDownHook.java b/src/main/java/org/apache/sling/feature/cpconverter/cli/ShutDownHook.java
index a1253b0..e56629b 100644
--- a/src/main/java/org/apache/sling/feature/cpconverter/cli/ShutDownHook.java
+++ b/src/main/java/org/apache/sling/feature/cpconverter/cli/ShutDownHook.java
@@ -33,8 +33,6 @@ final class ShutDownHook extends Thread {
@Override
public void run() {
- logger.info("");
-
// format the uptime string
Formatter uptimeFormatter = new Formatter();
uptimeFormatter.format("Total time:");
diff --git a/src/test/java/org/apache/sling/feature/cpconverter/cli/ContentPackage2FeatureModelConverterLauncherTest.java b/src/test/java/org/apache/sling/feature/cpconverter/cli/ContentPackage2FeatureModelConverterLauncherTest.java
index d269c4c..6bfd042 100644
--- a/src/test/java/org/apache/sling/feature/cpconverter/cli/ContentPackage2FeatureModelConverterLauncherTest.java
+++ b/src/test/java/org/apache/sling/feature/cpconverter/cli/ContentPackage2FeatureModelConverterLauncherTest.java
@@ -27,8 +27,6 @@ import java.util.List;
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.vault.packaging.CyclicDependencyException;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class ContentPackage2FeatureModelConverterLauncherTest {
@@ -49,14 +47,13 @@ public class ContentPackage2FeatureModelConverterLauncherTest {
@Test
public void testPackageOrdering() throws Exception {
ContentPackage2FeatureModelConverterLauncher launcher = new ContentPackage2FeatureModelConverterLauncher();
- Logger logger = LoggerFactory.getLogger("test");
List<File> contentPackages = new ArrayList<File>();
for (String pkgName : TEST_PACKAGES_INPUT) {
URL packageUrl = getClass().getResource(pkgName);
contentPackages.add(FileUtils.toFile(packageUrl));
}
- List<File> ordered = launcher.order(contentPackages, logger);
+ List<File> ordered = launcher.order(contentPackages);
Iterator<File> fileIt = ordered.iterator();
for (String expected : TEST_PACKAGES_OUTPUT) {
File next = fileIt.next();
@@ -67,14 +64,13 @@ public class ContentPackage2FeatureModelConverterLauncherTest {
@Test(expected = CyclicDependencyException.class)
public void testDependencyCycle() throws Exception {
ContentPackage2FeatureModelConverterLauncher launcher = new ContentPackage2FeatureModelConverterLauncher();
- Logger logger = LoggerFactory.getLogger("test");
List<File> contentPackages = new ArrayList<File>();
for (String pkgName : TEST_PACKAGES_CYCLIC_DEPENDENCY) {
URL packageUrl = getClass().getResource(pkgName);
contentPackages.add(FileUtils.toFile(packageUrl));
}
- launcher.order(contentPackages, logger);
+ launcher.order(contentPackages);
}
}