Skip to content

Commit c5817f8

Browse files
minor java CDK fixes (#36850)
1 parent 1b18a90 commit c5817f8

File tree

5 files changed

+17
-7
lines changed

5 files changed

+17
-7
lines changed

airbyte-cdk/java/airbyte-cdk/README.md

+8
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,14 @@ Maven and Gradle will automatically reference the correct (pinned) version of th
144144

145145
| Version | Date | Pull Request | Subject |
146146
|:--------|:-----------|:-----------------------------------------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------|
147+
| 0.29.3 | 2024-04-04 | [\#36759](https://github.com/airbytehq/airbyte/pull/36759) | Minor fixes. |
148+
| 0.29.3 | 2024-04-04 | [\#36706](https://github.com/airbytehq/airbyte/pull/36706) | Enabling spotbugs for s3-destination. |
149+
| 0.29.3 | 2024-04-03 | [\#36705](https://github.com/airbytehq/airbyte/pull/36705) | Enabling spotbugs for db-sources. |
150+
| 0.29.3 | 2024-04-03 | [\#36704](https://github.com/airbytehq/airbyte/pull/36704) | Enabling spotbugs for datastore-postgres. |
151+
| 0.29.3 | 2024-04-03 | [\#36703](https://github.com/airbytehq/airbyte/pull/36703) | Enabling spotbugs for gcs-destination. |
152+
| 0.29.3 | 2024-04-03 | [\#36702](https://github.com/airbytehq/airbyte/pull/36702) | Enabling spotbugs for db-destinations. |
153+
| 0.29.3 | 2024-04-03 | [\#36701](https://github.com/airbytehq/airbyte/pull/36701) | Enabling spotbugs for typing_and_deduping. |
154+
| 0.29.3 | 2024-04-03 | [\#36612](https://github.com/airbytehq/airbyte/pull/36612) | Enabling spotbugs for dependencies. |
147155
| 0.29.2 | 2024-04-04 | [\#36845](https://github.com/airbytehq/airbyte/pull/36772) | Changes to make source-mongo compileable |
148156
| 0.29.1 | 2024-04-03 | [\#36772](https://github.com/airbytehq/airbyte/pull/36772) | Changes to make source-mssql compileable |
149157
| 0.29.0 | 2024-04-02 | [\#36759](https://github.com/airbytehq/airbyte/pull/36759) | Build artifact publication changes and fixes. |
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version=0.29.2
1+
version=0.29.3

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ protected constructor(val container: C) : AutoCloseable {
305305
}
306306

307307
companion object {
308-
@JvmField val DEFAULT_CDC_REPLICATION_INITIAL_WAIT: Duration? = Duration.ofSeconds(5)
308+
@JvmField val DEFAULT_CDC_REPLICATION_INITIAL_WAIT: Duration = Duration.ofSeconds(5)
309309
}
310310
}
311311

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -230,14 +230,14 @@ abstract class DestinationAcceptanceTest {
230230
}
231231
}
232232

233-
protected fun normalizationFromDefinition(): Boolean {
233+
protected open fun normalizationFromDefinition(): Boolean {
234234
val metadata = readMetadata()["data"] ?: return false
235235
val normalizationConfig = metadata["normalizationConfig"] ?: return false
236236
return normalizationConfig.has("normalizationRepository") &&
237237
normalizationConfig.has("normalizationTag")
238238
}
239239

240-
protected fun dbtFromDefinition(): Boolean {
240+
protected open fun dbtFromDefinition(): Boolean {
241241
val metadata = readMetadata()["data"] ?: return false
242242
val supportsDbt = metadata["supportsDbt"]
243243
return supportsDbt != null && supportsDbt.asBoolean(false)
@@ -246,7 +246,7 @@ abstract class DestinationAcceptanceTest {
246246
protected val destinationDefinitionKey: String
247247
get() = imageNameWithoutTag
248248

249-
protected fun getNormalizationIntegrationType(): String? {
249+
protected open fun getNormalizationIntegrationType(): String? {
250250
val metadata = readMetadata()["data"] ?: return null
251251
val normalizationConfig = metadata["normalizationConfig"] ?: return null
252252
val normalizationIntegrationType =

airbyte-cdk/java/airbyte-cdk/typing-deduping/src/testFixtures/kotlin/io/airbyte/integrations/base/destination/typing_deduping/BaseSqlGeneratorIntegrationTest.kt

+4-2
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,10 @@ abstract class BaseSqlGeneratorIntegrationTest<DestinationState : MinimumDestina
5959
protected var cdcIncrementalAppendStream: StreamConfig = mock()
6060

6161
protected var generator: SqlGenerator = mock()
62-
protected abstract var destinationHandler: DestinationHandler<DestinationState>
63-
protected var namespace: String = mock()
62+
protected abstract val destinationHandler: DestinationHandler<DestinationState>
63+
// Need a placeholder otherwise Spotbugs will complain with
64+
// a possibility of returning null value in getNamespace.
65+
protected var namespace: String = "dummy_holder"
6466

6567
protected var streamId: StreamId = mock()
6668
private lateinit var primaryKey: List<ColumnId>

0 commit comments

Comments
 (0)