Skip to content

Commit 75ac5a9

Browse files
remove all dependencies to lombok (#37627)
We only use lombok for super trivial stuff and it tends to not play well with Micronauts. Lets' get rid of it!
1 parent 2f76ace commit 75ac5a9

File tree

12 files changed

+17
-32
lines changed

12 files changed

+17
-32
lines changed

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

-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import io.airbyte.commons.json.Jsons
1111
import io.airbyte.protocol.models.v0.AirbyteMessage
1212
import io.airbyte.protocol.models.v0.ConfiguredAirbyteCatalog
1313
import java.util.function.Consumer
14-
import lombok.extern.slf4j.Slf4j
1514
import org.slf4j.Logger
1615
import org.slf4j.LoggerFactory
1716

@@ -64,7 +63,6 @@ interface Destination : Integration {
6463
* Backwards-compatibility wrapper for an AirbyteMessageConsumer. Strips the sizeInBytes
6564
* argument away from the .accept call.
6665
*/
67-
@Slf4j
6866
class ShimToSerializedAirbyteMessageConsumer(private val consumer: AirbyteMessageConsumer?) :
6967
SerializedAirbyteMessageConsumer {
7068
@Throws(Exception::class)

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

-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import io.airbyte.protocol.models.AirbyteTraceMessage
1010
import java.io.*
1111
import java.nio.charset.StandardCharsets
1212
import java.util.*
13-
import lombok.SneakyThrows
1413
import org.junit.jupiter.api.AfterEach
1514
import org.junit.jupiter.api.Assertions
1615
import org.junit.jupiter.api.BeforeEach
@@ -202,7 +201,6 @@ class AirbyteExceptionHandlerTest {
202201
// because junit catches any exceptions in main thread, i.e. they're not 'uncaught'
203202
val thread: Thread =
204203
object : Thread() {
205-
@SneakyThrows
206204
override fun run() {
207205
val runner = Mockito.mock(IntegrationRunner::class.java)
208206
Mockito.doThrow(throwable).`when`(runner).run(arrayOf("write"))

airbyte-cdk/java/airbyte-cdk/db-destinations/src/main/kotlin/io/airbyte/cdk/integrations/destination/jdbc/typing_deduping/JdbcDestinationHandler.kt

-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import java.util.HashMap
2626
import java.util.concurrent.CompletableFuture
2727
import java.util.concurrent.CompletionStage
2828
import java.util.function.Predicate
29-
import lombok.extern.slf4j.Slf4j
3029
import org.jooq.Condition
3130
import org.jooq.DSLContext
3231
import org.jooq.SQLDialect
@@ -39,7 +38,6 @@ import org.jooq.impl.SQLDataType
3938
import org.slf4j.Logger
4039
import org.slf4j.LoggerFactory
4140

42-
@Slf4j
4341
abstract class JdbcDestinationHandler<DestinationState>(
4442
protected val databaseName: String,
4543
protected val jdbcDatabase: JdbcDatabase,

airbyte-cdk/java/airbyte-cdk/db-destinations/src/main/kotlin/io/airbyte/cdk/integrations/destination/jdbc/typing_deduping/JdbcV1V2Migrator.kt

-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import io.airbyte.integrations.base.destination.typing_deduping.StreamConfig
1313
import java.sql.DatabaseMetaData
1414
import java.sql.SQLException
1515
import java.util.*
16-
import lombok.SneakyThrows
1716

1817
/**
1918
* Largely based on
@@ -24,7 +23,6 @@ class JdbcV1V2Migrator(
2423
private val database: JdbcDatabase,
2524
private val databaseName: String
2625
) : BaseDestinationV1V2Migrator<TableDefinition>() {
27-
@SneakyThrows
2826
override fun doesAirbyteInternalNamespaceExist(streamConfig: StreamConfig?): Boolean {
2927
val retrievedSchema =
3028
database.executeMetadataQuery<String> { dbMetadata: DatabaseMetaData? ->
@@ -54,7 +52,6 @@ class JdbcV1V2Migrator(
5452
return existingTable.columns.keys.containsAll(columns)
5553
}
5654

57-
@SneakyThrows
5855
@Throws(Exception::class)
5956
override fun getTableIfExists(
6057
namespace: String?,

airbyte-cdk/java/airbyte-cdk/s3-destinations/src/main/kotlin/io/airbyte/cdk/integrations/destination/s3/jsonl/UploadJsonlFormatConfig.kt

+5-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ import io.airbyte.cdk.integrations.destination.s3.util.CompressionTypeHelper
1212
import io.airbyte.cdk.integrations.destination.s3.util.Flattening
1313
import io.airbyte.cdk.integrations.destination.s3.util.Flattening.Companion.fromValue
1414
import java.util.*
15-
import lombok.ToString
15+
import org.apache.commons.lang3.builder.ToStringBuilder
1616

17-
@ToString
1817
class UploadJsonlFormatConfig(
1918
val flatteningType: Flattening,
2019
val compressionType: CompressionType
@@ -51,6 +50,10 @@ class UploadJsonlFormatConfig(
5150
return Objects.hash(flatteningType, compressionType)
5251
}
5352

53+
override fun toString(): String {
54+
return ToStringBuilder.reflectionToString(this)
55+
}
56+
5457
companion object {
5558
const val JSONL_SUFFIX: String = ".jsonl"
5659
}

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

-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import kotlin.collections.List
1919
import kotlin.collections.MutableMap
2020
import kotlin.collections.emptyList
2121
import kotlin.collections.set
22-
import lombok.SneakyThrows
2322
import org.junit.jupiter.api.Assertions
2423
import org.junit.jupiter.api.BeforeEach
2524
import org.junit.jupiter.api.Test
@@ -59,7 +58,6 @@ class DefaultTyperDeduperTest {
5958

6059
private val MIGRATION_REQUIRING_SOFT_RESET: Migration<MockState> =
6160
object : Migration<MockState> {
62-
@SneakyThrows
6361
override fun migrateIfNecessary(
6462
destinationHandler: DestinationHandler<MockState>,
6563
stream: StreamConfig,

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

-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import io.airbyte.cdk.integrations.base.JavaBaseConstants
77
import io.airbyte.protocol.models.v0.DestinationSyncMode
88
import java.util.*
99
import java.util.stream.Stream
10-
import lombok.SneakyThrows
1110
import org.junit.jupiter.api.Assertions
1211
import org.junit.jupiter.api.Test
1312
import org.junit.jupiter.api.extension.ExtensionContext
@@ -99,7 +98,6 @@ class DestinationV1V2MigratorTest {
9998
)
10099
}
101100

102-
@SneakyThrows
103101
@Test
104102
@Throws(Exception::class)
105103
fun testMigrate() {

airbyte-integrations/connectors-performance/destination-harness/src/main/java/io/airbyte/integrations/destination_performance/Main.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@
2222
import java.nio.file.Path;
2323
import java.util.Arrays;
2424
import java.util.Objects;
25-
import lombok.extern.slf4j.Slf4j;
2625
import org.apache.commons.lang3.StringUtils;
26+
import org.slf4j.Logger;
27+
import org.slf4j.LoggerFactory;
2728

28-
@Slf4j
2929
public class Main {
3030

31+
private static final Logger log = LoggerFactory.getLogger(Main.class);
3132
private static final String CREDENTIALS_PATH = "secrets/%s_%s_credentials.json";
3233

3334
public static void main(final String[] args) {

airbyte-integrations/connectors-performance/destination-harness/src/main/java/io/airbyte/integrations/destination_performance/PerformanceHarness.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,18 @@
5050
import java.util.Set;
5151
import java.util.concurrent.CompletableFuture;
5252
import java.util.regex.Pattern;
53-
import lombok.extern.slf4j.Slf4j;
53+
import org.slf4j.Logger;
54+
import org.slf4j.LoggerFactory;
5455

5556
/**
5657
* This is a crude copy of {@link io.airbyte.workers.general.DefaultReplicationWorker} where if that
5758
* class changes this class will need to be updated to match as this class mocks the functionality
5859
* of the platform from the perspectives of the platform communicating with the destination by
5960
* sending AirbyteRecordMessages the same way platform pipes data into the destination
6061
*/
61-
@Slf4j
6262
public class PerformanceHarness {
6363

64+
private static final Logger log = LoggerFactory.getLogger(PerformanceHarness.class);
6465
public static final int PORT1 = 9877;
6566
public static final int PORT2 = 9878;
6667
public static final int PORT3 = 9879;

airbyte-integrations/connectors-performance/source-harness/src/main/java/io/airbyte/integrations/source_performance/Main.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@
1313
import java.nio.file.Files;
1414
import java.nio.file.Path;
1515
import java.util.Arrays;
16-
import lombok.extern.slf4j.Slf4j;
1716
import org.apache.commons.lang3.StringUtils;
17+
import org.slf4j.Logger;
18+
import org.slf4j.LoggerFactory;
1819

19-
@Slf4j
2020
public class Main {
2121

22+
private static final Logger log = LoggerFactory.getLogger(Main.class);
2223
private static final String CREDENTIALS_PATH = "secrets/%s_%s_credentials.json";
2324

2425
public static void main(final String[] args) {

airbyte-integrations/connectors-performance/source-harness/src/main/java/io/airbyte/integrations/source_performance/PerformanceTest.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,12 @@
4040
import java.util.List;
4141
import java.util.Optional;
4242
import java.util.Set;
43-
import lombok.extern.slf4j.Slf4j;
43+
import org.slf4j.Logger;
44+
import org.slf4j.LoggerFactory;
4445

45-
@Slf4j
4646
public class PerformanceTest {
4747

48+
private static final Logger log = LoggerFactory.getLogger(PerformanceTest.class);
4849
public static final int PORT1 = 9877;
4950
public static final int PORT2 = 9878;
5051
public static final int PORT3 = 9879;

build.gradle

-9
Original file line numberDiff line numberDiff line change
@@ -188,15 +188,6 @@ allprojects {
188188
}
189189

190190
dependencies {
191-
// Lombok dependencies.
192-
def lombok = "org.projectlombok:lombok:1.18.30"
193-
compileOnly lombok
194-
annotationProcessor lombok
195-
testCompileOnly lombok
196-
testAnnotationProcessor lombok
197-
testFixturesCompileOnly lombok
198-
testFixturesAnnotationProcessor lombok
199-
200191
// JUnit dependencies.
201192
def vAssertJ = "3.25.3"
202193
def vJUnit = "5.10.2"

0 commit comments

Comments
 (0)