Repository: incubator-tamaya-extensions Updated Branches: refs/heads/master 6fda13b48 -> bb73cdbfb
TAMAYA-260 Fixed MP Optional and Provider injection (and a corresponding issue in core in the Optional converter). 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/bb73cdbf Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/bb73cdbf Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/bb73cdbf Branch: refs/heads/master Commit: bb73cdbfb077ca0933271e8de7a4652127d90f67 Parents: 6fda13b Author: Anatole Tresch <[email protected]> Authored: Thu Oct 12 11:46:47 2017 +0200 Committer: Anatole Tresch <[email protected]> Committed: Thu Oct 12 11:47:32 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/tamaya/inject/ConfigurationInjector.java | 3 ++- .../tamaya/inject/internal/DefaultConfigurationInjector.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/bb73cdbf/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 075a62d..b9e64e0 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,7 +20,8 @@ package org.apache.tamaya.inject; import org.apache.tamaya.Configuration; -import org.apache.tamaya.functions.Supplier; + +import java.util.function.Supplier; /** * Accessor interface for injection of configuration and configuration templates. http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/bb73cdbf/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/internal/DefaultConfigurationInjector.java ---------------------------------------------------------------------- diff --git a/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/internal/DefaultConfigurationInjector.java b/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/internal/DefaultConfigurationInjector.java index 8ad6b7c..ef2f2ce 100644 --- a/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/internal/DefaultConfigurationInjector.java +++ b/modules/injection/standalone/src/main/java/org/apache/tamaya/inject/internal/DefaultConfigurationInjector.java @@ -20,7 +20,6 @@ package org.apache.tamaya.inject.internal; import org.apache.tamaya.Configuration; import org.apache.tamaya.ConfigurationProvider; -import org.apache.tamaya.functions.Supplier; import org.apache.tamaya.inject.ConfigurationInjector; import javax.annotation.Priority; @@ -30,6 +29,7 @@ import java.lang.reflect.Proxy; import java.util.Map; import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Supplier; import java.util.logging.Logger; import org.apache.tamaya.inject.api.NoConfig; @@ -43,7 +43,7 @@ import org.osgi.service.component.annotations.Component; */ @Priority(0) @Component -public final class DefaultConfigurationInjector implements ConfigurationInjector { +public class DefaultConfigurationInjector implements ConfigurationInjector { private final Map<Class<?>, ConfiguredType> configuredTypes = new ConcurrentHashMap<>();
