Skip to content

Commit a094142

Browse files
tulirentuliren
authored
Format code (#9892)
1 parent 479f0d7 commit a094142

File tree

51 files changed

+94
-132
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+94
-132
lines changed

‎airbyte-integrations/connectors/destination-gcs/src/main/java/io/airbyte/integrations/destination/gcs/writer/GcsWriterFactory.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
public interface GcsWriterFactory {
1717

1818
DestinationFileWriter create(GcsDestinationConfig config,
19-
AmazonS3 s3Client,
20-
ConfiguredAirbyteStream configuredStream,
21-
Timestamp uploadTimestamp)
19+
AmazonS3 s3Client,
20+
ConfiguredAirbyteStream configuredStream,
21+
Timestamp uploadTimestamp)
2222
throws Exception;
2323

2424
}

‎airbyte-integrations/connectors/destination-gcs/src/main/java/io/airbyte/integrations/destination/gcs/writer/ProductionWriterFactory.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ public class ProductionWriterFactory implements GcsWriterFactory {
2727

2828
@Override
2929
public DestinationFileWriter create(final GcsDestinationConfig config,
30-
final AmazonS3 s3Client,
31-
final ConfiguredAirbyteStream configuredStream,
32-
final Timestamp uploadTimestamp)
30+
final AmazonS3 s3Client,
31+
final ConfiguredAirbyteStream configuredStream,
32+
final Timestamp uploadTimestamp)
3333
throws Exception {
3434
final S3Format format = config.getFormatConfig().getFormat();
3535

‎airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/avro/S3AvroWriter.java

+1
Original file line numberDiff line numberDiff line change
@@ -106,4 +106,5 @@ public void write(JsonNode formattedData) throws IOException {
106106
final GenericData.Record record = avroRecordFactory.getAvroRecord(formattedData);
107107
dataFileWriter.append(record);
108108
}
109+
109110
}

‎airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/csv/S3CsvWriter.java

+1
Original file line numberDiff line numberDiff line change
@@ -173,4 +173,5 @@ public S3Format getFileFormat() {
173173
public void write(JsonNode formattedData) throws IOException {
174174
csvPrinter.printRecord(csvSheetGenerator.getDataRow(formattedData));
175175
}
176+
176177
}

‎airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/jsonl/S3JsonlWriter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import io.airbyte.integrations.destination.s3.writer.DestinationFileWriter;
2222
import io.airbyte.protocol.models.AirbyteRecordMessage;
2323
import io.airbyte.protocol.models.ConfiguredAirbyteStream;
24-
2524
import java.io.IOException;
2625
import java.io.PrintWriter;
2726
import java.nio.charset.StandardCharsets;
@@ -104,4 +103,5 @@ public S3Format getFileFormat() {
104103
public void write(JsonNode formattedData) throws IOException {
105104
printWriter.println(Jsons.serialize(formattedData));
106105
}
106+
107107
}

‎airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/parquet/S3ParquetWriter.java

+1
Original file line numberDiff line numberDiff line change
@@ -140,4 +140,5 @@ public S3Format getFileFormat() {
140140
public void write(JsonNode formattedData) throws IOException {
141141
parquetWriter.write(avroRecordFactory.getAvroRecord(formattedData));
142142
}
143+
143144
}

‎airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/writer/DestinationWriter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
import java.util.UUID;
1111

