fix(api): fix decimal numbers not being correctly parsed (#142)

Resolves: #142

Author: fhussonnois

connect-file-pulse-api/src/main/java/io/streamthoughts/kafka/connect/filepulse/data/internal/TypeConverter.java

@@ -28,6 +28,7 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.Objects;
+import java.util.Optional;
 
 /**
  * Class which can be used to convert an object to a specific type.
@@ -115,8 +116,12 @@ public static Long getLong(final Object value) throws IllegalArgumentException {
     public static Float getFloat(final Object value) throws IllegalArgumentException {
         Objects.requireNonNull(value, "value can't be null");
 
-        if (value instanceof String && isNumber((String) value)) {
-            return new BigDecimal(value.toString()).floatValue();
+        if (value instanceof String) {
+            return getBigDecimal(value)
+                    .map(BigDecimal::floatValue)
+                    .orElseThrow(() ->
+                            new DataException(String.format("Cannot parse 64-bits double content from \"%s\"", value))
+                    );
         }
         if (value instanceof Number) {
             Number number = (Number) value;
@@ -125,11 +130,23 @@ public static Float getFloat(final Object value) throws IllegalArgumentException
         throw new DataException(String.format("Cannot parse 32-bits float content from \"%s\"", value));
     }
 
+    private static Optional<BigDecimal> getBigDecimal(final Object value) {
+        try {
+            return Optional.of(new BigDecimal(value.toString().replace(",", ".")));
+        } catch (NumberFormatException e) {
+            return Optional.empty();
+        }
+    }
+
     public static Double getDouble(final Object value) throws IllegalArgumentException {
         Objects.requireNonNull(value, "value can't be null");
 
-        if (value instanceof String && isNumber((String) value)) {
-            return new BigDecimal(value.toString()).doubleValue();
+        if (value instanceof String) {
+            return getBigDecimal(value)
+               .map(BigDecimal::doubleValue)
+               .orElseThrow(() ->
+                       new DataException(String.format("Cannot parse 64-bits double content from \"%s\"", value))
+               );
         }
         if (value instanceof Number) {
             Number number = (Number) value;
@@ -202,12 +219,10 @@ public static BigDecimal getDecimal(final Object value) {
             return null;
         }
 
-        try {
-            return new BigDecimal(result.replace(",", "."));
-        } catch (NumberFormatException e) {
-            throw new DataException(
-                    String.format("Cannot parse decimal content from \"%s\"", value));
-        }
+        return getBigDecimal(value)
+                .orElseThrow(() ->
+                        new DataException(String.format("Cannot parse decimal content from \"%s\"", value))
+                );
     }
 
     private static boolean isNumber(final String s) {

connect-file-pulse-api/src/test/java/io/streamthoughts/kafka/connect/filepulse/data/internal/TypeConverterTest.java

@@ -0,0 +1,42 @@
+package io.streamthoughts.kafka.connect.filepulse.data.internal;
+
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.math.BigDecimal;
+
+public class TypeConverterTest {
+
+    @Test
+    public void should_convert_decimal_number() {
+        final BigDecimal result = TypeConverter.getDecimal("1.10");
+        Assert.assertEquals(1.10, result.doubleValue(), 0.1);
+    }
+
+    @Test
+    public void should_convert_decimal_number_given_comma() {
+        final BigDecimal result = TypeConverter.getDecimal("1,101");
+        Assert.assertEquals(1.101, result.doubleValue(), 0);
+    }
+
+    @Test
+    public void should_convert_double_number() {
+        final Double result = TypeConverter.getDouble("1.101");
+        Assert.assertEquals(1.101, result.doubleValue(), 0);
+    }
+
+    @Test
+    public void should_convert_double_number_given_comma() {
+        final Double result = TypeConverter.getDouble("1,101");
+        Assert.assertEquals(1.101, result.doubleValue(), 0);
+    }
+
+    @Test
+    public void should_convert_float_number() {
+        final Float result = TypeConverter.getFloat("1.101");
+        Assert.assertEquals(1.101f, result.floatValue(), 0);
+    }
+
+
+}