convert java CDK dependencies submodule to kotlin (#36446)

convert java CDK dependencies submodule to kotlin

fix compiler errors

Author: stephane-airbyte

airbyte-cdk/java/airbyte-cdk/core/build.gradle

@@ -57,7 +57,6 @@ dependencies {
     api 'com.zaxxer:HikariCP:5.1.0'
     api 'org.jooq:jooq:3.16.23'
     api 'org.apache.commons:commons-csv:1.10.0'
-    api 'io.github.oshai:kotlin-logging-jvm:5.1.0'
 
     implementation project(':airbyte-cdk:java:airbyte-cdk:dependencies')
 

airbyte-cdk/java/airbyte-cdk/core/src/main/kotlin/io/airbyte/cdk/integrations/BaseConnector.kt

@@ -18,7 +18,7 @@ abstract class BaseConnector : Integration {
      * - any exception.
      */
     @Throws(Exception::class)
-    override fun spec(): ConnectorSpecification? {
+    override fun spec(): ConnectorSpecification {
         // return a JsonSchema representation of the spec for the integration.
         val resourceString = MoreResources.readResource("spec.json")
         return Jsons.deserialize(resourceString, ConnectorSpecification::class.java)

airbyte-cdk/java/airbyte-cdk/core/src/main/kotlin/io/airbyte/cdk/integrations/base/Integration.kt

@@ -15,7 +15,7 @@ interface Integration {
      * @throws Exception
      * - any exception.
      */
-    @Throws(Exception::class) fun spec(): ConnectorSpecification?
+    @Throws(Exception::class) fun spec(): ConnectorSpecification
 
     /**
      * Check whether, given the current configuration, the integration can connect to the

airbyte-cdk/java/airbyte-cdk/core/src/main/kotlin/io/airbyte/cdk/integrations/base/Source.kt

@@ -21,7 +21,7 @@ interface Source : Integration {
      * @throws Exception
      * - any exception.
      */
-    @Throws(Exception::class) fun discover(config: JsonNode): AirbyteCatalog?
+    @Throws(Exception::class) fun discover(config: JsonNode): AirbyteCatalog
 
     /**
      * Return a iterator of messages pulled from the source.

airbyte-cdk/java/airbyte-cdk/core/src/main/kotlin/io/airbyte/cdk/integrations/base/errors/messages/ErrorMessage.kt

@@ -11,7 +11,7 @@ object ErrorMessage {
     // errorCode exists
     @JvmStatic
     fun getErrorMessage(
-        stateCode: String,
+        stateCode: String?,
         errorCode: Int,
         message: String?,
         exception: Exception
@@ -23,7 +23,7 @@ object ErrorMessage {
         }
     }
 
-    private fun configMessage(stateCode: String, errorCode: Int, message: String?): String {
+    private fun configMessage(stateCode: String?, errorCode: Int, message: String?): String {
         val stateCodePart =
             if (Objects.isNull(stateCode)) "" else String.format("State code: %s; ", stateCode)
         val errorCodePart = if (errorCode == 0) "" else String.format("Error code: %s; ", errorCode)

airbyte-cdk/java/airbyte-cdk/core/src/main/kotlin/io/airbyte/cdk/integrations/base/spec_modification/SpecModifyingDestination.kt

@@ -15,10 +15,10 @@ import java.util.function.Consumer
 
 abstract class SpecModifyingDestination(private val destination: Destination) : Destination {
     @Throws(Exception::class)
-    abstract fun modifySpec(originalSpec: ConnectorSpecification?): ConnectorSpecification?
+    abstract fun modifySpec(originalSpec: ConnectorSpecification): ConnectorSpecification
 
     @Throws(Exception::class)
-    override fun spec(): ConnectorSpecification? {
+    override fun spec(): ConnectorSpecification {
         return modifySpec(destination.spec())
     }
 

airbyte-cdk/java/airbyte-cdk/core/src/main/kotlin/io/airbyte/cdk/integrations/base/spec_modification/SpecModifyingSource.kt

@@ -15,10 +15,10 @@ import io.airbyte.protocol.models.v0.*
  */
 abstract class SpecModifyingSource(private val source: Source) : Source {
     @Throws(Exception::class)
-    abstract fun modifySpec(originalSpec: ConnectorSpecification?): ConnectorSpecification?
+    abstract fun modifySpec(originalSpec: ConnectorSpecification): ConnectorSpecification
 
     @Throws(Exception::class)
-    override fun spec(): ConnectorSpecification? {
+    override fun spec(): ConnectorSpecification {
         return modifySpec(source.spec())
     }
 
@@ -28,7 +28,7 @@ abstract class SpecModifyingSource(private val source: Source) : Source {
     }
 
     @Throws(Exception::class)
-    override fun discover(config: JsonNode): AirbyteCatalog? {
+    override fun discover(config: JsonNode): AirbyteCatalog {
         return source.discover(config)
     }
 

airbyte-cdk/java/airbyte-cdk/core/src/main/kotlin/io/airbyte/cdk/integrations/base/ssh/SshHelpers.kt

@@ -29,9 +29,9 @@ object SshHelpers {
     @JvmOverloads
     @Throws(IOException::class)
     fun injectSshIntoSpec(
-        connectorSpecification: ConnectorSpecification?,
+        connectorSpecification: ConnectorSpecification,
         group: Optional<String> = Optional.empty()
-    ): ConnectorSpecification? {
+    ): ConnectorSpecification {
         val originalSpec = Jsons.clone(connectorSpecification)
         val propNode = originalSpec!!.connectionSpecification["properties"] as ObjectNode
         val tunnelMethod =

airbyte-cdk/java/airbyte-cdk/core/src/main/kotlin/io/airbyte/cdk/integrations/base/ssh/SshTunnel.kt

@@ -422,11 +422,7 @@ constructor(
 
         const val TIMEOUT_MILLIS: Int = 15000 // 15 seconds
 
-        fun getInstance(
-            config: JsonNode,
-            hostKey: List<String>?,
-            portKey: List<String>?
-        ): SshTunnel {
+        fun getInstance(config: JsonNode, hostKey: List<String>, portKey: List<String>): SshTunnel {
             val tunnelMethod =
                 Jsons.getOptional(config, "tunnel_method", "tunnel_method")
                     .map { method: JsonNode ->
@@ -490,7 +486,7 @@ constructor(
         }
 
         @Throws(Exception::class)
-        fun getInstance(config: JsonNode, endPointKey: String?): SshTunnel {
+        fun getInstance(config: JsonNode, endPointKey: String): SshTunnel {
             val tunnelMethod =
                 Jsons.getOptional(config, "tunnel_method", "tunnel_method")
                     .map { method: JsonNode ->
@@ -522,8 +518,8 @@ constructor(
         @Throws(Exception::class)
         fun sshWrap(
             config: JsonNode,
-            hostKey: List<String>?,
-            portKey: List<String>?,
+            hostKey: List<String>,
+            portKey: List<String>,
             wrapped: CheckedConsumer<JsonNode?, Exception?>
         ) {
             sshWrap<Any?>(config, hostKey, portKey) { configInTunnel: JsonNode? ->
@@ -535,7 +531,7 @@ constructor(
         @Throws(Exception::class)
         fun sshWrap(
             config: JsonNode,
-            endPointKey: String?,
+            endPointKey: String,
             wrapped: CheckedConsumer<JsonNode?, Exception?>
         ) {
             sshWrap<Any?>(config, endPointKey) { configInTunnel: JsonNode? ->
@@ -547,8 +543,8 @@ constructor(
         @Throws(Exception::class)
         fun <T> sshWrap(
             config: JsonNode,
-            hostKey: List<String>?,
-            portKey: List<String>?,
+            hostKey: List<String>,
+            portKey: List<String>,
             wrapped: CheckedFunction<JsonNode, T, Exception?>
         ): T {
             getInstance(config, hostKey, portKey).use { sshTunnel ->
@@ -559,7 +555,7 @@ constructor(
         @Throws(Exception::class)
         fun <T> sshWrap(
             config: JsonNode,
-            endPointKey: String?,
+            endPointKey: String,
             wrapped: CheckedFunction<JsonNode, T, Exception?>
         ): T {
             getInstance(config, endPointKey).use { sshTunnel ->

airbyte-cdk/java/airbyte-cdk/core/src/main/kotlin/io/airbyte/cdk/integrations/base/ssh/SshWrappedDestination.kt

@@ -32,22 +32,22 @@ class SshWrappedDestination : Destination {
     private val portKey: List<String>?
     private val endPointKey: String?
 
-    constructor(delegate: Destination, hostKey: List<String>?, portKey: List<String>?) {
+    constructor(delegate: Destination, hostKey: List<String>, portKey: List<String>) {
         this.delegate = delegate
         this.hostKey = hostKey
         this.portKey = portKey
         this.endPointKey = null
     }
 
-    constructor(delegate: Destination, endPointKey: String?) {
+    constructor(delegate: Destination, endPointKey: String) {
         this.delegate = delegate
         this.endPointKey = endPointKey
         this.portKey = null
         this.hostKey = null
     }
 
     @Throws(Exception::class)
-    override fun spec(): ConnectorSpecification? {
+    override fun spec(): ConnectorSpecification {
         // inject the standard ssh configuration into the spec.
         val originalSpec = delegate.spec()
         val propNode = originalSpec!!.connectionSpecification["properties"] as ObjectNode
@@ -73,8 +73,8 @@ class SshWrappedDestination : Destination {
             else
                 SshTunnel.Companion.sshWrap<AirbyteConnectionStatus?>(
                     config,
-                    hostKey,
-                    portKey,
+                    hostKey!!,
+                    portKey!!,
                     CheckedFunction<JsonNode, AirbyteConnectionStatus?, Exception?> {
                         config: JsonNode ->
                         delegate.check(config)
@@ -165,7 +165,7 @@ class SshWrappedDestination : Destination {
     @Throws(Exception::class)
     protected fun getTunnelInstance(config: JsonNode): SshTunnel {
         return if ((endPointKey != null)) SshTunnel.Companion.getInstance(config, endPointKey)
-        else SshTunnel.Companion.getInstance(config, hostKey, portKey)
+        else SshTunnel.Companion.getInstance(config, hostKey!!, portKey!!)
     }
 
     override val isV2Destination: Boolean