From 548a3a3063eae4c729fe863210bd12e067d635c8 Mon Sep 17 00:00:00 2001 From: LiRen Tu Date: Wed, 22 Sep 2021 09:30:14 -0700 Subject: [PATCH] Format code (#6381) --- .../sources/streams/http/auth/test_auth.py | 5 +++-- .../source-hubspot/source_hubspot/client.py | 2 +- .../source/kafka/KafkaSourceConfig.java | 17 ++++++++--------- .../source-kafka/src/main/resources/spec.json | 8 ++------ .../AbstractSshMssqlSourceAcceptanceTest.java | 12 ++++++------ .../source-shopify/integration_tests/state.json | 2 +- 6 files changed, 21 insertions(+), 25 deletions(-) diff --git a/airbyte-cdk/python/unit_tests/sources/streams/http/auth/test_auth.py b/airbyte-cdk/python/unit_tests/sources/streams/http/auth/test_auth.py index b9961346ac8..01d496b4f64 100644 --- a/airbyte-cdk/python/unit_tests/sources/streams/http/auth/test_auth.py +++ b/airbyte-cdk/python/unit_tests/sources/streams/http/auth/test_auth.py @@ -130,8 +130,9 @@ class TestOauth2Authenticator: assert body == expected def test_refresh_access_token(self, requests_mock): - mock_refresh_token_call = requests_mock.post(TestOauth2Authenticator.refresh_endpoint, - json={"access_token": "token", "expires_in": 10}) + mock_refresh_token_call = requests_mock.post( + TestOauth2Authenticator.refresh_endpoint, json={"access_token": "token", "expires_in": 10} + ) oauth = Oauth2Authenticator( TestOauth2Authenticator.refresh_endpoint, diff --git a/airbyte-integrations/connectors/source-hubspot/source_hubspot/client.py b/airbyte-integrations/connectors/source-hubspot/source_hubspot/client.py index f62e2006085..12b14d53512 100644 --- a/airbyte-integrations/connectors/source-hubspot/source_hubspot/client.py +++ b/airbyte-integrations/connectors/source-hubspot/source_hubspot/client.py @@ -58,7 +58,7 @@ class Client(BaseClient): "contact_lists": ContactListStream(**common_params), "contacts": CRMObjectStream(entity="contact", **common_params), "deal_pipelines": DealPipelineStream(**common_params), - "deals": DealStream(associations=['contacts'], **common_params), + "deals": DealStream(associations=["contacts"], **common_params), "email_events": EmailEventStream(**common_params), "engagements": EngagementStream(**common_params), "forms": FormStream(**common_params), diff --git a/airbyte-integrations/connectors/source-kafka/src/main/java/io/airbyte/integrations/source/kafka/KafkaSourceConfig.java b/airbyte-integrations/connectors/source-kafka/src/main/java/io/airbyte/integrations/source/kafka/KafkaSourceConfig.java index b0904434ab5..7343a44d580 100644 --- a/airbyte-integrations/connectors/source-kafka/src/main/java/io/airbyte/integrations/source/kafka/KafkaSourceConfig.java +++ b/airbyte-integrations/connectors/source-kafka/src/main/java/io/airbyte/integrations/source/kafka/KafkaSourceConfig.java @@ -27,7 +27,6 @@ package io.airbyte.integrations.source.kafka; import com.fasterxml.jackson.databind.JsonNode; import com.google.common.collect.ImmutableMap; import io.airbyte.commons.json.Jsons; - import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; @@ -69,22 +68,22 @@ public class KafkaSourceConfig { final Map props = new HashMap<>(); props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, config.get("bootstrap_servers").asText()); props.put(ConsumerConfig.GROUP_ID_CONFIG, - config.has("group_id") ? config.get("group_id").asText() : null); + config.has("group_id") ? config.get("group_id").asText() : null); props.put(ConsumerConfig.MAX_POLL_RECORDS_CONFIG, - config.has("max_poll_records") ? config.get("max_poll_records").intValue() : null); + config.has("max_poll_records") ? config.get("max_poll_records").intValue() : null); props.putAll(propertiesByProtocol(config)); props.put(ConsumerConfig.CLIENT_ID_CONFIG, config.has("client_id") ? config.get("client_id").asText() : null); props.put(ConsumerConfig.CLIENT_DNS_LOOKUP_CONFIG, config.get("client_dns_lookup").asText()); props.put(ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG, config.get("enable_auto_commit").booleanValue()); props.put(ConsumerConfig.AUTO_COMMIT_INTERVAL_MS_CONFIG, - config.has("auto_commit_interval_ms") ? config.get("auto_commit_interval_ms").intValue() : null); + config.has("auto_commit_interval_ms") ? config.get("auto_commit_interval_ms").intValue() : null); props.put(ConsumerConfig.RETRY_BACKOFF_MS_CONFIG, - config.has("retry_backoff_ms") ? config.get("retry_backoff_ms").intValue() : null); + config.has("retry_backoff_ms") ? config.get("retry_backoff_ms").intValue() : null); props.put(ConsumerConfig.REQUEST_TIMEOUT_MS_CONFIG, - config.has("request_timeout_ms") ? config.get("request_timeout_ms").intValue() : null); + config.has("request_timeout_ms") ? config.get("request_timeout_ms").intValue() : null); props.put(ConsumerConfig.RECEIVE_BUFFER_CONFIG, - config.has("receive_buffer_bytes") ? config.get("receive_buffer_bytes").intValue() : null); + config.has("receive_buffer_bytes") ? config.get("receive_buffer_bytes").intValue() : null); props.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName()); props.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, JsonDeserializer.class.getName()); @@ -127,8 +126,8 @@ public class KafkaSourceConfig { String topicPattern = subscription.get("topic_pattern").asText(); consumer.subscribe(Pattern.compile(topicPattern)); topicsToSubscribe = consumer.listTopics().keySet().stream() - .filter(topic -> topic.matches(topicPattern)) - .collect(Collectors.toSet()); + .filter(topic -> topic.matches(topicPattern)) + .collect(Collectors.toSet()); } case "assign" -> { topicsToSubscribe = new HashSet<>(); diff --git a/airbyte-integrations/connectors/source-kafka/src/main/resources/spec.json b/airbyte-integrations/connectors/source-kafka/src/main/resources/spec.json index 21668c0b89e..d88e807c243 100644 --- a/airbyte-integrations/connectors/source-kafka/src/main/resources/spec.json +++ b/airbyte-integrations/connectors/source-kafka/src/main/resources/spec.json @@ -8,11 +8,7 @@ "$schema": "http://json-schema.org/draft-07/schema#", "title": "Kafka Source Spec", "type": "object", - "required": [ - "bootstrap_servers", - "subscription", - "protocol" - ], + "required": ["bootstrap_servers", "subscription", "protocol"], "additionalProperties": false, "properties": { "bootstrap_servers": { @@ -46,7 +42,7 @@ }, { "title": "Subscribe to all topics matching specified pattern", - "required": ["subscription_type","topic_pattern"], + "required": ["subscription_type", "topic_pattern"], "properties": { "subscription_type": { "description": "Topic pattern from which the records will be read.", diff --git a/airbyte-integrations/connectors/source-mssql/src/test-integration/java/io/airbyte/integrations/source/mssql/AbstractSshMssqlSourceAcceptanceTest.java b/airbyte-integrations/connectors/source-mssql/src/test-integration/java/io/airbyte/integrations/source/mssql/AbstractSshMssqlSourceAcceptanceTest.java index 63fe952812e..7e31046ccd0 100644 --- a/airbyte-integrations/connectors/source-mssql/src/test-integration/java/io/airbyte/integrations/source/mssql/AbstractSshMssqlSourceAcceptanceTest.java +++ b/airbyte-integrations/connectors/source-mssql/src/test-integration/java/io/airbyte/integrations/source/mssql/AbstractSshMssqlSourceAcceptanceTest.java @@ -86,9 +86,9 @@ public abstract class AbstractSshMssqlSourceAcceptanceTest extends SourceAccepta .withCursorField(Lists.newArrayList("id")) .withDestinationSyncMode(DestinationSyncMode.APPEND) .withStream(CatalogHelpers.createAirbyteStream( - STREAM_NAME, - Field.of("id", JsonSchemaPrimitive.NUMBER), - Field.of("name", JsonSchemaPrimitive.STRING)) + STREAM_NAME, + Field.of("id", JsonSchemaPrimitive.NUMBER), + Field.of("name", JsonSchemaPrimitive.STRING)) .withSupportedSyncModes( Lists.newArrayList(SyncMode.FULL_REFRESH, SyncMode.INCREMENTAL))), new ConfiguredAirbyteStream() @@ -96,9 +96,9 @@ public abstract class AbstractSshMssqlSourceAcceptanceTest extends SourceAccepta .withCursorField(Lists.newArrayList("id")) .withDestinationSyncMode(DestinationSyncMode.APPEND) .withStream(CatalogHelpers.createAirbyteStream( - STREAM_NAME2, - Field.of("id", JsonSchemaPrimitive.NUMBER), - Field.of("name", JsonSchemaPrimitive.STRING)) + STREAM_NAME2, + Field.of("id", JsonSchemaPrimitive.NUMBER), + Field.of("name", JsonSchemaPrimitive.STRING)) .withSupportedSyncModes( Lists.newArrayList(SyncMode.FULL_REFRESH, SyncMode.INCREMENTAL))))); } diff --git a/airbyte-integrations/connectors/source-shopify/integration_tests/state.json b/airbyte-integrations/connectors/source-shopify/integration_tests/state.json index 3bab6c83660..575f2171d4b 100644 --- a/airbyte-integrations/connectors/source-shopify/integration_tests/state.json +++ b/airbyte-integrations/connectors/source-shopify/integration_tests/state.json @@ -41,4 +41,4 @@ "discount_codes": { "updated_at": "2021-09-10T06:48:10-07:00" } -} \ No newline at end of file +}