diff --git a/airbyte-cdk/java/airbyte-cdk/dependencies/src/main/java/io/airbyte/commons/functional/CheckedBiConsumer.java b/airbyte-cdk/java/airbyte-cdk/dependencies/src/main/java/io/airbyte/commons/functional/CheckedBiConsumer.java
deleted file mode 100644
index 7afd5b96152e4c..00000000000000
--- a/airbyte-cdk/java/airbyte-cdk/dependencies/src/main/java/io/airbyte/commons/functional/CheckedBiConsumer.java
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright (c) 2023 Airbyte, Inc., all rights reserved.
- */
-
-package io.airbyte.commons.functional;
-
-import org.apache.commons.lang3.function.FailableBiConsumer;
-
-@FunctionalInterface
-public interface CheckedBiConsumer<T, R, E extends Throwable> extends FailableBiConsumer<T, R, E> {
-
-}
diff --git a/airbyte-cdk/java/airbyte-cdk/dependencies/src/main/java/io/airbyte/commons/functional/CheckedBiFunction.java b/airbyte-cdk/java/airbyte-cdk/dependencies/src/main/java/io/airbyte/commons/functional/CheckedBiFunction.java
deleted file mode 100644
index c941435b0589e0..00000000000000
--- a/airbyte-cdk/java/airbyte-cdk/dependencies/src/main/java/io/airbyte/commons/functional/CheckedBiFunction.java
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright (c) 2023 Airbyte, Inc., all rights reserved.
- */
-
-package io.airbyte.commons.functional;
-
-import org.apache.commons.lang3.function.FailableBiFunction;
-
-public interface CheckedBiFunction<First, Second, Result, E extends Throwable> extends FailableBiFunction<First, Second, Result, E> {
-
-}
diff --git a/airbyte-cdk/java/airbyte-cdk/dependencies/src/main/java/io/airbyte/commons/functional/CheckedConsumer.java b/airbyte-cdk/java/airbyte-cdk/dependencies/src/main/java/io/airbyte/commons/functional/CheckedConsumer.java
deleted file mode 100644
index 6905bd9e5d1d1e..00000000000000
--- a/airbyte-cdk/java/airbyte-cdk/dependencies/src/main/java/io/airbyte/commons/functional/CheckedConsumer.java
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright (c) 2023 Airbyte, Inc., all rights reserved.
- */
-
-package io.airbyte.commons.functional;
-
-import org.apache.commons.lang3.function.FailableConsumer;
-
-@FunctionalInterface
-public interface CheckedConsumer<T, E extends Throwable> extends FailableConsumer<T, E> {
-
-}
diff --git a/airbyte-cdk/java/airbyte-cdk/dependencies/src/main/java/io/airbyte/commons/functional/CheckedFunction.java b/airbyte-cdk/java/airbyte-cdk/dependencies/src/main/java/io/airbyte/commons/functional/CheckedFunction.java
deleted file mode 100644
index cf32b71e294b1f..00000000000000
--- a/airbyte-cdk/java/airbyte-cdk/dependencies/src/main/java/io/airbyte/commons/functional/CheckedFunction.java
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright (c) 2023 Airbyte, Inc., all rights reserved.
- */
-
-package io.airbyte.commons.functional;
-
-import org.apache.commons.lang3.function.FailableFunction;
-
-@FunctionalInterface
-public interface CheckedFunction<T, R, E extends Throwable> extends FailableFunction<T, R, E> {
-
-}
diff --git a/airbyte-cdk/java/airbyte-cdk/dependencies/src/main/java/io/airbyte/commons/functional/CheckedSupplier.java b/airbyte-cdk/java/airbyte-cdk/dependencies/src/main/java/io/airbyte/commons/functional/CheckedSupplier.java
deleted file mode 100644
index e15a9cf5b8fc77..00000000000000
--- a/airbyte-cdk/java/airbyte-cdk/dependencies/src/main/java/io/airbyte/commons/functional/CheckedSupplier.java
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright (c) 2023 Airbyte, Inc., all rights reserved.
- */
-
-package io.airbyte.commons.functional;
-
-import org.apache.commons.lang3.function.FailableSupplier;
-
-@FunctionalInterface
-public interface CheckedSupplier<T, E extends Throwable> extends FailableSupplier<T, E> {
-
-}
diff --git a/airbyte-cdk/java/airbyte-cdk/dependencies/src/main/kotlin/io/airbyte/commons/functional/CheckedBiConsumer.kt b/airbyte-cdk/java/airbyte-cdk/dependencies/src/main/kotlin/io/airbyte/commons/functional/CheckedBiConsumer.kt
new file mode 100644
index 00000000000000..d6ec94cd8649dc
--- /dev/null
+++ b/airbyte-cdk/java/airbyte-cdk/dependencies/src/main/kotlin/io/airbyte/commons/functional/CheckedBiConsumer.kt
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2023 Airbyte, Inc., all rights reserved.
+ */
+package io.airbyte.commons.functional
+
+import org.apache.commons.lang3.function.FailableBiConsumer
+
+@FunctionalInterface
+interface CheckedBiConsumer<T, R, E : Throwable?> : FailableBiConsumer<T, R, E>
diff --git a/airbyte-cdk/java/airbyte-cdk/dependencies/src/main/kotlin/io/airbyte/commons/functional/CheckedBiFunction.kt b/airbyte-cdk/java/airbyte-cdk/dependencies/src/main/kotlin/io/airbyte/commons/functional/CheckedBiFunction.kt
new file mode 100644
index 00000000000000..d6b36e27784b68
--- /dev/null
+++ b/airbyte-cdk/java/airbyte-cdk/dependencies/src/main/kotlin/io/airbyte/commons/functional/CheckedBiFunction.kt
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2023 Airbyte, Inc., all rights reserved.
+ */
+package io.airbyte.commons.functional
+
+import org.apache.commons.lang3.function.FailableBiFunction
+
+interface CheckedBiFunction<First, Second, Result, E : Throwable?> :
+    FailableBiFunction<First, Second, Result, E>
diff --git a/airbyte-cdk/java/airbyte-cdk/dependencies/src/main/kotlin/io/airbyte/commons/functional/CheckedConsumer.kt b/airbyte-cdk/java/airbyte-cdk/dependencies/src/main/kotlin/io/airbyte/commons/functional/CheckedConsumer.kt
new file mode 100644
index 00000000000000..c43e1d6f47737d
--- /dev/null
+++ b/airbyte-cdk/java/airbyte-cdk/dependencies/src/main/kotlin/io/airbyte/commons/functional/CheckedConsumer.kt
@@ -0,0 +1,8 @@
+/*
+ * Copyright (c) 2023 Airbyte, Inc., all rights reserved.
+ */
+package io.airbyte.commons.functional
+
+import org.apache.commons.lang3.function.FailableConsumer
+
+@FunctionalInterface interface CheckedConsumer<T, E : Throwable?> : FailableConsumer<T, E>
diff --git a/airbyte-cdk/java/airbyte-cdk/dependencies/src/main/kotlin/io/airbyte/commons/functional/CheckedFunction.kt b/airbyte-cdk/java/airbyte-cdk/dependencies/src/main/kotlin/io/airbyte/commons/functional/CheckedFunction.kt
new file mode 100644
index 00000000000000..f26cbaa9ccd755
--- /dev/null
+++ b/airbyte-cdk/java/airbyte-cdk/dependencies/src/main/kotlin/io/airbyte/commons/functional/CheckedFunction.kt
@@ -0,0 +1,8 @@
+/*
+ * Copyright (c) 2023 Airbyte, Inc., all rights reserved.
+ */
+package io.airbyte.commons.functional
+
+import org.apache.commons.lang3.function.FailableFunction
+
+@FunctionalInterface interface CheckedFunction<T, R, E : Throwable?> : FailableFunction<T, R, E>
diff --git a/airbyte-cdk/java/airbyte-cdk/dependencies/src/main/kotlin/io/airbyte/commons/functional/CheckedSupplier.kt b/airbyte-cdk/java/airbyte-cdk/dependencies/src/main/kotlin/io/airbyte/commons/functional/CheckedSupplier.kt
new file mode 100644
index 00000000000000..26c1776f8a6b9f
--- /dev/null
+++ b/airbyte-cdk/java/airbyte-cdk/dependencies/src/main/kotlin/io/airbyte/commons/functional/CheckedSupplier.kt
@@ -0,0 +1,8 @@
+/*
+ * Copyright (c) 2023 Airbyte, Inc., all rights reserved.
+ */
+package io.airbyte.commons.functional
+
+import org.apache.commons.lang3.function.FailableSupplier
+
+@FunctionalInterface interface CheckedSupplier<T, E : Throwable?> : FailableSupplier<T, E>