Updated ConverterOptions to provide defaults

jdereg · Jan 14, 2024 · 9c22810 · 9c22810
1 parent e227a0b
commit 9c22810
Show file tree

Hide file tree

Showing 12 changed files with 247 additions and 233 deletions.
diff --git a/src/main/java/com/cedarsoftware/util/convert/AtomicBooleanConversion.java b/src/main/java/com/cedarsoftware/util/convert/AtomicBooleanConversion.java
@@ -27,6 +27,21 @@ public static Long toLong(Object from, Converter converter, ConverterOptions opt
         return b.get() ? CommonValues.LONG_ONE : CommonValues.LONG_ZERO;
     }
 
+    public static Float toFloat(Object from, Converter converter, ConverterOptions options) {
+        AtomicBoolean b = (AtomicBoolean) from;
+        return b.get() ? CommonValues.FLOAT_ONE : CommonValues.FLOAT_ZERO;
+    }
+
+    public static Double toDouble(Object from, Converter converter, ConverterOptions options) {
+        AtomicBoolean b = (AtomicBoolean) from;
+        return b.get() ? CommonValues.DOUBLE_ONE : CommonValues.DOUBLE_ZERO;
+    }
+
+    public static boolean toBoolean(Object from, Converter converter, ConverterOptions options) {
+        AtomicBoolean b = (AtomicBoolean) from;
+        return b.get();
+    }
+
     public static AtomicInteger toAtomicInteger(Object from, Converter converter, ConverterOptions options) {
         AtomicBoolean b = (AtomicBoolean) from;
         return b.get() ? new AtomicInteger(1) : new AtomicInteger (0);

diff --git a/src/main/java/com/cedarsoftware/util/convert/BooleanConversion.java b/src/main/java/com/cedarsoftware/util/convert/BooleanConversion.java
@@ -25,22 +25,27 @@
 public class BooleanConversion {
     public static Byte toByte(Object from, Converter converter, ConverterOptions options) {
         Boolean b = (Boolean) from;
-        return b.booleanValue() ? CommonValues.BYTE_ONE : CommonValues.BYTE_ZERO;
+        return b ? CommonValues.BYTE_ONE : CommonValues.BYTE_ZERO;
     }
 
     public static Short toShort(Object from, Converter converter, ConverterOptions options) {
         Boolean b = (Boolean) from;
-        return b.booleanValue() ? CommonValues.SHORT_ONE : CommonValues.SHORT_ZERO;
+        return b ? CommonValues.SHORT_ONE : CommonValues.SHORT_ZERO;
     }
 
     public static Integer toInteger(Object from, Converter converter, ConverterOptions options) {
         Boolean b = (Boolean) from;
-        return b.booleanValue() ? CommonValues.INTEGER_ONE : CommonValues.INTEGER_ZERO;
+        return b ? CommonValues.INTEGER_ONE : CommonValues.INTEGER_ZERO;
     }
 
     public static AtomicLong toAtomicLong(Object from, Converter converter, ConverterOptions options) {
         Boolean b = (Boolean) from;
-        return new AtomicLong(b.booleanValue() ? 1 : 0);
+        return new AtomicLong(b ? 1 : 0);
+    }
+
+    public static AtomicBoolean toAtomicBoolean(Object from, Converter converter, ConverterOptions options) {
+        Boolean b = (Boolean) from;
+        return new AtomicBoolean(b);
     }
 
     public static Long toLong(Object from, Converter converter, ConverterOptions options) {
@@ -55,46 +60,16 @@ public static BigDecimal toBigDecimal(Object from, Converter converter, Converte
 
     public static Float toFloat(Object from, Converter converter, ConverterOptions options) {
         Boolean b = (Boolean) from;
-        return b.booleanValue() ? CommonValues.FLOAT_ONE : CommonValues.FLOAT_ZERO;
+        return b ? CommonValues.FLOAT_ONE : CommonValues.FLOAT_ZERO;
     }
 
     public static Double toDouble(Object from, Converter converter, ConverterOptions options) {
         Boolean b = (Boolean) from;
-        return b.booleanValue() ? CommonValues.DOUBLE_ONE : CommonValues.DOUBLE_ZERO;
-    }
-
-    public static Float atomicToFloat(Object from, Converter converter, ConverterOptions options) {
-        AtomicBoolean b = (AtomicBoolean) from;
-        return b.get() ? CommonValues.FLOAT_ONE : CommonValues.FLOAT_ZERO;
-    }
-
-    public static Double atomicToDouble(Object from, Converter converter, ConverterOptions options) {
-        AtomicBoolean b = (AtomicBoolean) from;
-        return b.get() ? CommonValues.DOUBLE_ONE : CommonValues.DOUBLE_ZERO;
-    }
-
-    public static Byte atomicToByte(Object from, Converter converter, ConverterOptions options) {
-        AtomicBoolean b = (AtomicBoolean) from;
-        return b.get() ? CommonValues.BYTE_ONE : CommonValues.BYTE_ZERO;
-    }
-
-    public static Short atomicToShort(Object from, Converter converter, ConverterOptions options) {
-        AtomicBoolean b = (AtomicBoolean) from;
-        return b.get() ? CommonValues.SHORT_ONE : CommonValues.SHORT_ZERO;
-    }
-
-    public static Integer atomicToInteger(Object from, Converter converter, ConverterOptions options) {
-        AtomicBoolean b = (AtomicBoolean) from;
-        return b.get() ? CommonValues.INTEGER_ONE : CommonValues.INTEGER_ZERO;
-    }
-
-    public static Long atomicToLong(Object from, Converter converter, ConverterOptions options) {
-        AtomicBoolean b = (AtomicBoolean) from;
-        return b.get() ? CommonValues.LONG_ONE : CommonValues.LONG_ZERO;
+        return b ? CommonValues.DOUBLE_ONE : CommonValues.DOUBLE_ZERO;
     }
 
-    public static Long atomicToCharacter(Object from, Converter converter, ConverterOptions options) {
-        AtomicBoolean b = (AtomicBoolean) from;
-        return b.get() ? CommonValues.LONG_ONE : CommonValues.LONG_ZERO;
+    public static char toCharacter(Object from, Converter converter, ConverterOptions options) {
+        Boolean b = (Boolean) from;
+        return b ? CommonValues.CHARACTER_ONE : CommonValues.CHARACTER_ZERO;
     }
 }
diff --git a/src/main/java/com/cedarsoftware/util/convert/CharacterConversion.java b/src/main/java/com/cedarsoftware/util/convert/CharacterConversion.java
@@ -0,0 +1,18 @@
+package com.cedarsoftware.util.convert;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class CharacterConversion {
+    public static boolean toBoolean(Object from, Converter converter, ConverterOptions options) {
+        Character c = (Character) from;
+        return c != CommonValues.CHARACTER_ZERO;
+    }
+
+    public static double toDouble(Object from, Converter converter, ConverterOptions options) {
+        return (char) from;
+    }
+
+    public static float toFloat(Object from, Converter converter, ConverterOptions options) {
+        return (char) from;
+    }
+}
diff --git a/src/main/java/com/cedarsoftware/util/convert/CommonValues.java b/src/main/java/com/cedarsoftware/util/convert/CommonValues.java
@@ -31,7 +31,7 @@ public class CommonValues {
     public static final Double DOUBLE_ZERO = 0.0d;
     public static final Double DOUBLE_ONE = 1.0d;
 
-    public static final Character CHARACTER_ZERO = '0';
+    public static final Character CHARACTER_ZERO = (char)0;
 
-    public static final Character CHARACTER_ONE = '1';
+    public static final Character CHARACTER_ONE = (char)1;
 }