Skip to content

Commit d7e7e2e

Browse files
stephane-airbytestephane-airbyte
committed
fix compiler errors
1 parent 1a6ebfe commit d7e7e2e

File tree

36 files changed

+251
-254
lines changed

36 files changed

+251
-254
lines changed

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -422,11 +422,7 @@ constructor(
422422

423423
const val TIMEOUT_MILLIS: Int = 15000 // 15 seconds
424424

425-
fun getInstance(
426-
config: JsonNode,
427-
hostKey: List<String>,
428-
portKey: List<String>
429-
): SshTunnel {
425+
fun getInstance(config: JsonNode, hostKey: List<String>, portKey: List<String>): SshTunnel {
430426
val tunnelMethod =
431427
Jsons.getOptional(config, "tunnel_method", "tunnel_method")
432428
.map { method: JsonNode ->

‎airbyte-cdk/java/airbyte-cdk/core/src/main/kotlin/io/airbyte/cdk/integrations/util/ConnectorExceptionUtil.kt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,16 +94,14 @@ object ConnectorExceptionUtil {
9494
fun <T : Throwable, Result> getResultsOrLogAndThrowFirst(
9595
initialMessage: String,
9696
eithers: List<Either<out T, Result>>
97-
): List<Result?> {
98-
val throwables: List<T> =
99-
eithers.filter { it.isLeft() }
100-
.map { it.left!! }
101-
.toList()
97+
): List<Result> {
98+
val throwables: List<T> = eithers.filter { it.isLeft() }.map { it.left!! }.toList()
10299
if (throwables.isNotEmpty()) {
103100
logAllAndThrowFirst(initialMessage, throwables)
104101
}
105102
// No need to filter on isRight since isLeft will throw before reaching this line.
106-
return eithers.stream().map { obj: Either<out T, Result> -> obj.right }.toList() }
103+
return eithers.stream().map { obj: Either<out T, Result> -> obj.right!! }.toList()
104+
}
107105

108106
private fun isConfigErrorException(e: Throwable?): Boolean {
109107
return e is ConfigErrorException

‎airbyte-cdk/java/airbyte-cdk/core/src/test/kotlin/io/airbyte/cdk/integrations/base/IntegrationRunnerTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import org.assertj.core.api.AssertionsForClassTypes
3030
import org.junit.jupiter.api.Assertions
3131
import org.junit.jupiter.api.BeforeEach
3232
import org.junit.jupiter.api.Test
33-
import org.mockito.ArgumentMatchers
3433
import org.mockito.Mockito
3534
import org.mockito.kotlin.any
3635
import org.mockito.kotlin.mock

‎airbyte-cdk/java/airbyte-cdk/core/src/testFixtures/kotlin/io/airbyte/cdk/testutils/TestDatabase.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,12 @@ protected constructor(@JvmField val container: C) : AutoCloseable {
189189
}
190190
try {
191191
LOGGER!!.info(
192-
formatLogLine(String.format("executing command %s", Strings.join(cmd.toList().asIterable(), " ")))
192+
formatLogLine(
193+
String.format(
194+
"executing command %s",
195+
Strings.join(cmd.toList().asIterable(), " ")
196+
)
197+
)
193198
)
194199
val exec = container!!.execInContainer(*cmd.toTypedArray<String?>())
195200
if (exec!!.exitCode == 0) {

‎airbyte-cdk/java/airbyte-cdk/db-destinations/src/testFixtures/kotlin/io/airbyte/cdk/integrations/standardtest/destination/DestinationAcceptanceTest.kt

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ import java.util.stream.Stream
6767
import kotlin.Comparator
6868
import kotlin.collections.ArrayList
6969
import kotlin.collections.HashSet
70+
import kotlin.test.assertNotNull
7071
import org.junit.jupiter.api.*
7172
import org.junit.jupiter.api.extension.ExtensionContext
7273
import org.junit.jupiter.params.ParameterizedTest
@@ -76,7 +77,6 @@ import org.junit.jupiter.params.provider.ArgumentsSource
7677
import org.mockito.Mockito
7778
import org.slf4j.Logger
7879
import org.slf4j.LoggerFactory
79-
import kotlin.test.assertNotNull
8080

8181
abstract class DestinationAcceptanceTest {
8282
protected lateinit var TEST_SCHEMAS: HashSet<String>
@@ -133,12 +133,11 @@ abstract class DestinationAcceptanceTest {
133133
}
134134

135135
protected fun getNormalizationImageName(): String? {
136-
val metadata = readMetadata()["data"] ?: return null
137-
val normalizationConfig = metadata["normalizationConfig"] ?: return null
138-
val normalizationRepository =
139-
normalizationConfig["normalizationRepository"] ?: return null
140-
return normalizationRepository.asText() + ":" + NORMALIZATION_VERSION
141-
}
136+
val metadata = readMetadata()["data"] ?: return null
137+
val normalizationConfig = metadata["normalizationConfig"] ?: return null
138+
val normalizationRepository = normalizationConfig["normalizationRepository"] ?: return null
139+
return normalizationRepository.asText() + ":" + NORMALIZATION_VERSION
140+
}
142141

143142
/**
144143
* Configuration specific to the integration. Will be passed to integration where appropriate in
@@ -248,12 +247,12 @@ abstract class DestinationAcceptanceTest {
248247
get() = imageNameWithoutTag
249248

250249
protected fun getNormalizationIntegrationType(): String? {
251-
val metadata = readMetadata()["data"] ?: return null
252-
val normalizationConfig = metadata["normalizationConfig"] ?: return null
253-
val normalizationIntegrationType =
254-
normalizationConfig["normalizationIntegrationType"] ?: return null
255-
return normalizationIntegrationType.asText()
256-
}
250+
val metadata = readMetadata()["data"] ?: return null
251+
val normalizationConfig = metadata["normalizationConfig"] ?: return null
252+
val normalizationIntegrationType =
253+
normalizationConfig["normalizationIntegrationType"] ?: return null
254+
return normalizationIntegrationType.asText()
255+
}
257256

258257
/**
259258
* Detects if a destination implements append dedup mode from the spec.json that should include
@@ -421,7 +420,7 @@ abstract class DestinationAcceptanceTest {
421420
@ParameterizedTest
422421
@ArgumentsSource(DataArgumentsProvider::class)
423422
@Throws(Exception::class)
424-
fun testSync(messagesFilename: String?, catalogFilename: String?) {
423+
fun testSync(messagesFilename: String, catalogFilename: String) {
425424
val catalog =
426425
Jsons.deserialize(
427426
MoreResources.readResource(catalogFilename),
@@ -450,7 +449,7 @@ abstract class DestinationAcceptanceTest {
450449
@ParameterizedTest
451450
@ArgumentsSource(DataArgumentsProvider::class)
452451
@Throws(Exception::class)
453-
fun testSyncWithLargeRecordBatch(messagesFilename: String?, catalogFilename: String?) {
452+
fun testSyncWithLargeRecordBatch(messagesFilename: String, catalogFilename: String) {
454453
val catalog =
455454
Jsons.deserialize(
456455
MoreResources.readResource(catalogFilename),
@@ -667,7 +666,7 @@ abstract class DestinationAcceptanceTest {
667666
DefaultNormalizationRunner(
668667
processFactory,
669668
getNormalizationImageName(),
670-
getNormalizationIntegrationType()
669+
getNormalizationIntegrationType()
671670
)
672671
normalizationRunnerFactorySupportsDestinationImage = true
673672
} catch (e: IllegalStateException) {
@@ -866,7 +865,7 @@ abstract class DestinationAcceptanceTest {
866865
@ParameterizedTest
867866
@ArgumentsSource(DataArgumentsProvider::class)
868867
@Throws(Exception::class)
869-
fun testSyncWithNormalization(messagesFilename: String?, catalogFilename: String?) {
868+
fun testSyncWithNormalization(messagesFilename: String, catalogFilename: String) {
870869
if (!normalizationFromDefinition()) {
871870
return
872871
}
@@ -1068,7 +1067,7 @@ abstract class DestinationAcceptanceTest {
10681067
processFactory,
10691068
DefaultNormalizationRunner(
10701069
processFactory,
1071-
getNormalizationImageName(),
1070+
getNormalizationImageName(),
10721071
getNormalizationIntegrationType()
10731072
)
10741073
)
@@ -1157,8 +1156,8 @@ abstract class DestinationAcceptanceTest {
11571156
processFactory,
11581157
DefaultNormalizationRunner(
11591158
processFactory,
1160-
getNormalizationImageName(),
1161-
getNormalizationIntegrationType()
1159+
getNormalizationImageName(),
1160+
getNormalizationIntegrationType()
11621161
)
11631162
)
11641163
runner.start()
@@ -1680,7 +1679,7 @@ abstract class DestinationAcceptanceTest {
16801679
val runner: NormalizationRunner =
16811680
DefaultNormalizationRunner(
16821681
processFactory,
1683-
getNormalizationImageName(),
1682+
getNormalizationImageName(),
16841683
getNormalizationIntegrationType()
16851684
)
16861685
runner.start()
@@ -1982,8 +1981,8 @@ abstract class DestinationAcceptanceTest {
19821981
@ArgumentsSource(DataTypeTestArgumentProvider::class)
19831982
@Throws(Exception::class)
19841983
fun testDataTypeTestWithNormalization(
1985-
messagesFilename: String?,
1986-
catalogFilename: String?,
1984+
messagesFilename: String,
1985+
catalogFilename: String,
19871986
testCompatibility: DataTypeTestArgumentProvider.TestCompatibility
19881987
) {
19891988
if (!checkTestCompatibility(testCompatibility)) {
@@ -2319,7 +2318,7 @@ abstract class DestinationAcceptanceTest {
23192318
get() = SpecialNumericTypes()
23202319

23212320
@Throws(IOException::class)
2322-
private fun readCatalogFromFile(catalogFilename: String?): AirbyteCatalog {
2321+
private fun readCatalogFromFile(catalogFilename: String): AirbyteCatalog {
23232322
return Jsons.deserialize(
23242323
MoreResources.readResource(catalogFilename),
23252324
AirbyteCatalog::class.java
@@ -2328,7 +2327,7 @@ abstract class DestinationAcceptanceTest {
23282327

23292328
@Throws(IOException::class)
23302329
private fun readMessagesFromFile(
2331-
messagesFilename: String?
2330+
messagesFilename: String
23322331
): List<io.airbyte.protocol.models.v0.AirbyteMessage> {
23332332
return MoreResources.readResource(messagesFilename).lines().map {
23342333
Jsons.deserialize(it, AirbyteMessage::class.java)

‎airbyte-cdk/java/airbyte-cdk/db-destinations/src/testFixtures/kotlin/io/airbyte/cdk/integrations/standardtest/destination/argproviders/DataArgumentsProvider.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class DataArgumentsProvider : ArgumentsProvider {
3333
}
3434

3535
open class CatalogMessageTestConfigPair(val catalogFile: String, val messageFile: String) {
36-
fun getCatalogFileVersion(protocolVersion: ProtocolVersion): String? {
36+
fun getCatalogFileVersion(protocolVersion: ProtocolVersion): String {
3737
return ArgumentProviderUtil.prefixFileNameByVersion(catalogFile, protocolVersion)
3838
}
3939

‎airbyte-cdk/java/airbyte-cdk/db-destinations/src/testFixtures/kotlin/io/airbyte/cdk/integrations/standardtest/destination/typing_deduping/JdbcTypingDedupingTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ abstract class JdbcTypingDedupingTest : BaseTypingDedupingTest() {
9696
@Throws(Exception::class)
9797
override fun dumpFinalTableRecords(
9898
streamNamespace: String?,
99-
streamName: String?
99+
streamName: String
100100
): List<JsonNode> {
101101
var streamNamespace = streamNamespace
102102
if (streamNamespace == null) {

‎airbyte-cdk/java/airbyte-cdk/db-sources/src/testFixtures/kotlin/io/airbyte/cdk/integrations/standardtest/source/AbstractSourceConnectorTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import io.airbyte.workers.process.ProcessFactory
3131
import java.nio.file.Files
3232
import java.nio.file.Path
3333
import java.util.*
34+
import kotlin.test.assertNotNull
3435
import org.junit.jupiter.api.AfterEach
3536
import org.junit.jupiter.api.Assertions
3637
import org.junit.jupiter.api.BeforeEach
@@ -39,7 +40,6 @@ import org.mockito.ArgumentMatchers
3940
import org.mockito.Mockito
4041
import org.slf4j.Logger
4142
import org.slf4j.LoggerFactory
42-
import kotlin.test.assertNotNull
4343

4444
/**
4545
* This abstract class contains helpful functionality and boilerplate for testing a source

‎airbyte-cdk/java/airbyte-cdk/db-sources/src/testFixtures/kotlin/io/airbyte/cdk/integrations/standardtest/source/TestEnvConfigs.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
*/
44
package io.airbyte.cdk.integrations.standardtest.source
55

6-
import com.google.common.base.Preconditions
76
import io.airbyte.commons.lang.Exceptions
87
import io.airbyte.commons.map.MoreMaps
98
import io.airbyte.commons.version.AirbyteVersion
@@ -89,8 +88,7 @@ class TestEnvConfigs private constructor(envMap: Map<String, String>) {
8988
Function { obj: Map.Entry<String, Function<TestEnvConfigs, String>> ->
9089
obj.key
9190
},
92-
Function { entry: Map.Entry<String, Function<TestEnvConfigs, String>>
93-
->
91+
Function { entry: Map.Entry<String, Function<TestEnvConfigs, String>> ->
9492
Exceptions.swallowWithDefault(
9593
{ Objects.requireNonNullElse(entry.value.apply(this), "") },
9694
""
@@ -130,7 +128,7 @@ class TestEnvConfigs private constructor(envMap: Map<String, String>) {
130128

131129
fun getEnsureEnv(name: String): String {
132130
val value = getEnv(name)
133-
checkNotNull(value != null) {"$name environment variable cannot be null"}
131+
checkNotNull(value != null) { "$name environment variable cannot be null" }
134132

135133
return value!!
136134
}

‎airbyte-cdk/java/airbyte-cdk/dependencies/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import org.openapitools.generator.gradle.plugin.tasks.GenerateTask
21
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
32
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
3+
import org.openapitools.generator.gradle.plugin.tasks.GenerateTask
44

55
plugins {
66
id "com.github.eirnym.js2p" version "1.0"

0 commit comments

Comments
 (0)