diff --git a/airbyte-integrations/connectors/destination-azure-blob-storage/src/main/java/io/airbyte/integrations/destination/azure_blob_storage/AzureBlobStorageConsumer.java b/airbyte-integrations/connectors/destination-azure-blob-storage/src/main/java/io/airbyte/integrations/destination/azure_blob_storage/AzureBlobStorageConsumer.java
index 6421810cabbd..f93b3fa4079a 100644
--- a/airbyte-integrations/connectors/destination-azure-blob-storage/src/main/java/io/airbyte/integrations/destination/azure_blob_storage/AzureBlobStorageConsumer.java
+++ b/airbyte-integrations/connectors/destination-azure-blob-storage/src/main/java/io/airbyte/integrations/destination/azure_blob_storage/AzureBlobStorageConsumer.java
@@ -9,7 +9,6 @@
 import com.azure.storage.blob.specialized.SpecializedBlobClientBuilder;
 import com.azure.storage.common.StorageSharedKeyCredential;
 import io.airbyte.commons.json.Jsons;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.base.FailureTrackingAirbyteMessageConsumer;
 import io.airbyte.integrations.destination.azure_blob_storage.writer.AzureBlobStorageWriter;
 import io.airbyte.integrations.destination.azure_blob_storage.writer.AzureBlobStorageWriterFactory;
@@ -17,6 +16,7 @@
 import io.airbyte.protocol.models.AirbyteMessage.Type;
 import io.airbyte.protocol.models.AirbyteRecordMessage;
 import io.airbyte.protocol.models.AirbyteStream;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
 import io.airbyte.protocol.models.ConfiguredAirbyteStream;
 import io.airbyte.protocol.models.DestinationSyncMode;
diff --git a/airbyte-integrations/connectors/destination-bigquery-denormalized/src/main/java/io/airbyte/integrations/destination/bigquery/BigQueryDenormalizedDestination.java b/airbyte-integrations/connectors/destination-bigquery-denormalized/src/main/java/io/airbyte/integrations/destination/bigquery/BigQueryDenormalizedDestination.java
index 7fd223429959..37f181f578e3 100644
--- a/airbyte-integrations/connectors/destination-bigquery-denormalized/src/main/java/io/airbyte/integrations/destination/bigquery/BigQueryDenormalizedDestination.java
+++ b/airbyte-integrations/connectors/destination-bigquery-denormalized/src/main/java/io/airbyte/integrations/destination/bigquery/BigQueryDenormalizedDestination.java
@@ -9,7 +9,6 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.google.cloud.bigquery.Field;
 import com.google.cloud.bigquery.Table;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.base.Destination;
 import io.airbyte.integrations.base.IntegrationRunner;
 import io.airbyte.integrations.destination.bigquery.formatter.BigQueryRecordFormatter;
@@ -22,6 +21,7 @@
 import io.airbyte.integrations.destination.bigquery.uploader.config.UploaderConfig;
 import io.airbyte.integrations.destination.s3.avro.JsonToAvroSchemaConverter;
 import io.airbyte.protocol.models.AirbyteStream;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import java.io.IOException;
 import java.util.Map;
 import java.util.function.BiFunction;
diff --git a/airbyte-integrations/connectors/destination-bigquery-denormalized/src/test/java/io/airbyte/integrations/destination/bigquery/BigQueryDenormalizedDestinationTest.java b/airbyte-integrations/connectors/destination-bigquery-denormalized/src/test/java/io/airbyte/integrations/destination/bigquery/BigQueryDenormalizedDestinationTest.java
index b87f9708bbe5..964bff57cb9f 100644
--- a/airbyte-integrations/connectors/destination-bigquery-denormalized/src/test/java/io/airbyte/integrations/destination/bigquery/BigQueryDenormalizedDestinationTest.java
+++ b/airbyte-integrations/connectors/destination-bigquery-denormalized/src/test/java/io/airbyte/integrations/destination/bigquery/BigQueryDenormalizedDestinationTest.java
@@ -28,7 +28,6 @@
 import com.google.cloud.bigquery.StandardSQLTypeName;
 import com.google.cloud.bigquery.Table;
 import com.google.cloud.bigquery.TableDefinition;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.destination.bigquery.formatter.BigQueryRecordFormatter;
 import io.airbyte.integrations.destination.bigquery.formatter.DefaultBigQueryDenormalizedRecordFormatter;
 import io.airbyte.integrations.destination.bigquery.formatter.GcsBigQueryDenormalizedRecordFormatter;
@@ -39,6 +38,7 @@
 import io.airbyte.integrations.destination.bigquery.uploader.UploaderType;
 import io.airbyte.integrations.destination.bigquery.uploader.config.UploaderConfig;
 import io.airbyte.protocol.models.AirbyteStream;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.ConfiguredAirbyteStream;
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/airbyte-integrations/connectors/destination-bigquery/src/main/java/io/airbyte/integrations/destination/bigquery/BigQueryAvroSerializedBuffer.java b/airbyte-integrations/connectors/destination-bigquery/src/main/java/io/airbyte/integrations/destination/bigquery/BigQueryAvroSerializedBuffer.java
index 9c6887f13db7..7841ffe2fa23 100644
--- a/airbyte-integrations/connectors/destination-bigquery/src/main/java/io/airbyte/integrations/destination/bigquery/BigQueryAvroSerializedBuffer.java
+++ b/airbyte-integrations/connectors/destination-bigquery/src/main/java/io/airbyte/integrations/destination/bigquery/BigQueryAvroSerializedBuffer.java
@@ -6,7 +6,6 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import io.airbyte.commons.functional.CheckedBiFunction;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.destination.bigquery.formatter.BigQueryRecordFormatter;
 import io.airbyte.integrations.destination.record_buffer.BufferStorage;
 import io.airbyte.integrations.destination.record_buffer.SerializableBuffer;
@@ -14,6 +13,7 @@
 import io.airbyte.integrations.destination.s3.avro.S3AvroFormatConfig;
 import io.airbyte.protocol.models.AirbyteRecordMessage;
 import io.airbyte.protocol.models.AirbyteStream;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
 import java.io.IOException;
 import java.util.concurrent.Callable;
diff --git a/airbyte-integrations/connectors/destination-bigquery/src/main/java/io/airbyte/integrations/destination/bigquery/BigQueryDestination.java b/airbyte-integrations/connectors/destination-bigquery/src/main/java/io/airbyte/integrations/destination/bigquery/BigQueryDestination.java
index cbac5ab2cdda..0e20d754eb6e 100644
--- a/airbyte-integrations/connectors/destination-bigquery/src/main/java/io/airbyte/integrations/destination/bigquery/BigQueryDestination.java
+++ b/airbyte-integrations/connectors/destination-bigquery/src/main/java/io/airbyte/integrations/destination/bigquery/BigQueryDestination.java
@@ -20,7 +20,6 @@
 import io.airbyte.commons.json.Jsons;
 import io.airbyte.integrations.BaseConnector;
 import io.airbyte.integrations.base.AirbyteMessageConsumer;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.base.Destination;
 import io.airbyte.integrations.base.IntegrationRunner;
 import io.airbyte.integrations.destination.StandardNameTransformer;
@@ -44,6 +43,7 @@
 import io.airbyte.protocol.models.AirbyteConnectionStatus.Status;
 import io.airbyte.protocol.models.AirbyteMessage;
 import io.airbyte.protocol.models.AirbyteStream;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
 import io.airbyte.protocol.models.ConfiguredAirbyteStream;
 import java.io.ByteArrayInputStream;
diff --git a/airbyte-integrations/connectors/destination-bigquery/src/main/java/io/airbyte/integrations/destination/bigquery/BigQueryRecordConsumer.java b/airbyte-integrations/connectors/destination-bigquery/src/main/java/io/airbyte/integrations/destination/bigquery/BigQueryRecordConsumer.java
index 2a2508b5d3fe..989dc11a8606 100644
--- a/airbyte-integrations/connectors/destination-bigquery/src/main/java/io/airbyte/integrations/destination/bigquery/BigQueryRecordConsumer.java
+++ b/airbyte-integrations/connectors/destination-bigquery/src/main/java/io/airbyte/integrations/destination/bigquery/BigQueryRecordConsumer.java
@@ -6,11 +6,11 @@
 
 import io.airbyte.commons.string.Strings;
 import io.airbyte.integrations.base.AirbyteMessageConsumer;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.base.FailureTrackingAirbyteMessageConsumer;
 import io.airbyte.integrations.destination.bigquery.uploader.AbstractBigQueryUploader;
 import io.airbyte.protocol.models.AirbyteMessage;
 import io.airbyte.protocol.models.AirbyteMessage.Type;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
diff --git a/airbyte-integrations/connectors/destination-bigquery/src/main/java/io/airbyte/integrations/destination/bigquery/BigQueryStagingConsumerFactory.java b/airbyte-integrations/connectors/destination-bigquery/src/main/java/io/airbyte/integrations/destination/bigquery/BigQueryStagingConsumerFactory.java
index 0dee0e9bdb66..49eff33187a0 100644
--- a/airbyte-integrations/connectors/destination-bigquery/src/main/java/io/airbyte/integrations/destination/bigquery/BigQueryStagingConsumerFactory.java
+++ b/airbyte-integrations/connectors/destination-bigquery/src/main/java/io/airbyte/integrations/destination/bigquery/BigQueryStagingConsumerFactory.java
@@ -13,13 +13,13 @@
 import io.airbyte.commons.functional.CheckedConsumer;
 import io.airbyte.commons.json.Jsons;
 import io.airbyte.integrations.base.AirbyteMessageConsumer;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.destination.bigquery.formatter.BigQueryRecordFormatter;
 import io.airbyte.integrations.destination.buffered_stream_consumer.BufferedStreamConsumer;
 import io.airbyte.integrations.destination.record_buffer.SerializableBuffer;
 import io.airbyte.integrations.destination.record_buffer.SerializedBufferingStrategy;
 import io.airbyte.protocol.models.AirbyteMessage;
 import io.airbyte.protocol.models.AirbyteStream;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
 import java.util.Map;
 import java.util.function.Consumer;
diff --git a/airbyte-integrations/connectors/destination-bigquery/src/test/java/io/airbyte/integrations/destination/bigquery/BigQueryRecordConsumerTest.java b/airbyte-integrations/connectors/destination-bigquery/src/test/java/io/airbyte/integrations/destination/bigquery/BigQueryRecordConsumerTest.java
index 8c10b2ec39c2..819e3d179e68 100644
--- a/airbyte-integrations/connectors/destination-bigquery/src/test/java/io/airbyte/integrations/destination/bigquery/BigQueryRecordConsumerTest.java
+++ b/airbyte-integrations/connectors/destination-bigquery/src/test/java/io/airbyte/integrations/destination/bigquery/BigQueryRecordConsumerTest.java
@@ -4,11 +4,11 @@
 
 package io.airbyte.integrations.destination.bigquery;
 
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.base.FailureTrackingAirbyteMessageConsumer;
 import io.airbyte.integrations.destination.bigquery.uploader.AbstractBigQueryUploader;
 import io.airbyte.integrations.standardtest.destination.PerStreamStateMessageTest;
 import io.airbyte.protocol.models.AirbyteMessage;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import java.util.Map;
 import java.util.function.Consumer;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/airbyte-integrations/connectors/destination-cassandra/src/main/java/io/airbyte/integrations/destination/cassandra/CassandraMessageConsumer.java b/airbyte-integrations/connectors/destination-cassandra/src/main/java/io/airbyte/integrations/destination/cassandra/CassandraMessageConsumer.java
index 30c5eb3b9d4e..c2d138f2539c 100644
--- a/airbyte-integrations/connectors/destination-cassandra/src/main/java/io/airbyte/integrations/destination/cassandra/CassandraMessageConsumer.java
+++ b/airbyte-integrations/connectors/destination-cassandra/src/main/java/io/airbyte/integrations/destination/cassandra/CassandraMessageConsumer.java
@@ -5,9 +5,9 @@
 package io.airbyte.integrations.destination.cassandra;
 
 import io.airbyte.commons.json.Jsons;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.base.FailureTrackingAirbyteMessageConsumer;
 import io.airbyte.protocol.models.AirbyteMessage;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
 import java.util.Map;
 import java.util.function.Consumer;
diff --git a/airbyte-integrations/connectors/destination-dynamodb/src/main/java/io/airbyte/integrations/destination/dynamodb/DynamodbConsumer.java b/airbyte-integrations/connectors/destination-dynamodb/src/main/java/io/airbyte/integrations/destination/dynamodb/DynamodbConsumer.java
index bf9d301cfdda..b4317776c834 100644
--- a/airbyte-integrations/connectors/destination-dynamodb/src/main/java/io/airbyte/integrations/destination/dynamodb/DynamodbConsumer.java
+++ b/airbyte-integrations/connectors/destination-dynamodb/src/main/java/io/airbyte/integrations/destination/dynamodb/DynamodbConsumer.java
@@ -12,9 +12,9 @@
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;
 import io.airbyte.commons.json.Jsons;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.base.FailureTrackingAirbyteMessageConsumer;
 import io.airbyte.protocol.models.*;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import java.util.*;
 import java.util.function.Consumer;
 import org.slf4j.Logger;
diff --git a/airbyte-integrations/connectors/destination-e2e-test/src/main/java/io/airbyte/integrations/destination/e2e_test/logging/BaseLogger.java b/airbyte-integrations/connectors/destination-e2e-test/src/main/java/io/airbyte/integrations/destination/e2e_test/logging/BaseLogger.java
index 9342ca91a942..ae99565a89a5 100644
--- a/airbyte-integrations/connectors/destination-e2e-test/src/main/java/io/airbyte/integrations/destination/e2e_test/logging/BaseLogger.java
+++ b/airbyte-integrations/connectors/destination-e2e-test/src/main/java/io/airbyte/integrations/destination/e2e_test/logging/BaseLogger.java
@@ -4,8 +4,8 @@
 
 package io.airbyte.integrations.destination.e2e_test.logging;
 
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.AirbyteRecordMessage;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import java.time.Instant;
 import java.time.OffsetDateTime;
 import java.time.ZoneId;