1212
/**
13-
* {@link DestinationWriter} is responsible for writing Airbyte stream data to an S3 location in a specific
14-
* format.
13+
* {@link DestinationWriter} is responsible for writing Airbyte stream data to an S3 location in a
14+
* specific format.
1515
*/
1616
public interface DestinationWriter {
1717

‎airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/writer/ProductionWriterFactory.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ public class ProductionWriterFactory implements S3WriterFactory {
2626

2727
@Override
2828
public DestinationFileWriter create(final S3DestinationConfig config,
29-
final AmazonS3 s3Client,
30-
final ConfiguredAirbyteStream configuredStream,
31-
final Timestamp uploadTimestamp)
29+
final AmazonS3 s3Client,
30+
final ConfiguredAirbyteStream configuredStream,
31+
final Timestamp uploadTimestamp)
3232
throws Exception {
3333
final S3Format format = config.getFormatConfig().getFormat();
3434

‎airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/writer/S3WriterFactory.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
public interface S3WriterFactory {
1616

1717
DestinationFileWriter create(S3DestinationConfig config,
18-
AmazonS3 s3Client,
19-
ConfiguredAirbyteStream configuredStream,
20-
Timestamp uploadTimestamp)
18+
AmazonS3 s3Client,
19+
ConfiguredAirbyteStream configuredStream,
20+
Timestamp uploadTimestamp)
2121
throws Exception;
2222

2323
}

‎airbyte-integrations/connectors/destination-snowflake/src/main/java/io/airbyte/integrations/destination/snowflake/SnowflakeInternalStagingDestination.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ public AirbyteConnectionStatus check(final JsonNode config) {
3333
final SnowflakeStagingSqlOperations snowflakeStagingSqlOperations = new SnowflakeStagingSqlOperations();
3434
try (final JdbcDatabase database = getDatabase(config)) {
3535
final String outputSchema = super.getNamingResolver().getIdentifier(config.get("schema").asText());
36-
AirbyteSentry.runWithSpan("CreateAndDropTable", () ->
37-
attemptSQLCreateAndDropTableOperations(outputSchema, database, nameTransformer, snowflakeStagingSqlOperations));
38-
AirbyteSentry.runWithSpan("CreateAndDropStage", () ->
39-
attemptSQLCreateAndDropStages(outputSchema, database, nameTransformer, snowflakeStagingSqlOperations));
36+
AirbyteSentry.runWithSpan("CreateAndDropTable",
37+
() -> attemptSQLCreateAndDropTableOperations(outputSchema, database, nameTransformer, snowflakeStagingSqlOperations));
38+
AirbyteSentry.runWithSpan("CreateAndDropStage",
39+
() -> attemptSQLCreateAndDropStages(outputSchema, database, nameTransformer, snowflakeStagingSqlOperations));
4040
return new AirbyteConnectionStatus().withStatus(AirbyteConnectionStatus.Status.SUCCEEDED);
4141
} catch (final Exception e) {
4242
LOGGER.error("Exception while checking connection: ", e);

‎airbyte-integrations/connectors/source-bigquery/src/test-integration/java/io/airbyte/integrations/source/bigquery/BigQuerySourceAcceptanceTest.java

-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@
2121
import java.nio.file.Files;
2222
import java.nio.file.Path;
2323
import java.sql.SQLException;
24-
import java.util.Collections;
2524
import java.util.HashMap;
26-
import java.util.List;
2725

2826
public class BigQuerySourceAcceptanceTest extends SourceAcceptanceTest {
2927

‎airbyte-integrations/connectors/source-clickhouse/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/AbstractSshClickHouseSourceAcceptanceTest.java

-2
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@
2424
import io.airbyte.protocol.models.Field;
2525
import io.airbyte.protocol.models.JsonSchemaPrimitive;
2626
import io.airbyte.protocol.models.SyncMode;
27-
import java.util.Collections;
2827
import java.util.HashMap;
29-
import java.util.List;
3028
import org.testcontainers.containers.ClickHouseContainer;
3129

3230
public abstract class AbstractSshClickHouseSourceAcceptanceTest extends SourceAcceptanceTest {

‎airbyte-integrations/connectors/source-clickhouse/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/ClickHouseSourceAcceptanceTest.java

-2
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@
2323
import io.airbyte.protocol.models.Field;
2424
import io.airbyte.protocol.models.JsonSchemaPrimitive;
2525
import io.airbyte.protocol.models.SyncMode;
26-
import java.util.Collections;
2726
import java.util.HashMap;
28-
import java.util.List;
2927
import org.testcontainers.containers.ClickHouseContainer;
3028

3129
public class ClickHouseSourceAcceptanceTest extends SourceAcceptanceTest {

‎airbyte-integrations/connectors/source-cockroachdb-strict-encrypt/src/test-integration/java/io/airbyte/integrations/source/cockroachdb/CockroachDbEncryptSourceAcceptanceTest.java

-2
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@
2222
import io.airbyte.protocol.models.Field;
2323
import io.airbyte.protocol.models.JsonSchemaPrimitive;
2424
import io.airbyte.protocol.models.SyncMode;
25-
import java.util.Collections;
2625
import java.util.HashMap;
27-
import java.util.List;
2826
import org.jooq.SQLDialect;
2927

3028
public class CockroachDbEncryptSourceAcceptanceTest extends SourceAcceptanceTest {

‎airbyte-integrations/connectors/source-cockroachdb/src/test-integration/java/io/airbyte/integrations/source/cockroachdb/CockroachDbSourceAcceptanceTest.java

-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@
2121
import io.airbyte.protocol.models.Field;
2222
import io.airbyte.protocol.models.JsonSchemaPrimitive;
2323
import io.airbyte.protocol.models.SyncMode;
24-
import java.util.Collections;
2524
import java.util.HashMap;
26-
import java.util.List;
2725
import org.jooq.SQLDialect;
2826
import org.testcontainers.containers.CockroachContainer;
2927

‎airbyte-integrations/connectors/source-db2-strict-encrypt/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/Db2StrictEncryptSourceCertificateAcceptanceTest.java

-2
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@
2525
import java.io.File;
2626
import java.io.IOException;
2727
import java.io.PrintWriter;
28-
import java.util.Collections;
2928
import java.util.HashMap;
30-
import java.util.List;
3129
import java.util.concurrent.TimeUnit;
3230
import org.testcontainers.containers.Db2Container;
3331

‎airbyte-integrations/connectors/source-db2/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/Db2SourceAcceptanceTest.java

-2
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@
2222
import io.airbyte.protocol.models.Field;
2323
import io.airbyte.protocol.models.JsonSchemaPrimitive;
2424
import io.airbyte.protocol.models.SyncMode;
25-
import java.util.Collections;
2625
import java.util.HashMap;
27-
import java.util.List;
2826
import org.testcontainers.containers.Db2Container;
2927

3028
public class Db2SourceAcceptanceTest extends SourceAcceptanceTest {

‎airbyte-integrations/connectors/source-db2/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/Db2SourceCertificateAcceptanceTest.java

-2
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@
2525
import java.io.File;
2626
import java.io.IOException;
2727
import java.io.PrintWriter;
28-
import java.util.Collections;
2928
import java.util.HashMap;
30-
import java.util.List;
3129
import java.util.concurrent.TimeUnit;
3230
import org.testcontainers.containers.Db2Container;
3331

‎airbyte-integrations/connectors/source-e2e-test/src/test-integration/java/io/airbyte/integrations/source/e2e_test/LegacyInfiniteFeedSourceAcceptanceTest.java

-2
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
1515
import io.airbyte.protocol.models.ConnectorSpecification;
1616
import java.io.IOException;
17-
import java.util.Collections;
1817
import java.util.HashMap;
19-
import java.util.List;
2018

2119
public class LegacyInfiniteFeedSourceAcceptanceTest extends SourceAcceptanceTest {
2220

‎airbyte-integrations/connectors/source-github/source_github/spec.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,11 @@
5454
},
5555
"repository": {
5656
"type": "string",
57-
"examples": ["airbytehq/airbyte airbytehq/another-repo", "airbytehq/*", "airbytehq/airbyte"],
57+
"examples": [
58+
"airbytehq/airbyte airbytehq/another-repo",
59+
"airbytehq/*",
60+
"airbytehq/airbyte"
61+
],
5862
"title": "GitHub Repositories",
5963
"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."
6064
},

‎airbyte-integrations/connectors/source-hubspot/sample_files/sample_config_oauth.json

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
{
2-
"start_date": "2021-10-01T00:00:00Z",
3-
"credentials": {
4-
"credentials_title": "OAuth Credentials",
5-
"client_id": "123456789_client_id_hubspot",
6-
"client_secret": "123456789_client_secret_hubspot",
7-
"refresh_token": "123456789_some_refresh_token"
8-
}
2+
"start_date": "2021-10-01T00:00:00Z",
3+
"credentials": {
4+
"credentials_title": "OAuth Credentials",
5+
"client_id": "123456789_client_id_hubspot",
6+
"client_secret": "123456789_client_secret_hubspot",
7+
"refresh_token": "123456789_some_refresh_token"
98
}
10-
9+
}

‎airbyte-integrations/connectors/source-hubspot/source_hubspot/schemas/property_history.json

+31-31
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
{
2-
"$schema": "http://json-schema.org/draft-07/schema",
3-
"type": ["null", "object"],
4-
"properties": {
5-
"value": {
6-
"type": ["null", "string"]
7-
},
8-
"source-type": {
9-
"type": ["null", "string"]
10-
},
11-
"source-id": {
12-
"type": ["null", "string"]
13-
},
14-
"source-label": {
15-
"type": ["null", "string"]
16-
},
17-
"updated-by-user-id" : {
18-
"type": ["null", "integer"]
19-
},
20-
"timestamp": {
21-
"type": ["null", "string"],
22-
"format": "date-time"
23-
},
24-
"selected": {
25-
"type": ["null", "boolean"]
26-
},
27-
"property": {
28-
"type": ["null", "string"]
29-
},
30-
"vid": {
31-
"type": ["null", "integer"]
32-
}
2+
"$schema": "http://json-schema.org/draft-07/schema",
3+
"type": ["null", "object"],
4+
"properties": {
5+
"value": {
6+
"type": ["null", "string"]
7+
},
8+
"source-type": {
9+
"type": ["null", "string"]
10+
},
11+
"source-id": {
12+
"type": ["null", "string"]
13+
},
14+
"source-label": {
15+
"type": ["null", "string"]
16+
},
17+
"updated-by-user-id": {
18+
"type": ["null", "integer"]
19+
},
20+
"timestamp": {
21+
"type": ["null", "string"],
22+
"format": "date-time"
23+
},
24+
"selected": {
25+
"type": ["null", "boolean"]
26+
},
27+
"property": {
28+
"type": ["null", "string"]
29+
},
30+
"vid": {
31+
"type": ["null", "integer"]
3332
}
33+
}
3434
}

‎airbyte-integrations/connectors/source-jdbc/src/test-integration/java/io/airbyte/integrations/source/jdbc/JdbcSourceSourceAcceptanceTest.java

-2
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
import io.airbyte.protocol.models.Field;
1919
import io.airbyte.protocol.models.JsonSchemaPrimitive;
2020
import java.sql.SQLException;
21-
import java.util.ArrayList;
2221
import java.util.HashMap;
23-
import java.util.List;
2422
import org.testcontainers.containers.PostgreSQLContainer;
2523

2624
/**

‎airbyte-integrations/connectors/source-kafka/src/test-integration/java/io/airbyte/integrations/source/kafka/KafkaSourceAcceptanceTest.java

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import io.airbyte.protocol.models.SyncMode;
2323
import java.util.Collections;
2424
import java.util.HashMap;
25-
import java.util.List;
2625
import java.util.Map;
2726
import java.util.concurrent.ExecutionException;
2827
import org.apache.kafka.clients.admin.AdminClient;

‎airbyte-integrations/connectors/source-mongodb-strict-encrypt/src/test-integration/java/io/airbyte/integrations/source/mongodb/MongodbSourceStrictEncryptAcceptanceTest.java

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import io.airbyte.protocol.models.SyncMode;
2727
import java.nio.file.Files;
2828
import java.nio.file.Path;
29-
import java.util.Collections;
3029
import java.util.HashMap;
3130
import java.util.List;
3231
import org.bson.BsonArray;

‎airbyte-integrations/connectors/source-mongodb-v2/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/MongoDbSourceAbstractAcceptanceTest.java

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import io.airbyte.protocol.models.Field;
1919
import io.airbyte.protocol.models.JsonSchemaPrimitive;
2020
import io.airbyte.protocol.models.SyncMode;
21-
import java.util.Collections;
2221
import java.util.HashMap;
2322
import java.util.List;
2423

‎airbyte-integrations/connectors/source-mssql-strict-encrypt/src/test-integration/java/io/airbyte/integrations/source/mssql/MssqlStrictEncryptSourceAcceptanceTest.java

-2
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020
import io.airbyte.protocol.models.Field;
2121
import io.airbyte.protocol.models.JsonSchemaPrimitive;
2222
import java.sql.SQLException;
23-
import java.util.Collections;
2423
import java.util.HashMap;
25-
import java.util.List;
2624
import org.apache.commons.lang3.RandomStringUtils;
2725
import org.testcontainers.containers.MSSQLServerContainer;
2826
import org.testcontainers.utility.DockerImageName;

‎airbyte-integrations/connectors/source-mssql/src/test-integration/java/io/airbyte/integrations/source/mssql/AbstractSshMssqlSourceAcceptanceTest.java

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import io.airbyte.protocol.models.Field;
2424
import io.airbyte.protocol.models.JsonSchemaPrimitive;
2525
import io.airbyte.protocol.models.SyncMode;
26-
import java.util.Collections;
2726
import java.util.HashMap;
2827
import java.util.List;
2928
import java.util.Objects;

‎airbyte-integrations/connectors/source-mssql/src/test-integration/java/io/airbyte/integrations/source/mssql/CdcMssqlSourceAcceptanceTest.java

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import io.airbyte.protocol.models.Field;
2222
import io.airbyte.protocol.models.JsonSchemaPrimitive;
2323
import io.airbyte.protocol.models.SyncMode;
24-
import java.util.Collections;
2524
import java.util.List;
2625
import org.testcontainers.containers.MSSQLServerContainer;
2726

‎airbyte-integrations/connectors/source-mssql/src/test-integration/java/io/airbyte/integrations/source/mssql/MssqlSourceAcceptanceTest.java

-2
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020
import io.airbyte.protocol.models.Field;
2121
import io.airbyte.protocol.models.JsonSchemaPrimitive;
2222
import java.sql.SQLException;
23-
import java.util.Collections;
2423
import java.util.HashMap;
25-
import java.util.List;
2624
import org.testcontainers.containers.MSSQLServerContainer;
2725

2826
public class MssqlSourceAcceptanceTest extends SourceAcceptanceTest {

‎airbyte-integrations/connectors/source-mysql-strict-encrypt/src/test-integration/java/io/airbyte/integrations/source/mysql_strict_encrypt/MySqlStrictEncryptSourceAcceptanceTest.java

-2
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@
2525
import io.airbyte.protocol.models.Field;
2626
import io.airbyte.protocol.models.JsonSchemaPrimitive;
2727
import io.airbyte.protocol.models.SyncMode;
28-
import java.util.Collections;
2928
import java.util.HashMap;
30-
import java.util.List;
3129
import org.jooq.SQLDialect;
3230
import org.testcontainers.containers.MySQLContainer;
3331

‎airbyte-integrations/connectors/source-mysql/src/test-integration/java/io/airbyte/integrations/source/mysql/AbstractSshMySqlSourceAcceptanceTest.java

-2
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020
import io.airbyte.protocol.models.JsonSchemaPrimitive;
2121
import io.airbyte.protocol.models.SyncMode;
2222
import java.nio.file.Path;
23-
import java.util.Collections;
2423
import java.util.HashMap;
25-
import java.util.List;
2624

2725
public abstract class AbstractSshMySqlSourceAcceptanceTest extends SourceAcceptanceTest {
2826

‎airbyte-integrations/connectors/source-mysql/src/test-integration/java/io/airbyte/integrations/source/mysql/CdcMySqlSourceAcceptanceTest.java

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import io.airbyte.protocol.models.Field;
2323
import io.airbyte.protocol.models.JsonSchemaPrimitive;
2424
import io.airbyte.protocol.models.SyncMode;
25-
import java.util.Collections;
2625
import java.util.List;
2726
import org.jooq.SQLDialect;
2827
import org.testcontainers.containers.MySQLContainer;

0 commit comments

Comments
 (0)