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-modelconverter.git
The following commit(s) were added to refs/heads/master by this push: new 0d94ff5 SLING-8108 : Provide setter methods for optional context info 0d94ff5 is described below commit 0d94ff5d7a73d54d5594f1264f1135cd2333d972 Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Wed Nov 14 10:37:14 2018 +0100 SLING-8108 : Provide setter methods for optional context info --- .../modelconverter/FeatureToProvisioning.java | 44 +++++++++++----------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/main/java/org/apache/sling/feature/modelconverter/FeatureToProvisioning.java b/src/main/java/org/apache/sling/feature/modelconverter/FeatureToProvisioning.java index 0bca2eb..47b089c 100644 --- a/src/main/java/org/apache/sling/feature/modelconverter/FeatureToProvisioning.java +++ b/src/main/java/org/apache/sling/feature/modelconverter/FeatureToProvisioning.java @@ -16,27 +16,6 @@ */ package org.apache.sling.feature.modelconverter; -import org.apache.sling.feature.ArtifactId; -import org.apache.sling.feature.Bundles; -import org.apache.sling.feature.Configurations; -import org.apache.sling.feature.Extension; -import org.apache.sling.feature.ExtensionType; -import org.apache.sling.feature.Extensions; -import org.apache.sling.feature.FeatureConstants; -import org.apache.sling.feature.KeyValueMap; -import org.apache.sling.feature.builder.BuilderContext; -import org.apache.sling.feature.builder.FeatureBuilder; -import org.apache.sling.feature.builder.FeatureProvider; -import org.apache.sling.feature.io.json.FeatureJSONReader; -import org.apache.sling.provisioning.model.Artifact; -import org.apache.sling.provisioning.model.Configuration; -import org.apache.sling.provisioning.model.Feature; -import org.apache.sling.provisioning.model.Model; -import org.apache.sling.provisioning.model.Section; -import org.apache.sling.provisioning.model.io.ModelWriter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.File; import java.io.FileInputStream; import java.io.FileWriter; @@ -61,6 +40,27 @@ import javax.json.JsonReader; import javax.json.JsonString; import javax.json.JsonValue; +import org.apache.sling.feature.ArtifactId; +import org.apache.sling.feature.Bundles; +import org.apache.sling.feature.Configurations; +import org.apache.sling.feature.Extension; +import org.apache.sling.feature.ExtensionType; +import org.apache.sling.feature.Extensions; +import org.apache.sling.feature.FeatureConstants; +import org.apache.sling.feature.KeyValueMap; +import org.apache.sling.feature.builder.BuilderContext; +import org.apache.sling.feature.builder.FeatureBuilder; +import org.apache.sling.feature.builder.FeatureProvider; +import org.apache.sling.feature.io.json.FeatureJSONReader; +import org.apache.sling.provisioning.model.Artifact; +import org.apache.sling.provisioning.model.Configuration; +import org.apache.sling.provisioning.model.Feature; +import org.apache.sling.provisioning.model.Model; +import org.apache.sling.provisioning.model.Section; +import org.apache.sling.provisioning.model.io.ModelWriter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** Converter that converts the feature model to the provisioning model. */ public class FeatureToProvisioning { @@ -115,7 +115,7 @@ public class FeatureToProvisioning { .map(FeatureToProvisioning::getFeature) .collect(Collectors.toMap(org.apache.sling.feature.Feature::getId, Function.identity())); - BuilderContext bc = new BuilderContext(id -> features.containsKey(id) ? features.get(id) : fp.provide(id), null); + BuilderContext bc = new BuilderContext(id -> features.containsKey(id) ? features.get(id) : fp.provide(id)); return FeatureBuilder.assemble(feature, bc); }