diff --git a/airbyte-integrations/connectors/destination-e2e-test/src/main/java/io/airbyte/integrations/destination/e2e_test/logging/EveryNthLogger.java b/airbyte-integrations/connectors/destination-e2e-test/src/main/java/io/airbyte/integrations/destination/e2e_test/logging/EveryNthLogger.java
index 7347955db235..127e53bee3cb 100644
--- a/airbyte-integrations/connectors/destination-e2e-test/src/main/java/io/airbyte/integrations/destination/e2e_test/logging/EveryNthLogger.java
+++ b/airbyte-integrations/connectors/destination-e2e-test/src/main/java/io/airbyte/integrations/destination/e2e_test/logging/EveryNthLogger.java
@@ -4,8 +4,8 @@
 
 package io.airbyte.integrations.destination.e2e_test.logging;
 
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.AirbyteRecordMessage;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airbyte-integrations/connectors/destination-e2e-test/src/main/java/io/airbyte/integrations/destination/e2e_test/logging/FirstNLogger.java b/airbyte-integrations/connectors/destination-e2e-test/src/main/java/io/airbyte/integrations/destination/e2e_test/logging/FirstNLogger.java
index b482b1107003..2ba624427608 100644
--- a/airbyte-integrations/connectors/destination-e2e-test/src/main/java/io/airbyte/integrations/destination/e2e_test/logging/FirstNLogger.java
+++ b/airbyte-integrations/connectors/destination-e2e-test/src/main/java/io/airbyte/integrations/destination/e2e_test/logging/FirstNLogger.java
@@ -4,8 +4,8 @@
 
 package io.airbyte.integrations.destination.e2e_test.logging;
 
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.AirbyteRecordMessage;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/airbyte-integrations/connectors/destination-e2e-test/src/main/java/io/airbyte/integrations/destination/e2e_test/logging/LoggingConsumer.java b/airbyte-integrations/connectors/destination-e2e-test/src/main/java/io/airbyte/integrations/destination/e2e_test/logging/LoggingConsumer.java
index deb15cc97df1..d1252f3b3f6e 100644
--- a/airbyte-integrations/connectors/destination-e2e-test/src/main/java/io/airbyte/integrations/destination/e2e_test/logging/LoggingConsumer.java
+++ b/airbyte-integrations/connectors/destination-e2e-test/src/main/java/io/airbyte/integrations/destination/e2e_test/logging/LoggingConsumer.java
@@ -6,11 +6,11 @@
 
 import io.airbyte.commons.json.Jsons;
 import io.airbyte.integrations.base.AirbyteMessageConsumer;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.AirbyteMessage;
 import io.airbyte.protocol.models.AirbyteMessage.Type;
 import io.airbyte.protocol.models.AirbyteRecordMessage;
 import io.airbyte.protocol.models.AirbyteStream;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
 import io.airbyte.protocol.models.ConfiguredAirbyteStream;
 import java.util.HashMap;
diff --git a/airbyte-integrations/connectors/destination-e2e-test/src/main/java/io/airbyte/integrations/destination/e2e_test/logging/RandomSamplingLogger.java b/airbyte-integrations/connectors/destination-e2e-test/src/main/java/io/airbyte/integrations/destination/e2e_test/logging/RandomSamplingLogger.java
index aab4df89c090..035f911623f4 100644
--- a/airbyte-integrations/connectors/destination-e2e-test/src/main/java/io/airbyte/integrations/destination/e2e_test/logging/RandomSamplingLogger.java
+++ b/airbyte-integrations/connectors/destination-e2e-test/src/main/java/io/airbyte/integrations/destination/e2e_test/logging/RandomSamplingLogger.java
@@ -4,8 +4,8 @@
 
 package io.airbyte.integrations.destination.e2e_test.logging;
 
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.AirbyteRecordMessage;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import java.util.Random;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/airbyte-integrations/connectors/destination-e2e-test/src/main/java/io/airbyte/integrations/destination/e2e_test/logging/TestingLoggerFactory.java b/airbyte-integrations/connectors/destination-e2e-test/src/main/java/io/airbyte/integrations/destination/e2e_test/logging/TestingLoggerFactory.java
index e7beb522f732..5c68bc347417 100644
--- a/airbyte-integrations/connectors/destination-e2e-test/src/main/java/io/airbyte/integrations/destination/e2e_test/logging/TestingLoggerFactory.java
+++ b/airbyte-integrations/connectors/destination-e2e-test/src/main/java/io/airbyte/integrations/destination/e2e_test/logging/TestingLoggerFactory.java
@@ -5,8 +5,8 @@
 package io.airbyte.integrations.destination.e2e_test.logging;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.destination.e2e_test.logging.TestingLogger.LoggingType;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 
 public class TestingLoggerFactory {
 
diff --git a/airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/jdbc/JdbcBufferedConsumerFactory.java b/airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/jdbc/JdbcBufferedConsumerFactory.java
index 18507caf79db..c3e1a0febce5 100644
--- a/airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/jdbc/JdbcBufferedConsumerFactory.java
+++ b/airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/jdbc/JdbcBufferedConsumerFactory.java
@@ -12,7 +12,6 @@
 import io.airbyte.db.jdbc.JdbcDatabase;
 import io.airbyte.db.jdbc.JdbcUtils;
 import io.airbyte.integrations.base.AirbyteMessageConsumer;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.destination.NamingConventionTransformer;
 import io.airbyte.integrations.destination.buffered_stream_consumer.BufferedStreamConsumer;
 import io.airbyte.integrations.destination.buffered_stream_consumer.OnCloseFunction;
@@ -22,6 +21,7 @@
 import io.airbyte.protocol.models.AirbyteMessage;
 import io.airbyte.protocol.models.AirbyteRecordMessage;
 import io.airbyte.protocol.models.AirbyteStream;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
 import io.airbyte.protocol.models.ConfiguredAirbyteStream;
 import io.airbyte.protocol.models.DestinationSyncMode;
diff --git a/airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/jdbc/copy/CopyConsumerFactory.java b/airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/jdbc/copy/CopyConsumerFactory.java
index d444d28e2b89..abd4e4f183e0 100644
--- a/airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/jdbc/copy/CopyConsumerFactory.java
+++ b/airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/jdbc/copy/CopyConsumerFactory.java
@@ -9,7 +9,6 @@
 import io.airbyte.db.factory.DataSourceFactory;
 import io.airbyte.db.jdbc.JdbcDatabase;
 import io.airbyte.integrations.base.AirbyteMessageConsumer;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.destination.ExtendedNameTransformer;
 import io.airbyte.integrations.destination.buffered_stream_consumer.BufferedStreamConsumer;
 import io.airbyte.integrations.destination.buffered_stream_consumer.CheckAndRemoveRecordWriter;
@@ -20,6 +19,7 @@
 import io.airbyte.integrations.destination.record_buffer.InMemoryRecordBufferingStrategy;
 import io.airbyte.protocol.models.AirbyteMessage;
 import io.airbyte.protocol.models.AirbyteRecordMessage;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/staging/StagingConsumerFactory.java b/airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/staging/StagingConsumerFactory.java
index 5c4291b95305..f0eeb1566679 100644
--- a/airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/staging/StagingConsumerFactory.java
+++ b/airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/staging/StagingConsumerFactory.java
@@ -11,7 +11,6 @@
 import io.airbyte.commons.json.Jsons;
 import io.airbyte.db.jdbc.JdbcDatabase;
 import io.airbyte.integrations.base.AirbyteMessageConsumer;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.destination.NamingConventionTransformer;
 import io.airbyte.integrations.destination.buffered_stream_consumer.BufferedStreamConsumer;
 import io.airbyte.integrations.destination.buffered_stream_consumer.OnCloseFunction;
@@ -21,6 +20,7 @@
 import io.airbyte.integrations.destination.record_buffer.SerializedBufferingStrategy;
 import io.airbyte.protocol.models.AirbyteMessage;
 import io.airbyte.protocol.models.AirbyteStream;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
 import io.airbyte.protocol.models.ConfiguredAirbyteStream;
 import io.airbyte.protocol.models.DestinationSyncMode;
diff --git a/airbyte-integrations/connectors/destination-kafka/src/main/java/io/airbyte/integrations/destination/kafka/KafkaRecordConsumer.java b/airbyte-integrations/connectors/destination-kafka/src/main/java/io/airbyte/integrations/destination/kafka/KafkaRecordConsumer.java
index e2f4ab914724..d4ceb260a109 100644
--- a/airbyte-integrations/connectors/destination-kafka/src/main/java/io/airbyte/integrations/destination/kafka/KafkaRecordConsumer.java
+++ b/airbyte-integrations/connectors/destination-kafka/src/main/java/io/airbyte/integrations/destination/kafka/KafkaRecordConsumer.java
@@ -7,11 +7,11 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.collect.ImmutableMap;
 import io.airbyte.commons.json.Jsons;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.base.FailureTrackingAirbyteMessageConsumer;
 import io.airbyte.integrations.destination.NamingConventionTransformer;
 import io.airbyte.protocol.models.AirbyteMessage;
 import io.airbyte.protocol.models.AirbyteRecordMessage;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/airbyte-integrations/connectors/destination-kafka/src/test/java/io/airbyte/integrations/destination/kafka/KafkaRecordConsumerTest.java b/airbyte-integrations/connectors/destination-kafka/src/test/java/io/airbyte/integrations/destination/kafka/KafkaRecordConsumerTest.java
index b18acf638ea7..ea00d2317964 100644
--- a/airbyte-integrations/connectors/destination-kafka/src/test/java/io/airbyte/integrations/destination/kafka/KafkaRecordConsumerTest.java
+++ b/airbyte-integrations/connectors/destination-kafka/src/test/java/io/airbyte/integrations/destination/kafka/KafkaRecordConsumerTest.java
@@ -13,13 +13,13 @@
 import com.google.common.collect.ImmutableMap;
 import io.airbyte.commons.jackson.MoreMappers;
 import io.airbyte.commons.json.Jsons;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.base.FailureTrackingAirbyteMessageConsumer;
 import io.airbyte.integrations.destination.StandardNameTransformer;
 import io.airbyte.integrations.standardtest.destination.PerStreamStateMessageTest;
 import io.airbyte.protocol.models.AirbyteMessage;
 import io.airbyte.protocol.models.AirbyteRecordMessage;
 import io.airbyte.protocol.models.AirbyteStateMessage;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.CatalogHelpers;
 import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
 import io.airbyte.protocol.models.Field;
diff --git a/airbyte-integrations/connectors/destination-kinesis/src/main/java/io/airbyte/integrations/destination/kinesis/KinesisMessageConsumer.java b/airbyte-integrations/connectors/destination-kinesis/src/main/java/io/airbyte/integrations/destination/kinesis/KinesisMessageConsumer.java
index f7d1336d783a..b6718691e741 100644
--- a/airbyte-integrations/connectors/destination-kinesis/src/main/java/io/airbyte/integrations/destination/kinesis/KinesisMessageConsumer.java
+++ b/airbyte-integrations/connectors/destination-kinesis/src/main/java/io/airbyte/integrations/destination/kinesis/KinesisMessageConsumer.java
@@ -5,9 +5,9 @@
 package io.airbyte.integrations.destination.kinesis;
 
 import io.airbyte.commons.json.Jsons;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.base.FailureTrackingAirbyteMessageConsumer;
 import io.airbyte.protocol.models.AirbyteMessage;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
 import java.time.Instant;
 import java.util.Map;
diff --git a/airbyte-integrations/connectors/destination-mongodb/src/main/java/io/airbyte/integrations/destination/mongodb/MongodbDestination.java b/airbyte-integrations/connectors/destination-mongodb/src/main/java/io/airbyte/integrations/destination/mongodb/MongodbDestination.java
index a00c2bb9f26e..9743e90d0099 100644
--- a/airbyte-integrations/connectors/destination-mongodb/src/main/java/io/airbyte/integrations/destination/mongodb/MongodbDestination.java
+++ b/airbyte-integrations/connectors/destination-mongodb/src/main/java/io/airbyte/integrations/destination/mongodb/MongodbDestination.java
@@ -22,7 +22,6 @@
 import io.airbyte.db.mongodb.MongoUtils.MongoInstanceType;
 import io.airbyte.integrations.BaseConnector;
 import io.airbyte.integrations.base.AirbyteMessageConsumer;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.base.AirbyteTraceMessageUtility;
 import io.airbyte.integrations.base.Destination;
 import io.airbyte.integrations.base.IntegrationRunner;
@@ -31,6 +30,7 @@
 import io.airbyte.protocol.models.AirbyteConnectionStatus;
 import io.airbyte.protocol.models.AirbyteMessage;
 import io.airbyte.protocol.models.AirbyteStream;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
 import io.airbyte.protocol.models.ConfiguredAirbyteStream;
 import io.airbyte.protocol.models.DestinationSyncMode;
diff --git a/airbyte-integrations/connectors/destination-mongodb/src/main/java/io/airbyte/integrations/destination/mongodb/MongodbRecordConsumer.java b/airbyte-integrations/connectors/destination-mongodb/src/main/java/io/airbyte/integrations/destination/mongodb/MongodbRecordConsumer.java
index f1bcfa43e4e7..858e0377f983 100644
--- a/airbyte-integrations/connectors/destination-mongodb/src/main/java/io/airbyte/integrations/destination/mongodb/MongodbRecordConsumer.java
+++ b/airbyte-integrations/connectors/destination-mongodb/src/main/java/io/airbyte/integrations/destination/mongodb/MongodbRecordConsumer.java
@@ -13,10 +13,10 @@
 import io.airbyte.commons.lang.Exceptions;
 import io.airbyte.db.mongodb.MongoDatabase;
 import io.airbyte.integrations.base.AirbyteMessageConsumer;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.base.FailureTrackingAirbyteMessageConsumer;
 import io.airbyte.protocol.models.AirbyteMessage;
 import io.airbyte.protocol.models.AirbyteRecordMessage;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
diff --git a/airbyte-integrations/connectors/destination-mongodb/src/test/java/io/airbyte/integrations/destination/mongodb/MongodbRecordConsumerTest.java b/airbyte-integrations/connectors/destination-mongodb/src/test/java/io/airbyte/integrations/destination/mongodb/MongodbRecordConsumerTest.java
index c3f0f513242c..ade0d60fea0a 100644
--- a/airbyte-integrations/connectors/destination-mongodb/src/test/java/io/airbyte/integrations/destination/mongodb/MongodbRecordConsumerTest.java
+++ b/airbyte-integrations/connectors/destination-mongodb/src/test/java/io/airbyte/integrations/destination/mongodb/MongodbRecordConsumerTest.java
@@ -5,10 +5,10 @@
 package io.airbyte.integrations.destination.mongodb;
 
 import io.airbyte.db.mongodb.MongoDatabase;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.base.FailureTrackingAirbyteMessageConsumer;
 import io.airbyte.integrations.standardtest.destination.PerStreamStateMessageTest;
 import io.airbyte.protocol.models.AirbyteMessage;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
 import java.util.Map;
 import java.util.function.Consumer;
diff --git a/airbyte-integrations/connectors/destination-mqtt/src/main/java/io/airbyte/integrations/destination/mqtt/MqttRecordConsumer.java b/airbyte-integrations/connectors/destination-mqtt/src/main/java/io/airbyte/integrations/destination/mqtt/MqttRecordConsumer.java
index 2431556baa2e..23cd92ac0d41 100644
--- a/airbyte-integrations/connectors/destination-mqtt/src/main/java/io/airbyte/integrations/destination/mqtt/MqttRecordConsumer.java
+++ b/airbyte-integrations/connectors/destination-mqtt/src/main/java/io/airbyte/integrations/destination/mqtt/MqttRecordConsumer.java
@@ -9,10 +9,10 @@
 import com.google.common.collect.ImmutableMap;
 import io.airbyte.commons.json.Jsons;
 import io.airbyte.commons.lang.Exceptions;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.base.FailureTrackingAirbyteMessageConsumer;
 import io.airbyte.protocol.models.AirbyteMessage;
 import io.airbyte.protocol.models.AirbyteRecordMessage;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/airbyte-integrations/connectors/destination-mqtt/src/test/java/io/airbyte/integrations/destination/mqtt/MqttRecordConsumerTest.java b/airbyte-integrations/connectors/destination-mqtt/src/test/java/io/airbyte/integrations/destination/mqtt/MqttRecordConsumerTest.java
index b98cb44b7058..25bb402a3204 100644
--- a/airbyte-integrations/connectors/destination-mqtt/src/test/java/io/airbyte/integrations/destination/mqtt/MqttRecordConsumerTest.java
+++ b/airbyte-integrations/connectors/destination-mqtt/src/test/java/io/airbyte/integrations/destination/mqtt/MqttRecordConsumerTest.java
@@ -14,11 +14,11 @@
 import com.google.common.collect.Sets;
 import com.hivemq.testcontainer.junit5.HiveMQTestContainerExtension;
 import io.airbyte.commons.json.Jsons;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.AirbyteMessage;
 import io.airbyte.protocol.models.AirbyteRecordMessage;
 import io.airbyte.protocol.models.AirbyteStateMessage;
 import io.airbyte.protocol.models.AirbyteStream;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.CatalogHelpers;
 import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
 import io.airbyte.protocol.models.ConfiguredAirbyteStream;
diff --git a/airbyte-integrations/connectors/destination-pubsub/src/main/java/io/airbyte/integrations/destination/pubsub/PubsubConsumer.java b/airbyte-integrations/connectors/destination-pubsub/src/main/java/io/airbyte/integrations/destination/pubsub/PubsubConsumer.java
index d02680555896..7a44c899dbf4 100644
--- a/airbyte-integrations/connectors/destination-pubsub/src/main/java/io/airbyte/integrations/destination/pubsub/PubsubConsumer.java
+++ b/airbyte-integrations/connectors/destination-pubsub/src/main/java/io/airbyte/integrations/destination/pubsub/PubsubConsumer.java
@@ -16,12 +16,12 @@
 import com.google.pubsub.v1.PubsubMessage;
 import com.google.pubsub.v1.TopicName;
 import io.airbyte.commons.json.Jsons;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.base.FailureTrackingAirbyteMessageConsumer;
 import io.airbyte.integrations.base.JavaBaseConstants;
 import io.airbyte.protocol.models.AirbyteMessage;
 import io.airbyte.protocol.models.AirbyteMessage.Type;
 import io.airbyte.protocol.models.AirbyteRecordMessage;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
 import io.airbyte.protocol.models.ConfiguredAirbyteStream;
 import java.io.ByteArrayInputStream;
diff --git a/airbyte-integrations/connectors/destination-pubsub/src/test-integration/java/io/airbyte/integrations/destination/pubsub/PubsubDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-pubsub/src/test-integration/java/io/airbyte/integrations/destination/pubsub/PubsubDestinationAcceptanceTest.java
index 0e7852b4a3df..8a6c0d409e7b 100644
--- a/airbyte-integrations/connectors/destination-pubsub/src/test-integration/java/io/airbyte/integrations/destination/pubsub/PubsubDestinationAcceptanceTest.java
+++ b/airbyte-integrations/connectors/destination-pubsub/src/test-integration/java/io/airbyte/integrations/destination/pubsub/PubsubDestinationAcceptanceTest.java
@@ -35,11 +35,11 @@
 import com.google.pubsub.v1.TopicName;
 import io.airbyte.commons.json.Jsons;
 import io.airbyte.commons.string.Strings;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.base.JavaBaseConstants;
 import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest;
 import io.airbyte.integrations.standardtest.destination.comparator.AdvancedTestDataComparator;
 import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
diff --git a/airbyte-integrations/connectors/destination-pulsar/src/main/java/io/airbyte/integrations/destination/pulsar/PulsarRecordConsumer.java b/airbyte-integrations/connectors/destination-pulsar/src/main/java/io/airbyte/integrations/destination/pulsar/PulsarRecordConsumer.java
index 6ba1c1826ee9..910da6dadd8e 100644
--- a/airbyte-integrations/connectors/destination-pulsar/src/main/java/io/airbyte/integrations/destination/pulsar/PulsarRecordConsumer.java
+++ b/airbyte-integrations/connectors/destination-pulsar/src/main/java/io/airbyte/integrations/destination/pulsar/PulsarRecordConsumer.java
@@ -5,11 +5,11 @@
 package io.airbyte.integrations.destination.pulsar;
 
 import io.airbyte.commons.lang.Exceptions;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.base.FailureTrackingAirbyteMessageConsumer;
 import io.airbyte.integrations.destination.NamingConventionTransformer;
 import io.airbyte.protocol.models.AirbyteMessage;
 import io.airbyte.protocol.models.AirbyteRecordMessage;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
diff --git a/airbyte-integrations/connectors/destination-pulsar/src/test/java/io/airbyte/integrations/destination/pulsar/PulsarRecordConsumerTest.java b/airbyte-integrations/connectors/destination-pulsar/src/test/java/io/airbyte/integrations/destination/pulsar/PulsarRecordConsumerTest.java
index 348b182bc80e..85b0b6b8ca19 100644
--- a/airbyte-integrations/connectors/destination-pulsar/src/test/java/io/airbyte/integrations/destination/pulsar/PulsarRecordConsumerTest.java
+++ b/airbyte-integrations/connectors/destination-pulsar/src/test/java/io/airbyte/integrations/destination/pulsar/PulsarRecordConsumerTest.java
@@ -14,7 +14,6 @@
 import com.google.common.collect.Streams;
 import com.google.common.net.InetAddresses;
 import io.airbyte.commons.json.Jsons;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.base.FailureTrackingAirbyteMessageConsumer;
 import io.airbyte.integrations.destination.StandardNameTransformer;
 import io.airbyte.integrations.standardtest.destination.PerStreamStateMessageTest;
@@ -22,6 +21,7 @@
 import io.airbyte.protocol.models.AirbyteRecordMessage;
 import io.airbyte.protocol.models.AirbyteStateMessage;
 import io.airbyte.protocol.models.AirbyteStream;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.CatalogHelpers;
 import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
 import io.airbyte.protocol.models.ConfiguredAirbyteStream;
diff --git a/airbyte-integrations/connectors/destination-redis/src/main/java/io/airbyte/integrations/destination/redis/RedisMessageConsumer.java b/airbyte-integrations/connectors/destination-redis/src/main/java/io/airbyte/integrations/destination/redis/RedisMessageConsumer.java
index 86d04b224f5d..d6576a41b41a 100644
--- a/airbyte-integrations/connectors/destination-redis/src/main/java/io/airbyte/integrations/destination/redis/RedisMessageConsumer.java
+++ b/airbyte-integrations/connectors/destination-redis/src/main/java/io/airbyte/integrations/destination/redis/RedisMessageConsumer.java
@@ -6,9 +6,9 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import io.airbyte.commons.json.Jsons;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.base.FailureTrackingAirbyteMessageConsumer;
 import io.airbyte.protocol.models.AirbyteMessage;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
 import java.time.Instant;
 import java.util.Map;
diff --git a/airbyte-integrations/connectors/destination-scylla/src/main/java/io/airbyte/integrations/destination/scylla/ScyllaMessageConsumer.java b/airbyte-integrations/connectors/destination-scylla/src/main/java/io/airbyte/integrations/destination/scylla/ScyllaMessageConsumer.java
index e0380e9e7b0f..91482584ce66 100644
--- a/airbyte-integrations/connectors/destination-scylla/src/main/java/io/airbyte/integrations/destination/scylla/ScyllaMessageConsumer.java
+++ b/airbyte-integrations/connectors/destination-scylla/src/main/java/io/airbyte/integrations/destination/scylla/ScyllaMessageConsumer.java
@@ -5,9 +5,9 @@
 package io.airbyte.integrations.destination.scylla;
 
 import io.airbyte.commons.json.Jsons;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.base.FailureTrackingAirbyteMessageConsumer;
 import io.airbyte.protocol.models.AirbyteMessage;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
 import java.util.Map;
 import java.util.function.Consumer;
diff --git a/airbyte-integrations/connectors/source-callrail/integration_tests/abnormal_state.json b/airbyte-integrations/connectors/source-callrail/integration_tests/abnormal_state.json
index a50e2442a078..e0b1e51d2c7f 100644
--- a/airbyte-integrations/connectors/source-callrail/integration_tests/abnormal_state.json
+++ b/airbyte-integrations/connectors/source-callrail/integration_tests/abnormal_state.json
@@ -1,8 +1,8 @@
 {
-   "calls": {
+  "calls": {
     "start_time": "2999-10-30T00:00:00.000Z"
   },
   "conversations": {
     "last_message_at": "2999-10-30T00:00:00.000Z"
   }
-}
\ No newline at end of file
+}
diff --git a/airbyte-integrations/connectors/source-callrail/integration_tests/configured_catalog.json b/airbyte-integrations/connectors/source-callrail/integration_tests/configured_catalog.json
index f0a1ab56bd66..0376bbedff5e 100644
--- a/airbyte-integrations/connectors/source-callrail/integration_tests/configured_catalog.json
+++ b/airbyte-integrations/connectors/source-callrail/integration_tests/configured_catalog.json
@@ -6,7 +6,7 @@
         "json_schema": {},
         "supported_sync_modes": ["full_refresh", "incremental"]
       },
