TAMAYA-260 Cleaning up how TCK runs.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/commit/96593c76 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/96593c76 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/96593c76 Branch: refs/heads/master Commit: 96593c764871af6b2317bade9745b45a8efedd08 Parents: 3aad356 Author: John Ament <[email protected]> Authored: Tue Oct 3 13:56:51 2017 -0400 Committer: John Ament <[email protected]> Committed: Tue Oct 3 13:56:51 2017 -0400 ---------------------------------------------------------------------- .../apache/tamaya/microprofile/TamayaConfiguration.java | 5 ----- .../cdi/MicroprofileConfigurationProducer.java | 11 +++++++---- .../tamaya/microprofile/converter/ProviderConverter.java | 3 +-- 3 files changed, 8 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/96593c76/microprofile/src/main/java/org/apache/tamaya/microprofile/TamayaConfiguration.java ---------------------------------------------------------------------- diff --git a/microprofile/src/main/java/org/apache/tamaya/microprofile/TamayaConfiguration.java b/microprofile/src/main/java/org/apache/tamaya/microprofile/TamayaConfiguration.java index 7b5a73c..0f27821 100644 --- a/microprofile/src/main/java/org/apache/tamaya/microprofile/TamayaConfiguration.java +++ b/microprofile/src/main/java/org/apache/tamaya/microprofile/TamayaConfiguration.java @@ -72,11 +72,6 @@ public class TamayaConfiguration implements Configuration{ } @Override - public <T> T getFromValue(String value, TypeLiteral<T> targetType) { - return ConfigurationProvider.getConfiguration().getFromValue(value, targetType); - } - - @Override public Map<String, String> getProperties() { return null; } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/96593c76/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileConfigurationProducer.java ---------------------------------------------------------------------- diff --git a/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileConfigurationProducer.java b/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileConfigurationProducer.java index 15f8c91..8445407 100644 --- a/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileConfigurationProducer.java +++ b/microprofile/src/main/java/org/apache/tamaya/microprofile/cdi/MicroprofileConfigurationProducer.java @@ -33,6 +33,7 @@ import javax.enterprise.inject.Produces; import javax.enterprise.inject.spi.AnnotatedField; import javax.enterprise.inject.spi.AnnotatedType; import javax.enterprise.inject.spi.InjectionPoint; +import javax.inject.Provider; import java.lang.reflect.AnnotatedElement; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; @@ -84,15 +85,17 @@ public class MicroprofileConfigurationProducer { Configuration config = ConfigurationProvider.getConfiguration(); ConversionContext.Builder builder = new ConversionContext.Builder(config, ConfigurationProvider.getConfiguration().getContext(), key, TypeLiteral.of(targetType)); - if (injectionPoint.getMember() instanceof AnnotatedElement) { - builder.setAnnotatedElement((AnnotatedElement) injectionPoint.getMember()); - } if(targetType instanceof ParameterizedType){ ParameterizedType pt = (ParameterizedType)targetType; if(pt.getRawType().equals(Provider.class)) { - builder.setTargetType(TypeLiteral.of(pt.getActualTypeArguments()[0])); + builder = new ConversionContext.Builder(config, + ConfigurationProvider.getConfiguration().getContext(), key, + TypeLiteral.of(pt.getActualTypeArguments()[0])); } } + if (injectionPoint.getMember() instanceof AnnotatedElement) { + builder.setAnnotatedElement((AnnotatedElement) injectionPoint.getMember()); + } return builder.build(); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/96593c76/microprofile/src/main/java/org/apache/tamaya/microprofile/converter/ProviderConverter.java ---------------------------------------------------------------------- diff --git a/microprofile/src/main/java/org/apache/tamaya/microprofile/converter/ProviderConverter.java b/microprofile/src/main/java/org/apache/tamaya/microprofile/converter/ProviderConverter.java index 1983e3d..b8b5068 100644 --- a/microprofile/src/main/java/org/apache/tamaya/microprofile/converter/ProviderConverter.java +++ b/microprofile/src/main/java/org/apache/tamaya/microprofile/converter/ProviderConverter.java @@ -26,7 +26,6 @@ import org.apache.tamaya.spi.PropertyConverter; import javax.annotation.Priority; import javax.inject.Provider; import java.lang.reflect.Type; -import java.util.Objects; import java.util.logging.Logger; /** @@ -42,7 +41,7 @@ public class ProviderConverter implements PropertyConverter<Provider> { return () -> { try{ Type targetType = context.getTargetType().getType(); - return context.getConfiguration().getFromValue(value, TypeLiteral.of(targetType)); + return context.getConfiguration().get(value, TypeLiteral.of(targetType)); }catch(Exception e){ throw new ConfigException("Error evaluating config value.", e); }
