TAMAYA-274 Some minor additions. TAMAYA-353 Some minor additions.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/commit/cabe3830 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/cabe3830 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/cabe3830 Branch: refs/heads/master Commit: cabe3830aab958c74109e90022f02a68a3fe34c2 Parents: 89e3dfa Author: Anatole Tresch <[email protected]> Authored: Mon Nov 5 00:16:13 2018 +0100 Committer: Anatole Tresch <[email protected]> Committed: Mon Nov 5 00:16:13 2018 +0100 ---------------------------------------------------------------------- .../filter/internal/DefaultMetadataFilter.java | 2 +- .../tamaya/inject/ConfigurationInjection.java | 2 ++ .../tamaya/inject/ConfigurationInjector.java | 22 ++++++++++++++++++++ .../tamaya/resource/ResourceResolver.java | 6 +++--- 4 files changed, 28 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/cabe3830/modules/filter/src/main/java/org/apache/tamaya/filter/internal/DefaultMetadataFilter.java ---------------------------------------------------------------------- diff --git a/modules/filter/src/main/java/org/apache/tamaya/filter/internal/DefaultMetadataFilter.java b/modules/filter/src/main/java/org/apache/tamaya/filter/internal/DefaultMetadataFilter.java index 18bef0a..2a543ef 100644 --- a/modules/filter/src/main/java/org/apache/tamaya/filter/internal/DefaultMetadataFilter.java +++ b/modules/filter/src/main/java/org/apache/tamaya/filter/internal/DefaultMetadataFilter.java @@ -34,7 +34,7 @@ public final class DefaultMetadataFilter implements PropertyFilter{ return valueToBeFiltered; } if(ThreadBasedConfigurationFilter.isMetadataFiltered()) { - if (context.getProperty().getKey().startsWith("_")) { + if (context.getProperty().getKey().startsWith("[META]")) { // Hide metadata entries. return null; } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/cabe3830/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/ConfigurationInjection.java ---------------------------------------------------------------------- diff --git a/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/ConfigurationInjection.java b/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/ConfigurationInjection.java index ee7e379..0c3eeef 100644 --- a/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/ConfigurationInjection.java +++ b/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/ConfigurationInjection.java @@ -22,7 +22,9 @@ import org.apache.tamaya.spi.ServiceContextManager; /** * Singleton accessor class for accessing {@link ConfigurationInjector} instances. + * @deprecated Use {@link ConfigurationInjector} */ +@Deprecated public final class ConfigurationInjection { /** http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/cabe3830/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/ConfigurationInjector.java ---------------------------------------------------------------------- diff --git a/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/ConfigurationInjector.java b/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/ConfigurationInjector.java index 205bea2..0b1331e 100644 --- a/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/ConfigurationInjector.java +++ b/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/ConfigurationInjector.java @@ -20,6 +20,7 @@ package org.apache.tamaya.inject; import org.apache.tamaya.Configuration; +import org.apache.tamaya.spi.ServiceContextManager; import java.util.function.Supplier; @@ -95,4 +96,25 @@ public interface ConfigurationInjector { */ <T> Supplier<T> getConfiguredSupplier(Supplier<T> supplier, Configuration config); + /** + * Get the current injector instance, using the default classloader. + * + * @return the current injector, not null. + */ + static ConfigurationInjector getInstance() { + return ServiceContextManager.getServiceContext(ServiceContextManager.getDefaultClassLoader()) + .getService(ConfigurationInjector.class); + } + + /** + * Get the current injector instance, using the given target classloader. + * + * @param classLoader the classloader, not null. + * @return the current injector, not null. + */ + static ConfigurationInjector getInstance(ClassLoader classLoader) { + return ServiceContextManager.getServiceContext(classLoader) + .getService(ConfigurationInjector.class); + } + } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/cabe3830/modules/resources/src/main/java/org/apache/tamaya/resource/ResourceResolver.java ---------------------------------------------------------------------- diff --git a/modules/resources/src/main/java/org/apache/tamaya/resource/ResourceResolver.java b/modules/resources/src/main/java/org/apache/tamaya/resource/ResourceResolver.java index f498193..8907d79 100644 --- a/modules/resources/src/main/java/org/apache/tamaya/resource/ResourceResolver.java +++ b/modules/resources/src/main/java/org/apache/tamaya/resource/ResourceResolver.java @@ -87,8 +87,8 @@ public interface ResourceResolver { * @return the current ResourceResolver instance, never null. * @see ServiceContextManager#getDefaultClassLoader() */ - static ResourceResolver current() throws ConfigException { - return current(ServiceContextManager.getDefaultClassLoader()); + static ResourceResolver getInstance() throws ConfigException { + return getInstance(ServiceContextManager.getDefaultClassLoader()); } /** @@ -98,7 +98,7 @@ public interface ResourceResolver { * * @return the current ResourceResolver instance, never null. */ - static ResourceResolver current(ClassLoader classLoader) throws ConfigException { + static ResourceResolver getInstance(ClassLoader classLoader) throws ConfigException { ResourceResolver resolver = ServiceContextManager.getServiceContext(classLoader) .getService(ResourceResolver.class); if (resolver == null) {
