rename GenericRecord#getAll to getValues

Author: abcfy2

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

@@ -3,23 +3,18 @@
 import com.clickhouse.client.api.data_formats.ClickHouseBinaryFormatReader;
 import com.clickhouse.client.api.metadata.TableSchema;
 import com.clickhouse.client.api.query.GenericRecord;
-import com.clickhouse.data.value.ClickHouseBitmap;
-import com.clickhouse.data.value.ClickHouseGeoMultiPolygonValue;
-import com.clickhouse.data.value.ClickHouseGeoPointValue;
-import com.clickhouse.data.value.ClickHouseGeoPolygonValue;
-import com.clickhouse.data.value.ClickHouseGeoRingValue;
+import com.clickhouse.data.ClickHouseColumn;
+import com.clickhouse.data.value.*;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.Inet4Address;
 import java.net.Inet6Address;
-import java.time.Duration;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZonedDateTime;
+import java.time.*;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 public class BinaryReaderBackedRecord implements GenericRecord {
 
@@ -383,4 +378,11 @@ public ClickHouseBitmap getClickHouseBitmap(int index) {
     public TableSchema getSchema() {
         return reader.getSchema();
     }
+
+    @Override
+    public Map<String, Object> getValues() {
+        return this.getSchema().getColumns().stream().collect(Collectors.toMap(
+                ClickHouseColumn::getColumnName,
+                column -> this.getObject(column.getColumnName())));
+    }
 }

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

@@ -5,24 +5,18 @@
 import com.clickhouse.client.api.query.GenericRecord;
 import com.clickhouse.client.api.query.NullValueException;
 import com.clickhouse.data.ClickHouseColumn;
-import com.clickhouse.data.value.ClickHouseBitmap;
-import com.clickhouse.data.value.ClickHouseGeoMultiPolygonValue;
-import com.clickhouse.data.value.ClickHouseGeoPointValue;
-import com.clickhouse.data.value.ClickHouseGeoPolygonValue;
-import com.clickhouse.data.value.ClickHouseGeoRingValue;
+import com.clickhouse.data.value.*;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.Inet4Address;
 import java.net.Inet6Address;
-import java.time.Duration;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
+import java.time.*;
 import java.time.temporal.ChronoUnit;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 import java.util.function.Function;
 
 public class MapBackedRecord implements GenericRecord {
@@ -523,4 +517,9 @@ public Object getObject(String colName) {
     public Object getObject(int index) {
         return readValue(index);
     }
+
+    @Override
+    public Map<String, Object> getValues() {
+        return this.record;
+    }
 }

client-v2/src/main/java/com/clickhouse/client/api/query/GenericRecord.java

@@ -1,7 +1,6 @@
 package com.clickhouse.client.api.query;
 
 import com.clickhouse.client.api.metadata.TableSchema;
-import com.clickhouse.data.ClickHouseColumn;
 import com.clickhouse.data.value.*;
 
 import java.math.BigDecimal;
@@ -12,7 +11,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
-import java.util.stream.Collectors;
 
 public interface GenericRecord {
 
@@ -504,9 +502,5 @@ public interface GenericRecord {
      *
      * @return a Map of column names and values.
      */
-    default Map<String, Object> getAll() {
-        return this.getSchema().getColumns().stream().collect(Collectors.toMap(
-                ClickHouseColumn::getColumnName,
-                column -> this.getObject(column.getColumnName())));
-    }
+    Map<String, Object> getValues();
 }