[sling-slingfeature-maven-plugin] branch master updated: SLING-10220 : Provide a mechanism to apply configuration defaults

[cziegeler]

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-slingfeature-maven-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new 07c2fac  SLING-10220 : Provide a mechanism to apply configuration 
defaults
07c2fac is described below

commit 07c2fac83ef81df46a10fc6e11431b7377bb5580
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Wed Mar 17 07:02:17 2021 +0100

    SLING-10220 : Provide a mechanism to apply configuration defaults
---
 .../org/apache/sling/feature/maven/mojos/ApplyDefaultConfigMojo.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/feature/maven/mojos/ApplyDefaultConfigMojo.java
 
b/src/main/java/org/apache/sling/feature/maven/mojos/ApplyDefaultConfigMojo.java
index 0eb4d27..5e7aca9 100644
--- 
a/src/main/java/org/apache/sling/feature/maven/mojos/ApplyDefaultConfigMojo.java
+++ 
b/src/main/java/org/apache/sling/feature/maven/mojos/ApplyDefaultConfigMojo.java
@@ -54,11 +54,12 @@ public class ApplyDefaultConfigMojo extends 
AbstractIncludingFeatureMojo {
             final Feature f = entry.getValue();
 
             // check if configuration api is set
-            if ( ConfigurationApi.getConfigurationApi(f) != null ) {
+            final ConfigurationApi api = 
ConfigurationApi.getConfigurationApi(f);
+            if ( api != null ) {
                 final FeatureValidator validator = new FeatureValidator();
                 validator.setFeatureProvider(new BaseFeatureProvider());
 
-                final FeatureValidationResult result = validator.validate(f);
+                final FeatureValidationResult result = validator.validate(f, 
api);
                 if ( !result.isValid() && failOnValidationError ) {
                     throw new MojoExecutionException("Unable to apply default 
configuration to invalid feature ".concat(f.getId().toMvnId()));
                 }