Format code (#9892)

airbytehq · Jan 30, 2022 · a094142 · a094142
1 parent 479f0d7
commit a094142
Show file tree

Hide file tree

Showing 51 changed files with 94 additions and 132 deletions.
diff --git a/...on-gcs/src/main/java/io/airbyte/integrations/destination/gcs/writer/GcsWriterFactory.java b/...on-gcs/src/main/java/io/airbyte/integrations/destination/gcs/writer/GcsWriterFactory.java
@@ -16,9 +16,9 @@
 public interface GcsWriterFactory {
 
   DestinationFileWriter create(GcsDestinationConfig config,
-                  AmazonS3 s3Client,
-                  ConfiguredAirbyteStream configuredStream,
-                  Timestamp uploadTimestamp)
+                               AmazonS3 s3Client,
+                               ConfiguredAirbyteStream configuredStream,
+                               Timestamp uploadTimestamp)
       throws Exception;
 
 }
diff --git a/...src/main/java/io/airbyte/integrations/destination/gcs/writer/ProductionWriterFactory.java b/...src/main/java/io/airbyte/integrations/destination/gcs/writer/ProductionWriterFactory.java
@@ -27,9 +27,9 @@ public class ProductionWriterFactory implements GcsWriterFactory {
 
   @Override
   public DestinationFileWriter create(final GcsDestinationConfig config,
-                         final AmazonS3 s3Client,
-                         final ConfiguredAirbyteStream configuredStream,
-                         final Timestamp uploadTimestamp)
+                                      final AmazonS3 s3Client,
+                                      final ConfiguredAirbyteStream configuredStream,
+                                      final Timestamp uploadTimestamp)
       throws Exception {
     final S3Format format = config.getFormatConfig().getFormat();
 

diff --git a/...estination-s3/src/main/java/io/airbyte/integrations/destination/s3/avro/S3AvroWriter.java b/...estination-s3/src/main/java/io/airbyte/integrations/destination/s3/avro/S3AvroWriter.java
@@ -106,4 +106,5 @@ public void write(JsonNode formattedData) throws IOException {
     final GenericData.Record record = avroRecordFactory.getAvroRecord(formattedData);
     dataFileWriter.append(record);
   }
+
 }
diff --git a/.../destination-s3/src/main/java/io/airbyte/integrations/destination/s3/csv/S3CsvWriter.java b/.../destination-s3/src/main/java/io/airbyte/integrations/destination/s3/csv/S3CsvWriter.java
@@ -173,4 +173,5 @@ public S3Format getFileFormat() {
   public void write(JsonNode formattedData) throws IOException {
     csvPrinter.printRecord(csvSheetGenerator.getDataRow(formattedData));
   }
+
 }
diff --git a/...tination-s3/src/main/java/io/airbyte/integrations/destination/s3/jsonl/S3JsonlWriter.java b/...tination-s3/src/main/java/io/airbyte/integrations/destination/s3/jsonl/S3JsonlWriter.java
@@ -21,7 +21,6 @@
 import io.airbyte.integrations.destination.s3.writer.DestinationFileWriter;
 import io.airbyte.protocol.models.AirbyteRecordMessage;
 import io.airbyte.protocol.models.ConfiguredAirbyteStream;
-
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.nio.charset.StandardCharsets;
@@ -104,4 +103,5 @@ public S3Format getFileFormat() {
   public void write(JsonNode formattedData) throws IOException {
     printWriter.println(Jsons.serialize(formattedData));
   }
+
 }
diff --git a/...tion-s3/src/main/java/io/airbyte/integrations/destination/s3/parquet/S3ParquetWriter.java b/...tion-s3/src/main/java/io/airbyte/integrations/destination/s3/parquet/S3ParquetWriter.java
@@ -140,4 +140,5 @@ public S3Format getFileFormat() {
   public void write(JsonNode formattedData) throws IOException {
     parquetWriter.write(avroRecordFactory.getAvroRecord(formattedData));
   }
+
 }
