[sling-org-apache-sling-feature-extension-apiregions] branch master updated: SLING-10565 : Additional properties are not validated according to the validation mode

[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 9c8b36d  SLING-10565 : Additional properties are not validated 
according to the validation mode
9c8b36d is described below

commit 9c8b36d23a8974105610564db3bceb54b1d7b914
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Mon Jun 28 14:10:44 2021 +0200

    SLING-10565 : Additional properties are not validated according to the 
validation mode
---
 .../apiregions/api/config/validation/ConfigurationValidator.java   | 4 ++--
 .../api/config/validation/ConfigurationValidatorTest.java          | 7 +++++++
 2 files changed, 9 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 540548b..ad1c176 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
@@ -168,7 +168,7 @@ public class ConfigurationValidator {
 
                 if ( desc.getInternalPropertyNames().contains(propName ) ) {
                     if  ( region != Region.INTERNAL ) {
-                        result.getErrors().add("Property is not allowed");
+                        PropertyValidator.setResult(result, null, mode, 
"Property is not allowed");
                     }
                 } else if ( 
Constants.SERVICE_RANKING.equalsIgnoreCase(propName) ) {
                     final Object value = properties.get(propName);
@@ -176,7 +176,7 @@ public class ConfigurationValidator {
                         PropertyValidator.setResult(result, 0, mode, 
"service.ranking must be of type Integer");
                     }    
                 } else if ( !isAllowedProperty(propName) && region != 
Region.INTERNAL && !desc.isAllowAdditionalProperties() ) {
-                    result.getErrors().add("Property is not allowed");
+                    PropertyValidator.setResult(result, null, mode, "Property 
is not allowed");
                 }
             }
         }
diff --git 
a/src/test/java/org/apache/sling/feature/extension/apiregions/api/config/validation/ConfigurationValidatorTest.java
 
b/src/test/java/org/apache/sling/feature/extension/apiregions/api/config/validation/ConfigurationValidatorTest.java
index 2d7d697..1cfff34 100644
--- 
a/src/test/java/org/apache/sling/feature/extension/apiregions/api/config/validation/ConfigurationValidatorTest.java
+++ 
b/src/test/java/org/apache/sling/feature/extension/apiregions/api/config/validation/ConfigurationValidatorTest.java
@@ -120,6 +120,13 @@ public class ConfigurationValidatorTest {
         result = validator.validate(cfg, cd, Region.INTERNAL);
         assertTrue(result.isValid());
         assertEquals(2, result.getPropertyResults().size());
+
+        // allowed if lenient
+        cd.setMode(Mode.LENIENT);
+        result = validator.validate(cfg, cd, Region.GLOBAL);
+        assertTrue(result.isValid());
+        assertEquals(2, result.getPropertyResults().size());
+
     }
 
     @Test public void testInvalidProperty() {