-      "sync_mode":  "full_refresh",
+      "sync_mode": "full_refresh",
       "destination_sync_mode": "append"
     },
     {
@@ -15,7 +15,7 @@
         "json_schema": {},
         "supported_sync_modes": ["full_refresh", "incremental"]
       },
-      "sync_mode":  "full_refresh",
+      "sync_mode": "full_refresh",
       "destination_sync_mode": "append"
     }
   ]
diff --git a/airbyte-integrations/connectors/source-callrail/integration_tests/invalid_config.json b/airbyte-integrations/connectors/source-callrail/integration_tests/invalid_config.json
index 3b3f40819cda..6de15facc50d 100644
--- a/airbyte-integrations/connectors/source-callrail/integration_tests/invalid_config.json
+++ b/airbyte-integrations/connectors/source-callrail/integration_tests/invalid_config.json
@@ -1,5 +1,5 @@
 {
   "api_key": "",
-  "account_id":  "",
+  "account_id": "",
   "start_date": "2019-01-01"
 }
diff --git a/airbyte-integrations/connectors/source-callrail/integration_tests/sample_config.json b/airbyte-integrations/connectors/source-callrail/integration_tests/sample_config.json
index 6acc1e4aac2a..ea4fef222d21 100644
--- a/airbyte-integrations/connectors/source-callrail/integration_tests/sample_config.json
+++ b/airbyte-integrations/connectors/source-callrail/integration_tests/sample_config.json
@@ -1,5 +1,5 @@
 {
   "api_key": "XXXXXXXXXXXXXXXXXX",
-  "account_id":  "XXXXXXXXXXXXXXXXXX",
+  "account_id": "XXXXXXXXXXXXXXXXXX",
   "start_date": "2019-01-01"
 }
diff --git a/airbyte-integrations/connectors/source-callrail/integration_tests/sample_state.json b/airbyte-integrations/connectors/source-callrail/integration_tests/sample_state.json
index b49d99f68551..b4c5967112fe 100644
--- a/airbyte-integrations/connectors/source-callrail/integration_tests/sample_state.json
+++ b/airbyte-integrations/connectors/source-callrail/integration_tests/sample_state.json
@@ -11,4 +11,4 @@
   "companies": {
     "created_at": "2022-10-13T13:51:44.830-07:00"
   }
-}
\ No newline at end of file
+}
diff --git a/airbyte-integrations/connectors/source-callrail/source_callrail/callrail.yaml b/airbyte-integrations/connectors/source-callrail/source_callrail/callrail.yaml
index 35c437b67fd5..1952b75b63d9 100644
--- a/airbyte-integrations/connectors/source-callrail/source_callrail/callrail.yaml
+++ b/airbyte-integrations/connectors/source-callrail/source_callrail/callrail.yaml
@@ -26,7 +26,7 @@ definitions:
       datetime: "{{ today_utc() }}"
       datetime_format: "%Y-%m-%d"
     step: "*ref(definitions.step)"
-    cursor_field:  "{{ options.stream_cursor_field }}"
+    cursor_field: "{{ options.stream_cursor_field }}"
     start_time_option:
       field_name: "start_date"
       inject_into: "request_parameter"
@@ -41,7 +41,7 @@ definitions:
     record_selector:
       extractor:
         type: DpathExtractor
-        field_pointer: [ "{{ options['name'] }}" ]
+        field_pointer: ["{{ options['name'] }}"]
     paginator:
       type: DefaultPaginator
       pagination_strategy:
@@ -68,7 +68,7 @@ definitions:
       $ref: "*ref(definitions.retriever)"
       requester:
         $ref: "*ref(definitions.requester)"
