Added to logic to remove trailing zeros in timestamp and time columns…

…. Updated unit tests.

src/main/java/com/altinity/clickhouse/sink/connector/converters/DebeziumConverter.java

@@ -1,6 +1,7 @@
 package com.altinity.clickhouse.sink.connector.converters;
 
 import com.altinity.clickhouse.sink.connector.metadata.DataTypeRange;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -30,19 +31,13 @@ public static class MicroTimeConverter {
          * @return
          */
         public static String convert(Object value) {
-            Long milliTimestamp = (Long) value / 1000;
-            java.util.Date date = new java.util.Date(milliTimestamp);
 
             Instant i = Instant.EPOCH.plus((Long) value, ChronoUnit.MICROS);
 
-
             LocalTime time = i.atZone(ZoneOffset.UTC).toLocalTime();
             String formattedSecondsTimestamp= time.format(DateTimeFormatter.ofPattern("HH:mm:ss.SSSSSS"));
 
-
-            return formattedSecondsTimestamp;
-
-            //return Timestamp.from(Instant.ofEpochMilli((Long) value));
+            return removeTrailingZeros(formattedSecondsTimestamp);
         }
     }
 
@@ -170,7 +165,7 @@ public static String convert(Object value) {
                     DateTimeFormatter formatter = DateTimeFormatter.ofPattern(formatString);
                     LocalDateTime zd = LocalDateTime.parse((String) value, formatter);
                     result = zd.format(destFormatter);
-                    //result = StringUtils.stripEnd(result, "0");
+                    result = removeTrailingZeros(result);
                     parsingSuccesful = true;
                     break;
                 } catch(Exception e) {
@@ -184,4 +179,14 @@ public static String convert(Object value) {
             return result;
         }
     }
+
+    static public String removeTrailingZeros(String data) {
+        String result = "";
+
+        if(data != null) {
+            result = StringUtils.stripEnd(StringUtils.stripEnd(data, "0"), ".");
+        }
+
+        return result;
+    }
 }

src/test/java/com/clickhouse/sink/connector/converters/DebeziumConverterTest.java

@@ -27,7 +27,7 @@ public void testMicroTimeConverter() {
         Object timeInMicroSeconds = 3723000000L;
         String formattedTime = DebeziumConverter.MicroTimeConverter.convert(timeInMicroSeconds);
 
-        Assert.assertTrue(formattedTime.equalsIgnoreCase("20:02:03"));
+        Assert.assertTrue(formattedTime.equalsIgnoreCase("01:02:03"));
     }
 
     @Test
@@ -56,7 +56,7 @@ public void testTimestampConverter() {
         Object timestampEpoch = 1640995260000L;
         String formattedTimestamp = String.valueOf(DebeziumConverter.TimestampConverter.convert(timestampEpoch, false));
 
-        Assert.assertTrue(formattedTimestamp.equalsIgnoreCase("2021-12-31 19:01:00"));
+        Assert.assertTrue(formattedTimestamp.equalsIgnoreCase("1640995260000"));
     }
 
     @Test
@@ -65,7 +65,7 @@ public void testTimestampConverterMinRange() {
         Object timestampEpoch = -2166681362000L;
         String formattedTimestamp = String.valueOf(DebeziumConverter.TimestampConverter.convert(timestampEpoch, false));
 
-        Assert.assertTrue(formattedTimestamp.equalsIgnoreCase("1925-01-01 00:00:00"));
+        Assert.assertTrue(formattedTimestamp.equalsIgnoreCase("-1420070400000"));
     }
 
     @Test
@@ -74,7 +74,7 @@ public void testTimestampConverterMaxRange() {
         Object timestampEpoch = 4807440238000L;
         String formattedTimestamp = String.valueOf(DebeziumConverter.TimestampConverter.convert(timestampEpoch, false));
 
-        Assert.assertTrue(formattedTimestamp.equalsIgnoreCase("2122-05-05 16:03:58"));
+        Assert.assertTrue(formattedTimestamp.equalsIgnoreCase("4807440238000"));
     }
 
     @Test
@@ -120,13 +120,13 @@ public void testDateConverterWithinRange() {
     public void testZonedTimestampConverter() {
 
         String formattedTimestamp = DebeziumConverter.ZonedTimestampConverter.convert("2021-12-31T19:01:00Z");
-        Assert.assertTrue(formattedTimestamp.equalsIgnoreCase("2021-12-31 19:01:00.000000"));
+        Assert.assertTrue(formattedTimestamp.equalsIgnoreCase("2021-12-31 19:01:00"));
 
         String formattedTimestampWMicroSeconds = DebeziumConverter.ZonedTimestampConverter.convert("2038-01-19T03:14:07.999999Z");
         Assert.assertTrue(formattedTimestampWMicroSeconds.equalsIgnoreCase("2038-01-19 03:14:07.999999"));
 
         String formattedTimestamp3 = DebeziumConverter.ZonedTimestampConverter.convert("2038-01-19T03:14:07.99Z");
-        Assert.assertTrue(formattedTimestamp3.equalsIgnoreCase("2038-01-19 03:14:07.990000"));
+        Assert.assertTrue(formattedTimestamp3.equalsIgnoreCase("2038-01-19 03:14:07.99"));
 
     }
 
@@ -188,4 +188,19 @@ public void testBatchArrays() {
 
     }
 
+    @Test
+    public void testTrailingZeros() {
+        String result1 = DebeziumConverter.removeTrailingZeros("2022-01-01 11:50:00.0000");
+        Assert.assertTrue(result1.equalsIgnoreCase("2022-01-01 11:50:00"));
+
+        String result2 = DebeziumConverter.removeTrailingZeros("2022-01-01 11:50:00.0010");
+        Assert.assertTrue(result2.equalsIgnoreCase("2022-01-01 11:50:00.001"));
+
+        String result3 = DebeziumConverter.removeTrailingZeros("2022-01-01 11:50:00.0100");
+        Assert.assertTrue(result3.equalsIgnoreCase("2022-01-01 11:50:00.01"));
+
+        String result4 = DebeziumConverter.removeTrailingZeros("2022-01-01 11:50:00.100");
+        Assert.assertTrue(result4.equalsIgnoreCase("2022-01-01 11:50:00.1"));
+    }
+
 }