You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by pa...@apache.org on 2022/02/28 11:23:36 UTC
[sling-org-apache-sling-feature-cpconverter] branch master updated: Fix some bc issues around constructor signatures
This is an automated email from the ASF dual-hosted git repository.
pauls 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 714e45e Fix some bc issues around constructor signatures
714e45e is described below
commit 714e45ef6d51e78ee133c5777e6dc1d08eed9528
Author: Karl Pauls <ka...@gmail.com>
AuthorDate: Mon Feb 28 12:23:13 2022 +0100
Fix some bc issues around constructor signatures
---
.../feature/cpconverter/ContentPackage2FeatureModelConverter.java | 4 ++++
.../feature/cpconverter/handlers/DefaultEntryHandlersManager.java | 5 +++++
2 files changed, 9 insertions(+)
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 0d13bde..c077ab0 100644
--- a/src/main/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverter.java
+++ b/src/main/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverter.java
@@ -146,6 +146,10 @@ public class ContentPackage2FeatureModelConverter extends BaseVaultPackageScanne
this(false, SlingInitialContentPolicy.KEEP, false);
}
+ public ContentPackage2FeatureModelConverter(boolean strictValidation, @NotNull SlingInitialContentPolicy slingInitialContentPolicy) throws IOException {
+ this(strictValidation, slingInitialContentPolicy, false);
+ }
+
public ContentPackage2FeatureModelConverter(boolean strictValidation, @NotNull SlingInitialContentPolicy slingInitialContentPolicy, boolean disablePackageTypeRecalculation) throws IOException {
super(strictValidation);
this.disablePackageTypeRecalculation = disablePackageTypeRecalculation;
diff --git a/src/main/java/org/apache/sling/feature/cpconverter/handlers/DefaultEntryHandlersManager.java b/src/main/java/org/apache/sling/feature/cpconverter/handlers/DefaultEntryHandlersManager.java
index 0c63954..478f953 100644
--- a/src/main/java/org/apache/sling/feature/cpconverter/handlers/DefaultEntryHandlersManager.java
+++ b/src/main/java/org/apache/sling/feature/cpconverter/handlers/DefaultEntryHandlersManager.java
@@ -41,6 +41,11 @@ public class DefaultEntryHandlersManager implements EntryHandlersManager {
);
}
+ public DefaultEntryHandlersManager(@NotNull Map<String, String> configs, boolean enforceConfigurationsAndBundlesBelowProperFolder,
+ @NotNull SlingInitialContentPolicy slingInitialContentPolicy, @NotNull String systemUserRelPath) {
+ this(configs, enforceConfigurationsAndBundlesBelowProperFolder, slingInitialContentPolicy, new BundleSlingInitialContentExtractor(), systemUserRelPath);
+ }
+
public DefaultEntryHandlersManager(@NotNull Map<String, String> configs,
boolean enforceConfigurationsAndBundlesBelowProperFolder,
@NotNull SlingInitialContentPolicy slingInitialContentPolicy,