You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by pl...@apache.org on 2015/01/28 18:35:48 UTC
[1/3] incubator-tamaya git commit: Improved exception message in
DefaultConfiguration.
Repository: incubator-tamaya
Updated Branches:
refs/heads/master 16d4a3f95 -> cc284de3c
Improved exception message in DefaultConfiguration.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/f43f697b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/f43f697b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/f43f697b
Branch: refs/heads/master
Commit: f43f697b579db40f70f5c07b4cbfd0c06218b86e
Parents: 16d4a3f
Author: Oliver B. Fischer <pl...@apache.org>
Authored: Wed Jan 28 17:27:41 2015 +0100
Committer: Oliver B. Fischer <pl...@apache.org>
Committed: Wed Jan 28 17:27:41 2015 +0100
----------------------------------------------------------------------
.../org/apache/tamaya/core/internal/DefaultConfiguration.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f43f697b/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java
----------------------------------------------------------------------
diff --git a/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java b/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java
index ee827b7..feb09a0 100644
--- a/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java
+++ b/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java
@@ -227,7 +227,9 @@ public class DefaultConfiguration implements Configuration {
" failed to convert value: " + value.get());
}
}
- throw new ConfigException("Unparseable config value for type: " + type.getType() + ": " + key);
+
+ throw new ConfigException("Unable to convert config for key " +
+ key + " value in type " + type.getType());
}
return null;
[2/3] incubator-tamaya git commit: Corrected the new error message.
Fix for the improvement.
Posted by pl...@apache.org.
Corrected the new error message. Fix for the improvement.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/4de81502
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/4de81502
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/4de81502
Branch: refs/heads/master
Commit: 4de81502831249e447facbe20352d07c3d5d7b88
Parents: f43f697
Author: Oliver B. Fischer <pl...@apache.org>
Authored: Wed Jan 28 17:31:37 2015 +0100
Committer: Oliver B. Fischer <pl...@apache.org>
Committed: Wed Jan 28 17:31:37 2015 +0100
----------------------------------------------------------------------
.../org/apache/tamaya/core/internal/DefaultConfiguration.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/4de81502/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java
----------------------------------------------------------------------
diff --git a/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java b/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java
index feb09a0..d49f05d 100644
--- a/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java
+++ b/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java
@@ -228,8 +228,8 @@ public class DefaultConfiguration implements Configuration {
}
}
- throw new ConfigException("Unable to convert config for key " +
- key + " value in type " + type.getType());
+ throw new ConfigException("Unable to convert config value for key " +
+ key + " in type " + type.getType());
}
return null;
[3/3] incubator-tamaya git commit: TAMAYA-60 The
PropertyConverterManager can now use static methods as factory method.
Posted by pl...@apache.org.
TAMAYA-60 The PropertyConverterManager can now use static methods as factory method.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/cc284de3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/cc284de3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/cc284de3
Branch: refs/heads/master
Commit: cc284de3cb41605188627f4aa90b013258ae4e1e
Parents: 4de8150
Author: Oliver B. Fischer <pl...@apache.org>
Authored: Wed Jan 28 18:34:55 2015 +0100
Committer: Oliver B. Fischer <pl...@apache.org>
Committed: Wed Jan 28 18:34:55 2015 +0100
----------------------------------------------------------------------
.../core/internal/PropertyConverterManager.java | 11 ++-
.../internal/PropertyConverterManagerTest.java | 77 ++++++++++++++++++++
2 files changed, 87 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/cc284de3/java8/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
----------------------------------------------------------------------
diff --git a/java8/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java b/java8/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
index a06d3d1..4c60706 100644
--- a/java8/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
+++ b/java8/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
@@ -20,6 +20,7 @@ package org.apache.tamaya.core.internal;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.ArrayList;
@@ -181,8 +182,16 @@ public class PropertyConverterManager {
if (factoryMethod != null) {
converter = (value) -> {
try {
+ if (!Modifier.isStatic(factoryMethod.getModifiers())) {
+ throw new RuntimeException(factoryMethod.toGenericString() +
+ " is not a static method. Only static " +
+ "methods can be used as factory methods.");
+ }
+
factoryMethod.setAccessible(true);
- return targetType.getRawType().cast(factoryMethod.invoke(value));
+
+ Object invoke = factoryMethod.invoke(null, value);
+ return targetType.getRawType().cast(invoke);
} catch (Exception e) {
throw new ConfigException("Failed to decode '" + value + "'", e);
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/cc284de3/java8/core/src/test/java/org/apache/tamaya/core/internal/PropertyConverterManagerTest.java
----------------------------------------------------------------------
diff --git a/java8/core/src/test/java/org/apache/tamaya/core/internal/PropertyConverterManagerTest.java b/java8/core/src/test/java/org/apache/tamaya/core/internal/PropertyConverterManagerTest.java
new file mode 100644
index 0000000..332105a
--- /dev/null
+++ b/java8/core/src/test/java/org/apache/tamaya/core/internal/PropertyConverterManagerTest.java
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tamaya.core.internal;
+
+
+import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.TypeLiteral;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
+
+public class PropertyConverterManagerTest {
+ @Test
+ public void customTypeWithFactoryMethodOfIsRecognizedAsSupported() {
+ PropertyConverterManager manager = new PropertyConverterManager();
+
+ assertThat(manager.isTargetTypeSupported(TypeLiteral.of(MyType.class)),
+ is(true));
+ }
+
+ @Test
+ public void factoryMethodOfIsUsedAsConverter() {
+ PropertyConverterManager manager = new PropertyConverterManager();
+
+ List<PropertyConverter<Object>> converters = manager.getPropertyConverters(TypeLiteral.of(MyType.class));
+
+ assertThat(converters, hasSize(1));
+
+ PropertyConverter<Object> converter = converters.get(0);
+
+ Object result = converter.convert("IN");
+
+ assertThat(result, notNullValue());
+ assertThat(result, instanceOf(MyType.class));
+ assertThat(((MyType)result).getValue(), equalTo("IN"));
+ }
+
+ public static class MyType {
+ private String typeValue;
+
+ private MyType(String value) {
+ typeValue = value;
+ }
+
+ public static MyType of(String source) {
+ return new MyType(source);
+ }
+
+ public String getValue() {
+ return typeValue;
+ }
+
+ }
+}
\ No newline at end of file