You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2022/03/31 13:15:34 UTC
[sling-org-apache-sling-feature-cpconverter] branch issue/SLING-11238 created (now a8ae580)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to branch issue/SLING-11238
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git.
at a8ae580 SLING-11238 - Set a default index manager
This branch includes the following new commits:
new a8ae580 SLING-11238 - Set a default index manager
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[sling-org-apache-sling-feature-cpconverter] 01/01: SLING-11238 - Set a default index manager
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch issue/SLING-11238
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git
commit a8ae580ec537c02993ade5a83034ad5e86187f9a
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu Mar 31 15:14:53 2022 +0200
SLING-11238 - Set a default index manager
---
.../feature/cpconverter/ContentPackage2FeatureModelConverter.java | 3 ++-
.../org/apache/sling/feature/cpconverter/AdjustedFilterTest.java | 4 +---
.../cpconverter/ContentPackage2FeatureModelConverterTest.java | 5 +----
.../sling/feature/cpconverter/ConverterUserAndPermissionTest.java | 2 --
4 files changed, 4 insertions(+), 10 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 f6c5507..fec998a 100644
--- a/src/main/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverter.java
+++ b/src/main/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverter.java
@@ -57,6 +57,7 @@ import org.apache.sling.feature.cpconverter.handlers.EntryHandler;
import org.apache.sling.feature.cpconverter.handlers.EntryHandlersManager;
import org.apache.sling.feature.cpconverter.handlers.NodeTypesEntryHandler;
import org.apache.sling.feature.cpconverter.handlers.slinginitialcontent.BundleSlingInitialContentExtractor;
+import org.apache.sling.feature.cpconverter.index.DefaultIndexManager;
import org.apache.sling.feature.cpconverter.index.IndexManager;
import org.apache.sling.feature.cpconverter.vltpkg.BaseVaultPackageScanner;
import org.apache.sling.feature.cpconverter.vltpkg.PackagesEventsEmitter;
@@ -111,7 +112,7 @@ public class ContentPackage2FeatureModelConverter extends BaseVaultPackageScanne
private BundleSlingInitialContentExtractor bundleSlingInitialContentExtractor = new BundleSlingInitialContentExtractor();
- private IndexManager indexManager;
+ private IndexManager indexManager = new DefaultIndexManager();
public enum PackagePolicy {
/**
diff --git a/src/test/java/org/apache/sling/feature/cpconverter/AdjustedFilterTest.java b/src/test/java/org/apache/sling/feature/cpconverter/AdjustedFilterTest.java
index 86fd426..0792378 100644
--- a/src/test/java/org/apache/sling/feature/cpconverter/AdjustedFilterTest.java
+++ b/src/test/java/org/apache/sling/feature/cpconverter/AdjustedFilterTest.java
@@ -27,7 +27,6 @@ import org.apache.sling.feature.cpconverter.features.FeaturesManager;
import org.apache.sling.feature.cpconverter.handlers.DefaultEntryHandlersManager;
import org.apache.sling.feature.cpconverter.handlers.EntryHandlersManager;
import org.apache.sling.feature.cpconverter.handlers.slinginitialcontent.BundleSlingInitialContentExtractor;
-import org.apache.sling.feature.cpconverter.index.DefaultIndexManager;
import org.apache.sling.feature.cpconverter.shared.ConverterConstants;
import org.apache.sling.feature.cpconverter.vltpkg.DefaultPackagesEventsEmitter;
import org.jetbrains.annotations.NotNull;
@@ -60,8 +59,7 @@ public class AdjustedFilterTest extends AbstractConverterTest {
converter = new ContentPackage2FeatureModelConverter()
.setEntryHandlersManager(handlersManager)
- .setAclManager(aclManager)
- .setIndexManager(new DefaultIndexManager());
+ .setAclManager(aclManager);
outputDirectory = new File(System.getProperty("java.io.tmpdir"), getClass().getName() + '_' + System.currentTimeMillis());
FeaturesManager featuresManager = new DefaultFeaturesManager(true, 5, outputDirectory, null, null, null, aclManager);
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 940c780..4aea947 100644
--- a/src/test/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverterTest.java
+++ b/src/test/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverterTest.java
@@ -68,7 +68,6 @@ import org.apache.sling.feature.cpconverter.filtering.RegexBasedResourceFilter;
import org.apache.sling.feature.cpconverter.handlers.DefaultEntryHandlersManager;
import org.apache.sling.feature.cpconverter.handlers.EntryHandlersManager;
import org.apache.sling.feature.cpconverter.handlers.slinginitialcontent.BundleSlingInitialContentExtractor;
-import org.apache.sling.feature.cpconverter.index.DefaultIndexManager;
import org.apache.sling.feature.cpconverter.shared.ConverterConstants;
import org.apache.sling.feature.cpconverter.vltpkg.DefaultPackagesEventsEmitter;
import org.apache.sling.feature.io.json.FeatureJSONReader;
@@ -101,8 +100,7 @@ public class ContentPackage2FeatureModelConverterTest extends AbstractConverterT
converter = new ContentPackage2FeatureModelConverter()
.setEntryHandlersManager(handlersManager)
.setFeaturesManager(new DefaultFeaturesManager(new File("")))
- .setAclManager(new DefaultAclManager())
- .setIndexManager(new DefaultIndexManager());
+ .setAclManager(new DefaultAclManager());
}
@After
@@ -487,7 +485,6 @@ public class ContentPackage2FeatureModelConverterTest extends AbstractConverterT
converter.setFeaturesManager(new DefaultFeaturesManager(true, 5, outputDirectory, null, null, new HashMap<>(), aclManager))
.setBundlesDeployer(new SimpleFolderArtifactsDeployer(outputDirectory))
.setEmitter(DefaultPackagesEventsEmitter.open(outputDirectory))
- .setIndexManager(new DefaultIndexManager())
.convert(packageFile);
} finally {
verify(aclManager, times(1)).addPrivilegeDefinitions(any(PrivilegeDefinitions.class));
diff --git a/src/test/java/org/apache/sling/feature/cpconverter/ConverterUserAndPermissionTest.java b/src/test/java/org/apache/sling/feature/cpconverter/ConverterUserAndPermissionTest.java
index 9e46b80..6ff8aea 100644
--- a/src/test/java/org/apache/sling/feature/cpconverter/ConverterUserAndPermissionTest.java
+++ b/src/test/java/org/apache/sling/feature/cpconverter/ConverterUserAndPermissionTest.java
@@ -35,7 +35,6 @@ import org.apache.sling.feature.cpconverter.features.FeaturesManager;
import org.apache.sling.feature.cpconverter.handlers.DefaultEntryHandlersManager;
import org.apache.sling.feature.cpconverter.handlers.EntryHandlersManager;
import org.apache.sling.feature.cpconverter.handlers.slinginitialcontent.BundleSlingInitialContentExtractor;
-import org.apache.sling.feature.cpconverter.index.DefaultIndexManager;
import org.apache.sling.feature.cpconverter.shared.ConverterConstants;
import org.apache.sling.feature.cpconverter.vltpkg.DefaultPackagesEventsEmitter;
import org.apache.sling.feature.io.json.FeatureJSONReader;
@@ -147,7 +146,6 @@ public class ConverterUserAndPermissionTest extends AbstractConverterTest {
converter = new ContentPackage2FeatureModelConverter()
.setEntryHandlersManager(handlersManager)
.setAclManager(aclManager)
- .setIndexManager(new DefaultIndexManager())
.setContentTypePackagePolicy(PackagePolicy.REFERENCE);
outputDirectory = new File(System.getProperty("java.io.tmpdir"), getClass().getName() + '_' + System.currentTimeMillis());