You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by an...@apache.org on 2016/02/17 01:21:09 UTC
[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 <an...@apache.org>
Authored: Wed Feb 17 01:16:56 2016 +0100
Committer: anatole <an...@apache.org>
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<PropertyConverter<T>> 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<T> 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<PropertyConverter<T>> 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<T> 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<T> extends BaseDynamicValue<T> {
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> T convertValue(String key, String value, TypeLiteral<T> type) {
if (value != null) {
List<PropertyConverter<T>> 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<T> converter : converters) {
try {
T t = converter.convert(value, context);