[sling-org-apache-sling-feature-extension-apiregions] branch master updated: SLING-10568 : Use configuration property origin for validation

[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-org-apache-sling-feature-extension-apiregions.git


The following commit(s) were added to refs/heads/master by this push:
     new 16f794c  SLING-10568 : Use configuration property origin for validation
16f794c is described below

commit 16f794cbb954abc9a40d976274bf999e5d3ba328
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Mon Jun 28 17:44:29 2021 +0200

    SLING-10568 : Use configuration property origin for validation
---
 .../apiregions/api/config/validation/ConfigurationValidator.java  | 2 +-
 .../apiregions/api/config/validation/FeatureValidator.java        | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/feature/extension/apiregions/api/config/validation/ConfigurationValidator.java
 
b/src/main/java/org/apache/sling/feature/extension/apiregions/api/config/validation/ConfigurationValidator.java
index 867c217..2eb7080 100644
--- 
a/src/main/java/org/apache/sling/feature/extension/apiregions/api/config/validation/ConfigurationValidator.java
+++ 
b/src/main/java/org/apache/sling/feature/extension/apiregions/api/config/validation/ConfigurationValidator.java
@@ -182,7 +182,7 @@ public class ConfigurationValidator {
                     if ( !(value instanceof Integer) ) {
                         PropertyValidator.setResult(result, 0, mode, 
"service.ranking must be of type Integer");
                     }    
-                } else if ( !isAllowedProperty(propName) && propRegion != 
Region.INTERNAL && !desc.isAllowAdditionalProperties() ) {
+                } else if ( !isAllowedProperty(propName) && propRegion != 
Region.INTERNAL && !desc.isAllowAdditionalProperties() ) {                    
                     PropertyValidator.setResult(result, null, mode, "Property 
is not allowed");
                 }
             }
diff --git 
a/src/main/java/org/apache/sling/feature/extension/apiregions/api/config/validation/FeatureValidator.java
 
b/src/main/java/org/apache/sling/feature/extension/apiregions/api/config/validation/FeatureValidator.java
index dfecf09..04f0f23 100644
--- 
a/src/main/java/org/apache/sling/feature/extension/apiregions/api/config/validation/FeatureValidator.java
+++ 
b/src/main/java/org/apache/sling/feature/extension/apiregions/api/config/validation/FeatureValidator.java
@@ -49,6 +49,13 @@ public class FeatureValidator {
     final Map<ArtifactId, Region> cache = new HashMap<>();
 
     /**
+     * Create a new feature validator
+     */
+    public FeatureValidator() {
+        this.configurationValidator.setCache(cache);
+    }
+
+    /**
      * Get the current feature provider
      * @return the feature provider or {@code null}
      */
@@ -81,7 +88,6 @@ public class FeatureValidator {
     public void setLiveValues(final boolean value) {
         this.liveValues = value;
         this.configurationValidator.setLiveValues(value);
-        this.configurationValidator.setCache(cache);
         this.propertyValidator.setLiveValues(value);
     }