-        path:  "{{ config['account_id'] }}/calls.json?"
+        path: "{{ config['account_id'] }}/calls.json?"
         request_options_provider:
           request_parameters:
             fields: "call_type,company_id,company_name,company_time_zone,created_at,device_type,first_call,formatted_call_type,formatted_customer_location,formatted_business_phone_number,formatted_customer_name,prior_calls,formatted_customer_name_or_phone_number,formatted_customer_phone_number,formatted_duration,formatted_tracking_phone_number,formatted_tracking_source,formatted_value,good_lead_call_id,good_lead_call_time,lead_status,note,source,source_name,tags,total_calls,value,waveforms,tracker_id,speaker_percent,keywords,medium,campaign,referring_url,landing_page_url,last_requested_url,referrer_domain,utm_source,utm_medium,utm_term,utm_content,utm_campaign,utma,utmb,utmc,utmv,utmz,ga,gclid,fbclid,msclkid,milestones,timeline_url,keywords_spotted,call_highlights,agent_email,keypad_entries"
@@ -84,7 +84,7 @@ definitions:
       $ref: "*ref(definitions.retriever)"
       requester:
         $ref: "*ref(definitions.requester)"
-        path:  "{{ config['account_id'] }}/text-messages.json?"
+        path: "{{ config['account_id'] }}/text-messages.json?"
         request_options_provider:
           request_parameters:
             fields: "id,company_id,initial_tracker_id,current_tracker_id,customer_name,customer_phone_number,initial_tracking_number,current_tracking_number,last_message_at,state,company_time_zone,formatted_customer_phone_number,formatted_initial_tracking_number,formatted_current_tracking_number,formatted_customer_name,recent_messages"
@@ -123,5 +123,5 @@ streams:
 
 check:
   type: CheckStream
-  stream_names: 
+  stream_names:
     - users
