java CDK: build no longer downloads files from connector registry (ai…

…rbytehq#34441)
sherifnada · Jan 25, 2024 · d01bb65 · d01bb65
1 parent 7706cdd
commit d01bb65
Show file tree

Hide file tree

Showing 60 changed files with 120 additions and 15,577 deletions.
diff --git a/.gitignore b/.gitignore
@@ -69,13 +69,6 @@ resources/examples/airflow/logs/*
 # Summary.md keeps getting added and we just don't like it
 docs/SUMMARY.md
 
-# Files generated by unit tests
-**/specs_secrets_mask.yaml
-
-# Files generated when downloading connector registry
-**/init-oss/src/main/resources/seed/oss_registry.json
-**/init-oss/src/main/resources/seed/oss_catalog.json
-
 # Output Files generated by scripts
 lowcode_connector_names.txt
 num_lowcode_connectors.csv

diff --git a/airbyte-cdk/java/airbyte-cdk/README.md b/airbyte-cdk/java/airbyte-cdk/README.md
@@ -166,6 +166,7 @@ MavenLocal debugging steps:
 
 | Version | Date       | Pull Request                                               | Subject                                                                                                                                                        |
 |:--------|:-----------|:-----------------------------------------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| 0.15.0  | 2024-01-23 | [\#34441](https://github.com/airbytehq/airbyte/pull/34441) | Removed connector registry and micronaut dependencies.                                                                                                         |
 | 0.14.2  | 2024-01-24 | [\#34458](https://github.com/airbytehq/airbyte/pull/34458) | Handle case-sensitivity in sentry error grouping                                                                                                               |
 | 0.14.1  | 2024-01-24 | [\#34468](https://github.com/airbytehq/airbyte/pull/34468) | Add wait for process to be done before ending sync in destination BaseTDTest                                                                                   |
 | 0.14.0  | 2024-01-23 | [\#34461](https://github.com/airbytehq/airbyte/pull/34461) | Revert non backward compatible signature changes from 0.13.1                                                                                                   |

diff --git a/airbyte-cdk/java/airbyte-cdk/acceptance-test-harness/build.gradle b/airbyte-cdk/java/airbyte-cdk/acceptance-test-harness/build.gradle
@@ -9,12 +9,6 @@ java {
 }
 
 dependencies {
-    annotationProcessor platform(libs.micronaut.bom)
-    annotationProcessor libs.bundles.micronaut.annotation.processor
-
-    implementation platform(libs.micronaut.bom)
-    implementation libs.bundles.micronaut
-
     implementation group: 'joda-time', name: 'joda-time', version: '2.12.5'
     implementation 'io.fabric8:kubernetes-client:5.12.2'
     implementation 'com.auth0:java-jwt:3.19.2'
@@ -33,11 +27,8 @@ dependencies {
     implementation project(':airbyte-cdk:java:airbyte-cdk:config-models-oss')
     implementation project(':airbyte-cdk:java:airbyte-cdk:airbyte-json-validation')
 
-    testAnnotationProcessor platform(libs.micronaut.bom)
-    testAnnotationProcessor libs.bundles.micronaut.test.annotation.processor
     testAnnotationProcessor libs.jmh.annotations
 
-    testImplementation libs.bundles.micronaut.test
     testImplementation 'com.jayway.jsonpath:json-path:2.7.0'
     testImplementation 'org.mockito:mockito-inline:4.7.0'
     testImplementation libs.postgresql

diff --git a/airbyte-cdk/java/airbyte-cdk/airbyte-commons-protocol/build.gradle b/airbyte-cdk/java/airbyte-cdk/airbyte-commons-protocol/build.gradle
@@ -5,12 +5,6 @@ java {
 }
 
 dependencies {
-    annotationProcessor libs.bundles.micronaut.annotation.processor
-    testAnnotationProcessor libs.bundles.micronaut.test.annotation.processor
-
-    implementation libs.bundles.micronaut.annotation
-    testImplementation libs.bundles.micronaut.test
-
     implementation project(':airbyte-cdk:java:airbyte-cdk:airbyte-commons')
     implementation project(':airbyte-cdk:java:airbyte-cdk:airbyte-json-validation')
 }
diff --git a/...te-commons-protocol/src/main/java/io/airbyte/commons/protocol/AirbyteMessageMigrator.java b/...te-commons-protocol/src/main/java/io/airbyte/commons/protocol/AirbyteMessageMigrator.java
@@ -9,8 +9,6 @@
 import io.airbyte.commons.protocol.migrations.MigrationContainer;
 import io.airbyte.commons.version.Version;
 import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
-import jakarta.annotation.PostConstruct;
-import jakarta.inject.Singleton;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
@@ -21,7 +19,6 @@
  * This class is intended to apply the transformations required to go from one version of the
  * AirbyteProtocol to another.
  */
-@Singleton
 public class AirbyteMessageMigrator {
 
   private final MigrationContainer<AirbyteMessageMigration<?, ?>> migrationContainer;
@@ -30,7 +27,6 @@ public AirbyteMessageMigrator(final List<AirbyteMessageMigration<?, ?>> migratio
     migrationContainer = new MigrationContainer<>(migrations);
   }
 
-  @PostConstruct
   public void initialize() {
     migrationContainer.initialize();
   }

diff --git a/...mmons-protocol/src/main/java/io/airbyte/commons/protocol/AirbyteMessageSerDeProvider.java b/...mmons-protocol/src/main/java/io/airbyte/commons/protocol/AirbyteMessageSerDeProvider.java
@@ -8,8 +8,6 @@
 import io.airbyte.commons.protocol.serde.AirbyteMessageDeserializer;
 import io.airbyte.commons.protocol.serde.AirbyteMessageSerializer;
 import io.airbyte.commons.version.Version;
-import jakarta.annotation.PostConstruct;
-import jakarta.inject.Singleton;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -23,7 +21,6 @@
  * This class is intended to help access the serializer/deserializer for a given version of the
  * Airbyte Protocol.
  */
-@Singleton
 public class AirbyteMessageSerDeProvider {
 
   private final List<AirbyteMessageDeserializer<?>> deserializersToRegister;
@@ -42,7 +39,6 @@ public AirbyteMessageSerDeProvider() {
     this(Collections.emptyList(), Collections.emptyList());
   }
 
-  @PostConstruct
   public void initialize() {
     deserializersToRegister.forEach(this::registerDeserializer);
     serializersToRegister.forEach(this::registerSerializer);

diff --git a/...ol/src/main/java/io/airbyte/commons/protocol/AirbyteProtocolVersionedMigratorFactory.java b/...ol/src/main/java/io/airbyte/commons/protocol/AirbyteProtocolVersionedMigratorFactory.java
@@ -5,12 +5,10 @@
 package io.airbyte.commons.protocol;
 
 import io.airbyte.commons.version.Version;
-import jakarta.inject.Singleton;
 
 /**
  * Factory to build AirbyteMessageVersionedMigrator
  */
-@Singleton
 public class AirbyteProtocolVersionedMigratorFactory {
 
   private final AirbyteMessageMigrator airbyteMessageMigrator;

diff --git a/...-protocol/src/main/java/io/airbyte/commons/protocol/ConfiguredAirbyteCatalogMigrator.java b/...-protocol/src/main/java/io/airbyte/commons/protocol/ConfiguredAirbyteCatalogMigrator.java
@@ -8,12 +8,9 @@
 import io.airbyte.commons.protocol.migrations.ConfiguredAirbyteCatalogMigration;
 import io.airbyte.commons.protocol.migrations.MigrationContainer;
 import io.airbyte.commons.version.Version;
-import jakarta.annotation.PostConstruct;
-import jakarta.inject.Singleton;
 import java.util.List;
 import java.util.Set;
 
-@Singleton
 public class ConfiguredAirbyteCatalogMigrator {
 
   private final MigrationContainer<ConfiguredAirbyteCatalogMigration<?, ?>> migrationContainer;
@@ -22,7 +19,6 @@ public ConfiguredAirbyteCatalogMigrator(final List<ConfiguredAirbyteCatalogMigra
     migrationContainer = new MigrationContainer<>(migrations);
   }
 
-  @PostConstruct
   public void initialize() {
     migrationContainer.initialize();
   }

diff --git a/...rotocol/src/main/java/io/airbyte/commons/protocol/serde/AirbyteMessageV0Deserializer.java b/...rotocol/src/main/java/io/airbyte/commons/protocol/serde/AirbyteMessageV0Deserializer.java
@@ -6,9 +6,7 @@
 
 import io.airbyte.commons.version.AirbyteProtocolVersion;
 import io.airbyte.protocol.models.AirbyteMessage;
-import jakarta.inject.Singleton;
 
-@Singleton
 public class AirbyteMessageV0Deserializer extends AirbyteMessageGenericDeserializer<AirbyteMessage> {
 
   public AirbyteMessageV0Deserializer() {

diff --git a/...-protocol/src/main/java/io/airbyte/commons/protocol/serde/AirbyteMessageV0Serializer.java b/...-protocol/src/main/java/io/airbyte/commons/protocol/serde/AirbyteMessageV0Serializer.java
@@ -6,9 +6,7 @@
 
 import io.airbyte.commons.version.AirbyteProtocolVersion;
 import io.airbyte.protocol.models.AirbyteMessage;
-import jakarta.inject.Singleton;
 
-@Singleton
 public class AirbyteMessageV0Serializer extends AirbyteMessageGenericSerializer<AirbyteMessage> {
 
   public AirbyteMessageV0Serializer() {

diff --git a/...rotocol/src/main/java/io/airbyte/commons/protocol/serde/AirbyteMessageV1Deserializer.java b/...rotocol/src/main/java/io/airbyte/commons/protocol/serde/AirbyteMessageV1Deserializer.java
@@ -6,9 +6,7 @@
 
 import io.airbyte.commons.version.AirbyteProtocolVersion;
 import io.airbyte.protocol.models.AirbyteMessage;
-import jakarta.inject.Singleton;
 
-@Singleton
 public class AirbyteMessageV1Deserializer extends AirbyteMessageGenericDeserializer<AirbyteMessage> {
 
   public AirbyteMessageV1Deserializer() {

diff --git a/...-protocol/src/main/java/io/airbyte/commons/protocol/serde/AirbyteMessageV1Serializer.java b/...-protocol/src/main/java/io/airbyte/commons/protocol/serde/AirbyteMessageV1Serializer.java
@@ -6,9 +6,7 @@
 
 import io.airbyte.commons.version.AirbyteProtocolVersion;
 import io.airbyte.protocol.models.AirbyteMessage;
-import jakarta.inject.Singleton;
 
-@Singleton
 public class AirbyteMessageV1Serializer extends AirbyteMessageGenericSerializer<AirbyteMessage> {
 
   public AirbyteMessageV1Serializer() {

diff --git a/...l/src/test/java/io/airbyte/commons/protocol/AirbyteMessageSerDeProviderMicronautTest.java b/...l/src/test/java/io/airbyte/commons/protocol/AirbyteMessageSerDeProviderMicronautTest.java
diff --git a/...te-commons-protocol/src/test/java/io/airbyte/commons/protocol/MigratorsMicronautTest.java b/...te-commons-protocol/src/test/java/io/airbyte/commons/protocol/MigratorsMicronautTest.java
diff --git a/airbyte-cdk/java/airbyte-cdk/airbyte-commons/build.gradle b/airbyte-cdk/java/airbyte-cdk/airbyte-commons/build.gradle
@@ -1,6 +1,5 @@
 plugins {
     id 'java-library'
-    id 'de.undercouch.download' version "5.4.0"
 }
 
 java {
@@ -18,10 +17,3 @@ dependencies {
     // this dependency is an exception to the above rule because it is only used INTERNALLY to the commons library.
     implementation 'com.jayway.jsonpath:json-path:2.7.0'
 }
-
-def downloadSpecSecretMask = tasks.register('downloadSpecSecretMask', Download) {
-    src 'https://connectors.airbyte.com/files/registries/v0/specs_secrets_mask.yaml'
-    dest new File(projectDir, 'src/main/resources/seed/specs_secrets_mask.yaml')
-    overwrite true
-}
-tasks.named('processResources').configure { dependsOn downloadSpecSecretMask }