This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-analyser.git
The following commit(s) were added to refs/heads/master by this push:
new 2361975 Create interface for ArtifactManager
2361975 is described below
commit 2361975334ed0d2d13ce76efc0e49cdf522636c8
Author: Carsten Ziegeler <[email protected]>
AuthorDate: Mon Oct 1 12:24:52 2018 +0200
Create interface for ArtifactManager
---
.../java/org/apache/sling/feature/analyser/main/Main.java | 5 +++--
src/main/java/org/apache/sling/feature/scanner/Scanner.java | 13 ++++++-------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/apache/sling/feature/analyser/main/Main.java
b/src/main/java/org/apache/sling/feature/analyser/main/Main.java
index 348ec80..45f8ece 100644
--- a/src/main/java/org/apache/sling/feature/analyser/main/Main.java
+++ b/src/main/java/org/apache/sling/feature/analyser/main/Main.java
@@ -28,7 +28,8 @@ import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.sling.feature.Feature;
import org.apache.sling.feature.analyser.Analyser;
-import org.apache.sling.feature.io.ArtifactManagerConfig;
+import org.apache.sling.feature.io.DefaultArtifactManagerConfig;
+import org.apache.sling.feature.io.DefaultArtifactManager;
import org.apache.sling.feature.io.json.FeatureJSONReader;
import org.apache.sling.feature.scanner.Scanner;
import org.slf4j.Logger;
@@ -89,7 +90,7 @@ public class Main {
}
try {
- final Scanner scanner = new Scanner(new ArtifactManagerConfig());
+ final Scanner scanner = new
Scanner(DefaultArtifactManager.getArtifactManager(new
DefaultArtifactManagerConfig()));
final Analyser analyser;
if (pluginClass != null) {
analyser = new Analyser(scanner, pluginClass);
diff --git a/src/main/java/org/apache/sling/feature/scanner/Scanner.java
b/src/main/java/org/apache/sling/feature/scanner/Scanner.java
index f4e14d4..3f0e1ba 100644
--- a/src/main/java/org/apache/sling/feature/scanner/Scanner.java
+++ b/src/main/java/org/apache/sling/feature/scanner/Scanner.java
@@ -31,7 +31,6 @@ import org.apache.sling.feature.Extensions;
import org.apache.sling.feature.Feature;
import org.apache.sling.feature.KeyValueMap;
import org.apache.sling.feature.io.ArtifactManager;
-import org.apache.sling.feature.io.ArtifactManagerConfig;
import org.apache.sling.feature.scanner.impl.BundleDescriptorImpl;
import org.apache.sling.feature.scanner.impl.FeatureDescriptorImpl;
import org.apache.sling.feature.scanner.spi.ExtensionScanner;
@@ -58,15 +57,15 @@ public class Scanner {
/**
* Create a new scanner
*
- * @param amConfig The artifact manager configuration
+ * @param am The artifact manager
* @param extensionScanners A list of extension scanners
* @throws IOException If something goes wrong
*/
- public Scanner(final ArtifactManagerConfig amConfig,
+ public Scanner(final ArtifactManager am,
final List<ExtensionScanner> extensionScanners,
final List<FrameworkScanner> frameworkScanners)
throws IOException {
- this.artifactManager = ArtifactManager.getArtifactManager(amConfig);
+ this.artifactManager = am;
this.extensionScanners = extensionScanners == null ?
getServices(ExtensionScanner.class) : extensionScanners;
this.frameworkScanners = frameworkScanners == null ?
getServices(FrameworkScanner.class) : frameworkScanners;
}
@@ -74,12 +73,12 @@ public class Scanner {
/**
* Create a new scanner and use the service loader to find the scanners
*
- * @param amConfig The artifact manager configuration
+ * @param am The artifact manager
* @throws IOException If something goes wrong
*/
- public Scanner(final ArtifactManagerConfig amConfig)
+ public Scanner(final ArtifactManager am)
throws IOException {
- this(amConfig, null, null);
+ this(am, null, null);
}
/**
