This is an automated email from the ASF dual-hosted git repository. anatole pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-tamaya-sandbox.git
commit dbc8466abda240c61ac94454b2c6b4dd8592a9ff Author: Anatole Tresch <[email protected]> AuthorDate: Thu Feb 21 19:10:35 2019 +0100 Initial experiments with config documentation. --- .../src/main/java/org/apache/tamaya/validation/ValidationCheck.java | 4 ++-- .../validation/internal/ConfigValidationDocumentationReader.java | 4 ++-- .../main/java/org/apache/tamaya/validation/spi/PropertyValidator.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/validation/src/main/java/org/apache/tamaya/validation/ValidationCheck.java b/validation/src/main/java/org/apache/tamaya/validation/ValidationCheck.java index d4ad293..fbb31ae 100644 --- a/validation/src/main/java/org/apache/tamaya/validation/ValidationCheck.java +++ b/validation/src/main/java/org/apache/tamaya/validation/ValidationCheck.java @@ -192,11 +192,11 @@ public final class ValidationCheck { } if(source instanceof ConfigPropertySpec){ ConfigPropertySpec pspec = (ConfigPropertySpec) source; - return result + ": " + pspec.name() + " (property)"+finalMessage + '\n'; + return result + ": " + pspec.key() + " (property)"+finalMessage + '\n'; } else if(source instanceof ConfigAreaSpec){ ConfigAreaSpec gspec = (ConfigAreaSpec) source; - return result + ": " + gspec.path() + " (group)"+finalMessage + '\n'; + return result + ": " + gspec.basePaths() + " (group)"+finalMessage + '\n'; } return result + ": " + source + ")"+finalMessage + '\n'; } diff --git a/validation/src/main/java/org/apache/tamaya/validation/internal/ConfigValidationDocumentationReader.java b/validation/src/main/java/org/apache/tamaya/validation/internal/ConfigValidationDocumentationReader.java index 67b2979..7875fa7 100644 --- a/validation/src/main/java/org/apache/tamaya/validation/internal/ConfigValidationDocumentationReader.java +++ b/validation/src/main/java/org/apache/tamaya/validation/internal/ConfigValidationDocumentationReader.java @@ -23,7 +23,7 @@ import java.util.*; import org.apache.tamaya.Configuration; import org.apache.tamaya.doc.ConfigDocumenter; import org.apache.tamaya.doc.DocumentedArea; -import org.apache.tamaya.doc.DocumentedConfiguration; +import org.apache.tamaya.doc.ConfigurationDocumentation; import org.apache.tamaya.doc.DocumentedProperty; import org.apache.tamaya.spi.ClassloaderAware; import org.apache.tamaya.spi.ServiceContextManager; @@ -59,7 +59,7 @@ public class ConfigValidationDocumentationReader implements ClassloaderAware { */ public List<ConfigValidator> loadValidations(ClassLoader classLoader) { List<ConfigValidator> result = new ArrayList<>(); - DocumentedConfiguration configDoc = ConfigDocumenter.getInstance(classLoader).getDocumentation(); + ConfigurationDocumentation configDoc = ConfigDocumenter.getInstance(classLoader).getDocumentation(); for(DocumentedArea docArea: configDoc.getAllAreasSorted()){ loadValidations(docArea, result); } diff --git a/validation/src/main/java/org/apache/tamaya/validation/spi/PropertyValidator.java b/validation/src/main/java/org/apache/tamaya/validation/spi/PropertyValidator.java index b5f8efb..66a68ba 100644 --- a/validation/src/main/java/org/apache/tamaya/validation/spi/PropertyValidator.java +++ b/validation/src/main/java/org/apache/tamaya/validation/spi/PropertyValidator.java @@ -49,7 +49,7 @@ public class PropertyValidator implements ConfigValidator { * @param documentedProperty the property docs, not null. */ public PropertyValidator(DocumentedProperty documentedProperty) { - this.name = Objects.requireNonNull(documentedProperty.getName()); + this.name = Objects.requireNonNull(documentedProperty.getKeys()); this.description = documentedProperty.getDescription(); this.required = documentedProperty.isRequired(); this.owner = documentedProperty;