diff --git a/airbyte-integrations/connectors/source-callrail/source_callrail/schemas/calls.json b/airbyte-integrations/connectors/source-callrail/source_callrail/schemas/calls.json
index 6b0dcfd59412..605b0baa364a 100644
--- a/airbyte-integrations/connectors/source-callrail/source_callrail/schemas/calls.json
+++ b/airbyte-integrations/connectors/source-callrail/source_callrail/schemas/calls.json
@@ -1,233 +1,231 @@
 {
-  "type" : "object",
-  "properties" : {
-    "answered" : {
-      "type" : ["null", "boolean"]
+  "type": "object",
+  "properties": {
+    "answered": {
+      "type": ["null", "boolean"]
     },
-    "business_phone_number" : {
-      "type" : ["null", "string"]
+    "business_phone_number": {
+      "type": ["null", "string"]
     },
-    "customer_city" : {
-      "type" : ["null", "string"]
+    "customer_city": {
+      "type": ["null", "string"]
     },
-    "customer_country" : {
-      "type" : ["null", "string"]
+    "customer_country": {
+      "type": ["null", "string"]
     },
-    "customer_name" : {
-      "type" : ["null", "string"]
+    "customer_name": {
+      "type": ["null", "string"]
     },
-    "customer_phone_number" : {
-      "type" : ["null", "string"]
+    "customer_phone_number": {
+      "type": ["null", "string"]
     },
-    "customer_state" : {
-      "type" : ["null", "string"]
+    "customer_state": {
+      "type": ["null", "string"]
     },
-    "direction" : {
-      "type" : ["null", "string"]
+    "direction": {
+      "type": ["null", "string"]
     },
-    "duration" : {
-      "type" : ["null", "integer"]
+    "duration": {
+      "type": ["null", "integer"]
     },
-    "id" : {
-      "type" : ["null", "string"]
+    "id": {
+      "type": ["null", "string"]
     },
-    "recording" : {
-      "type" : ["null", "string"]
+    "recording": {
+      "type": ["null", "string"]
     },
-    "recording_duration" : {
-      "type" : ["null", "integer"]
+    "recording_duration": {
+      "type": ["null", "integer"]
     },
-    "recording_player" : {
-      "type" : ["null", "string"]
+    "recording_player": {
+      "type": ["null", "string"]
     },
-    "start_time" : {
-      "type" : ["null", "string"],
-      "format" : "date-time"
+    "start_time": {
+      "type": ["null", "string"],
+      "format": "date-time"
     },
-    "tracking_phone_number" : {
-      "type" : ["null", "string"]
+    "tracking_phone_number": {
+      "type": ["null", "string"]
     },
-    "voicemail" : {
-      "type" : ["null", "boolean"]
+    "voicemail": {
+      "type": ["null", "boolean"]
     },
-    "call_type" : {
-      "type" : ["null", "string"]
+    "call_type": {
+      "type": ["null", "string"]
     },
-    "company_id" : {
-      "type" : ["null", "string"]
+    "company_id": {
+      "type": ["null", "string"]
     },
-    "company_name" : {
-      "type" : ["null", "string"]
+    "company_name": {
+      "type": ["null", "string"]
     },
-    "company_time_zone" : {
-      "type" : ["null", "string"]
+    "company_time_zone": {
+      "type": ["null", "string"]
     },
-    "created_at" : {
-      "type" : ["null", "string"],
-      "format" : "date-time"
+    "created_at": {
+      "type": ["null", "string"],
+      "format": "date-time"
     },
-    "device_type" : {
-      "type" : ["null", "string"]
+    "device_type": {
+      "type": ["null", "string"]
     },
-    "first_call" : {
-      "type" : ["null", "boolean"]
+    "first_call": {
+      "type": ["null", "boolean"]
     },
-    "formatted_call_type" : {
-      "type" : ["null", "string"]
+    "formatted_call_type": {
+      "type": ["null", "string"]
     },
-    "formatted_customer_location" : {
-      "type" : ["null", "string"]
+    "formatted_customer_location": {
+      "type": ["null", "string"]
     },
-    "formatted_business_phone_number" : {
-      "type" : ["null", "string"]
+    "formatted_business_phone_number": {
+      "type": ["null", "string"]
     },
-    "formatted_customer_name" : {
-      "type" : ["null", "string"]
+    "formatted_customer_name": {
+      "type": ["null", "string"]
     },
-    "prior_calls" : {
-      "type" : ["null", "integer"]
+    "prior_calls": {
+      "type": ["null", "integer"]
     },
-    "formatted_customer_name_or_phone_number" : {
-      "type" : ["null", "string"]
+    "formatted_customer_name_or_phone_number": {
+      "type": ["null", "string"]
     },
-    "formatted_customer_phone_number" : {
-      "type" : ["null", "string"]
+    "formatted_customer_phone_number": {
+      "type": ["null", "string"]
     },
-    "formatted_duration" : {
-      "type" : ["null", "string"]
+    "formatted_duration": {
+      "type": ["null", "string"]
     },
-    "formatted_tracking_phone_number" : {
-      "type" : ["null", "string"]
+    "formatted_tracking_phone_number": {
+      "type": ["null", "string"]
     },
-    "formatted_tracking_source" : {
-      "type" : ["null", "string"]
+    "formatted_tracking_source": {
+      "type": ["null", "string"]
     },
-    "formatted_value" : {
-      "type" : ["null", "string"]
+    "formatted_value": {
+      "type": ["null", "string"]
     },
-    "good_lead_call_id" : {
-      "type" : ["null", "string"]
+    "good_lead_call_id": {
+      "type": ["null", "string"]
     },
-    "good_lead_call_time" : {
-      "type" : ["null", "string"],
-      "format" : "date-time"
+    "good_lead_call_time": {
+      "type": ["null", "string"],
+      "format": "date-time"
     },
-    "lead_status" : {
-      "type" : ["null", "string"]
+    "lead_status": {
+      "type": ["null", "string"]
     },
-    "note" : {
-      "type" : ["null", "string"]
+    "note": {
+      "type": ["null", "string"]
     },
-    "source" : {
-      "type" : ["null", "string"]
+    "source": {
+      "type": ["null", "string"]
     },
-    "source_name" : {
-      "type" : ["null", "string"]
+    "source_name": {
+      "type": ["null", "string"]
     },
-    "tags" : {
-      "type" : ["null", "array"],
-      "items" : {}
+    "tags": {
+      "type": ["null", "array"],
+      "items": {}
     },
-    "total_calls" : {
-      "type" : ["null", "integer"]
+    "total_calls": {
+      "type": ["null", "integer"]
     },
-    "value" : {
-      "type" : ["null", "string"]
+    "value": {
+      "type": ["null", "string"]
     },
-    "waveforms" : {
-      "type" : ["null", "array"],
-      "items" : {}
+    "waveforms": {
+      "type": ["null", "array"],
+      "items": {}
     },
-    "tracker_id" : {
-      "type" : ["null", "string"]
+    "tracker_id": {
+      "type": ["null", "string"]
     },
-    "speaker_percent" : {
-      "type" : ["null", "array"],
-      "items" : {}
+    "speaker_percent": {
+      "type": ["null", "array"],
+      "items": {}
     },
-    "keywords" : {
-      "type" : ["null", "string"]
+    "keywords": {
+      "type": ["null", "string"]
     },
-    "medium" : {
-      "type" : ["null", "string"]
+    "medium": {
+      "type": ["null", "string"]
     },
-    "campaign" : {
-      "type" : ["null", "string"]
+    "campaign": {
+      "type": ["null", "string"]
     },
-    "referring_url" : {
-      "type" : ["null", "string"]
+    "referring_url": {
+      "type": ["null", "string"]
     },
-    "landing_page_url" : {
-      "type" : ["null", "string"]
+    "landing_page_url": {
+      "type": ["null", "string"]
     },
-    "last_requested_url" : {
-      "type" : ["null", "string"]
+    "last_requested_url": {
+      "type": ["null", "string"]
     },
-    "referrer_domain" : {
-      "type" : ["null", "string"]
+    "referrer_domain": {
+      "type": ["null", "string"]
     },
-    "utm_source" : {
-      "type" : ["null", "string"]
+    "utm_source": {
+      "type": ["null", "string"]
     },
-    "utm_medium" : {
-      "type" : ["null", "string"]
+    "utm_medium": {
+      "type": ["null", "string"]
     },
-    "utm_term" : {
-      "type" : ["null", "string"]
+    "utm_term": {
+      "type": ["null", "string"]
     },
-    "utm_content" : {
-      "type" : ["null", "string"]
+    "utm_content": {
+      "type": ["null", "string"]
     },
-    "utm_campaign" : {
-      "type" : ["null", "string"]
+    "utm_campaign": {
+      "type": ["null", "string"]
     },
-    "utma" : {
-      "type" : ["null", "string"]
+    "utma": {
+      "type": ["null", "string"]
     },
-    "utmb" : {
-      "type" : ["null", "string"]
+    "utmb": {
+      "type": ["null", "string"]
     },
-    "utmc" : {
-      "type" : ["null", "string"]
+    "utmc": {
+      "type": ["null", "string"]
     },
-    "utmv" : {
-      "type" : ["null", "string"]
+    "utmv": {
+      "type": ["null", "string"]
     },
-    "utmz" : {
-      "type" : ["null", "string"]
+    "utmz": {
+      "type": ["null", "string"]
     },
-    "ga" : {
-      "type" : ["null", "string"]
+    "ga": {
+      "type": ["null", "string"]
     },
-    "gclid" : {
-      "type" : ["null", "string"]
+    "gclid": {
+      "type": ["null", "string"]
     },
-    "fbclid" : {
-      "type" : ["null", "string"]
+    "fbclid": {
+      "type": ["null", "string"]
     },
-    "msclkid" : {
-      "type" : ["null", "string"]
+    "msclkid": {
+      "type": ["null", "string"]
     },
-    "timeline_url" : {
-      "type" : ["null", "string"]
+    "timeline_url": {
+      "type": ["null", "string"]
     },
-    "keywords_spotted" : {
-      "type" : ["null", "array"],
-      "items" : {},
-      "additionalProperties" : true
+    "keywords_spotted": {
+      "type": ["null", "array"],
+      "items": {},
+      "additionalProperties": true
     },
-    "call_highlights" : {
-      "type" : ["null", "array"],
-      "items" : {},
-      "additionalProperties" : true
+    "call_highlights": {
+      "type": ["null", "array"],
+      "items": {},
+      "additionalProperties": true
     },
-    "agent_email" : {
-      "type" : ["null", "string"]
+    "agent_email": {
+      "type": ["null", "string"]
     },
-    "keypad_entries" : {
-      "type" : ["null", "string"]
+    "keypad_entries": {
+      "type": ["null", "string"]
     }
   }
 }
-
-
diff --git a/airbyte-integrations/connectors/source-callrail/source_callrail/schemas/companies.json b/airbyte-integrations/connectors/source-callrail/source_callrail/schemas/companies.json
index ecbae1e8c14a..dc4fdec1432e 100644
--- a/airbyte-integrations/connectors/source-callrail/source_callrail/schemas/companies.json
+++ b/airbyte-integrations/connectors/source-callrail/source_callrail/schemas/companies.json
@@ -1,56 +1,58 @@
-{"type": "object",
+{
+  "type": "object",
   "properties": {
-    "id" : {
-      "type" : ["null","string"]
+    "id": {
+      "type": ["null", "string"]
     },
-    "name" : {
-      "type" : ["null","string"]
+    "name": {
+      "type": ["null", "string"]
     },
-    "status" : {
-      "type" : ["null","string"]
+    "status": {
+      "type": ["null", "string"]
     },
-    "time_zone" : {
-      "type" : ["null","string"]
+    "time_zone": {
+      "type": ["null", "string"]
     },
-    "created_at" : {
-      "type" : ["null","string"],
-      "format" : "date-time"
+    "created_at": {
+      "type": ["null", "string"],
+      "format": "date-time"
     },
-    "disabled_at" : {
-      "type" : ["null","string"],
-      "format" : "date-time"
+    "disabled_at": {
+      "type": ["null", "string"],
+      "format": "date-time"
     },
-    "dni_active" : {
-      "type" : ["null", "boolean"]
+    "dni_active": {
+      "type": ["null", "boolean"]
     },
-    "script_url" : {
-      "type" : ["null","string"]
+    "script_url": {
+      "type": ["null", "string"]
     },
-    "callscore_enabled" : {
-      "type" : ["null", "boolean"]
+    "callscore_enabled": {
+      "type": ["null", "boolean"]
     },
-    "lead_scoring_enabled" : {
-      "type" : ["null", "boolean"]
+    "lead_scoring_enabled": {
+      "type": ["null", "boolean"]
     },
-    "swap_exclude_jquery" : {
-      "type" : ["null","string"]
+    "swap_exclude_jquery": {
+      "type": ["null", "string"]
     },
-    "swap_ppc_override" : {
-      "type" : ["null","string"]
+    "swap_ppc_override": {
+      "type": ["null", "string"]
     },
-    "swap_landing_override" : {
-      "type" : ["null","string"]
+    "swap_landing_override": {
+      "type": ["null", "string"]
     },
-    "swap_cookie_duration" : {
-      "type" : "integer"
+    "swap_cookie_duration": {
+      "type": "integer"
     },
-    "callscribe_enabled" : {
-      "type" : ["null", "boolean"]
+    "callscribe_enabled": {
+      "type": ["null", "boolean"]
     },
-    "keyword_spotting_enabled" : {
-      "type" : ["null", "boolean"]
+    "keyword_spotting_enabled": {
+      "type": ["null", "boolean"]
     },
-    "form_capture" : {
-      "type" : ["null", "boolean"]
+    "form_capture": {
+      "type": ["null", "boolean"]
     }
-  }}
+  }
+}
diff --git a/airbyte-integrations/connectors/source-callrail/source_callrail/schemas/conversations.json b/airbyte-integrations/connectors/source-callrail/source_callrail/schemas/conversations.json
index 42d86c6b765e..552bb1fd0258 100644
--- a/airbyte-integrations/connectors/source-callrail/source_callrail/schemas/conversations.json
+++ b/airbyte-integrations/connectors/source-callrail/source_callrail/schemas/conversations.json
@@ -1,31 +1,36 @@
-{ "type": "object",
+{
+  "type": "object",
   "properties": {
-    "id": {"type": ["null","string"]},
-    "initial_tracker_id": {"type": ["null","string"]},
-    "current_tracker_id": {"type": ["null","string"]},
-    "customer_name": {"type": ["null","string"]},
-    "customer_phone_number": {"type": ["null","string"]},
-    "initial_tracking_number": {"type": ["null","string"]},
-    "current_tracking_number": {"type": ["null","string"]},
-    "last_message_at": {"type": ["null","string"],
-                   "format": "date-time"},
-    "state": {"type": ["null","string"]},
-    "formatted_customer_phone_number": {"type": ["null","string"]},
-    "formatted_initial_tracking_number": {"type": ["null","string"]},
-    "formatted_current_tracking_number": {"type": ["null","string"]},
-    "formatted_customer_name": {"type": ["null","string"]},
-    "company_time_zone": {"type": ["null","string"]},
-    "tracker_name": {"type": ["null","string"]},
-    "company_name": {"type": ["null","string"]},
-    "company_id": {"type": ["null","string"]},
+    "id": { "type": ["null", "string"] },
+    "initial_tracker_id": { "type": ["null", "string"] },
+    "current_tracker_id": { "type": ["null", "string"] },
+    "customer_name": { "type": ["null", "string"] },
+    "customer_phone_number": { "type": ["null", "string"] },
+    "initial_tracking_number": { "type": ["null", "string"] },
+    "current_tracking_number": { "type": ["null", "string"] },
+    "last_message_at": { "type": ["null", "string"], "format": "date-time" },
+    "state": { "type": ["null", "string"] },
+    "formatted_customer_phone_number": { "type": ["null", "string"] },
+    "formatted_initial_tracking_number": { "type": ["null", "string"] },
+    "formatted_current_tracking_number": { "type": ["null", "string"] },
+    "formatted_customer_name": { "type": ["null", "string"] },
+    "company_time_zone": { "type": ["null", "string"] },
+    "tracker_name": { "type": ["null", "string"] },
+    "company_name": { "type": ["null", "string"] },
+    "company_id": { "type": ["null", "string"] },
     "recent_messages": {
-      "type": ["null","array"],
+      "type": ["null", "array"],
       "items": {
-          "type": ["null","object"],
-          "properties": {
-            "direction": {"type": ["null","string"]},
-            "content": {"type": ["null","string"]},
-            "created_at": {
-              "type": ["null","string"],
-                   "format": "date-time"}
-          } }  } } }
\ No newline at end of file
+        "type": ["null", "object"],
+        "properties": {
+          "direction": { "type": ["null", "string"] },
+          "content": { "type": ["null", "string"] },
+          "created_at": {
+            "type": ["null", "string"],
+            "format": "date-time"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/airbyte-integrations/connectors/source-callrail/source_callrail/schemas/users.json b/airbyte-integrations/connectors/source-callrail/source_callrail/schemas/users.json
index 5f20a0f4ffaa..9db6c2d1e53b 100644
--- a/airbyte-integrations/connectors/source-callrail/source_callrail/schemas/users.json
+++ b/airbyte-integrations/connectors/source-callrail/source_callrail/schemas/users.json
@@ -1,11 +1,13 @@
-{ "type": "object",
+{
+  "type": "object",
   "properties": {
-    "email": {"type": ["null","string"]},
-    "id": {"type": ["null","string"]},
-    "created_at": {"type": ["null","string"],
-                   "format": "date-time"},
-    "role": {"type": ["null","string"]},
-    "first_name": {"type": ["null","string"]},
-    "last_name": {"type": ["null","string"]},
-    "name": {"type": ["null","string"]},
-    "accepted": {"type": ["null","boolean"]}}}
\ No newline at end of file
+    "email": { "type": ["null", "string"] },
+    "id": { "type": ["null", "string"] },
+    "created_at": { "type": ["null", "string"], "format": "date-time" },
+    "role": { "type": ["null", "string"] },
+    "first_name": { "type": ["null", "string"] },
+    "last_name": { "type": ["null", "string"] },
+    "name": { "type": ["null", "string"] },
+    "accepted": { "type": ["null", "boolean"] }
+  }
+}
diff --git a/airbyte-integrations/connectors/source-callrail/source_callrail/spec.yaml b/airbyte-integrations/connectors/source-callrail/source_callrail/spec.yaml
index bcf26e3114d8..6fe35b647e27 100644
--- a/airbyte-integrations/connectors/source-callrail/source_callrail/spec.yaml
+++ b/airbyte-integrations/connectors/source-callrail/source_callrail/spec.yaml
@@ -22,4 +22,4 @@ connectionSpecification:
       description: Start getting data from that date.
       pattern: ^[0-9]{4}-[0-9]{2}-[0-9]{2}$
       examples:
-        - "%Y-%m-%d"
\ No newline at end of file
+        - "%Y-%m-%d"
diff --git a/airbyte-integrations/connectors/source-jdbc/src/main/java/io/airbyte/integrations/source/jdbc/AbstractJdbcSource.java b/airbyte-integrations/connectors/source-jdbc/src/main/java/io/airbyte/integrations/source/jdbc/AbstractJdbcSource.java
index c8bbb3d090c3..3c2461cfae31 100644
--- a/airbyte-integrations/connectors/source-jdbc/src/main/java/io/airbyte/integrations/source/jdbc/AbstractJdbcSource.java
+++ b/airbyte-integrations/connectors/source-jdbc/src/main/java/io/airbyte/integrations/source/jdbc/AbstractJdbcSource.java
@@ -40,13 +40,13 @@
 import io.airbyte.db.jdbc.JdbcUtils;
 import io.airbyte.db.jdbc.StreamingJdbcDatabase;
 import io.airbyte.db.jdbc.streaming.JdbcStreamingQueryConfig;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.base.Source;
 import io.airbyte.integrations.source.jdbc.dto.JdbcPrivilegeDto;
 import io.airbyte.integrations.source.relationaldb.AbstractDbSource;
 import io.airbyte.integrations.source.relationaldb.CursorInfo;
 import io.airbyte.integrations.source.relationaldb.TableInfo;
 import io.airbyte.integrations.source.relationaldb.state.StateManager;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.CommonField;
 import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
 import io.airbyte.protocol.models.ConfiguredAirbyteStream;
diff --git a/airbyte-integrations/connectors/source-mysql/src/main/java/io/airbyte/integrations/source/mysql/MySqlCdcTargetPosition.java b/airbyte-integrations/connectors/source-mysql/src/main/java/io/airbyte/integrations/source/mysql/MySqlCdcTargetPosition.java
index 3853cd11a99c..3bfea4985dbe 100644
--- a/airbyte-integrations/connectors/source-mysql/src/main/java/io/airbyte/integrations/source/mysql/MySqlCdcTargetPosition.java
+++ b/airbyte-integrations/connectors/source-mysql/src/main/java/io/airbyte/integrations/source/mysql/MySqlCdcTargetPosition.java
@@ -83,4 +83,5 @@ public boolean reachedTargetPosition(final JsonNode valueAsJson) {
         + fileName + " , target position : " + position);
     return true;
   }
+
 }
diff --git a/airbyte-integrations/connectors/source-postgres/src/main/java/io/airbyte/integrations/source/postgres/PostgresCdcCatalogHelper.java b/airbyte-integrations/connectors/source-postgres/src/main/java/io/airbyte/integrations/source/postgres/PostgresCdcCatalogHelper.java
index 4bd85230a7d4..21f082a5ad08 100644
--- a/airbyte-integrations/connectors/source-postgres/src/main/java/io/airbyte/integrations/source/postgres/PostgresCdcCatalogHelper.java
+++ b/airbyte-integrations/connectors/source-postgres/src/main/java/io/airbyte/integrations/source/postgres/PostgresCdcCatalogHelper.java
@@ -10,9 +10,9 @@
 import com.google.common.collect.Lists;
 import io.airbyte.commons.json.Jsons;
 import io.airbyte.db.jdbc.JdbcDatabase;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.debezium.internals.DebeziumEventUtils;
 import io.airbyte.protocol.models.AirbyteStream;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.SyncMode;
 import java.sql.SQLException;
 import java.util.ArrayList;
diff --git a/airbyte-integrations/connectors/source-postgres/src/main/java/io/airbyte/integrations/source/postgres/PostgresCdcTargetPosition.java b/airbyte-integrations/connectors/source-postgres/src/main/java/io/airbyte/integrations/source/postgres/PostgresCdcTargetPosition.java
index aa71b5f89803..d69e0426ca1c 100644
--- a/airbyte-integrations/connectors/source-postgres/src/main/java/io/airbyte/integrations/source/postgres/PostgresCdcTargetPosition.java
+++ b/airbyte-integrations/connectors/source-postgres/src/main/java/io/airbyte/integrations/source/postgres/PostgresCdcTargetPosition.java
@@ -68,7 +68,7 @@ public boolean reachedTargetPosition(final JsonNode valueAsJson) {
   }
 
   private boolean isHeartbeatEvent(final ChangeEvent<String, String> event) {
-    return  Objects.nonNull(event) && !event.value().contains("source");
+    return Objects.nonNull(event) && !event.value().contains("source");
   }
 
   @Override
@@ -105,4 +105,5 @@ private PgLsn extractLsn(final JsonNode valueAsJson) {
   public boolean isHeartbeatSupported() {
     return true;
   }
+
 }
diff --git a/airbyte-integrations/connectors/source-postgres/src/main/java/io/airbyte/integrations/source/postgres/PostgresSource.java b/airbyte-integrations/connectors/source-postgres/src/main/java/io/airbyte/integrations/source/postgres/PostgresSource.java
index 913f5c1530a9..321c075f9e92 100644
--- a/airbyte-integrations/connectors/source-postgres/src/main/java/io/airbyte/integrations/source/postgres/PostgresSource.java
+++ b/airbyte-integrations/connectors/source-postgres/src/main/java/io/airbyte/integrations/source/postgres/PostgresSource.java
@@ -28,7 +28,6 @@
 import io.airbyte.db.jdbc.JdbcDatabase;
 import io.airbyte.db.jdbc.JdbcUtils;
 import io.airbyte.db.jdbc.streaming.AdaptiveStreamingQueryConfig;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.base.IntegrationRunner;
 import io.airbyte.integrations.base.Source;
 import io.airbyte.integrations.base.ssh.SshWrappedSource;
@@ -50,6 +49,7 @@
 import io.airbyte.protocol.models.AirbyteStateMessage;
 import io.airbyte.protocol.models.AirbyteStateMessage.AirbyteStateType;
 import io.airbyte.protocol.models.AirbyteStream;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.AirbyteStreamState;
 import io.airbyte.protocol.models.CommonField;
 import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
diff --git a/airbyte-integrations/connectors/source-postgres/src/main/java/io/airbyte/integrations/source/postgres/PostgresSourceStrictEncrypt.java b/airbyte-integrations/connectors/source-postgres/src/main/java/io/airbyte/integrations/source/postgres/PostgresSourceStrictEncrypt.java
index c060ddebdb39..aa9ad53c58fb 100644
--- a/airbyte-integrations/connectors/source-postgres/src/main/java/io/airbyte/integrations/source/postgres/PostgresSourceStrictEncrypt.java
+++ b/airbyte-integrations/connectors/source-postgres/src/main/java/io/airbyte/integrations/source/postgres/PostgresSourceStrictEncrypt.java
@@ -4,6 +4,8 @@
 
 package io.airbyte.integrations.source.postgres;
 
+import static io.airbyte.protocol.models.AirbyteConnectionStatus.Status;
+
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -18,8 +20,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static io.airbyte.protocol.models.AirbyteConnectionStatus.Status;
-
 /**
  * This class is copied from source-postgres-strict-encrypt. The original file can be deleted
  * completely once the migration of multi-variant connector is done.
diff --git a/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/CdcPostgresSourceTest.java b/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/CdcPostgresSourceTest.java
index 27e093cf1b81..8712be9b2903 100644
--- a/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/CdcPostgresSourceTest.java
+++ b/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/CdcPostgresSourceTest.java
@@ -402,18 +402,33 @@ void testGetHeartbeatPosition() {
     final CdcTargetPosition ctp = cdcLatestTargetPosition();
     final PostgresCdcTargetPosition pctp = (PostgresCdcTargetPosition) ctp;
     final Long lsn = pctp.getHeartbeatPosition(new ChangeEvent<String, String>() {
-      private final SourceRecord sourceRecord = new SourceRecord(null, Collections.singletonMap("lsn", 358824993496L), null, null, null );
+
+      private final SourceRecord sourceRecord = new SourceRecord(null, Collections.singletonMap("lsn", 358824993496L), null, null, null);
+
       @Override
-      public String key() { return null; }
+      public String key() {
+        return null;
+      }
+
       @Override
-      public String value() { return "{\"ts_ms\":1667616934701}"; }
+      public String value() {
+        return "{\"ts_ms\":1667616934701}";
+      }
+
       @Override
-      public String destination() { return null; }
-      public SourceRecord sourceRecord() { return sourceRecord; }
+      public String destination() {
+        return null;
+      }
+
+      public SourceRecord sourceRecord() {
+        return sourceRecord;
+      }
+
     });
 
     assertEquals(lsn, 358824993496L);
 
     assertNull(pctp.getHeartbeatPosition(null));
   }
+
 }
diff --git a/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/PostgresSourceStrictEncryptTest.java b/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/PostgresSourceStrictEncryptTest.java
index 691546149247..dc27b8a5db33 100644
--- a/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/PostgresSourceStrictEncryptTest.java
+++ b/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/PostgresSourceStrictEncryptTest.java
@@ -117,8 +117,8 @@ void testSslModeRequiredNoTunnel() throws Exception {
       final ImmutableMap<Object, Object> configBuilderWithSslModeRequire = getDatabaseConfigBuilderWithSSLMode(db, "require").build();
       final JsonNode config = Jsons.jsonNode(configBuilderWithSslModeRequire);
       ((ObjectNode) config).putIfAbsent("tunnel_method", Jsons.jsonNode(ImmutableMap.builder()
-              .put("tunnel_method", "NO_TUNNEL")
-              .build()));
+          .put("tunnel_method", "NO_TUNNEL")
+          .build()));
       final AirbyteConnectionStatus connectionStatusForPreferredMode = new PostgresSourceStrictEncrypt().check(config);
       assertEquals(AirbyteConnectionStatus.Status.SUCCEEDED, connectionStatusForPreferredMode.getStatus());
     }
diff --git a/airbyte-integrations/connectors/source-punk-api/source_punk_api/punk_api.yaml b/airbyte-integrations/connectors/source-punk-api/source_punk_api/punk_api.yaml
index fd3eee00a766..fa6ea890b71a 100644
--- a/airbyte-integrations/connectors/source-punk-api/source_punk_api/punk_api.yaml
+++ b/airbyte-integrations/connectors/source-punk-api/source_punk_api/punk_api.yaml
@@ -15,7 +15,7 @@ definitions:
             if options['name'] == 'beers_with_id'
             else ''
           }}
-          
+
   stream_slicer:
     type: DatetimeStreamSlicer
     start_datetime:
@@ -33,7 +33,7 @@ definitions:
     # start_time_option:
     #   field_name: "date"
     #   inject_into: "request_parameter"
-      
+
   retriever:
     record_selector:
       $ref: "*ref(definitions.selector)"
@@ -85,7 +85,6 @@ definitions:
       name: "beers_with_id"
       path: "/beers?{{ config['brewed_after'] }}"
 
-
 streams:
   - "*ref(definitions.beers_stream)"
   - "*ref(definitions.beers_with_id_stream)"
diff --git a/airbyte-integrations/connectors/source-punk-api/source_punk_api/schemas/beers.json b/airbyte-integrations/connectors/source-punk-api/source_punk_api/schemas/beers.json
index 123fd2d86cee..0a4d5c831b89 100644
--- a/airbyte-integrations/connectors/source-punk-api/source_punk_api/schemas/beers.json
+++ b/airbyte-integrations/connectors/source-punk-api/source_punk_api/schemas/beers.json
@@ -19,35 +19,35 @@
       "name": {
         "$id": "#root/items/name",
         "title": "Name",
-        "type":  ["null","array","object", "string"],
+        "type": ["null", "array", "object", "string"],
         "default": "",
         "pattern": "^.*$"
       },
       "tagline": {
         "$id": "#root/items/tagline",
         "title": "Tagline",
-        "type":  ["null","array","object", "string"],
+        "type": ["null", "array", "object", "string"],
         "default": "",
         "pattern": "^.*$"
       },
       "first_brewed": {
         "$id": "#root/items/first_brewed",
         "title": "First_brewed",
-        "type":  ["null","array","object", "string"],
+        "type": ["null", "array", "object", "string"],
         "default": "",
         "pattern": "^.*$"
       },
       "description": {
         "$id": "#root/items/description",
         "title": "Description",
-        "type":  ["null","array","object", "string"],
+        "type": ["null", "array", "object", "string"],
         "default": "",
         "pattern": "^.*$"
       },
       "image_url": {
         "$id": "#root/items/image_url",
         "title": "Image_url",
-        "type":  ["null","array","object", "string"],
+        "type": ["null", "array", "object", "string"],
         "default": "",
         "pattern": "^.*$"
       },
@@ -113,7 +113,7 @@
           "unit": {
             "$id": "#root/items/volume/unit",
             "title": "Unit",
-            "type":  ["null","array","object", "string"],
+            "type": ["null", "array", "object", "string"],
             "default": "",
             "pattern": "^.*$"
           }
@@ -133,7 +133,7 @@
           "unit": {
             "$id": "#root/items/boil_volume/unit",
             "title": "Unit",
-            "type":  ["null","array","object", "string"],
+            "type": ["null", "array", "object", "string"],
             "default": "",
             "pattern": "^.*$"
           }
@@ -168,7 +168,7 @@
                     "unit": {
                       "$id": "#root/items/method/mash_temp/items/temp/unit",
                       "title": "Unit",
-                      "type":  ["null","array","object", "string"],
+                      "type": ["null", "array", "object", "string"],
                       "default": "",
                       "pattern": "^.*$"
                     }
@@ -202,7 +202,7 @@
                   "unit": {
                     "$id": "#root/items/method/fermentation/temp/unit",
                     "title": "Unit",
-                    "type":  ["null","array","object", "string"],
+                    "type": ["null", "array", "object", "string"],
                     "default": "",
                     "pattern": "^.*$"
                   }
@@ -236,7 +236,7 @@
                 "name": {
                   "$id": "#root/items/ingredients/malt/items/name",
                   "title": "Name",
-                  "type":  ["null","array","object", "string"],
+                  "type": ["null", "array", "object", "string"],
                   "default": "",
                   "pattern": "^.*$"
                 },
@@ -254,7 +254,7 @@
                     "unit": {
                       "$id": "#root/items/ingredients/malt/items/amount/unit",
                       "title": "Unit",
-                      "type":  ["null","array","object", "string"],
+                      "type": ["null", "array", "object", "string"],
                       "default": "",
                       "pattern": "^.*$"
                     }
@@ -276,7 +276,7 @@
                 "name": {
                   "$id": "#root/items/ingredients/hops/items/name",
                   "title": "Name",
-                  "type":  ["null","array","object", "string"],
+                  "type": ["null", "array", "object", "string"],
                   "default": "",
                   "pattern": "^.*$"
                 },
@@ -294,7 +294,7 @@
                     "unit": {
                       "$id": "#root/items/ingredients/hops/items/amount/unit",
                       "title": "Unit",
-                      "type":  ["null","array","object", "string"],
+                      "type": ["null", "array", "object", "string"],
                       "default": "",
                       "pattern": "^.*$"
                     }
@@ -303,14 +303,14 @@
                 "add": {
                   "$id": "#root/items/ingredients/hops/items/add",
                   "title": "Add",
-                  "type":  ["null","array","object", "string"],
+                  "type": ["null", "array", "object", "string"],
                   "default": "",
                   "pattern": "^.*$"
                 },
                 "attribute": {
                   "$id": "#root/items/ingredients/hops/items/attribute",
                   "title": "Attribute",
-                  "type":  ["null","array","object", "string"],
+                  "type": ["null", "array", "object", "string"],
                   "default": "",
                   "pattern": "^.*$"
                 }
@@ -320,7 +320,7 @@
           "yeast": {
             "$id": "#root/items/ingredients/yeast",
             "title": "Yeast",
-            "type":  ["null","array","object", "string"],
+            "type": ["null", "array", "object", "string"],
             "default": "",
             "pattern": "^.*$"
           }
@@ -334,7 +334,7 @@
         "items": {
           "$id": "#root/items/food_pairing/items",
           "title": "Items",
-          "type":  ["null","array","object", "string"],
+          "type": ["null", "array", "object", "string"],
           "default": "",
           "pattern": "^.*$"
         }
@@ -342,14 +342,14 @@
       "brewers_tips": {
         "$id": "#root/items/brewers_tips",
         "title": "Brewers_tips",
-        "type":  ["null","array","object", "string"],
+        "type": ["null", "array", "object", "string"],
         "default": "",
         "pattern": "^.*$"
       },
       "contributed_by": {
         "$id": "#root/items/contributed_by",
         "title": "Contributed_by",
-        "type":  ["null","array","object", "string"],
+        "type": ["null", "array", "object", "string"],
         "default": "",
         "pattern": "^.*$"
       }
diff --git a/airbyte-integrations/connectors/source-punk-api/source_punk_api/schemas/beers_with_id.json b/airbyte-integrations/connectors/source-punk-api/source_punk_api/schemas/beers_with_id.json
index f0ef4e0016cd..f000365e26aa 100644
--- a/airbyte-integrations/connectors/source-punk-api/source_punk_api/schemas/beers_with_id.json
+++ b/airbyte-integrations/connectors/source-punk-api/source_punk_api/schemas/beers_with_id.json
@@ -19,35 +19,35 @@
       "name": {
         "$id": "#root/items/name",
         "title": "Name",
-        "type":  ["null","array","object","string"],
+        "type": ["null", "array", "object", "string"],
         "default": "",
         "pattern": "^.*$"
       },
       "tagline": {
         "$id": "#root/items/tagline",
         "title": "Tagline",
-        "type":  ["null","array","object","string"],
+        "type": ["null", "array", "object", "string"],
         "default": "",
         "pattern": "^.*$"
       },
       "first_brewed": {
         "$id": "#root/items/first_brewed",
         "title": "First_brewed",
-        "type":  ["null","array","object","string"],
+        "type": ["null", "array", "object", "string"],
         "default": "",
         "pattern": "^.*$"
       },
       "description": {
         "$id": "#root/items/description",
         "title": "Description",
-        "type":  ["null","array","object","string"],
+        "type": ["null", "array", "object", "string"],
         "default": "",
         "pattern": "^.*$"
       },
       "image_url": {
         "$id": "#root/items/image_url",
         "title": "Image_url",
-        "type":  ["null","array","object","string"],
+        "type": ["null", "array", "object", "string"],
         "default": "",
         "pattern": "^.*$"
       },
@@ -113,7 +113,7 @@
           "unit": {
             "$id": "#root/items/volume/unit",
             "title": "Unit",
-            "type":  ["null","array","object", "string"],
+            "type": ["null", "array", "object", "string"],
             "default": "",
             "pattern": "^.*$"
           }
@@ -133,7 +133,7 @@
           "unit": {
             "$id": "#root/items/boil_volume/unit",
             "title": "Unit",
-            "type":  ["null","array","object", "string"],
+            "type": ["null", "array", "object", "string"],
             "default": "",
             "pattern": "^.*$"
           }
@@ -168,7 +168,7 @@
                     "unit": {
                       "$id": "#root/items/method/mash_temp/items/temp/unit",
                       "title": "Unit",
-                      "type":  ["null","array","object", "string"],
+                      "type": ["null", "array", "object", "string"],
                       "default": "",
                       "pattern": "^.*$"
                     }
@@ -202,7 +202,7 @@
                   "unit": {
                     "$id": "#root/items/method/fermentation/temp/unit",
                     "title": "Unit",
-                    "type":  ["null","array","object", "string"],
+                    "type": ["null", "array", "object", "string"],
                     "default": "",
                     "pattern": "^.*$"
                   }
@@ -254,7 +254,7 @@
                     "unit": {
                       "$id": "#root/items/ingredients/malt/items/amount/unit",
                       "title": "Unit",
-                      "type":  ["null","array","object", "string"],
+                      "type": ["null", "array", "object", "string"],
                       "default": "",
                       "pattern": "^.*$"
                     }
@@ -276,7 +276,7 @@
                 "name": {
                   "$id": "#root/items/ingredients/hops/items/name",
                   "title": "Name",
-                  "type":  ["null","array","object", "string"],
+                  "type": ["null", "array", "object", "string"],
                   "default": "",
                   "pattern": "^.*$"
                 },
@@ -303,14 +303,14 @@
                 "add": {
                   "$id": "#root/items/ingredients/hops/items/add",
                   "title": "Add",
-                  "type":  ["null","array","object", "string"],
+                  "type": ["null", "array", "object", "string"],
                   "default": "",
                   "pattern": "^.*$"
                 },
                 "attribute": {
                   "$id": "#root/items/ingredients/hops/items/attribute",
                   "title": "Attribute",
-                  "type":  ["null","array","object", "string"],
+                  "type": ["null", "array", "object", "string"],
                   "default": "",
                   "pattern": "^.*$"
                 }
@@ -320,7 +320,7 @@
           "yeast": {
             "$id": "#root/items/ingredients/yeast",
             "title": "Yeast",
-            "type":  ["null","array","object", "string"],
+            "type": ["null", "array", "object", "string"],
             "default": "",
             "pattern": "^.*$"
           }
@@ -334,7 +334,7 @@
         "items": {
           "$id": "#root/items/food_pairing/items",
           "title": "Items",
-          "type":  ["null","array","object", "string"],
+          "type": ["null", "array", "object", "string"],
           "default": "",
           "pattern": "^.*$"
         }
@@ -342,14 +342,14 @@
       "brewers_tips": {
         "$id": "#root/items/brewers_tips",
         "title": "Brewers_tips",
-        "type":  ["null","array","object", "string"],
+        "type": ["null", "array", "object", "string"],
         "default": "",
         "pattern": "^.*$"
       },
       "contributed_by": {
         "$id": "#root/items/contributed_by",
         "title": "Contributed_by",
-        "type":  ["null","array","object", "string"],
+        "type": ["null", "array", "object", "string"],
         "default": "",
         "pattern": "^.*$"
       }
diff --git a/airbyte-integrations/connectors/source-punk-api/source_punk_api/spec.yaml b/airbyte-integrations/connectors/source-punk-api/source_punk_api/spec.yaml
index e7762559e0fc..1d7da8b0a768 100644
--- a/airbyte-integrations/connectors/source-punk-api/source_punk_api/spec.yaml
+++ b/airbyte-integrations/connectors/source-punk-api/source_punk_api/spec.yaml
@@ -12,7 +12,7 @@ connectionSpecification:
       title: Beers with specific ID
       type: string
       description: To extract specific data with Unique ID
-      examples: 
+      examples:
         - 1
         - 22
     brewed_before:
diff --git a/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/AbstractDbSource.java b/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/AbstractDbSource.java
index 17f702f33fe5..2f415395bcb3 100644
--- a/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/AbstractDbSource.java
+++ b/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/AbstractDbSource.java
@@ -24,7 +24,6 @@
 import io.airbyte.db.IncrementalUtils;
 import io.airbyte.db.jdbc.JdbcDatabase;
 import io.airbyte.integrations.BaseConnector;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.base.AirbyteTraceMessageUtility;
 import io.airbyte.integrations.base.Source;
 import io.airbyte.integrations.source.relationaldb.InvalidCursorInfoUtil.InvalidCursorInfo;
@@ -40,6 +39,7 @@
 import io.airbyte.protocol.models.AirbyteStateMessage;
 import io.airbyte.protocol.models.AirbyteStateMessage.AirbyteStateType;
 import io.airbyte.protocol.models.AirbyteStream;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.CatalogHelpers;
 import io.airbyte.protocol.models.CommonField;
 import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
diff --git a/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/CdcStateManager.java b/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/CdcStateManager.java
index ea0058247c58..cca8d5da5c8c 100644
--- a/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/CdcStateManager.java
+++ b/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/CdcStateManager.java
@@ -5,8 +5,8 @@
 package io.airbyte.integrations.source.relationaldb;
 
 import io.airbyte.commons.json.Jsons;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.source.relationaldb.models.CdcState;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import java.util.Collections;
 import java.util.Set;
 import org.slf4j.Logger;
diff --git a/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/StateDecoratingIterator.java b/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/StateDecoratingIterator.java
index c43c1b20f09c..75675bfc792b 100644
--- a/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/StateDecoratingIterator.java
+++ b/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/StateDecoratingIterator.java
@@ -6,11 +6,11 @@
 
 import com.google.common.collect.AbstractIterator;
 import io.airbyte.db.IncrementalUtils;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.source.relationaldb.state.StateManager;
 import io.airbyte.protocol.models.AirbyteMessage;
 import io.airbyte.protocol.models.AirbyteMessage.Type;
 import io.airbyte.protocol.models.AirbyteStateMessage;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.JsonSchemaPrimitive;
 import java.util.Iterator;
 import java.util.Objects;
diff --git a/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/state/AbstractStateManager.java b/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/state/AbstractStateManager.java
index 1197c866d0a8..a71ab96c341d 100644
--- a/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/state/AbstractStateManager.java
+++ b/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/state/AbstractStateManager.java
@@ -4,9 +4,9 @@
 
 package io.airbyte.integrations.source.relationaldb.state;
 
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.source.relationaldb.CursorInfo;
 import io.airbyte.protocol.models.AirbyteStateMessage;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
 import java.util.Collection;
 import java.util.List;
diff --git a/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/state/CursorManager.java b/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/state/CursorManager.java
index 19a5989d78eb..3539fc9219b4 100644
--- a/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/state/CursorManager.java
+++ b/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/state/CursorManager.java
@@ -5,8 +5,8 @@
 package io.airbyte.integrations.source.relationaldb.state;
 
 import com.google.common.annotations.VisibleForTesting;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.source.relationaldb.CursorInfo;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
 import io.airbyte.protocol.models.ConfiguredAirbyteStream;
 import java.util.Collection;
diff --git a/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/state/GlobalStateManager.java b/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/state/GlobalStateManager.java
index 2efdc18ba475..548c17179751 100644
--- a/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/state/GlobalStateManager.java
+++ b/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/state/GlobalStateManager.java
@@ -10,7 +10,6 @@
 import static io.airbyte.integrations.source.relationaldb.state.StateGeneratorUtils.NAME_NAMESPACE_PAIR_FUNCTION;
 
 import io.airbyte.commons.json.Jsons;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.source.relationaldb.CdcStateManager;
 import io.airbyte.integrations.source.relationaldb.models.CdcState;
 import io.airbyte.integrations.source.relationaldb.models.DbState;
@@ -18,6 +17,7 @@
 import io.airbyte.protocol.models.AirbyteGlobalState;
 import io.airbyte.protocol.models.AirbyteStateMessage;
 import io.airbyte.protocol.models.AirbyteStateMessage.AirbyteStateType;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.AirbyteStreamState;
 import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
 import io.airbyte.protocol.models.StreamDescriptor;
diff --git a/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/state/LegacyStateManager.java b/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/state/LegacyStateManager.java
index 7e73f9855cf1..669a07fdb72d 100644
--- a/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/state/LegacyStateManager.java
+++ b/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/state/LegacyStateManager.java
@@ -5,12 +5,12 @@
 package io.airbyte.integrations.source.relationaldb.state;
 
 import io.airbyte.commons.json.Jsons;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.source.relationaldb.CdcStateManager;
 import io.airbyte.integrations.source.relationaldb.models.DbState;
 import io.airbyte.integrations.source.relationaldb.models.DbStreamState;
 import io.airbyte.protocol.models.AirbyteStateMessage;
 import io.airbyte.protocol.models.AirbyteStateMessage.AirbyteStateType;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
 import java.util.List;
 import java.util.Objects;
diff --git a/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/state/StateGeneratorUtils.java b/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/state/StateGeneratorUtils.java
index cca021fd66c5..493eafbffccf 100644
--- a/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/state/StateGeneratorUtils.java
+++ b/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/state/StateGeneratorUtils.java
@@ -6,13 +6,13 @@
 
 import com.google.common.collect.Lists;
 import io.airbyte.commons.json.Jsons;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.source.relationaldb.CursorInfo;
 import io.airbyte.integrations.source.relationaldb.models.DbState;
 import io.airbyte.integrations.source.relationaldb.models.DbStreamState;
 import io.airbyte.protocol.models.AirbyteGlobalState;
 import io.airbyte.protocol.models.AirbyteStateMessage;
 import io.airbyte.protocol.models.AirbyteStateMessage.AirbyteStateType;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.AirbyteStreamState;
 import io.airbyte.protocol.models.StreamDescriptor;
 import java.util.Collections;
diff --git a/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/state/StateManager.java b/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/state/StateManager.java
index 09e8305fe8cc..07593cfe923d 100644
--- a/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/state/StateManager.java
+++ b/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/state/StateManager.java
@@ -5,10 +5,10 @@
 package io.airbyte.integrations.source.relationaldb.state;
 
 import com.google.common.base.Preconditions;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.source.relationaldb.CdcStateManager;
 import io.airbyte.integrations.source.relationaldb.CursorInfo;
 import io.airbyte.protocol.models.AirbyteStateMessage;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import java.util.Map;
 import java.util.Optional;
 import org.slf4j.Logger;
diff --git a/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/state/StreamStateManager.java b/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/state/StreamStateManager.java
index 593c07ed335d..f4169006b62a 100644
--- a/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/state/StreamStateManager.java
+++ b/airbyte-integrations/connectors/source-relational-db/src/main/java/io/airbyte/integrations/source/relationaldb/state/StreamStateManager.java
@@ -10,11 +10,11 @@
 import static io.airbyte.integrations.source.relationaldb.state.StateGeneratorUtils.NAME_NAMESPACE_PAIR_FUNCTION;
 
 import io.airbyte.commons.json.Jsons;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.source.relationaldb.CdcStateManager;
 import io.airbyte.integrations.source.relationaldb.CursorInfo;
 import io.airbyte.protocol.models.AirbyteStateMessage;
 import io.airbyte.protocol.models.AirbyteStateMessage.AirbyteStateType;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.AirbyteStreamState;
 import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
 import java.util.List;
diff --git a/airbyte-integrations/connectors/source-relational-db/src/test/java/io/airbyte/integrations/source/relationaldb/StateDecoratingIteratorTest.java b/airbyte-integrations/connectors/source-relational-db/src/test/java/io/airbyte/integrations/source/relationaldb/StateDecoratingIteratorTest.java
index c94b83928cd0..26873ac039c8 100644
--- a/airbyte-integrations/connectors/source-relational-db/src/test/java/io/airbyte/integrations/source/relationaldb/StateDecoratingIteratorTest.java
+++ b/airbyte-integrations/connectors/source-relational-db/src/test/java/io/airbyte/integrations/source/relationaldb/StateDecoratingIteratorTest.java
@@ -13,12 +13,12 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import io.airbyte.commons.json.Jsons;
 import io.airbyte.commons.util.MoreIterators;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.source.relationaldb.state.StateManager;
 import io.airbyte.protocol.models.AirbyteMessage;
 import io.airbyte.protocol.models.AirbyteMessage.Type;
 import io.airbyte.protocol.models.AirbyteRecordMessage;
 import io.airbyte.protocol.models.AirbyteStateMessage;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.JsonSchemaPrimitive;
 import java.sql.SQLException;
 import java.util.Collections;
diff --git a/airbyte-integrations/connectors/source-relational-db/src/test/java/io/airbyte/integrations/source/relationaldb/state/CursorManagerTest.java b/airbyte-integrations/connectors/source-relational-db/src/test/java/io/airbyte/integrations/source/relationaldb/state/CursorManagerTest.java
index eec2d4b7e1ef..f3e7f62df0f5 100644
--- a/airbyte-integrations/connectors/source-relational-db/src/test/java/io/airbyte/integrations/source/relationaldb/state/CursorManagerTest.java
+++ b/airbyte-integrations/connectors/source-relational-db/src/test/java/io/airbyte/integrations/source/relationaldb/state/CursorManagerTest.java
@@ -15,9 +15,9 @@
 import static io.airbyte.integrations.source.relationaldb.state.StateTestConstants.getStream;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.source.relationaldb.CursorInfo;
 import io.airbyte.integrations.source.relationaldb.models.DbStreamState;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import java.util.Collections;
 import java.util.Optional;
 import java.util.function.Function;
diff --git a/airbyte-integrations/connectors/source-relational-db/src/test/java/io/airbyte/integrations/source/relationaldb/state/GlobalStateManagerTest.java b/airbyte-integrations/connectors/source-relational-db/src/test/java/io/airbyte/integrations/source/relationaldb/state/GlobalStateManagerTest.java
index 48442e356bb9..5124df49ab91 100644
--- a/airbyte-integrations/connectors/source-relational-db/src/test/java/io/airbyte/integrations/source/relationaldb/state/GlobalStateManagerTest.java
+++ b/airbyte-integrations/connectors/source-relational-db/src/test/java/io/airbyte/integrations/source/relationaldb/state/GlobalStateManagerTest.java
@@ -17,7 +17,6 @@
 import static org.mockito.Mockito.mock;
 
 import io.airbyte.commons.json.Jsons;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.source.relationaldb.models.CdcState;
 import io.airbyte.integrations.source.relationaldb.models.DbState;
 import io.airbyte.integrations.source.relationaldb.models.DbStreamState;
@@ -25,6 +24,7 @@
 import io.airbyte.protocol.models.AirbyteStateMessage;
 import io.airbyte.protocol.models.AirbyteStateMessage.AirbyteStateType;
 import io.airbyte.protocol.models.AirbyteStream;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.AirbyteStreamState;
 import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
 import io.airbyte.protocol.models.ConfiguredAirbyteStream;
diff --git a/airbyte-integrations/connectors/source-relational-db/src/test/java/io/airbyte/integrations/source/relationaldb/state/StateTestConstants.java b/airbyte-integrations/connectors/source-relational-db/src/test/java/io/airbyte/integrations/source/relationaldb/state/StateTestConstants.java
index 2df9760c8ea4..50d224759231 100644
--- a/airbyte-integrations/connectors/source-relational-db/src/test/java/io/airbyte/integrations/source/relationaldb/state/StateTestConstants.java
+++ b/airbyte-integrations/connectors/source-relational-db/src/test/java/io/airbyte/integrations/source/relationaldb/state/StateTestConstants.java
@@ -4,9 +4,9 @@
 
 package io.airbyte.integrations.source.relationaldb.state;
 
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.source.relationaldb.models.DbStreamState;
 import io.airbyte.protocol.models.AirbyteStream;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
 import io.airbyte.protocol.models.ConfiguredAirbyteStream;
 import java.util.Collections;
diff --git a/airbyte-integrations/connectors/source-relational-db/src/test/java/io/airbyte/integrations/source/relationaldb/state/StreamStateManagerTest.java b/airbyte-integrations/connectors/source-relational-db/src/test/java/io/airbyte/integrations/source/relationaldb/state/StreamStateManagerTest.java
index f37b41567524..1afd609c77fb 100644
--- a/airbyte-integrations/connectors/source-relational-db/src/test/java/io/airbyte/integrations/source/relationaldb/state/StreamStateManagerTest.java
+++ b/airbyte-integrations/connectors/source-relational-db/src/test/java/io/airbyte/integrations/source/relationaldb/state/StreamStateManagerTest.java
@@ -20,12 +20,12 @@
 
 import com.google.common.collect.Lists;
 import io.airbyte.commons.json.Jsons;
-import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.source.relationaldb.models.DbState;
 import io.airbyte.integrations.source.relationaldb.models.DbStreamState;
 import io.airbyte.protocol.models.AirbyteStateMessage;
 import io.airbyte.protocol.models.AirbyteStateMessage.AirbyteStateType;
 import io.airbyte.protocol.models.AirbyteStream;
+import io.airbyte.protocol.models.AirbyteStreamNameNamespacePair;
 import io.airbyte.protocol.models.AirbyteStreamState;
 import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
 import io.airbyte.protocol.models.ConfiguredAirbyteStream;
diff --git a/airbyte-integrations/connectors/source-tmdb/source_tmdb/schemas/movies_changes.json b/airbyte-integrations/connectors/source-tmdb/source_tmdb/schemas/movies_changes.json
index 17b7e011c102..be71c6b7dfa0 100644
--- a/airbyte-integrations/connectors/source-tmdb/source_tmdb/schemas/movies_changes.json
+++ b/airbyte-integrations/connectors/source-tmdb/source_tmdb/schemas/movies_changes.json
@@ -1,89 +1,85 @@
 {
-	"definitions": {},
-	"$schema": "http://json-schema.org/draft-07/schema#", 
-	"$id": "https://example.com/object1668092844.json", 
-	"title": "Root", 
-	"type": "object",
-	"properties": {
-					"key": {
-						"$id": "#root/changes/items/key", 
-						"title": "Key", 
-						"type": ["null","string"],
-						"default": "",
-						"pattern": "^.*$"
-					},
-					"items": {
-						"$id": "#root/changes/items/items", 
-						"title": "Items", 
-						"type": "array",
-						"default": [],
-						"items":{
-							"$id": "#root/changes/items/items/items", 
-							"title": "Items", 
-							"type": "object",
-							"properties": {
-								"id": {
-									"$id": "#root/changes/items/items/items/id", 
-									"title": "Id", 
-									"type": ["null","string"],
-									"default": "",
-									"pattern": "^.*$"
-								},
-								"action": {
-									"$id": "#root/changes/items/items/items/action", 
-									"title": "Action", 
-									"type": ["null","string"],
-									"default": "",
-									"pattern": "^.*$"
-								},
-								"time": {
-									"$id": "#root/changes/items/items/items/time", 
-									"title": "Time", 
-									"type": ["null","string"],
-									"default": "",
-									"pattern": "^.*$"
-								},
-								"iso_639_1": {
-									"$id": "#root/changes/items/items/items/iso_639_1", 
-									"title": "Iso_639_1", 
-									"type": ["null","string"],
-									"default": "",
-									"pattern": "^.*$"
-								},
-								"iso_3166_1": {
-									"$id": "#root/changes/items/items/items/iso_3166_1", 
-									"title": "Iso_3166_1", 
-									"type": ["null","string"],
-									"default": "",
-									"pattern": "^.*$"
-								},
-								"value": {
-									"$id": "#root/changes/items/items/items/value", 
-									"title": "Value", 
-									"type": "object",
-									"properties": {
-										"poster": {
-											"$id": "#root/changes/items/items/items/value/poster", 
-											"title": "Poster", 
-											"type": "object",
-											"properties": {
-												"file_path": {
-													"$id": "#root/changes/items/items/items/value/poster/file_path", 
-													"title": "File_path", 
-													"type": ["null","string"],
-													"default": "",
-													"pattern": "^.*$"
-												}
-											}
-										}
-
-									}
-								}
-
-							}
-						}
-
-					}
-				}
-			}
-
+  "definitions": {},
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "https://example.com/object1668092844.json",
+  "title": "Root",
+  "type": "object",
+  "properties": {
+    "key": {
+      "$id": "#root/changes/items/key",
+      "title": "Key",
+      "type": ["null", "string"],
+      "default": "",
+      "pattern": "^.*$"
+    },
+    "items": {
+      "$id": "#root/changes/items/items",
+      "title": "Items",
+      "type": "array",
+      "default": [],
+      "items": {
+        "$id": "#root/changes/items/items/items",
+        "title": "Items",
+        "type": "object",
+        "properties": {
+          "id": {
+            "$id": "#root/changes/items/items/items/id",
+            "title": "Id",
+            "type": ["null", "string"],
+            "default": "",
+            "pattern": "^.*$"
+          },
+          "action": {
+            "$id": "#root/changes/items/items/items/action",
+            "title": "Action",
+            "type": ["null", "string"],
+            "default": "",
+            "pattern": "^.*$"
+          },
+          "time": {
+            "$id": "#root/changes/items/items/items/time",
+            "title": "Time",
+            "type": ["null", "string"],
+            "default": "",
+            "pattern": "^.*$"
+          },
+          "iso_639_1": {
+            "$id": "#root/changes/items/items/items/iso_639_1",
+            "title": "Iso_639_1",
+            "type": ["null", "string"],
+            "default": "",
+            "pattern": "^.*$"
+          },
+          "iso_3166_1": {
+            "$id": "#root/changes/items/items/items/iso_3166_1",
+            "title": "Iso_3166_1",
+            "type": ["null", "string"],
+            "default": "",
+            "pattern": "^.*$"
+          },
+          "value": {
+            "$id": "#root/changes/items/items/items/value",
+            "title": "Value",
+            "type": "object",
+            "properties": {
+              "poster": {
+                "$id": "#root/changes/items/items/items/value/poster",
+                "title": "Poster",
+                "type": "object",
+                "properties": {
+                  "file_path": {
+                    "$id": "#root/changes/items/items/items/value/poster/file_path",
+                    "title": "File_path",
+                    "type": ["null", "string"],
+                    "default": "",
+                    "pattern": "^.*$"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/airbyte-integrations/connectors/source-tmdb/source_tmdb/schemas/movies_latest.json b/airbyte-integrations/connectors/source-tmdb/source_tmdb/schemas/movies_latest.json
index 05e60d6679f3..bf2a00a01644 100644
--- a/airbyte-integrations/connectors/source-tmdb/source_tmdb/schemas/movies_latest.json
+++ b/airbyte-integrations/connectors/source-tmdb/source_tmdb/schemas/movies_latest.json
@@ -14,13 +14,13 @@
     "backdrop_path": {
       "$id": "#root/backdrop_path",
       "title": "Backdrop_path",
-      "type": ["string","null"],
+      "type": ["string", "null"],
       "default": null
     },
     "belongs_to_collection": {
       "$id": "#root/belongs_to_collection",
       "title": "Belongs_to_collection",
-      "type": ["string","null"],
+      "type": ["string", "null"],
       "default": null
     },
     "budget": {
diff --git a/airbyte-integrations/connectors/source-tmdb/source_tmdb/schemas/search_tv_shows.json b/airbyte-integrations/connectors/source-tmdb/source_tmdb/schemas/search_tv_shows.json
index 7292fcf466d3..a45e1ff8588d 100644
--- a/airbyte-integrations/connectors/source-tmdb/source_tmdb/schemas/search_tv_shows.json
+++ b/airbyte-integrations/connectors/source-tmdb/source_tmdb/schemas/search_tv_shows.json
@@ -1,139 +1,138 @@
 {
-	"definitions": {},
-	"$schema": "http://json-schema.org/draft-07/schema#", 
-	"$id": "https://example.com/object1667666886.json", 
-	"title": "Root", 
-	"type": "object",
-	"properties": {
-		"page": {
-			"$id": "#root/page", 
-			"title": "Page", 
-			"type": "integer",
-			"default": 0
-		},
-		"results": {
-			"$id": "#root/results", 
-			"title": "Results", 
-			"type": "array",
-			"default": [],
-			"items":{
-				"$id": "#root/results/items", 
-				"title": "Items", 
-				"type": "object",
-				"properties": {
-					"poster_path": {
-						"$id": "#root/results/items/poster_path", 
-						"title": "Poster_path", 
-						"type": ["null","string"],
-						"default": "",
-						"pattern": "^.*$"
-					},
-					"popularity": {
-						"$id": "#root/results/items/popularity", 
-						"title": "Popularity", 
-						"type": "number",
-						"default": 0.0
-					},
-					"id": {
-						"$id": "#root/results/items/id", 
-						"title": "Id", 
-						"type": "integer",
-						"default": 0
-					},
-					"backdrop_path": {
-						"$id": "#root/results/items/backdrop_path", 
-						"title": "Backdrop_path", 
-						"type": ["null","string"],
-						"default": "",
-						"pattern": "^.*$"
-					},
-					"vote_average": {
-						"$id": "#root/results/items/vote_average", 
-						"title": "Vote_average", 
-						"type": "number",
-						"default": 0.0
-					},
-					"overview": {
-						"$id": "#root/results/items/overview", 
-						"title": "Overview", 
-						"type": ["null","string"],
-						"default": "",
-						"pattern": "^.*$"
-					},
-					"first_air_date": {
-						"$id": "#root/results/items/first_air_date", 
-						"title": "First_air_date", 
-						"type": ["null","string"],
-						"default": "",
-						"pattern": "^.*$"
-					},
-					"origin_country": {
-						"$id": "#root/results/items/origin_country", 
-						"title": "Origin_country", 
-						"type": "array",
-						"default": [],
-						"items":{
-							"$id": "#root/results/items/origin_country/items", 
-							"title": "Items", 
-							"type": ["null","string"],
-							"default": "",
-							"pattern": "^.*$"
-						}
-					},
-					"genre_ids": {
-						"$id": "#root/results/items/genre_ids", 
-						"title": "Genre_ids", 
-						"type": "array",
-						"default": [],
-						"items":{
-							"$id": "#root/results/items/genre_ids/items", 
-							"title": "Items", 
-							"type": "integer",
-							"default": 0
-						}
-					},
-					"original_language": {
-						"$id": "#root/results/items/original_language", 
-						"title": "Original_language", 
-						"type": ["null","string"],
-						"default": "",
-						"pattern": "^.*$"
-					},
-					"vote_count": {
-						"$id": "#root/results/items/vote_count", 
-						"title": "Vote_count", 
-						"type": "integer",
-						"default": 0
-					},
-					"name": {
-						"$id": "#root/results/items/name", 
-						"title": "Name", 
-						"type": ["null","string"],
-						"default": "",
-						"pattern": "^.*$"
-					},
-					"original_name": {
-						"$id": "#root/results/items/original_name", 
-						"title": "Original_name", 
-						"type": ["null","string"],
-						"default": "",
-						"pattern": "^.*$"
-					}
-				}
-			}
-
-		},
-		"total_results": {
-			"$id": "#root/total_results", 
-			"title": "Total_results", 
-			"type": "integer",
-			"default": 0
-		},
-		"total_pages": {
-			"$id": "#root/total_pages", 
-			"title": "Total_pages", 
-			"type": "integer",
-			"default": 0
-		}
-	}
+  "definitions": {},
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "https://example.com/object1667666886.json",
+  "title": "Root",
+  "type": "object",
+  "properties": {
+    "page": {
+      "$id": "#root/page",
+      "title": "Page",
+      "type": "integer",
+      "default": 0
+    },
+    "results": {
+      "$id": "#root/results",
+      "title": "Results",
+      "type": "array",
+      "default": [],
+      "items": {
+        "$id": "#root/results/items",
+        "title": "Items",
+        "type": "object",
+        "properties": {
+          "poster_path": {
+            "$id": "#root/results/items/poster_path",
+            "title": "Poster_path",
+            "type": ["null", "string"],
+            "default": "",
+            "pattern": "^.*$"
+          },
+          "popularity": {
+            "$id": "#root/results/items/popularity",
+            "title": "Popularity",
+            "type": "number",
+            "default": 0.0
+          },
+          "id": {
+            "$id": "#root/results/items/id",
+            "title": "Id",
+            "type": "integer",
+            "default": 0
+          },
+          "backdrop_path": {
+            "$id": "#root/results/items/backdrop_path",
+            "title": "Backdrop_path",
+            "type": ["null", "string"],
+            "default": "",
+            "pattern": "^.*$"
+          },
+          "vote_average": {
+            "$id": "#root/results/items/vote_average",
+            "title": "Vote_average",
+            "type": "number",
+            "default": 0.0
+          },
+          "overview": {
+            "$id": "#root/results/items/overview",
+            "title": "Overview",
+            "type": ["null", "string"],
+            "default": "",
+            "pattern": "^.*$"
+          },
+          "first_air_date": {
+            "$id": "#root/results/items/first_air_date",
+            "title": "First_air_date",
+            "type": ["null", "string"],
+            "default": "",
+            "pattern": "^.*$"
+          },
+          "origin_country": {
+            "$id": "#root/results/items/origin_country",
+            "title": "Origin_country",
+            "type": "array",
+            "default": [],
+            "items": {
+              "$id": "#root/results/items/origin_country/items",
+              "title": "Items",
+              "type": ["null", "string"],
+              "default": "",
+              "pattern": "^.*$"
+            }
+          },
+          "genre_ids": {
+            "$id": "#root/results/items/genre_ids",
+            "title": "Genre_ids",
+            "type": "array",
+            "default": [],
+            "items": {
+              "$id": "#root/results/items/genre_ids/items",
+              "title": "Items",
+              "type": "integer",
+              "default": 0
+            }
+          },
+          "original_language": {
+            "$id": "#root/results/items/original_language",
+            "title": "Original_language",
+            "type": ["null", "string"],
+            "default": "",
+            "pattern": "^.*$"
+          },
+          "vote_count": {
+            "$id": "#root/results/items/vote_count",
+            "title": "Vote_count",
+            "type": "integer",
+            "default": 0
+          },
+          "name": {
+            "$id": "#root/results/items/name",
+            "title": "Name",
+            "type": ["null", "string"],
+            "default": "",
+            "pattern": "^.*$"
+          },
+          "original_name": {
+            "$id": "#root/results/items/original_name",
+            "title": "Original_name",
+            "type": ["null", "string"],
+            "default": "",
+            "pattern": "^.*$"
+          }
+        }
+      }
+    },
+    "total_results": {
+      "$id": "#root/total_results",
+      "title": "Total_results",
+      "type": "integer",
+      "default": 0
+    },
+    "total_pages": {
+      "$id": "#root/total_pages",
+      "title": "Total_pages",
+      "type": "integer",
+      "default": 0
+    }
+  }
 }
diff --git a/airbyte-integrations/connectors/source-tmdb/source_tmdb/spec.yaml b/airbyte-integrations/connectors/source-tmdb/source_tmdb/spec.yaml
index 637ba2f388ce..0b99b10e10cb 100644
--- a/airbyte-integrations/connectors/source-tmdb/source_tmdb/spec.yaml
+++ b/airbyte-integrations/connectors/source-tmdb/source_tmdb/spec.yaml
@@ -19,20 +19,20 @@ connectionSpecification:
       title: Movie ID for targeting movies
       type: string
       description: Target movie ID, Mandate for movie streams (Example is 550)
-      examples: 
+      examples:
         - 550
         - 560
     query:
       title: Query for search streams
       type: string
       description: Target movie ID, Mandate for search streams
-      examples: 
+      examples:
         - Marvel
         - DC
     language:
       title: Language for filtering
       type: string
       description: Language expressed in ISO 639-1 scheme, Mandate for required streams (Example en-US)
-      examples: 
+      examples:
         - en-US
         - en-UK
diff --git a/airbyte-integrations/connectors/source-tmdb/source_tmdb/tmdb.yaml b/airbyte-integrations/connectors/source-tmdb/source_tmdb/tmdb.yaml
index 6bfdc29c780d..315a411caa99 100644
--- a/airbyte-integrations/connectors/source-tmdb/source_tmdb/tmdb.yaml
+++ b/airbyte-integrations/connectors/source-tmdb/source_tmdb/tmdb.yaml
@@ -40,14 +40,13 @@ definitions:
     requester:
       $ref: "*ref(definitions.requester)"
 
-
   base_stream:
     schema_loader:
       type: JsonSchema
       file_path: "./source_tmdb/schemas/{{ options['name'] }}.json"
     retriever:
       $ref: "*ref(definitions.retriever)"
-  
+
   page_stream:
     schema_loader:
       type: JsonSchema
@@ -135,13 +134,13 @@ definitions:
     $options:
       name: "movies_keywords"
       path: "/movie/{{ config['movie_id'] }}/keywords"
-  
+
   movies_lists_stream:
     $ref: "*ref(definitions.base_stream)"
     $options:
       name: "movies_lists"
       path: "/movie/{{ config['movie_id'] }}/lists"
-      
+
   movies_recommendations_stream:
     $ref: "*ref(definitions.base_stream)"
     $options: