You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2021/04/15 04:27:11 UTC
[sling-org-apache-sling-feature-extension-apiregions] branch master
updated: SLING-10307 : Report warnings/errors on configurations
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 afbe3d4 SLING-10307 : Report warnings/errors on configurations
afbe3d4 is described below
commit afbe3d4eeb03a134fec98273603d06955026718d
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Apr 15 06:27:01 2021 +0200
SLING-10307 : Report warnings/errors on configurations
---
pom.xml | 2 +-
.../extension/apiregions/analyser/CheckConfigurationApi.java | 8 ++++----
.../extension/apiregions/analyser/CheckConfigurationApiTest.java | 6 +++++-
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3563a19..c45b826 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature.analyser</artifactId>
- <version>1.3.22</version>
+ <version>1.3.23-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/src/main/java/org/apache/sling/feature/extension/apiregions/analyser/CheckConfigurationApi.java b/src/main/java/org/apache/sling/feature/extension/apiregions/analyser/CheckConfigurationApi.java
index f5b01ea..7efedf3 100644
--- a/src/main/java/org/apache/sling/feature/extension/apiregions/analyser/CheckConfigurationApi.java
+++ b/src/main/java/org/apache/sling/feature/extension/apiregions/analyser/CheckConfigurationApi.java
@@ -61,21 +61,21 @@ public class CheckConfigurationApi implements AnalyserTask{
}
for(final Map.Entry<String, ConfigurationValidationResult> entry : result.getConfigurationResults().entrySet()) {
for(final String warn : entry.getValue().getWarnings()) {
- context.reportWarning("Configuration " + entry.getKey() + " : " + warn);
+ context.reportConfigurationWarning(context.getFeature().getConfigurations().getConfiguration(entry.getKey()), warn);
}
for(final Map.Entry<String, PropertyValidationResult> propEntry : entry.getValue().getPropertyResults().entrySet()) {
for(final String warn : propEntry.getValue().getWarnings()) {
- context.reportWarning("Configuration " + entry.getKey() + "." + propEntry.getKey() + " : " + warn);
+ context.reportConfigurationWarning(context.getFeature().getConfigurations().getConfiguration(entry.getKey()), warn);
}
}
if ( !entry.getValue().isValid() ) {
for(final String err : entry.getValue().getErrors()) {
- context.reportError("Configuration " + entry.getKey() + " : " + err);
+ context.reportConfigurationError(context.getFeature().getConfigurations().getConfiguration(entry.getKey()), err);
}
for(final Map.Entry<String, PropertyValidationResult> propEntry : entry.getValue().getPropertyResults().entrySet()) {
if ( !propEntry.getValue().isValid() ) {
for(final String err : propEntry.getValue().getErrors()) {
- context.reportError("Configuration " + entry.getKey() + "." + propEntry.getKey() + " : " + err);
+ context.reportConfigurationError(context.getFeature().getConfigurations().getConfiguration(entry.getKey()), err);
}
}
}
diff --git a/src/test/java/org/apache/sling/feature/extension/apiregions/analyser/CheckConfigurationApiTest.java b/src/test/java/org/apache/sling/feature/extension/apiregions/analyser/CheckConfigurationApiTest.java
index 7cd7422..18e20b0 100644
--- a/src/test/java/org/apache/sling/feature/extension/apiregions/analyser/CheckConfigurationApiTest.java
+++ b/src/test/java/org/apache/sling/feature/extension/apiregions/analyser/CheckConfigurationApiTest.java
@@ -58,13 +58,17 @@ public class CheckConfigurationApiTest {
analyser.execute(context);
Mockito.verify(context, Mockito.never()).reportError(Mockito.anyString());
Mockito.verify(context, Mockito.never()).reportWarning(Mockito.anyString());
+ Mockito.verify(context, Mockito.never()).reportConfigurationError(Mockito.any(Configuration.class), Mockito.anyString());
+ Mockito.verify(context, Mockito.never()).reportConfigurationWarning(Mockito.any(Configuration.class), Mockito.anyString());
// integer -> validation error
api.getConfigurationDescriptions().get("pid").getPropertyDescriptions().get("a").setType(PropertyType.INTEGER);
ConfigurationApi.setConfigurationApi(f, api);
context = newContext(f);
analyser.execute(context);
- Mockito.verify(context, Mockito.atLeastOnce()).reportError(Mockito.anyString());
+ Mockito.verify(context, Mockito.atLeastOnce()).reportConfigurationError(Mockito.any(Configuration.class), Mockito.anyString());
+ Mockito.verify(context, Mockito.never()).reportConfigurationWarning(Mockito.any(Configuration.class), Mockito.anyString());
+ Mockito.verify(context, Mockito.never()).reportWarning(Mockito.anyString());
Mockito.verify(context, Mockito.never()).reportWarning(Mockito.anyString());
}
}