diff --git a/...ion-s3/src/main/java/io/airbyte/integrations/destination/s3/writer/DestinationWriter.java b/...ion-s3/src/main/java/io/airbyte/integrations/destination/s3/writer/DestinationWriter.java
@@ -10,8 +10,8 @@
 import java.util.UUID;
 
 /**
- * {@link DestinationWriter} is responsible for writing Airbyte stream data to an S3 location in a specific
- * format.
+ * {@link DestinationWriter} is responsible for writing Airbyte stream data to an S3 location in a
+ * specific format.
  */
 public interface DestinationWriter {
 

diff --git a/.../src/main/java/io/airbyte/integrations/destination/s3/writer/ProductionWriterFactory.java b/.../src/main/java/io/airbyte/integrations/destination/s3/writer/ProductionWriterFactory.java
@@ -26,9 +26,9 @@ public class ProductionWriterFactory implements S3WriterFactory {
 
   @Override
   public DestinationFileWriter create(final S3DestinationConfig config,
-                         final AmazonS3 s3Client,
-                         final ConfiguredAirbyteStream configuredStream,
-                         final Timestamp uploadTimestamp)
+                                      final AmazonS3 s3Client,
+                                      final ConfiguredAirbyteStream configuredStream,
+                                      final Timestamp uploadTimestamp)
       throws Exception {
     final S3Format format = config.getFormatConfig().getFormat();
 

diff --git a/...ation-s3/src/main/java/io/airbyte/integrations/destination/s3/writer/S3WriterFactory.java b/...ation-s3/src/main/java/io/airbyte/integrations/destination/s3/writer/S3WriterFactory.java
@@ -15,9 +15,9 @@
 public interface S3WriterFactory {
 
   DestinationFileWriter create(S3DestinationConfig config,
-                  AmazonS3 s3Client,
-                  ConfiguredAirbyteStream configuredStream,
-                  Timestamp uploadTimestamp)
+                               AmazonS3 s3Client,
+                               ConfiguredAirbyteStream configuredStream,
+                               Timestamp uploadTimestamp)
       throws Exception;
 
 }
diff --git a/...va/io/airbyte/integrations/destination/snowflake/SnowflakeInternalStagingDestination.java b/...va/io/airbyte/integrations/destination/snowflake/SnowflakeInternalStagingDestination.java
@@ -33,10 +33,10 @@ public AirbyteConnectionStatus check(final JsonNode config) {
     final SnowflakeStagingSqlOperations snowflakeStagingSqlOperations = new SnowflakeStagingSqlOperations();
     try (final JdbcDatabase database = getDatabase(config)) {
       final String outputSchema = super.getNamingResolver().getIdentifier(config.get("schema").asText());
-      AirbyteSentry.runWithSpan("CreateAndDropTable", () ->
-          attemptSQLCreateAndDropTableOperations(outputSchema, database, nameTransformer, snowflakeStagingSqlOperations));
-      AirbyteSentry.runWithSpan("CreateAndDropStage", () ->
-          attemptSQLCreateAndDropStages(outputSchema, database, nameTransformer, snowflakeStagingSqlOperations));
+      AirbyteSentry.runWithSpan("CreateAndDropTable",
+          () -> attemptSQLCreateAndDropTableOperations(outputSchema, database, nameTransformer, snowflakeStagingSqlOperations));
+      AirbyteSentry.runWithSpan("CreateAndDropStage",
+          () -> attemptSQLCreateAndDropStages(outputSchema, database, nameTransformer, snowflakeStagingSqlOperations));
       return new AirbyteConnectionStatus().withStatus(AirbyteConnectionStatus.Status.SUCCEEDED);
     } catch (final Exception e) {
       LOGGER.error("Exception while checking connection: ", e);

diff --git a/...ntegration/java/io/airbyte/integrations/source/bigquery/BigQuerySourceAcceptanceTest.java b/...ntegration/java/io/airbyte/integrations/source/bigquery/BigQuerySourceAcceptanceTest.java
@@ -21,9 +21,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.sql.SQLException;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 
 public class BigQuerySourceAcceptanceTest extends SourceAcceptanceTest {
 

diff --git a/...tions/io/airbyte/integration_tests/sources/AbstractSshClickHouseSourceAcceptanceTest.java b/...tions/io/airbyte/integration_tests/sources/AbstractSshClickHouseSourceAcceptanceTest.java
@@ -24,9 +24,7 @@
 import io.airbyte.protocol.models.Field;
 import io.airbyte.protocol.models.JsonSchemaPrimitive;
 import io.airbyte.protocol.models.SyncMode;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import org.testcontainers.containers.ClickHouseContainer;
 
 public abstract class AbstractSshClickHouseSourceAcceptanceTest extends SourceAcceptanceTest {

diff --git a/...yte/integrations/io/airbyte/integration_tests/sources/ClickHouseSourceAcceptanceTest.java b/...yte/integrations/io/airbyte/integration_tests/sources/ClickHouseSourceAcceptanceTest.java
@@ -23,9 +23,7 @@
 import io.airbyte.protocol.models.Field;
 import io.airbyte.protocol.models.JsonSchemaPrimitive;
 import io.airbyte.protocol.models.SyncMode;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import org.testcontainers.containers.ClickHouseContainer;
 
 public class ClickHouseSourceAcceptanceTest extends SourceAcceptanceTest {

diff --git a/...va/io/airbyte/integrations/source/cockroachdb/CockroachDbEncryptSourceAcceptanceTest.java b/...va/io/airbyte/integrations/source/cockroachdb/CockroachDbEncryptSourceAcceptanceTest.java
@@ -22,9 +22,7 @@
 import io.airbyte.protocol.models.Field;
 import io.airbyte.protocol.models.JsonSchemaPrimitive;
 import io.airbyte.protocol.models.SyncMode;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import org.jooq.SQLDialect;
 
 public class CockroachDbEncryptSourceAcceptanceTest extends SourceAcceptanceTest {

diff --git a/...tion/java/io/airbyte/integrations/source/cockroachdb/CockroachDbSourceAcceptanceTest.java b/...tion/java/io/airbyte/integrations/source/cockroachdb/CockroachDbSourceAcceptanceTest.java
@@ -21,9 +21,7 @@
 import io.airbyte.protocol.models.Field;
 import io.airbyte.protocol.models.JsonSchemaPrimitive;
 import io.airbyte.protocol.models.SyncMode;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import org.jooq.SQLDialect;
 import org.testcontainers.containers.CockroachContainer;
 

diff --git a/...io/airbyte/integration_tests/sources/Db2StrictEncryptSourceCertificateAcceptanceTest.java b/...io/airbyte/integration_tests/sources/Db2StrictEncryptSourceCertificateAcceptanceTest.java
@@ -25,9 +25,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.concurrent.TimeUnit;
 import org.testcontainers.containers.Db2Container;
 

diff --git a/...io/airbyte/integrations/io/airbyte/integration_tests/sources/Db2SourceAcceptanceTest.java b/...io/airbyte/integrations/io/airbyte/integration_tests/sources/Db2SourceAcceptanceTest.java
@@ -22,9 +22,7 @@
 import io.airbyte.protocol.models.Field;
 import io.airbyte.protocol.models.JsonSchemaPrimitive;
 import io.airbyte.protocol.models.SyncMode;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import org.testcontainers.containers.Db2Container;
 
 public class Db2SourceAcceptanceTest extends SourceAcceptanceTest {

diff --git a/...integrations/io/airbyte/integration_tests/sources/Db2SourceCertificateAcceptanceTest.java b/...integrations/io/airbyte/integration_tests/sources/Db2SourceCertificateAcceptanceTest.java
@@ -25,9 +25,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.concurrent.TimeUnit;
 import org.testcontainers.containers.Db2Container;
 

diff --git a/.../java/io/airbyte/integrations/source/e2e_test/LegacyInfiniteFeedSourceAcceptanceTest.java b/.../java/io/airbyte/integrations/source/e2e_test/LegacyInfiniteFeedSourceAcceptanceTest.java
@@ -14,9 +14,7 @@
 import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
 import io.airbyte.protocol.models.ConnectorSpecification;
 import java.io.IOException;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 
 public class LegacyInfiniteFeedSourceAcceptanceTest extends SourceAcceptanceTest {
 

diff --git a/airbyte-integrations/connectors/source-github/source_github/spec.json b/airbyte-integrations/connectors/source-github/source_github/spec.json
@@ -54,7 +54,11 @@
       },
       "repository": {
         "type": "string",
-        "examples": ["airbytehq/airbyte airbytehq/another-repo", "airbytehq/*", "airbytehq/airbyte"],
+        "examples": [
+          "airbytehq/airbyte airbytehq/another-repo",
+          "airbytehq/*",
+          "airbytehq/airbyte"
+        ],
         "title": "GitHub Repositories",
         "description": "Space-delimited list of GitHub organizations/repositories, e.g. `airbytehq/airbyte` for single repository, `airbytehq/*` for get all repositories from organization and `airbytehq/airbyte airbytehq/another-repo` for multiple repositories."
       },

diff --git a/airbyte-integrations/connectors/source-hubspot/sample_files/sample_config_oauth.json b/airbyte-integrations/connectors/source-hubspot/sample_files/sample_config_oauth.json
@@ -1,10 +1,9 @@
 {
-    "start_date": "2021-10-01T00:00:00Z",
-    "credentials": {
-      "credentials_title": "OAuth Credentials",
-      "client_id": "123456789_client_id_hubspot",
-      "client_secret": "123456789_client_secret_hubspot",
-      "refresh_token": "123456789_some_refresh_token"
-    }
+  "start_date": "2021-10-01T00:00:00Z",
+  "credentials": {
+    "credentials_title": "OAuth Credentials",
+    "client_id": "123456789_client_id_hubspot",
+    "client_secret": "123456789_client_secret_hubspot",
+    "refresh_token": "123456789_some_refresh_token"
   }
-  
+}
diff --git a/airbyte-integrations/connectors/source-hubspot/source_hubspot/schemas/property_history.json b/airbyte-integrations/connectors/source-hubspot/source_hubspot/schemas/property_history.json
@@ -1,34 +1,34 @@
 {
-    "$schema": "http://json-schema.org/draft-07/schema",
-    "type": ["null", "object"],
-    "properties": {
-      "value": {
-        "type": ["null", "string"]
-      },
-      "source-type": {
-        "type": ["null", "string"]
-      },
-      "source-id": {
-        "type": ["null", "string"]
-      },
-      "source-label": {
-        "type": ["null", "string"]
-      },
-      "updated-by-user-id" : {
-        "type": ["null", "integer"]
-      },
-      "timestamp": {
-        "type": ["null", "string"],
-        "format": "date-time"
-      },
-      "selected": {
-        "type": ["null", "boolean"]
-      },
-      "property": {
-        "type": ["null", "string"]
-      },
-      "vid": {
-        "type": ["null", "integer"]
-      }
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "type": ["null", "object"],
+  "properties": {
+    "value": {
+      "type": ["null", "string"]
+    },
+    "source-type": {
+      "type": ["null", "string"]
+    },
+    "source-id": {
+      "type": ["null", "string"]
+    },
+    "source-label": {
+      "type": ["null", "string"]
+    },
+    "updated-by-user-id": {
+      "type": ["null", "integer"]
+    },
+    "timestamp": {
+      "type": ["null", "string"],
+      "format": "date-time"
+    },
+    "selected": {
+      "type": ["null", "boolean"]
+    },
+    "property": {
+      "type": ["null", "string"]
+    },
+    "vid": {
+      "type": ["null", "integer"]
     }
+  }
 }
diff --git a/...-integration/java/io/airbyte/integrations/source/jdbc/JdbcSourceSourceAcceptanceTest.java b/...-integration/java/io/airbyte/integrations/source/jdbc/JdbcSourceSourceAcceptanceTest.java
@@ -18,9 +18,7 @@
 import io.airbyte.protocol.models.Field;
 import io.airbyte.protocol.models.JsonSchemaPrimitive;
 import java.sql.SQLException;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import org.testcontainers.containers.PostgreSQLContainer;
 
 /**

diff --git a/...test-integration/java/io/airbyte/integrations/source/kafka/KafkaSourceAcceptanceTest.java b/...test-integration/java/io/airbyte/integrations/source/kafka/KafkaSourceAcceptanceTest.java
@@ -22,7 +22,6 @@
 import io.airbyte.protocol.models.SyncMode;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import org.apache.kafka.clients.admin.AdminClient;

diff --git a/...java/io/airbyte/integrations/source/mongodb/MongodbSourceStrictEncryptAcceptanceTest.java b/...java/io/airbyte/integrations/source/mongodb/MongodbSourceStrictEncryptAcceptanceTest.java
@@ -26,7 +26,6 @@
 import io.airbyte.protocol.models.SyncMode;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import org.bson.BsonArray;

diff --git a/...ntegrations/io/airbyte/integration_tests/sources/MongoDbSourceAbstractAcceptanceTest.java b/...ntegrations/io/airbyte/integration_tests/sources/MongoDbSourceAbstractAcceptanceTest.java
@@ -18,7 +18,6 @@
 import io.airbyte.protocol.models.Field;
 import io.airbyte.protocol.models.JsonSchemaPrimitive;
 import io.airbyte.protocol.models.SyncMode;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 

diff --git a/...ion/java/io/airbyte/integrations/source/mssql/MssqlStrictEncryptSourceAcceptanceTest.java b/...ion/java/io/airbyte/integrations/source/mssql/MssqlStrictEncryptSourceAcceptanceTest.java
@@ -20,9 +20,7 @@
 import io.airbyte.protocol.models.Field;
 import io.airbyte.protocol.models.JsonSchemaPrimitive;
 import java.sql.SQLException;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.testcontainers.containers.MSSQLServerContainer;
 import org.testcontainers.utility.DockerImageName;

diff --git a/...ation/java/io/airbyte/integrations/source/mssql/AbstractSshMssqlSourceAcceptanceTest.java b/...ation/java/io/airbyte/integrations/source/mssql/AbstractSshMssqlSourceAcceptanceTest.java
@@ -23,7 +23,6 @@
 import io.airbyte.protocol.models.Field;
 import io.airbyte.protocol.models.JsonSchemaPrimitive;
 import io.airbyte.protocol.models.SyncMode;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;

diff --git a/...t-integration/java/io/airbyte/integrations/source/mssql/CdcMssqlSourceAcceptanceTest.java b/...t-integration/java/io/airbyte/integrations/source/mssql/CdcMssqlSourceAcceptanceTest.java
@@ -21,7 +21,6 @@
 import io.airbyte.protocol.models.Field;
 import io.airbyte.protocol.models.JsonSchemaPrimitive;
 import io.airbyte.protocol.models.SyncMode;
-import java.util.Collections;
 import java.util.List;
 import org.testcontainers.containers.MSSQLServerContainer;
 

diff --git a/...test-integration/java/io/airbyte/integrations/source/mssql/MssqlSourceAcceptanceTest.java b/...test-integration/java/io/airbyte/integrations/source/mssql/MssqlSourceAcceptanceTest.java
@@ -20,9 +20,7 @@
 import io.airbyte.protocol.models.Field;
 import io.airbyte.protocol.models.JsonSchemaPrimitive;
 import java.sql.SQLException;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import org.testcontainers.containers.MSSQLServerContainer;
 
 public class MssqlSourceAcceptanceTest extends SourceAcceptanceTest {

diff --git a/...byte/integrations/source/mysql_strict_encrypt/MySqlStrictEncryptSourceAcceptanceTest.java b/...byte/integrations/source/mysql_strict_encrypt/MySqlStrictEncryptSourceAcceptanceTest.java
@@ -25,9 +25,7 @@
 import io.airbyte.protocol.models.Field;
 import io.airbyte.protocol.models.JsonSchemaPrimitive;
 import io.airbyte.protocol.models.SyncMode;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import org.jooq.SQLDialect;
 import org.testcontainers.containers.MySQLContainer;
 

diff --git a/...ation/java/io/airbyte/integrations/source/mysql/AbstractSshMySqlSourceAcceptanceTest.java b/...ation/java/io/airbyte/integrations/source/mysql/AbstractSshMySqlSourceAcceptanceTest.java
@@ -20,9 +20,7 @@
 import io.airbyte.protocol.models.JsonSchemaPrimitive;
 import io.airbyte.protocol.models.SyncMode;
 import java.nio.file.Path;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 
 public abstract class AbstractSshMySqlSourceAcceptanceTest extends SourceAcceptanceTest {
 

diff --git a/...t-integration/java/io/airbyte/integrations/source/mysql/CdcMySqlSourceAcceptanceTest.java b/...t-integration/java/io/airbyte/integrations/source/mysql/CdcMySqlSourceAcceptanceTest.java
@@ -22,7 +22,6 @@
 import io.airbyte.protocol.models.Field;
 import io.airbyte.protocol.models.JsonSchemaPrimitive;
 import io.airbyte.protocol.models.SyncMode;
-import java.util.Collections;
 import java.util.List;
 import org.jooq.SQLDialect;
 import org.testcontainers.containers.MySQLContainer;
-Original file line number
+Diff line change
@@ Expand Up @@
         final GenericData.Record record = avroRecordFactory.getAvroRecord(formattedData);
         dataFileWriter.append(record);
       }
     }