sanity

airbytehq · Mar 5, 2024 · 74fda84 · 74fda84
1 parent cc6bacf
commit 74fda84
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 11 deletions.
diff --git a/airbyte-cdk/java/airbyte-cdk/README.md b/airbyte-cdk/java/airbyte-cdk/README.md
@@ -166,7 +166,7 @@ MavenLocal debugging steps:
 
 | Version | Date       | Pull Request                                               | Subject                                                                                                                                                        |
 |:--------|:-----------|:-----------------------------------------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| 0.23.13 | 2024-03-04 | [\#35774](https://github.com/airbytehq/airbyte/pull/35774) | minor changes to the CDK test fixtures.                                                                                                                          |
+| 0.23.15 | 2024-03-04 | [\#35774](https://github.com/airbytehq/airbyte/pull/35774) | minor changes to the CDK test fixtures.                                                                                                                          |
 | 0.23.12 | 2024-03-01 | [\#35767](https://github.com/airbytehq/airbyte/pull/35767) | introducing a timeout for java tests.                                                                                                                          |
 | 0.23.11 | 2024-03-01 | [\#35313](https://github.com/airbytehq/airbyte/pull/35313) | Preserve timezone offset in CSV writer for destinations                                                                                                        |
 | 0.23.10 | 2024-03-01 | [\#35303](https://github.com/airbytehq/airbyte/pull/35303) | Migration framework with DestinationState for softReset                                                                                                        |

diff --git a/airbyte-cdk/java/airbyte-cdk/core/src/main/resources/version.properties b/airbyte-cdk/java/airbyte-cdk/core/src/main/resources/version.properties
@@ -1 +1 @@
-version=0.23.10
+version=0.23.15
diff --git a/...ava/airbyte-cdk/core/src/testFixtures/java/io/airbyte/cdk/testutils/ContainerFactory.java b/...ava/airbyte-cdk/core/src/testFixtures/java/io/airbyte/cdk/testutils/ContainerFactory.java
@@ -127,8 +127,7 @@ public final C shared(String imageName, List<? extends NamedContainerModifier<C>
   @SuppressWarnings("unchecked")
   @Deprecated
   public final C exclusive(String imageName, String... methods) {
-    return exclusive(imageName,
-        (NamedContainerModifier<C>) Stream.of(methods).map(n -> new NamedContainerModifierImpl<C>(n, resolveModifierByName(n))).toList());
+    return exclusive(imageName, Stream.of(methods).map(n -> new NamedContainerModifierImpl<C>(n, resolveModifierByName(n))).toList());
   }
 
   public final C exclusive(String imageName) {
@@ -139,7 +138,7 @@ public final C exclusive(String imageName, NamedContainerModifier<C>... namedCon
     return exclusive(imageName, List.of(namedContainerModifiers));
   }
 
-  public final C exclusive(String imageName, List<NamedContainerModifier<C>> namedContainerModifiers) {
+  public final C exclusive(String imageName, List<? extends NamedContainerModifier<C>> namedContainerModifiers) {
     return (C) createAndStartContainer(DockerImageName.parse(imageName), namedContainerModifiers);
   }
 

diff --git a/...db-sources/src/main/java/io/airbyte/cdk/integrations/debezium/AirbyteDebeziumHandler.java b/...db-sources/src/main/java/io/airbyte/cdk/integrations/debezium/AirbyteDebeziumHandler.java
@@ -4,6 +4,8 @@
 
 package io.airbyte.cdk.integrations.debezium;
 
+import static io.airbyte.cdk.integrations.debezium.DebeziumIteratorConstants.*;
+
 import com.fasterxml.jackson.databind.JsonNode;
 import io.airbyte.cdk.db.jdbc.JdbcUtils;
 import io.airbyte.cdk.integrations.debezium.internals.*;
@@ -15,16 +17,13 @@
 import io.airbyte.protocol.models.v0.SyncMode;
 import io.debezium.engine.ChangeEvent;
 import io.debezium.engine.DebeziumEngine;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.time.Duration;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.Optional;
 import java.util.concurrent.LinkedBlockingQueue;
-
-import static io.airbyte.cdk.integrations.debezium.DebeziumIteratorConstants.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class acts as the bridge between Airbyte DB connectors and debezium. If a DB connector wants
@@ -64,6 +63,7 @@ public AirbyteDebeziumHandler(final JsonNode config,
   }
 
   class CapacityReportingBlockingQueue<E> extends LinkedBlockingQueue<E> {
+
     private static Duration REPORT_DURATION = Duration.of(10, ChronoUnit.SECONDS);
     private Instant lastReport;
 
@@ -79,6 +79,7 @@ private void reportQueueUtilization() {
         }
       }
     }
+
     @Override
     public void put(final E e) throws InterruptedException {
       reportQueueUtilization();
@@ -90,6 +91,7 @@ public E poll() {
       reportQueueUtilization();
       return super.poll();
     }
+
   }
 
   public AutoCloseableIterator<AirbyteMessage> getIncrementalIterators(final DebeziumPropertiesManager debeziumPropertiesManager,

diff --git a/airbyte-integrations/connectors/source-mssql/build.gradle b/airbyte-integrations/connectors/source-mssql/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 airbyteJavaConnector {
-    cdkVersionRequired = '0.23.14'
+    cdkVersionRequired = '0.23.15'
     features = ['db-sources']
     useLocalCdk = false
 }

diff --git a/...e-mssql/src/testFixtures/java/io/airbyte/integrations/source/mssql/MsSQLTestDatabase.java b/...e-mssql/src/testFixtures/java/io/airbyte/integrations/source/mssql/MsSQLTestDatabase.java
@@ -59,6 +59,7 @@ public enum ContainerModifier {
 
   }
 
+  @SuppressWarnings("deprecation")
   static public MsSQLTestDatabase in(final BaseImage imageName, final ContainerModifier... methods) {
     final String[] methodNames = Stream.of(methods).map(im -> im.methodName).toList().toArray(new String[0]);
     final var container = new MsSQLContainerFactory().shared(imageName.reference, methodNames);