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/07 23:44:38 UTC
[sling-org-apache-sling-feature-cpconverter] branch master updated:
all artifacts management stuff moved to a dedicated package
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
The following commit(s) were added to refs/heads/master by this push:
new a9f31ff all artifacts management stuff moved to a dedicated package
a9f31ff is described below
commit a9f31ff14f0dc845cdef12ade3af52268a0a9955
Author: stripodi <st...@simos-mbp>
AuthorDate: Wed May 8 01:44:31 2019 +0200
all artifacts management stuff moved to a dedicated package
---
.../ContentPackage2FeatureModelConverter.java | 55 +++++++++-------------
.../{spi => artifacts}/ArtifactWriter.java | 2 +-
.../ArtifactsDeployer.java} | 4 +-
.../DefaultArtifactsDeployer.java} | 9 ++--
.../{writers => artifacts}/FileArtifactWriter.java | 4 +-
.../InputStreamArtifactWriter.java | 3 +-
.../MavenPomSupplierWriter.java | 3 +-
.../{writers => artifacts}/package-info.java | 4 +-
...ntentPackage2FeatureModelConverterLauncher.java | 7 ++-
.../cpconverter/handlers/BundleEntryHandler.java | 14 +++---
.../ContentPackage2FeatureModelConverterTest.java | 9 ++--
.../DefaultBundlesDeployerTest.java | 11 +++--
.../handlers/BundleEntryHandlerTest.java | 5 +-
13 files changed, 57 insertions(+), 73 deletions(-)
diff --git a/src/main/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverter.java b/src/main/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverter.java
index bd66980..397a8e9 100644
--- a/src/main/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverter.java
+++ b/src/main/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverter.java
@@ -43,13 +43,13 @@ import org.apache.sling.feature.ExtensionType;
import org.apache.sling.feature.Extensions;
import org.apache.sling.feature.Feature;
import org.apache.sling.feature.cpconverter.acl.AclManager;
+import org.apache.sling.feature.cpconverter.artifacts.ArtifactsDeployer;
+import org.apache.sling.feature.cpconverter.artifacts.FileArtifactWriter;
import org.apache.sling.feature.cpconverter.filtering.ResourceFilter;
import org.apache.sling.feature.cpconverter.interpolator.SimpleVariablesInterpolator;
import org.apache.sling.feature.cpconverter.interpolator.VariablesInterpolator;
-import org.apache.sling.feature.cpconverter.spi.BundlesDeployer;
import org.apache.sling.feature.cpconverter.spi.EntryHandler;
import org.apache.sling.feature.cpconverter.vltpkg.VaultPackageAssembler;
-import org.apache.sling.feature.cpconverter.writers.FileArtifactWriter;
import org.apache.sling.feature.io.json.FeatureJSONWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -82,7 +82,7 @@ public class ContentPackage2FeatureModelConverter {
private ResourceFilter resourceFilter;
- private BundlesDeployer artifactDeployer;
+ private ArtifactsDeployer artifactsDeployer;
private boolean strictValidation = false;
@@ -90,8 +90,6 @@ public class ContentPackage2FeatureModelConverter {
private int bundlesStartOrder = 0;
- private File artifactsOutputDirectory;
-
private File featureModelsOutputDirectory;
private Feature targetFeature = null;
@@ -127,15 +125,6 @@ public class ContentPackage2FeatureModelConverter {
return this;
}
- public ContentPackage2FeatureModelConverter setArtifactsOutputDirectory(File artifactsOutputDirectory) {
- this.artifactsOutputDirectory = artifactsOutputDirectory;
- return this;
- }
-
- public File getArtifactsOutputDirectory() {
- return artifactsOutputDirectory;
- }
-
public ContentPackage2FeatureModelConverter setFeatureModelsOutputDirectory(File featureModelsOutputDirectory) {
this.featureModelsOutputDirectory = featureModelsOutputDirectory;
return this;
@@ -160,8 +149,18 @@ public class ContentPackage2FeatureModelConverter {
return this;
}
- public void setResourceFilter(ResourceFilter resourceFilter) {
+ public ContentPackage2FeatureModelConverter setResourceFilter(ResourceFilter resourceFilter) {
this.resourceFilter = resourceFilter;
+ return this;
+ }
+
+ public ArtifactsDeployer getArtifactsDeployer() {
+ return artifactsDeployer;
+ }
+
+ public ContentPackage2FeatureModelConverter setBundlesDeployer(ArtifactsDeployer bundlesDeployer) {
+ this.artifactsDeployer = bundlesDeployer;
+ return this;
}
public AclManager getAclManager() {
@@ -203,10 +202,6 @@ public class ContentPackage2FeatureModelConverter {
return newId;
}
- public BundlesDeployer getArtifactDeployer() {
- return artifactDeployer;
- }
-
private static void checkDirectory(File directory, String name) {
if (directory == null) {
throw new IllegalStateException("Null " + name + " output directory not supported, it must be set before invoking the convert(File) method.");
@@ -230,16 +225,8 @@ public class ContentPackage2FeatureModelConverter {
+ " does not exist or it is not a valid file.");
}
- checkDirectory(artifactsOutputDirectory, "artifacts");
checkDirectory(featureModelsOutputDirectory, "models");
- Iterator<BundlesDeployer> artifactDeployerLoader = ServiceLoader.load(BundlesDeployer.class).iterator();
- if (!artifactDeployerLoader.hasNext()) {
- artifactDeployer = new DefaultBundlesDeployer(artifactsOutputDirectory);
- } else {
- artifactDeployer = artifactDeployerLoader.next();
- }
-
logger.info("Reading content-package '{}'...", contentPackage);
try (VaultPackage vaultPackage = packageManager.open(contentPackage, strictValidation)) {
@@ -287,16 +274,16 @@ public class ContentPackage2FeatureModelConverter {
// attach all unmatched resources as new content-package
- File contentPackageArchive = mainPackageAssembler.createPackage(artifactsOutputDirectory);
+ File contentPackageArchive = mainPackageAssembler.createPackage();
// deploy the new zip content-package to the local mvn bundles dir
- artifactDeployer.deploy(new FileArtifactWriter(contentPackageArchive),
- targetFeature.getId().getGroupId(),
- targetFeature.getId().getArtifactId(),
- targetFeature.getId().getVersion(),
- PACKAGE_CLASSIFIER,
- ZIP_TYPE);
+ artifactsDeployer.deploy(new FileArtifactWriter(contentPackageArchive),
+ targetFeature.getId().getGroupId(),
+ targetFeature.getId().getArtifactId(),
+ targetFeature.getId().getVersion(),
+ PACKAGE_CLASSIFIER,
+ ZIP_TYPE);
attach(null,
targetFeature.getId().getGroupId(),
diff --git a/src/main/java/org/apache/sling/feature/cpconverter/spi/ArtifactWriter.java b/src/main/java/org/apache/sling/feature/cpconverter/artifacts/ArtifactWriter.java
similarity index 94%
rename from src/main/java/org/apache/sling/feature/cpconverter/spi/ArtifactWriter.java
rename to src/main/java/org/apache/sling/feature/cpconverter/artifacts/ArtifactWriter.java
index 6df9c20..61de667 100644
--- a/src/main/java/org/apache/sling/feature/cpconverter/spi/ArtifactWriter.java
+++ b/src/main/java/org/apache/sling/feature/cpconverter/artifacts/ArtifactWriter.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.feature.cpconverter.spi;
+package org.apache.sling.feature.cpconverter.artifacts;
import java.io.IOException;
import java.io.OutputStream;
diff --git a/src/main/java/org/apache/sling/feature/cpconverter/spi/BundlesDeployer.java b/src/main/java/org/apache/sling/feature/cpconverter/artifacts/ArtifactsDeployer.java
similarity index 92%
rename from src/main/java/org/apache/sling/feature/cpconverter/spi/BundlesDeployer.java
rename to src/main/java/org/apache/sling/feature/cpconverter/artifacts/ArtifactsDeployer.java
index ca64299..27548cf 100644
--- a/src/main/java/org/apache/sling/feature/cpconverter/spi/BundlesDeployer.java
+++ b/src/main/java/org/apache/sling/feature/cpconverter/artifacts/ArtifactsDeployer.java
@@ -14,12 +14,12 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.feature.cpconverter.spi;
+package org.apache.sling.feature.cpconverter.artifacts;
import java.io.File;
import java.io.IOException;
-public interface BundlesDeployer {
+public interface ArtifactsDeployer {
File getBundlesDirectory();
diff --git a/src/main/java/org/apache/sling/feature/cpconverter/DefaultBundlesDeployer.java b/src/main/java/org/apache/sling/feature/cpconverter/artifacts/DefaultArtifactsDeployer.java
similarity index 90%
rename from src/main/java/org/apache/sling/feature/cpconverter/DefaultBundlesDeployer.java
rename to src/main/java/org/apache/sling/feature/cpconverter/artifacts/DefaultArtifactsDeployer.java
index 8d86b5a..c728642 100644
--- a/src/main/java/org/apache/sling/feature/cpconverter/DefaultBundlesDeployer.java
+++ b/src/main/java/org/apache/sling/feature/cpconverter/artifacts/DefaultArtifactsDeployer.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.feature.cpconverter;
+package org.apache.sling.feature.cpconverter.artifacts;
import static java.util.Objects.requireNonNull;
@@ -23,19 +23,16 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.util.StringTokenizer;
-import org.apache.sling.feature.cpconverter.spi.ArtifactWriter;
-import org.apache.sling.feature.cpconverter.spi.BundlesDeployer;
-import org.apache.sling.feature.cpconverter.writers.MavenPomSupplierWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public final class DefaultBundlesDeployer implements BundlesDeployer {
+public final class DefaultArtifactsDeployer implements ArtifactsDeployer {
private final Logger logger = LoggerFactory.getLogger(getClass());
private final File artifactsDirectory;
- public DefaultBundlesDeployer(File outputDirectory) {
+ public DefaultArtifactsDeployer(File outputDirectory) {
artifactsDirectory = outputDirectory;
if (!artifactsDirectory.exists()) {
artifactsDirectory.mkdirs();
diff --git a/src/main/java/org/apache/sling/feature/cpconverter/writers/FileArtifactWriter.java b/src/main/java/org/apache/sling/feature/cpconverter/artifacts/FileArtifactWriter.java
similarity index 92%
rename from src/main/java/org/apache/sling/feature/cpconverter/writers/FileArtifactWriter.java
rename to src/main/java/org/apache/sling/feature/cpconverter/artifacts/FileArtifactWriter.java
index c70bc8e..f876866 100644
--- a/src/main/java/org/apache/sling/feature/cpconverter/writers/FileArtifactWriter.java
+++ b/src/main/java/org/apache/sling/feature/cpconverter/artifacts/FileArtifactWriter.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.feature.cpconverter.writers;
+package org.apache.sling.feature.cpconverter.artifacts;
import java.io.File;
import java.io.FileInputStream;
@@ -22,8 +22,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import org.apache.sling.feature.cpconverter.spi.ArtifactWriter;
-
public final class FileArtifactWriter implements ArtifactWriter {
private final File fileArtifact;
diff --git a/src/main/java/org/apache/sling/feature/cpconverter/writers/InputStreamArtifactWriter.java b/src/main/java/org/apache/sling/feature/cpconverter/artifacts/InputStreamArtifactWriter.java
similarity index 91%
rename from src/main/java/org/apache/sling/feature/cpconverter/writers/InputStreamArtifactWriter.java
rename to src/main/java/org/apache/sling/feature/cpconverter/artifacts/InputStreamArtifactWriter.java
index 3092c0f..1f975a5 100644
--- a/src/main/java/org/apache/sling/feature/cpconverter/writers/InputStreamArtifactWriter.java
+++ b/src/main/java/org/apache/sling/feature/cpconverter/artifacts/InputStreamArtifactWriter.java
@@ -14,14 +14,13 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.feature.cpconverter.writers;
+package org.apache.sling.feature.cpconverter.artifacts;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import org.apache.commons.io.IOUtils;
-import org.apache.sling.feature.cpconverter.spi.ArtifactWriter;
public class InputStreamArtifactWriter implements ArtifactWriter {
diff --git a/src/main/java/org/apache/sling/feature/cpconverter/writers/MavenPomSupplierWriter.java b/src/main/java/org/apache/sling/feature/cpconverter/artifacts/MavenPomSupplierWriter.java
similarity index 93%
rename from src/main/java/org/apache/sling/feature/cpconverter/writers/MavenPomSupplierWriter.java
rename to src/main/java/org/apache/sling/feature/cpconverter/artifacts/MavenPomSupplierWriter.java
index 69f8f9b..cff6b4c 100644
--- a/src/main/java/org/apache/sling/feature/cpconverter/writers/MavenPomSupplierWriter.java
+++ b/src/main/java/org/apache/sling/feature/cpconverter/artifacts/MavenPomSupplierWriter.java
@@ -14,14 +14,13 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.feature.cpconverter.writers;
+package org.apache.sling.feature.cpconverter.artifacts;
import java.io.IOException;
import java.io.OutputStream;
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
-import org.apache.sling.feature.cpconverter.spi.ArtifactWriter;
public final class MavenPomSupplierWriter implements ArtifactWriter {
diff --git a/src/main/java/org/apache/sling/feature/cpconverter/writers/package-info.java b/src/main/java/org/apache/sling/feature/cpconverter/artifacts/package-info.java
similarity index 84%
rename from src/main/java/org/apache/sling/feature/cpconverter/writers/package-info.java
rename to src/main/java/org/apache/sling/feature/cpconverter/artifacts/package-info.java
index 103359d..a4a76bb 100644
--- a/src/main/java/org/apache/sling/feature/cpconverter/writers/package-info.java
+++ b/src/main/java/org/apache/sling/feature/cpconverter/artifacts/package-info.java
@@ -16,6 +16,6 @@
*/
/**
- * Default implementations of the <i>org.apache.sling.feature.cpconverter.spi.ArtifactWriter</i>.
+ * Maven2 alike repository manager.
*/
-package org.apache.sling.feature.cpconverter.writers;
+package org.apache.sling.feature.cpconverter.artifacts;
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 ad5a5ce..de25873 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
@@ -32,6 +32,7 @@ import org.apache.jackrabbit.vault.packaging.Dependency;
import org.apache.jackrabbit.vault.packaging.PackageId;
import org.apache.jackrabbit.vault.packaging.impl.ZipVaultPackage;
import org.apache.sling.feature.cpconverter.ContentPackage2FeatureModelConverter;
+import org.apache.sling.feature.cpconverter.artifacts.DefaultArtifactsDeployer;
import org.apache.sling.feature.cpconverter.filtering.RegexBasedResourceFilter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -119,10 +120,10 @@ public final class ContentPackage2FeatureModelConverterLauncher implements Runna
.setStrictValidation(strictValidation)
.setMergeConfigurations(mergeConfigurations)
.setBundlesStartOrder(bundlesStartOrder)
- .setArtifactsOutputDirectory(artifactsOutputDirectory)
.setFeatureModelsOutputDirectory(featureModelsOutputDirectory)
.setIdOverride(artifactId)
- .setProperties(properties);
+ .setProperties(properties)
+ .setBundlesDeployer(new DefaultArtifactsDeployer(artifactsOutputDirectory));
if (filteringPatterns != null && filteringPatterns.length > 0) {
RegexBasedResourceFilter filter = new RegexBasedResourceFilter();
@@ -130,6 +131,8 @@ public final class ContentPackage2FeatureModelConverterLauncher implements Runna
for (String filteringPattern : filteringPatterns) {
filter.addFilteringPattern(filteringPattern);
}
+
+ converter.setResourceFilter(filter);
}
List<File> orderedContentPackages = order(contentPackages, logger);
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 97735f2..922963f 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
@@ -31,7 +31,7 @@ import java.util.regex.Pattern;
import org.apache.jackrabbit.vault.fs.io.Archive;
import org.apache.jackrabbit.vault.fs.io.Archive.Entry;
import org.apache.sling.feature.cpconverter.ContentPackage2FeatureModelConverter;
-import org.apache.sling.feature.cpconverter.writers.InputStreamArtifactWriter;
+import org.apache.sling.feature.cpconverter.artifacts.InputStreamArtifactWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -99,12 +99,12 @@ public final class BundleEntryHandler extends AbstractRegexEntryHandler {
}
try (InputStream input = archive.openInputStream(entry)) {
- converter.getArtifactDeployer().deploy(new InputStreamArtifactWriter(input),
- groupId,
- artifactId,
- version,
- classifier,
- JAR_TYPE);
+ converter.getArtifactsDeployer().deploy(new InputStreamArtifactWriter(input),
+ groupId,
+ artifactId,
+ version,
+ classifier,
+ JAR_TYPE);
converter.attach(runMode,
groupId,
diff --git a/src/test/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverterTest.java b/src/test/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverterTest.java
index 0a4ef47..bb7d988 100644
--- a/src/test/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverterTest.java
+++ b/src/test/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverterTest.java
@@ -38,6 +38,7 @@ import java.util.zip.ZipFile;
import org.apache.commons.io.FileUtils;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Feature;
+import org.apache.sling.feature.cpconverter.artifacts.DefaultArtifactsDeployer;
import org.apache.sling.feature.cpconverter.filtering.RegexBasedResourceFilter;
import org.apache.sling.feature.io.json.FeatureJSONReader;
import org.junit.After;
@@ -127,7 +128,7 @@ public class ContentPackage2FeatureModelConverterTest {
File outputDirectory = new File(System.getProperty("testDirectory"), getClass().getName() + '_' + System.currentTimeMillis());
converter.setBundlesStartOrder(5)
- .setArtifactsOutputDirectory(outputDirectory)
+ .setBundlesDeployer(new DefaultArtifactsDeployer(outputDirectory))
.setFeatureModelsOutputDirectory(outputDirectory)
.convert(packageFile);
@@ -253,7 +254,7 @@ public class ContentPackage2FeatureModelConverterTest {
File outputDirectory = new File(System.getProperty("testDirectory"), getClass().getName() + '_' + System.currentTimeMillis());
converter.setBundlesStartOrder(5)
- .setArtifactsOutputDirectory(outputDirectory)
+ .setBundlesDeployer(new DefaultArtifactsDeployer(outputDirectory))
.setFeatureModelsOutputDirectory(outputDirectory)
.convert(packageFile);
}
@@ -273,7 +274,7 @@ public class ContentPackage2FeatureModelConverterTest {
URL packageUrl = getClass().getResource("test-content-package.zip");
File packageFile = FileUtils.toFile(packageUrl);
- converter.setArtifactsOutputDirectory(outputDirectory)
+ converter.setBundlesDeployer(new DefaultArtifactsDeployer(outputDirectory))
.setFeatureModelsOutputDirectory(outputDirectory)
.convert(packageFile);
@@ -291,7 +292,7 @@ public class ContentPackage2FeatureModelConverterTest {
String overrideId = "${project.groupId}:${project.artifactId}:slingosgifeature:asd.test.all-1.0.0:${project.version}";
converter.setBundlesStartOrder(5)
- .setArtifactsOutputDirectory(outputDirectory)
+ .setBundlesDeployer(new DefaultArtifactsDeployer(outputDirectory))
.setFeatureModelsOutputDirectory(outputDirectory)
.setIdOverride(overrideId)
.convert(packageFile);
diff --git a/src/test/java/org/apache/sling/feature/cpconverter/DefaultBundlesDeployerTest.java b/src/test/java/org/apache/sling/feature/cpconverter/artifacts/DefaultBundlesDeployerTest.java
similarity index 87%
rename from src/test/java/org/apache/sling/feature/cpconverter/DefaultBundlesDeployerTest.java
rename to src/test/java/org/apache/sling/feature/cpconverter/artifacts/DefaultBundlesDeployerTest.java
index 477f02b..3129f09 100644
--- a/src/test/java/org/apache/sling/feature/cpconverter/DefaultBundlesDeployerTest.java
+++ b/src/test/java/org/apache/sling/feature/cpconverter/artifacts/DefaultBundlesDeployerTest.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.feature.cpconverter;
+package org.apache.sling.feature.cpconverter.artifacts;
import static org.junit.Assert.*;
@@ -22,20 +22,21 @@ import static org.mockito.Mockito.mock;
import java.io.File;
-import org.apache.sling.feature.cpconverter.spi.ArtifactWriter;
-import org.apache.sling.feature.cpconverter.spi.BundlesDeployer;
+import org.apache.sling.feature.cpconverter.artifacts.ArtifactWriter;
+import org.apache.sling.feature.cpconverter.artifacts.ArtifactsDeployer;
+import org.apache.sling.feature.cpconverter.artifacts.DefaultArtifactsDeployer;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
public class DefaultBundlesDeployerTest {
- private BundlesDeployer artifactDeployer;
+ private ArtifactsDeployer artifactDeployer;
@Before
public void setUp() {
File outputDirectory = new File(System.getProperty("testDirectory"), getClass().getName() + '_' + System.currentTimeMillis());
- artifactDeployer = new DefaultBundlesDeployer(outputDirectory);
+ artifactDeployer = new DefaultArtifactsDeployer(outputDirectory);
}
@After
diff --git a/src/test/java/org/apache/sling/feature/cpconverter/handlers/BundleEntryHandlerTest.java b/src/test/java/org/apache/sling/feature/cpconverter/handlers/BundleEntryHandlerTest.java
index fcd5162..bca7ce1 100644
--- a/src/test/java/org/apache/sling/feature/cpconverter/handlers/BundleEntryHandlerTest.java
+++ b/src/test/java/org/apache/sling/feature/cpconverter/handlers/BundleEntryHandlerTest.java
@@ -35,7 +35,7 @@ import org.apache.jackrabbit.vault.fs.io.Archive.Entry;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Feature;
import org.apache.sling.feature.cpconverter.ContentPackage2FeatureModelConverter;
-import org.apache.sling.feature.cpconverter.DefaultBundlesDeployer;
+import org.apache.sling.feature.cpconverter.artifacts.DefaultArtifactsDeployer;
import org.apache.sling.feature.cpconverter.spi.EntryHandler;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -89,10 +89,9 @@ public final class BundleEntryHandlerTest {
ContentPackage2FeatureModelConverter converter = spy(ContentPackage2FeatureModelConverter.class);
File testDirectory = new File(System.getProperty("testDirectory"), getClass().getName() + '_' + System.currentTimeMillis());
- when(converter.getArtifactsOutputDirectory()).thenReturn(testDirectory);
doCallRealMethod().when(converter).attach(anyString(), anyString(), anyString(), anyString(), anyString(), anyString());
- when(converter.getArtifactDeployer()).thenReturn(new DefaultBundlesDeployer(testDirectory));
+ when(converter.getArtifactsDeployer()).thenReturn(new DefaultArtifactsDeployer(testDirectory));
Feature feature = new Feature(new ArtifactId("org.apache.sling", "org.apache.sling.cp2fm", "0.0.1", null, null));
when(converter.getTargetFeature()).thenReturn(feature);