SLING-10568 : Use configuration property origin for validation
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 @@
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 @@
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 void setLiveValues(final boolean value) {
this.liveValues = value;
this.configurationValidator.setLiveValues(value);
- this.configurationValidator.setCache(cache);
this.propertyValidator.setLiveValues(value);
}
