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 2015/01/18 01:16:43 UTC

incubator-tamaya git commit: Fixed some minor issues.

Repository: incubator-tamaya
Updated Branches:
  refs/heads/master bfbaefa43 -> 449b752ea


Fixed some minor issues.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/449b752e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/449b752e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/449b752e

Branch: refs/heads/master
Commit: 449b752ea9d2f32c23835d76d57fcdd8c6500067
Parents: bfbaefa
Author: anatole <an...@apache.org>
Authored: Sun Jan 18 01:16:35 2015 +0100
Committer: anatole <an...@apache.org>
Committed: Sun Jan 18 01:16:35 2015 +0100

----------------------------------------------------------------------
 .../apache/tamaya/core/internal/converters/BooleanConverter.java  | 3 ++-
 .../apache/tamaya/core/internal/converters/CurrencyConverter.java | 3 ++-
 .../org/apache/tamaya/core/internal/converters/EnumConverter.java | 2 --
 3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/449b752e/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/BooleanConverter.java
----------------------------------------------------------------------
diff --git a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/BooleanConverter.java b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/BooleanConverter.java
index 47e53ea..9b51d1e 100644
--- a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/BooleanConverter.java
+++ b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/BooleanConverter.java
@@ -20,6 +20,7 @@ package org.apache.tamaya.core.internal.converters;
 
 import org.apache.tamaya.spi.PropertyConverter;
 
+import java.util.Locale;
 import java.util.logging.Logger;
 
 /**
@@ -36,7 +37,7 @@ public class BooleanConverter implements PropertyConverter<Boolean> {
 
     @Override
     public Boolean convert(String value) {
-        String ignoreCaseValue = value.toLowerCase();
+        String ignoreCaseValue = value.toLowerCase(Locale.ENGLISH);
         switch(ignoreCaseValue) {
             case "yes":
             case "y":

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/449b752e/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/CurrencyConverter.java
----------------------------------------------------------------------
diff --git a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/CurrencyConverter.java b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/CurrencyConverter.java
index 6cd5c67..bd92abd 100644
--- a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/CurrencyConverter.java
+++ b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/CurrencyConverter.java
@@ -21,6 +21,7 @@ package org.apache.tamaya.core.internal.converters;
 import org.apache.tamaya.spi.PropertyConverter;
 
 import java.util.Currency;
+import java.util.Locale;
 import java.util.Objects;
 
 /**
@@ -35,6 +36,6 @@ public class CurrencyConverter implements PropertyConverter<Currency>{
     @Override
     public Currency convert(String value) {
         String trimmed = Objects.requireNonNull(value).trim();
-        return Currency.getInstance(trimmed.toUpperCase());
+        return Currency.getInstance(trimmed.toUpperCase(Locale.ENGLISH));
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/449b752e/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/EnumConverter.java
----------------------------------------------------------------------
diff --git a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/EnumConverter.java b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/EnumConverter.java
index 0440ef2..b7d1869 100644
--- a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/EnumConverter.java
+++ b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/EnumConverter.java
@@ -53,9 +53,7 @@ public class EnumConverter<T> implements PropertyConverter<T> {
 
     @Override
     public T convert(String value) {
-        String trimmed = Objects.requireNonNull(value).trim();
         try {
-            Method m = enumType.getMethod("valueOf", String.class);
             return (T) factory.invoke(null, value);
         } catch (Exception e) {
             throw new ConfigException("Invalid enum value '" + value + "' for " + enumType.getName());