Adjusting to reduce lines since we reuse

Author: Paultagoras

client-v2/src/main/java/com/clickhouse/client/api/data_formats/internal/SerializerUtils.java

@@ -80,25 +80,19 @@ public static void serializeData(OutputStream stream, Object value, ClickHouseCo
                 serializeTupleData(stream, value, GEO_POINT_TUPLE);
                 break;
             case Ring:
-                value = value instanceof ClickHouseGeoRingValue ? ((ClickHouseGeoRingValue)value).getValue() : value;
-                serializeArrayData(stream, value, GEO_RING_ARRAY);
-                break;
             case LineString:
                 value = value instanceof ClickHouseGeoRingValue ? ((ClickHouseGeoRingValue)value).getValue() : value;
-                serializeArrayData(stream, value, GEO_LINE_ARRAY);
+                serializeArrayData(stream, value, GEO_RING_ARRAY);
                 break;
             case Polygon:
+            case MultiLineString:
                 value = value instanceof ClickHouseGeoPolygonValue ? ((ClickHouseGeoPolygonValue)value).getValue() : value;
                 serializeArrayData(stream, value, GEO_POLYGON_ARRAY);
                 break;
             case MultiPolygon:
                 value = value instanceof ClickHouseGeoMultiPolygonValue ? ((ClickHouseGeoMultiPolygonValue)value).getValue() : value;
                 serializeArrayData(stream, value, GEO_MULTI_POLYGON_ARRAY);
                 break;
-            case MultiLineString:
-                value = value instanceof ClickHouseGeoMultiPolygonValue ? ((ClickHouseGeoMultiPolygonValue)value).getValue() : value;
-                serializeArrayData(stream, value, GEO_MULTI_LINE_ARRAY);
-                break;
             case Dynamic:
                 ClickHouseColumn typeColumn = valueToColumnForDynamicType(value);
                 writeDynamicTypeTag(stream, typeColumn);
@@ -686,9 +680,7 @@ private static void serializerVariant(OutputStream out, ClickHouseColumn column,
     }
 
     private static final ClickHouseColumn GEO_POINT_TUPLE = ClickHouseColumn.parse("geopoint Tuple(Float64, Float64)").get(0);
-    private static final ClickHouseColumn GEO_LINE_ARRAY = ClickHouseColumn.parse("geoline Array(Tuple(Float64, Float64))").get(0);
     private static final ClickHouseColumn GEO_RING_ARRAY = ClickHouseColumn.parse("georing Array(Tuple(Float64, Float64))").get(0);
-    private static final ClickHouseColumn GEO_MULTI_LINE_ARRAY = ClickHouseColumn.parse("geomultiline Array(Array(Tuple(Float64, Float64)))").get(0);
     private static final ClickHouseColumn GEO_POLYGON_ARRAY = ClickHouseColumn.parse("geopolygin Array(Array(Tuple(Float64, Float64)))").get(0);
     private static final ClickHouseColumn GEO_MULTI_POLYGON_ARRAY = ClickHouseColumn.parse("geomultipolygin Array(Array(Array(Tuple(Float64, Float64))))").get(0);
 

client-v2/src/test/java/com/clickhouse/client/datatypes/RowBinaryFormatWriterTest.java

@@ -25,24 +25,17 @@
 import java.math.BigInteger;
 import java.net.Inet4Address;
 import java.net.Inet6Address;
-import java.time.Duration;
 import java.time.ZonedDateTime;
-import java.time.temporal.ChronoUnit;
-import java.time.temporal.TemporalUnit;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Random;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
-import static com.clickhouse.data.ClickHouseDataType.Decimal;
 import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
 
 public class RowBinaryFormatWriterTest extends BaseIntegrationTest {
     private Client client;