Skip to content

Commit acbceda

Browse files
authored
fix: remove unused data types (#122)
We will add additional extension types as and when needed.
1 parent 9c7b78f commit acbceda

File tree

6 files changed

+3
-124
lines changed

6 files changed

+3
-124
lines changed

Diff for: lib/src/main/java/io/cloudquery/transformers/TypeTransformer.java

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package io.cloudquery.transformers;
22

33
import io.cloudquery.scalar.Timestamp;
4-
import io.cloudquery.types.InetType;
54
import io.cloudquery.types.JSONType;
6-
import io.cloudquery.types.ListType;
75
import io.cloudquery.types.UUIDType;
86
import java.lang.reflect.Field;
97
import org.apache.arrow.vector.types.FloatingPointPrecision;
@@ -37,9 +35,6 @@ private static ArrowType transformArrowType(String name, Class<?> type)
3735
case "java.util.Map" -> {
3836
return JSONType.INSTANCE;
3937
}
40-
case "java.net.InetAddress" -> {
41-
return InetType.INSTANCE;
42-
}
4338
case "java.time.LocalDateTime" -> {
4439
return Timestamp.dt;
4540
}
@@ -52,9 +47,7 @@ private static ArrowType transformArrowType(String name, Class<?> type)
5247
if (componentType.getName().equals("byte")) {
5348
return ArrowType.Binary.INSTANCE;
5449
}
55-
// if element type is already json just return JSON rather than a list of JSON
56-
ArrowType elementType = transformArrowType(name, componentType);
57-
return elementType == JSONType.INSTANCE ? elementType : ListType.listOf(elementType);
50+
return JSONType.INSTANCE;
5851
}
5952
if (!type.isPrimitive()) {
6053
return JSONType.INSTANCE;

Diff for: lib/src/main/java/io/cloudquery/types/InetType.java

-41
This file was deleted.

Diff for: lib/src/main/java/io/cloudquery/types/ListType.java

-40
This file was deleted.

Diff for: lib/src/test/java/io/cloudquery/transformers/TransformWithClassTest.java

+2-7
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@
1212

1313
import io.cloudquery.schema.Column;
1414
import io.cloudquery.schema.Table;
15-
import io.cloudquery.types.InetType;
1615
import io.cloudquery.types.JSONType;
17-
import io.cloudquery.types.ListType;
18-
import java.net.InetAddress;
1916
import java.time.LocalDateTime;
2017
import java.time.ZoneOffset;
2118
import java.util.List;
@@ -57,7 +54,6 @@ public static final class TestClass {
5754
private List<Integer> intListCol;
5855
private String[] stringArrayCol;
5956
private List<String> stringListCol;
60-
private InetAddress inetAddressCol;
6157
private byte[] byteArrayCol;
6258
private Object[] anyArrayCol;
6359
private LocalDateTime timeCol;
@@ -89,11 +85,10 @@ public static final class TestClass {
8985
Column.builder().name("boolean_col").type(Bool.INSTANCE).build(),
9086
Column.builder().name("boolean_object_col").type(Bool.INSTANCE).build(),
9187
Column.builder().name("json_col").type(JSONType.INSTANCE).build(),
92-
Column.builder().name("int_array_col").type(ListType.listOf(new Int(64, true))).build(),
88+
Column.builder().name("int_array_col").type(JSONType.INSTANCE).build(),
9389
Column.builder().name("int_list_col").type(JSONType.INSTANCE).build(),
94-
Column.builder().name("string_array_col").type(ListType.listOf(Utf8.INSTANCE)).build(),
90+
Column.builder().name("string_array_col").type(JSONType.INSTANCE).build(),
9591
Column.builder().name("string_list_col").type(JSONType.INSTANCE).build(),
96-
Column.builder().name("inet_address_col").type(InetType.INSTANCE).build(),
9792
Column.builder().name("byte_array_col").type(Binary.INSTANCE).build(),
9893
Column.builder().name("any_array_col").type(JSONType.INSTANCE).build(),
9994
Column.builder()

Diff for: lib/src/test/java/io/cloudquery/transformers/TypeTransformerTest.java

-9
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
import static org.junit.jupiter.api.Assertions.assertEquals;
44

55
import io.cloudquery.transformers.TypeTransformer.DefaultTypeTransformer;
6-
import io.cloudquery.types.InetType;
76
import io.cloudquery.types.JSONType;
8-
import io.cloudquery.types.ListType;
97
import java.net.InetAddress;
108
import java.time.LocalDateTime;
119
import java.time.ZoneOffset;
@@ -98,20 +96,13 @@ public static Stream<Arguments> testArgumentsSource() {
9896
// Inner class
9997
Arguments.of("innerClassObjectField", JSONType.INSTANCE),
10098

101-
// Array field
102-
Arguments.of("intArrayField", ListType.listOf(new ArrowType.Int(64, true))),
103-
Arguments.of("stringArrayField", ListType.listOf(ArrowType.Utf8.INSTANCE)),
104-
10599
// Time
106100
Arguments.of(
107101
"timeField", new ArrowType.Timestamp(TimeUnit.MILLISECOND, ZoneOffset.UTC.getId())),
108102

109103
// Byte
110104
Arguments.of("byteArrayField", ArrowType.Binary.INSTANCE),
111105

112-
// Inet
113-
Arguments.of("inetField", InetType.INSTANCE),
114-
115106
// Object array
116107
Arguments.of("objectArrayField", JSONType.INSTANCE));
117108
}

Diff for: lib/src/test/java/io/cloudquery/types/ListTypeTest.java

-19
This file was deleted.

0 commit comments

Comments
 (0)