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 e05158740a4d2827cd57e9a022b2e65cdccbbe77 Author: Anatole Tresch <[email protected]> AuthorDate: Thu Feb 21 23:16:52 2019 +0100 TAMAYA-378 Improved injection API for more transparent key resolution. --- .../apache/tamaya/remote/BaseRemotePropertySource.java | 5 ----- .../org/apache/tamaya/validation/ValidationCheck.java | 2 +- .../internal/ConfigValidationDocumentationReader.java | 16 ++++++++-------- .../org/apache/tamaya/validation/spi/AreaValidator.java | 2 +- .../apache/tamaya/validation/spi/PropertyValidator.java | 2 +- .../apache/tamaya/vertx/TamayaConfigurationProducer.java | 6 +++--- .../org/apache/tamaya/vertx/TestInjectedVerticle.java | 6 +++--- .../test/java/org/apache/tamaya/vertx/TestVerticle.java | 6 +++--- 8 files changed, 20 insertions(+), 25 deletions(-) diff --git a/remote/src/main/java/org/apache/tamaya/remote/BaseRemotePropertySource.java b/remote/src/main/java/org/apache/tamaya/remote/BaseRemotePropertySource.java index a6a203b..92afd1d 100644 --- a/remote/src/main/java/org/apache/tamaya/remote/BaseRemotePropertySource.java +++ b/remote/src/main/java/org/apache/tamaya/remote/BaseRemotePropertySource.java @@ -114,11 +114,6 @@ public abstract class BaseRemotePropertySource implements PropertySource{ } @Override - public boolean isScannable(){ - return true; - } - - @Override public PropertyValue get(String key) { return getProperties().get(key); } 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 72a324d..085a35b 100644 --- a/validation/src/main/java/org/apache/tamaya/validation/ValidationCheck.java +++ b/validation/src/main/java/org/apache/tamaya/validation/ValidationCheck.java @@ -192,7 +192,7 @@ public final class ValidationCheck { } if (source instanceof ConfigPropertySpec) { ConfigPropertySpec pspec = (ConfigPropertySpec) source; - return result + ": " + pspec.key() + " (property)"+finalMessage + '\n'; + return result + ": " + pspec.keys() + " (property)"+finalMessage + '\n'; } else if (source instanceof ConfigAreaSpec) { ConfigAreaSpec gspec = (ConfigAreaSpec) source; return result + ": " + gspec.basePaths() + " (group)"+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 7875fa7..b09295c 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.ConfigurationDocumentation; +import org.apache.tamaya.doc.DocumentedConfiguration; 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<>(); - ConfigurationDocumentation configDoc = ConfigDocumenter.getInstance(classLoader).getDocumentation(); + DocumentedConfiguration configDoc = ConfigDocumenter.getInstance(classLoader).getDocumentation(); for(DocumentedArea docArea: configDoc.getAllAreasSorted()){ loadValidations(docArea, result); } @@ -71,12 +71,12 @@ public class ConfigValidationDocumentationReader implements ClassloaderAware { private void loadValidations(DocumentedArea docArea, List<ConfigValidator> result) { result.add(new AreaValidator(docArea)); - for(DocumentedProperty propDoc:docArea.getPropertiesSorted()){ - result.add(new PropertyValidator(propDoc)); - } - for(DocumentedArea area:docArea.getAreasSorted()){ - loadValidations(area, result); - } +// for(DocumentedProperty propDoc:docArea.getPropertiesSorted()){ +// result.add(new PropertyValidator(propDoc)); +// } +// for(DocumentedArea area:docArea.getAreasSorted()){ +// loadValidations(area, result); +// } } @Override diff --git a/validation/src/main/java/org/apache/tamaya/validation/spi/AreaValidator.java b/validation/src/main/java/org/apache/tamaya/validation/spi/AreaValidator.java index 94dc19d..715057a 100644 --- a/validation/src/main/java/org/apache/tamaya/validation/spi/AreaValidator.java +++ b/validation/src/main/java/org/apache/tamaya/validation/spi/AreaValidator.java @@ -52,7 +52,7 @@ public class AreaValidator implements ConfigValidator { * @param documentedArea the property docs, not null. */ public AreaValidator(DocumentedArea documentedArea) { - this.name = Objects.requireNonNull(documentedArea.getPath()); + this.name = Objects.requireNonNull(documentedArea.getBasePaths().iterator().next()); this.description = documentedArea.getDescription(); this.minCardinality = documentedArea.getMinCardinality(); this.maxCardinality = documentedArea.getMaxCardinality(); 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 66a68ba..f934840 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.getKeys()); + this.name = Objects.requireNonNull(documentedProperty.getKeys().iterator().next()); this.description = documentedProperty.getDescription(); this.required = documentedProperty.isRequired(); this.owner = documentedProperty; diff --git a/vertx/src/main/java/org/apache/tamaya/vertx/TamayaConfigurationProducer.java b/vertx/src/main/java/org/apache/tamaya/vertx/TamayaConfigurationProducer.java index 03d287b..d8af31e 100644 --- a/vertx/src/main/java/org/apache/tamaya/vertx/TamayaConfigurationProducer.java +++ b/vertx/src/main/java/org/apache/tamaya/vertx/TamayaConfigurationProducer.java @@ -47,13 +47,13 @@ public class TamayaConfigurationProducer extends AbstractConfiguredVerticle{ public static final String DEFAULT_CONFIG_GET_MULTI_ADDRESS = "CONFIG.GET.MAP"; public static final String DEFAULT_CONFIG_GET_SINGLE_ADDRESS = "CONFIG.GET.SINGLE"; - @Config(value = "tamaya.vertx.busaddress.inject", defaultValue = DEFAULT_CONFIGRE_ADDRESS) + @Config(key = "tamaya.vertx.busaddress.inject", defaultValue = DEFAULT_CONFIGRE_ADDRESS) private String injectionBusTarget; - @Config(value = "tamaya.vertx.busaddress.multi", defaultValue = DEFAULT_CONFIG_GET_MULTI_ADDRESS) + @Config(key = "tamaya.vertx.busaddress.multi", defaultValue = DEFAULT_CONFIG_GET_MULTI_ADDRESS) private String mapBusTarget; - @Config(value = "tamaya.vertx.busaddress.single", defaultValue = DEFAULT_CONFIG_GET_SINGLE_ADDRESS) + @Config(key = "tamaya.vertx.busaddress.single", defaultValue = DEFAULT_CONFIG_GET_SINGLE_ADDRESS) private String singleBusTarget; diff --git a/vertx/src/test/java/org/apache/tamaya/vertx/TestInjectedVerticle.java b/vertx/src/test/java/org/apache/tamaya/vertx/TestInjectedVerticle.java index bce913c..3fa1d96 100644 --- a/vertx/src/test/java/org/apache/tamaya/vertx/TestInjectedVerticle.java +++ b/vertx/src/test/java/org/apache/tamaya/vertx/TestInjectedVerticle.java @@ -33,13 +33,13 @@ import java.math.BigDecimal; */ public class TestInjectedVerticle extends AbstractVerticle{ - @Config("user.name") + @Config(key="user.name") public String userName; - @Config("user.home") + @Config(key="user.home") public String userHome; - @Config(value = "any.number.BD", defaultValue = "1.123456789") + @Config(key= "any.number.BD", defaultValue = "1.123456789") public BigDecimal anyNumber; @Override diff --git a/vertx/src/test/java/org/apache/tamaya/vertx/TestVerticle.java b/vertx/src/test/java/org/apache/tamaya/vertx/TestVerticle.java index 8ec90ec..345254e 100644 --- a/vertx/src/test/java/org/apache/tamaya/vertx/TestVerticle.java +++ b/vertx/src/test/java/org/apache/tamaya/vertx/TestVerticle.java @@ -27,13 +27,13 @@ import java.math.BigDecimal; */ public class TestVerticle extends AbstractConfiguredVerticle{ - @Config("user.name") + @Config(key="user.name") String userName; - @Config("user.home") + @Config(key="user.home") String userHome; - @Config(value = "any.number.BD", defaultValue = "1.123456789") + @Config(key= "any.number.BD", defaultValue = "1.123456789") BigDecimal anyNumber; public TestVerticle(){
