Return-Path: X-Original-To: apmail-tamaya-commits-archive@minotaur.apache.org Delivered-To: apmail-tamaya-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BFA8318C13 for ; Wed, 17 Feb 2016 00:21:10 +0000 (UTC) Received: (qmail 72953 invoked by uid 500); 17 Feb 2016 00:21:10 -0000 Delivered-To: apmail-tamaya-commits-archive@tamaya.apache.org Received: (qmail 72924 invoked by uid 500); 17 Feb 2016 00:21:10 -0000 Mailing-List: contact commits-help@tamaya.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tamaya.incubator.apache.org Delivered-To: mailing list commits@tamaya.incubator.apache.org Received: (qmail 72915 invoked by uid 99); 17 Feb 2016 00:21:10 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Feb 2016 00:21:10 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 4B0781A0076 for ; Wed, 17 Feb 2016 00:21:10 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.549 X-Spam-Level: X-Spam-Status: No, score=-3.549 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.329] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id oC4OfZXPkF8c for ; Wed, 17 Feb 2016 00:21:08 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 522DB5F1B9 for ; Wed, 17 Feb 2016 00:21:07 +0000 (UTC) Received: (qmail 72556 invoked by uid 99); 17 Feb 2016 00:21:06 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Feb 2016 00:21:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 66FC7E08CD; Wed, 17 Feb 2016 00:21:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anatole@apache.org To: commits@tamaya.incubator.apache.org Date: Wed, 17 Feb 2016 00:21:09 -0000 Message-Id: In-Reply-To: <45212cbd84724b689688ddfb68809fc9@git.apache.org> References: <45212cbd84724b689688ddfb68809fc9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/5] incubator-tamaya git commit: Fixed compile issues due to extended constructor for ConversionContext. Fixed compile issues due to extended constructor for ConversionContext. Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/370c44d9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/370c44d9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/370c44d9 Branch: refs/heads/master Commit: 370c44d9b1e6f11dd7089657b0f3a1c065ae8e49 Parents: 97f6255 Author: anatole Authored: Wed Feb 17 01:16:56 2016 +0100 Committer: anatole Committed: Wed Feb 17 01:16:56 2016 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/tamaya/events/FrozenConfiguration.java | 3 ++- .../java/org/apache/tamaya/inject/internal/InjectionHelper.java | 3 ++- .../org/apache/tamaya/integration/cdi/ConfigurationProducer.java | 3 ++- .../org/apache/tamaya/integration/cdi/DefaultDynamicValue.java | 4 +++- .../java/org/apache/tamaya/spisupport/DefaultConfiguration.java | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/370c44d9/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java b/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java index 313f569..b874987 100644 --- a/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java +++ b/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java @@ -116,7 +116,8 @@ public final class FrozenConfiguration implements Configuration, Serializable { if (value != null) { List> converters = ConfigurationProvider.getConfigurationContext() .getPropertyConverters(type); - ConversionContext context = new ConversionContext.Builder(this,key,type).build(); + ConversionContext context = new ConversionContext.Builder(this, + ConfigurationProvider.getConfigurationContext(), key,type).build(); for (PropertyConverter converter : converters) { try { T t = converter.convert(value, context); http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/370c44d9/modules/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java ---------------------------------------------------------------------- diff --git a/modules/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java b/modules/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java index ed14119..1a71586 100644 --- a/modules/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java +++ b/modules/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionHelper.java @@ -187,7 +187,8 @@ final class InjectionHelper { } else { List> converters = ConfigurationProvider.getConfigurationContext() .getPropertyConverters(targetType); - ConversionContext ctx = new ConversionContext.Builder(ConfigurationProvider.getConfiguration(), key,targetType) + ConversionContext ctx = new ConversionContext.Builder(ConfigurationProvider.getConfiguration(), + ConfigurationProvider.getConfigurationContext(), key,targetType) .setAnnotatedElement(element).build(); for (PropertyConverter converter : converters) { adaptedValue = converter.convert(configValue, ctx); http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/370c44d9/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/ConfigurationProducer.java ---------------------------------------------------------------------- diff --git a/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/ConfigurationProducer.java b/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/ConfigurationProducer.java index 90bec41..bf7c6eb 100644 --- a/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/ConfigurationProducer.java +++ b/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/ConfigurationProducer.java @@ -98,7 +98,8 @@ public class ConfigurationProducer { break; } } - ConversionContext.Builder builder = new ConversionContext.Builder(config, keyFound, TypeLiteral.of(toType)); + ConversionContext.Builder builder = new ConversionContext.Builder(config, + ConfigurationProvider.getConfigurationContext(), keyFound, TypeLiteral.of(toType)); if (injectionPoint.getMember() instanceof AnnotatedElement) { builder.setAnnotatedElement((AnnotatedElement) injectionPoint.getMember()); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/370c44d9/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/DefaultDynamicValue.java ---------------------------------------------------------------------- diff --git a/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/DefaultDynamicValue.java b/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/DefaultDynamicValue.java index ae1a5cb..dbae46a 100644 --- a/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/DefaultDynamicValue.java +++ b/modules/integration/cdi/src/main/java/org/apache/tamaya/integration/cdi/DefaultDynamicValue.java @@ -20,6 +20,7 @@ package org.apache.tamaya.integration.cdi; import org.apache.tamaya.ConfigException; import org.apache.tamaya.Configuration; +import org.apache.tamaya.ConfigurationProvider; import org.apache.tamaya.TypeLiteral; import org.apache.tamaya.inject.api.BaseDynamicValue; import org.apache.tamaya.inject.api.DynamicValue; @@ -382,7 +383,8 @@ final class DefaultDynamicValue extends BaseDynamicValue { value = configuration.get(key, targetType); } else { String source = configuration.get(key); - ConversionContext ctx = new ConversionContext.Builder(configuration, key, targetType).build(); + ConversionContext ctx = new ConversionContext.Builder(configuration, + ConfigurationProvider.getConfigurationContext(), key, targetType).build(); value = propertyConverter.convert(source, ctx); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/370c44d9/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfiguration.java b/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfiguration.java index fdf5814..4dbdb77 100644 --- a/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfiguration.java +++ b/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfiguration.java @@ -185,7 +185,7 @@ public class DefaultConfiguration implements Configuration { protected T convertValue(String key, String value, TypeLiteral type) { if (value != null) { List> converters = configurationContext.getPropertyConverters(type); - ConversionContext context = new ConversionContext.Builder(this, key, type).build(); + ConversionContext context = new ConversionContext.Builder(this, configurationContext, key, type).build(); for (PropertyConverter converter : converters) { try { T t = converter.convert(value, context);