From 018efd4a5d0c59f392fd8e3b0d0967c666b72947 Mon Sep 17 00:00:00 2001
From: Edward Gao <edward.gao@airbyte.io>
Date: Fri, 15 Jul 2022 08:31:49 -0700
Subject: [PATCH] delete long type for now, treat all ints as longs

---
 .../integrations/destination/s3/avro/JsonSchemaType.java    | 2 +-
 .../destination/s3/avro/JsonToAvroSchemaConverter.java      | 2 +-
 .../destination/s3/avro/JsonSchemaTypeTest.java             | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/avro/JsonSchemaType.java b/airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/avro/JsonSchemaType.java
index 2fb77a214a3a..68a86d3ddf1f 100644
--- a/airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/avro/JsonSchemaType.java
+++ b/airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/avro/JsonSchemaType.java
@@ -17,7 +17,7 @@ public enum JsonSchemaType {
 
   STRING("string", true, null, Schema.Type.STRING),
   NUMBER_INT("number", true, "integer", Schema.Type.LONG),
-  NUMBER_LONG("number", true, "long", Schema.Type.STRING),
+  NUMBER_BIGINT("number", true, "big_integer", Schema.Type.STRING),
   NUMBER_FLOAT("number", true, "float", Schema.Type.FLOAT),
   NUMBER("number", true, null, Schema.Type.DOUBLE),
   INTEGER("integer", true, null, Schema.Type.INT),
diff --git a/airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/avro/JsonToAvroSchemaConverter.java b/airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/avro/JsonToAvroSchemaConverter.java
index 920ddfbaa1a8..aae14dae955a 100644
--- a/airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/avro/JsonToAvroSchemaConverter.java
+++ b/airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/avro/JsonToAvroSchemaConverter.java
@@ -218,7 +218,7 @@ Schema parseSingleType(final String fieldName,
 
     final Schema fieldSchema;
     switch (fieldType) {
-      case INTEGER, NUMBER, NUMBER_INT, NUMBER_LONG, NUMBER_FLOAT, BOOLEAN -> fieldSchema = Schema.create(fieldType.getAvroType());
+      case INTEGER, NUMBER, NUMBER_INT, NUMBER_FLOAT, BOOLEAN -> fieldSchema = Schema.create(fieldType.getAvroType());
       case STRING -> {
         if (fieldDefinition.has("format")) {
           final String format = fieldDefinition.get("format").asText();
diff --git a/airbyte-integrations/connectors/destination-s3/src/test/java/io/airbyte/integrations/destination/s3/avro/JsonSchemaTypeTest.java b/airbyte-integrations/connectors/destination-s3/src/test/java/io/airbyte/integrations/destination/s3/avro/JsonSchemaTypeTest.java
index be27d9802ae4..7821347a14e7 100644
--- a/airbyte-integrations/connectors/destination-s3/src/test/java/io/airbyte/integrations/destination/s3/avro/JsonSchemaTypeTest.java
+++ b/airbyte-integrations/connectors/destination-s3/src/test/java/io/airbyte/integrations/destination/s3/avro/JsonSchemaTypeTest.java
@@ -17,7 +17,7 @@ public class JsonSchemaTypeTest {
 
   @ParameterizedTest
   @ArgumentsSource(JsonSchemaTypeProvider.class)
-  public void testFromJsonSchemaType(String type, String airbyteType, JsonSchemaType expectedJsonSchemaType) {
+  public void testFromJsonSchemaType(final String type, final String airbyteType, final JsonSchemaType expectedJsonSchemaType) {
     assertEquals(
         expectedJsonSchemaType,
         JsonSchemaType.fromJsonSchemaType(type, airbyteType));
@@ -26,10 +26,10 @@ public void testFromJsonSchemaType(String type, String airbyteType, JsonSchemaTy
   public static class JsonSchemaTypeProvider implements ArgumentsProvider {
 
     @Override
-    public Stream<? extends Arguments> provideArguments(ExtensionContext context) throws Exception {
+    public Stream<? extends Arguments> provideArguments(final ExtensionContext context) throws Exception {
       return Stream.of(
           Arguments.of("number", "integer", JsonSchemaType.NUMBER_INT),
-          Arguments.of("number", "big_integer", JsonSchemaType.NUMBER_LONG),
+          Arguments.of("number", "big_integer", JsonSchemaType.NUMBER_BIGINT),
           Arguments.of("number", "float", JsonSchemaType.NUMBER_FLOAT),
           Arguments.of("number", null, JsonSchemaType.NUMBER),
           Arguments.of("string", null, JsonSchemaType.STRING),