You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by jo...@apache.org on 2015/01/06 03:06:57 UTC
incubator-tamaya git commit: TAMAYA-42 Minor javadoc clarification.
Removed unused field. Removed code duplication from char converter.
Repository: incubator-tamaya
Updated Branches:
refs/heads/master ea651771f -> f15ed8d5c
TAMAYA-42 Minor javadoc clarification. Removed unused field. Removed code duplication from char converter.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/f15ed8d5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/f15ed8d5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/f15ed8d5
Branch: refs/heads/master
Commit: f15ed8d5cda0a7f3e13baea36dc49fba42b00783
Parents: ea65177
Author: John D. Ament <jo...@apache.org>
Authored: Mon Jan 5 21:06:53 2015 -0500
Committer: John D. Ament <jo...@apache.org>
Committed: Mon Jan 5 21:06:53 2015 -0500
----------------------------------------------------------------------
.../java/org/apache/tamaya/spi/ConfigurationContext.java | 2 +-
.../tamaya/core/internal/DefaultConfigurationContext.java | 2 --
.../tamaya/core/internal/PropertyConverterManager.java | 9 ++++++---
3 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f15ed8d5/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java b/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java
index 27bc52e..efad465 100644
--- a/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java
+++ b/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java
@@ -47,7 +47,7 @@ public interface ConfigurationContext {
* PropertySources are loaded when this method is called the first time, which basically is
* when the first time configuration is accessed.
*
- * @return sorted list of registered PropertySources
+ * @return a sorted list of registered PropertySources. The returned list need not be modifiable
*/
List<PropertySource> getPropertySources();
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f15ed8d5/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContext.java b/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContext.java
index a2705ef..b367d25 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContext.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContext.java
@@ -40,8 +40,6 @@ import java.util.logging.Logger;
* Default Implementation of a simple ConfigurationContext.
*/
public class DefaultConfigurationContext implements ConfigurationContext {
-
- private static final Logger LOG = Logger.getLogger(DefaultConfigurationContext.class.getName());
/**
* Cubcomponent handling {@link org.apache.tamaya.spi.PropertyConverter} instances.
*/
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f15ed8d5/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java b/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
index 86c8ebe..5c7ae02 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
@@ -52,7 +52,7 @@ public class PropertyConverterManager {
private Map<Class<?>, List<PropertyConverter<?>>> converters = new ConcurrentHashMap<>();
/** The lock used. */
private StampedLock lock = new StampedLock();
-
+ private static final String CHAR_NULL_ERROR = "Cannot convert null property";
/**
* Constructor.
*/
@@ -60,12 +60,15 @@ public class PropertyConverterManager {
initDefaultConverters();
}
+ private static final PropertyConverter<Character> CHAR_CONVERTER =
+ (s) -> Objects.requireNonNull(s,CHAR_NULL_ERROR).charAt(0);
+
/**
* Registers the default converters provided out of the box.
*/
protected void initDefaultConverters() {
// Add default converters
- register(char.class, (s) -> s != null ? s.charAt(0) : null);
+ register(char.class, CHAR_CONVERTER);
register(byte.class, Byte::parseByte);
register(short.class, Short::parseShort);
register(int.class, Integer::parseInt);
@@ -74,7 +77,7 @@ public class PropertyConverterManager {
register(float.class, Float::parseFloat); //X TODO not good enough as this is Locale dependent!
register(double.class, Double::parseDouble); //X TODO not good enough as this is Locale dependent!
- register(Character.class, (s) -> s != null ? s.charAt(0) : null );
+ register(Character.class, CHAR_CONVERTER);
register(Byte.class, Byte::valueOf);
register(Short.class, Short::valueOf);
register(Integer.class, Integer::valueOf);