From 0fac6a99b0479b0007b8d19e440c1bb3c5c37331 Mon Sep 17 00:00:00 2001 From: Christophe Duong Date: Tue, 20 Oct 2020 22:45:31 +0200 Subject: [PATCH] Move JsonSchemaValidator into its own module airbyte-json-validation (#234) (#647) --- airbyte-analytics/build.gradle | 1 + .../io/airbyte/analytics/TrackingClientSingleton.java | 2 +- .../airbyte/analytics/TrackingClientSingletonTest.java | 2 +- airbyte-commons/build.gradle | 4 ---- airbyte-config/persistence/build.gradle | 1 + .../io/airbyte/config/persistence/ConfigPersistence.java | 2 +- .../io/airbyte/config/persistence/ConfigRepository.java | 2 +- .../config/persistence/DefaultConfigPersistence.java | 4 ++-- .../config/persistence/DefaultConfigPersistenceTest.java | 4 ++-- airbyte-json-validation/build.gradle | 9 +++++++++ .../io/airbyte/validation}/json/JsonSchemaValidator.java | 2 +- .../validation}/json/JsonValidationException.java | 2 +- .../validation}/json/JsonSchemaValidatorTest.java | 3 ++- airbyte-scheduler/build.gradle | 1 + .../src/main/java/io/airbyte/scheduler/JobScheduler.java | 2 +- .../scheduler/job_factory/DefaultSyncJobFactory.java | 2 +- .../test/java/io/airbyte/scheduler/JobSchedulerTest.java | 2 +- .../scheduler/job_factory/DefaultSyncJobFactoryTest.java | 2 +- airbyte-server/build.gradle | 1 + .../src/main/java/io/airbyte/server/ServerApp.java | 2 +- .../java/io/airbyte/server/apis/ConfigurationApi.java | 4 ++-- .../io/airbyte/server/handlers/ConnectionsHandler.java | 2 +- .../handlers/DestinationImplementationsHandler.java | 4 ++-- .../io/airbyte/server/handlers/DestinationsHandler.java | 2 +- .../io/airbyte/server/handlers/SchedulerHandler.java | 2 +- .../server/handlers/SourceImplementationsHandler.java | 4 ++-- .../java/io/airbyte/server/handlers/SourcesHandler.java | 2 +- .../server/handlers/WebBackendConnectionsHandler.java | 2 +- .../WebBackendDestinationImplementationHandler.java | 2 +- .../handlers/WebBackendSourceImplementationHandler.java | 2 +- .../io/airbyte/server/handlers/WorkspacesHandler.java | 2 +- .../airbyte/server/handlers/ConnectionsHandlerTest.java | 2 +- .../io/airbyte/server/handlers/DebugInfoHandlerTest.java | 2 +- .../handlers/DestinationImplementationsHandlerTest.java | 4 ++-- .../airbyte/server/handlers/DestinationsHandlerTest.java | 2 +- .../io/airbyte/server/handlers/SchedulerHandlerTest.java | 2 +- .../handlers/SourceImplementationsHandlerTest.java | 4 ++-- .../io/airbyte/server/handlers/SourcesHandlerTest.java | 2 +- .../handlers/WebBackendConnectionsHandlerTest.java | 2 +- .../WebBackendDestinationImplementationHandlerTest.java | 2 +- .../WebBackendSourceImplementationHandlerTest.java | 2 +- .../airbyte/server/handlers/WorkspacesHandlerTest.java | 2 +- airbyte-workers/build.gradle | 1 + .../protocols/airbyte/AirbyteProtocolPredicate.java | 2 +- .../protocols/singer/SingerProtocolPredicate.java | 2 +- settings.gradle | 2 ++ 46 files changed, 62 insertions(+), 49 deletions(-) create mode 100644 airbyte-json-validation/build.gradle rename {airbyte-commons/src/main/java/io/airbyte/commons => airbyte-json-validation/src/main/java/io/airbyte/validation}/json/JsonSchemaValidator.java (98%) rename {airbyte-commons/src/main/java/io/airbyte/commons => airbyte-json-validation/src/main/java/io/airbyte/validation}/json/JsonValidationException.java (97%) rename {airbyte-commons/src/test/java/io/airbyte/commons => airbyte-json-validation/src/test/java/io/airbyte/validation}/json/JsonSchemaValidatorTest.java (97%) diff --git a/airbyte-analytics/build.gradle b/airbyte-analytics/build.gradle index 8993aa529cf8..a405e5756b68 100644 --- a/airbyte-analytics/build.gradle +++ b/airbyte-analytics/build.gradle @@ -4,4 +4,5 @@ dependencies { implementation project(':airbyte-config:models') implementation project(':airbyte-config:persistence') + implementation project(':airbyte-json-validation') } diff --git a/airbyte-analytics/src/main/java/io/airbyte/analytics/TrackingClientSingleton.java b/airbyte-analytics/src/main/java/io/airbyte/analytics/TrackingClientSingleton.java index 9f53556c72a6..58a3d82ae352 100644 --- a/airbyte-analytics/src/main/java/io/airbyte/analytics/TrackingClientSingleton.java +++ b/airbyte-analytics/src/main/java/io/airbyte/analytics/TrackingClientSingleton.java @@ -25,12 +25,12 @@ package io.airbyte.analytics; import com.google.common.annotations.VisibleForTesting; -import io.airbyte.commons.json.JsonValidationException; import io.airbyte.config.Configs; import io.airbyte.config.StandardWorkspace; import io.airbyte.config.persistence.ConfigNotFoundException; import io.airbyte.config.persistence.ConfigRepository; import io.airbyte.config.persistence.PersistenceConstants; +import io.airbyte.validation.json.JsonValidationException; import java.io.IOException; import java.util.function.Supplier; diff --git a/airbyte-analytics/src/test/java/io/airbyte/analytics/TrackingClientSingletonTest.java b/airbyte-analytics/src/test/java/io/airbyte/analytics/TrackingClientSingletonTest.java index dc3f1be8a2d0..c414690e54fb 100644 --- a/airbyte-analytics/src/test/java/io/airbyte/analytics/TrackingClientSingletonTest.java +++ b/airbyte-analytics/src/test/java/io/airbyte/analytics/TrackingClientSingletonTest.java @@ -29,12 +29,12 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import io.airbyte.commons.json.JsonValidationException; import io.airbyte.config.Configs; import io.airbyte.config.StandardWorkspace; import io.airbyte.config.persistence.ConfigNotFoundException; import io.airbyte.config.persistence.ConfigRepository; import io.airbyte.config.persistence.PersistenceConstants; +import io.airbyte.validation.json.JsonValidationException; import java.io.IOException; import java.util.UUID; import org.junit.jupiter.api.BeforeEach; diff --git a/airbyte-commons/build.gradle b/airbyte-commons/build.gradle index 9e44078e4001..7ce58844fea8 100644 --- a/airbyte-commons/build.gradle +++ b/airbyte-commons/build.gradle @@ -3,9 +3,5 @@ plugins { } dependencies { - implementation group: 'com.networknt', name: 'json-schema-validator', version: '1.0.42' - // needed so that we can follow $ref when parsing json. jackson does not support this natively. - implementation 'me.andrz.jackson:jackson-json-reference-core:0.3.2' - testImplementation 'org.apache.commons:commons-lang3:3.11' } diff --git a/airbyte-config/persistence/build.gradle b/airbyte-config/persistence/build.gradle index 0130bf90b089..52aeca65b1f0 100644 --- a/airbyte-config/persistence/build.gradle +++ b/airbyte-config/persistence/build.gradle @@ -2,4 +2,5 @@ dependencies { implementation group: 'commons-io', name: 'commons-io', version: '2.7' implementation project(':airbyte-config:models') + implementation project(":airbyte-json-validation") } diff --git a/airbyte-config/persistence/src/main/java/io/airbyte/config/persistence/ConfigPersistence.java b/airbyte-config/persistence/src/main/java/io/airbyte/config/persistence/ConfigPersistence.java index 098a9f9d2a3f..a8bf4dfda922 100644 --- a/airbyte-config/persistence/src/main/java/io/airbyte/config/persistence/ConfigPersistence.java +++ b/airbyte-config/persistence/src/main/java/io/airbyte/config/persistence/ConfigPersistence.java @@ -24,8 +24,8 @@ package io.airbyte.config.persistence; -import io.airbyte.commons.json.JsonValidationException; import io.airbyte.config.ConfigSchema; +import io.airbyte.validation.json.JsonValidationException; import java.io.IOException; import java.util.List; diff --git a/airbyte-config/persistence/src/main/java/io/airbyte/config/persistence/ConfigRepository.java b/airbyte-config/persistence/src/main/java/io/airbyte/config/persistence/ConfigRepository.java index 46e3d2f43a2c..d43f06e6d266 100644 --- a/airbyte-config/persistence/src/main/java/io/airbyte/config/persistence/ConfigRepository.java +++ b/airbyte-config/persistence/src/main/java/io/airbyte/config/persistence/ConfigRepository.java @@ -24,7 +24,6 @@ package io.airbyte.config.persistence; -import io.airbyte.commons.json.JsonValidationException; import io.airbyte.config.ConfigSchema; import io.airbyte.config.DestinationConnectionImplementation; import io.airbyte.config.SourceConnectionImplementation; @@ -33,6 +32,7 @@ import io.airbyte.config.StandardSync; import io.airbyte.config.StandardSyncSchedule; import io.airbyte.config.StandardWorkspace; +import io.airbyte.validation.json.JsonValidationException; import java.io.IOException; import java.util.List; import java.util.UUID; diff --git a/airbyte-config/persistence/src/main/java/io/airbyte/config/persistence/DefaultConfigPersistence.java b/airbyte-config/persistence/src/main/java/io/airbyte/config/persistence/DefaultConfigPersistence.java index 90c693c38e8b..aef4a0b6feff 100644 --- a/airbyte-config/persistence/src/main/java/io/airbyte/config/persistence/DefaultConfigPersistence.java +++ b/airbyte-config/persistence/src/main/java/io/airbyte/config/persistence/DefaultConfigPersistence.java @@ -26,10 +26,10 @@ import com.fasterxml.jackson.databind.JsonNode; import com.google.common.collect.Lists; -import io.airbyte.commons.json.JsonSchemaValidator; -import io.airbyte.commons.json.JsonValidationException; import io.airbyte.commons.json.Jsons; import io.airbyte.config.ConfigSchema; +import io.airbyte.validation.json.JsonSchemaValidator; +import io.airbyte.validation.json.JsonValidationException; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; diff --git a/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/DefaultConfigPersistenceTest.java b/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/DefaultConfigPersistenceTest.java index 6db553188a3c..e4010a746f03 100644 --- a/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/DefaultConfigPersistenceTest.java +++ b/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/DefaultConfigPersistenceTest.java @@ -30,12 +30,12 @@ import static org.mockito.Mockito.*; import com.google.common.collect.Sets; -import io.airbyte.commons.json.JsonSchemaValidator; -import io.airbyte.commons.json.JsonValidationException; import io.airbyte.config.ConfigSchema; import io.airbyte.config.Schema; import io.airbyte.config.StandardSource; import io.airbyte.config.StandardSync; +import io.airbyte.validation.json.JsonSchemaValidator; +import io.airbyte.validation.json.JsonValidationException; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; diff --git a/airbyte-json-validation/build.gradle b/airbyte-json-validation/build.gradle new file mode 100644 index 000000000000..8866ac64d555 --- /dev/null +++ b/airbyte-json-validation/build.gradle @@ -0,0 +1,9 @@ +plugins { + id "java-library" +} + +dependencies { + implementation group: 'com.networknt', name: 'json-schema-validator', version: '1.0.42' + // needed so that we can follow $ref when parsing json. jackson does not support this natively. + implementation 'me.andrz.jackson:jackson-json-reference-core:0.3.2' +} diff --git a/airbyte-commons/src/main/java/io/airbyte/commons/json/JsonSchemaValidator.java b/airbyte-json-validation/src/main/java/io/airbyte/validation/json/JsonSchemaValidator.java similarity index 98% rename from airbyte-commons/src/main/java/io/airbyte/commons/json/JsonSchemaValidator.java rename to airbyte-json-validation/src/main/java/io/airbyte/validation/json/JsonSchemaValidator.java index c4e88bf7da95..3d6376b3e77f 100644 --- a/airbyte-commons/src/main/java/io/airbyte/commons/json/JsonSchemaValidator.java +++ b/airbyte-json-validation/src/main/java/io/airbyte/validation/json/JsonSchemaValidator.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.airbyte.commons.json; +package io.airbyte.validation.json; import com.fasterxml.jackson.databind.JsonNode; import com.google.common.base.Preconditions; diff --git a/airbyte-commons/src/main/java/io/airbyte/commons/json/JsonValidationException.java b/airbyte-json-validation/src/main/java/io/airbyte/validation/json/JsonValidationException.java similarity index 97% rename from airbyte-commons/src/main/java/io/airbyte/commons/json/JsonValidationException.java rename to airbyte-json-validation/src/main/java/io/airbyte/validation/json/JsonValidationException.java index 9c1145cbf3e0..542cdb55f3ab 100644 --- a/airbyte-commons/src/main/java/io/airbyte/commons/json/JsonValidationException.java +++ b/airbyte-json-validation/src/main/java/io/airbyte/validation/json/JsonValidationException.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.airbyte.commons.json; +package io.airbyte.validation.json; public class JsonValidationException extends Exception { diff --git a/airbyte-commons/src/test/java/io/airbyte/commons/json/JsonSchemaValidatorTest.java b/airbyte-json-validation/src/test/java/io/airbyte/validation/json/JsonSchemaValidatorTest.java similarity index 97% rename from airbyte-commons/src/test/java/io/airbyte/commons/json/JsonSchemaValidatorTest.java rename to airbyte-json-validation/src/test/java/io/airbyte/validation/json/JsonSchemaValidatorTest.java index 3b8778e102c0..af3b370b5291 100644 --- a/airbyte-commons/src/test/java/io/airbyte/commons/json/JsonSchemaValidatorTest.java +++ b/airbyte-json-validation/src/test/java/io/airbyte/validation/json/JsonSchemaValidatorTest.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package io.airbyte.commons.json; +package io.airbyte.validation.json; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -30,6 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import com.fasterxml.jackson.databind.JsonNode; +import io.airbyte.commons.json.Jsons; import org.junit.jupiter.api.Test; class JsonSchemaValidatorTest { diff --git a/airbyte-scheduler/build.gradle b/airbyte-scheduler/build.gradle index 20c0d101344f..187edeadebc4 100644 --- a/airbyte-scheduler/build.gradle +++ b/airbyte-scheduler/build.gradle @@ -6,6 +6,7 @@ dependencies { implementation project(':airbyte-config:models') implementation project(':airbyte-config:persistence') implementation project(':airbyte-db') + implementation project(':airbyte-json-validation') implementation project(':airbyte-protocol:models') implementation project(':airbyte-singer') implementation project(':airbyte-workers') diff --git a/airbyte-scheduler/src/main/java/io/airbyte/scheduler/JobScheduler.java b/airbyte-scheduler/src/main/java/io/airbyte/scheduler/JobScheduler.java index 9b5a11f8ed50..4c53e8819d93 100644 --- a/airbyte-scheduler/src/main/java/io/airbyte/scheduler/JobScheduler.java +++ b/airbyte-scheduler/src/main/java/io/airbyte/scheduler/JobScheduler.java @@ -25,7 +25,6 @@ package io.airbyte.scheduler; import com.google.common.annotations.VisibleForTesting; -import io.airbyte.commons.json.JsonValidationException; import io.airbyte.config.StandardSync; import io.airbyte.config.StandardSyncSchedule; import io.airbyte.config.persistence.ConfigNotFoundException; @@ -33,6 +32,7 @@ import io.airbyte.scheduler.job_factory.DefaultSyncJobFactory; import io.airbyte.scheduler.job_factory.SyncJobFactory; import io.airbyte.scheduler.persistence.SchedulerPersistence; +import io.airbyte.validation.json.JsonValidationException; import java.io.IOException; import java.time.Instant; import java.util.List; diff --git a/airbyte-scheduler/src/main/java/io/airbyte/scheduler/job_factory/DefaultSyncJobFactory.java b/airbyte-scheduler/src/main/java/io/airbyte/scheduler/job_factory/DefaultSyncJobFactory.java index a4e67cdaf797..fb32b1fbb8b7 100644 --- a/airbyte-scheduler/src/main/java/io/airbyte/scheduler/job_factory/DefaultSyncJobFactory.java +++ b/airbyte-scheduler/src/main/java/io/airbyte/scheduler/job_factory/DefaultSyncJobFactory.java @@ -25,7 +25,6 @@ package io.airbyte.scheduler.job_factory; import io.airbyte.commons.docker.DockerUtils; -import io.airbyte.commons.json.JsonValidationException; import io.airbyte.config.DestinationConnectionImplementation; import io.airbyte.config.SourceConnectionImplementation; import io.airbyte.config.StandardDestination; @@ -34,6 +33,7 @@ import io.airbyte.config.persistence.ConfigNotFoundException; import io.airbyte.config.persistence.ConfigRepository; import io.airbyte.scheduler.persistence.SchedulerPersistence; +import io.airbyte.validation.json.JsonValidationException; import java.io.IOException; import java.util.UUID; diff --git a/airbyte-scheduler/src/test/java/io/airbyte/scheduler/JobSchedulerTest.java b/airbyte-scheduler/src/test/java/io/airbyte/scheduler/JobSchedulerTest.java index 6bcbcfd5599c..045ef55f999a 100644 --- a/airbyte-scheduler/src/test/java/io/airbyte/scheduler/JobSchedulerTest.java +++ b/airbyte-scheduler/src/test/java/io/airbyte/scheduler/JobSchedulerTest.java @@ -30,7 +30,6 @@ import static org.mockito.Mockito.when; import com.google.common.collect.Lists; -import io.airbyte.commons.json.JsonValidationException; import io.airbyte.config.DataType; import io.airbyte.config.Field; import io.airbyte.config.Schema; @@ -41,6 +40,7 @@ import io.airbyte.config.persistence.ConfigRepository; import io.airbyte.scheduler.job_factory.SyncJobFactory; import io.airbyte.scheduler.persistence.SchedulerPersistence; +import io.airbyte.validation.json.JsonValidationException; import java.io.IOException; import java.util.Collections; import java.util.Optional; diff --git a/airbyte-scheduler/src/test/java/io/airbyte/scheduler/job_factory/DefaultSyncJobFactoryTest.java b/airbyte-scheduler/src/test/java/io/airbyte/scheduler/job_factory/DefaultSyncJobFactoryTest.java index b56ba912be54..bdd8bfbc08aa 100644 --- a/airbyte-scheduler/src/test/java/io/airbyte/scheduler/job_factory/DefaultSyncJobFactoryTest.java +++ b/airbyte-scheduler/src/test/java/io/airbyte/scheduler/job_factory/DefaultSyncJobFactoryTest.java @@ -30,7 +30,6 @@ import static org.mockito.Mockito.when; import io.airbyte.commons.docker.DockerUtils; -import io.airbyte.commons.json.JsonValidationException; import io.airbyte.config.DestinationConnectionImplementation; import io.airbyte.config.SourceConnectionImplementation; import io.airbyte.config.StandardDestination; @@ -39,6 +38,7 @@ import io.airbyte.config.persistence.ConfigNotFoundException; import io.airbyte.config.persistence.ConfigRepository; import io.airbyte.scheduler.persistence.SchedulerPersistence; +import io.airbyte.validation.json.JsonValidationException; import java.io.IOException; import java.util.UUID; import org.junit.jupiter.api.Test; diff --git a/airbyte-server/build.gradle b/airbyte-server/build.gradle index 0b041e5b527c..04d4af888128 100644 --- a/airbyte-server/build.gradle +++ b/airbyte-server/build.gradle @@ -18,6 +18,7 @@ dependencies { implementation project(':airbyte-config:persistence') implementation project(':airbyte-config:init') implementation project(':airbyte-db') + implementation project(":airbyte-json-validation") implementation project(':airbyte-scheduler') } diff --git a/airbyte-server/src/main/java/io/airbyte/server/ServerApp.java b/airbyte-server/src/main/java/io/airbyte/server/ServerApp.java index 7d72a3f92d3f..58a05cda5a05 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/ServerApp.java +++ b/airbyte-server/src/main/java/io/airbyte/server/ServerApp.java @@ -25,7 +25,6 @@ package io.airbyte.server; import io.airbyte.analytics.TrackingClientSingleton; -import io.airbyte.commons.json.JsonValidationException; import io.airbyte.commons.resources.MoreResources; import io.airbyte.config.Configs; import io.airbyte.config.EnvConfigs; @@ -43,6 +42,7 @@ import io.airbyte.server.errors.InvalidJsonInputExceptionMapper; import io.airbyte.server.errors.KnownExceptionMapper; import io.airbyte.server.errors.UncaughtExceptionMapper; +import io.airbyte.validation.json.JsonValidationException; import java.io.IOException; import java.nio.file.Path; import java.util.UUID; diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/ConfigurationApi.java b/airbyte-server/src/main/java/io/airbyte/server/apis/ConfigurationApi.java index c3d4c3c7025d..5ae42323606c 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/apis/ConfigurationApi.java +++ b/airbyte-server/src/main/java/io/airbyte/server/apis/ConfigurationApi.java @@ -66,8 +66,6 @@ import io.airbyte.api.model.WorkspaceIdRequestBody; import io.airbyte.api.model.WorkspaceRead; import io.airbyte.api.model.WorkspaceUpdate; -import io.airbyte.commons.json.JsonSchemaValidator; -import io.airbyte.commons.json.JsonValidationException; import io.airbyte.config.persistence.ConfigNotFoundException; import io.airbyte.config.persistence.ConfigRepository; import io.airbyte.scheduler.persistence.SchedulerPersistence; @@ -85,6 +83,8 @@ import io.airbyte.server.handlers.WebBackendSourceImplementationHandler; import io.airbyte.server.handlers.WorkspacesHandler; import io.airbyte.server.validators.DockerImageValidator; +import io.airbyte.validation.json.JsonSchemaValidator; +import io.airbyte.validation.json.JsonValidationException; import java.io.IOException; import javax.validation.Valid; import org.eclipse.jetty.http.HttpStatus; diff --git a/airbyte-server/src/main/java/io/airbyte/server/handlers/ConnectionsHandler.java b/airbyte-server/src/main/java/io/airbyte/server/handlers/ConnectionsHandler.java index 41bbaa926cdc..c3116ee8fb36 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/handlers/ConnectionsHandler.java +++ b/airbyte-server/src/main/java/io/airbyte/server/handlers/ConnectionsHandler.java @@ -35,7 +35,6 @@ import io.airbyte.api.model.ConnectionUpdate; import io.airbyte.api.model.WorkspaceIdRequestBody; import io.airbyte.commons.enums.Enums; -import io.airbyte.commons.json.JsonValidationException; import io.airbyte.config.Schedule; import io.airbyte.config.Schema; import io.airbyte.config.StandardSync; @@ -43,6 +42,7 @@ import io.airbyte.config.persistence.ConfigNotFoundException; import io.airbyte.config.persistence.ConfigRepository; import io.airbyte.server.converters.SchemaConverter; +import io.airbyte.validation.json.JsonValidationException; import java.io.IOException; import java.util.Collections; import java.util.List; diff --git a/airbyte-server/src/main/java/io/airbyte/server/handlers/DestinationImplementationsHandler.java b/airbyte-server/src/main/java/io/airbyte/server/handlers/DestinationImplementationsHandler.java index b84d599970e7..9541b3478b3f 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/handlers/DestinationImplementationsHandler.java +++ b/airbyte-server/src/main/java/io/airbyte/server/handlers/DestinationImplementationsHandler.java @@ -37,12 +37,12 @@ import io.airbyte.api.model.DestinationImplementationUpdate; import io.airbyte.api.model.DestinationSpecificationRead; import io.airbyte.api.model.WorkspaceIdRequestBody; -import io.airbyte.commons.json.JsonSchemaValidator; -import io.airbyte.commons.json.JsonValidationException; import io.airbyte.config.DestinationConnectionImplementation; import io.airbyte.config.StandardDestination; import io.airbyte.config.persistence.ConfigNotFoundException; import io.airbyte.config.persistence.ConfigRepository; +import io.airbyte.validation.json.JsonSchemaValidator; +import io.airbyte.validation.json.JsonValidationException; import java.io.IOException; import java.util.List; import java.util.UUID; diff --git a/airbyte-server/src/main/java/io/airbyte/server/handlers/DestinationsHandler.java b/airbyte-server/src/main/java/io/airbyte/server/handlers/DestinationsHandler.java index 17e17748e2a1..9b92c142c54b 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/handlers/DestinationsHandler.java +++ b/airbyte-server/src/main/java/io/airbyte/server/handlers/DestinationsHandler.java @@ -28,11 +28,11 @@ import io.airbyte.api.model.DestinationRead; import io.airbyte.api.model.DestinationReadList; import io.airbyte.api.model.DestinationUpdate; -import io.airbyte.commons.json.JsonValidationException; import io.airbyte.config.StandardDestination; import io.airbyte.config.persistence.ConfigNotFoundException; import io.airbyte.config.persistence.ConfigRepository; import io.airbyte.server.validators.DockerImageValidator; +import io.airbyte.validation.json.JsonValidationException; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; diff --git a/airbyte-server/src/main/java/io/airbyte/server/handlers/SchedulerHandler.java b/airbyte-server/src/main/java/io/airbyte/server/handlers/SchedulerHandler.java index 4844714e0c75..d6aafac13345 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/handlers/SchedulerHandler.java +++ b/airbyte-server/src/main/java/io/airbyte/server/handlers/SchedulerHandler.java @@ -39,7 +39,6 @@ import io.airbyte.api.model.SourceSpecificationRead; import io.airbyte.commons.docker.DockerUtils; import io.airbyte.commons.enums.Enums; -import io.airbyte.commons.json.JsonValidationException; import io.airbyte.config.ConnectorSpecification; import io.airbyte.config.DestinationConnectionImplementation; import io.airbyte.config.JobOutput; @@ -56,6 +55,7 @@ import io.airbyte.scheduler.JobStatus; import io.airbyte.scheduler.persistence.SchedulerPersistence; import io.airbyte.server.converters.SchemaConverter; +import io.airbyte.validation.json.JsonValidationException; import java.io.IOException; import java.util.Collections; import java.util.UUID; diff --git a/airbyte-server/src/main/java/io/airbyte/server/handlers/SourceImplementationsHandler.java b/airbyte-server/src/main/java/io/airbyte/server/handlers/SourceImplementationsHandler.java index d24f60d6f586..b3b831ab1195 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/handlers/SourceImplementationsHandler.java +++ b/airbyte-server/src/main/java/io/airbyte/server/handlers/SourceImplementationsHandler.java @@ -37,12 +37,12 @@ import io.airbyte.api.model.SourceImplementationUpdate; import io.airbyte.api.model.SourceSpecificationRead; import io.airbyte.api.model.WorkspaceIdRequestBody; -import io.airbyte.commons.json.JsonSchemaValidator; -import io.airbyte.commons.json.JsonValidationException; import io.airbyte.config.SourceConnectionImplementation; import io.airbyte.config.StandardSource; import io.airbyte.config.persistence.ConfigNotFoundException; import io.airbyte.config.persistence.ConfigRepository; +import io.airbyte.validation.json.JsonSchemaValidator; +import io.airbyte.validation.json.JsonValidationException; import java.io.IOException; import java.util.List; import java.util.UUID; diff --git a/airbyte-server/src/main/java/io/airbyte/server/handlers/SourcesHandler.java b/airbyte-server/src/main/java/io/airbyte/server/handlers/SourcesHandler.java index 5b89f610c9b7..27bda2a7db8d 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/handlers/SourcesHandler.java +++ b/airbyte-server/src/main/java/io/airbyte/server/handlers/SourcesHandler.java @@ -29,11 +29,11 @@ import io.airbyte.api.model.SourceRead; import io.airbyte.api.model.SourceReadList; import io.airbyte.api.model.SourceUpdate; -import io.airbyte.commons.json.JsonValidationException; import io.airbyte.config.StandardSource; import io.airbyte.config.persistence.ConfigNotFoundException; import io.airbyte.config.persistence.ConfigRepository; import io.airbyte.server.validators.DockerImageValidator; +import io.airbyte.validation.json.JsonValidationException; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; diff --git a/airbyte-server/src/main/java/io/airbyte/server/handlers/WebBackendConnectionsHandler.java b/airbyte-server/src/main/java/io/airbyte/server/handlers/WebBackendConnectionsHandler.java index 782be0f96590..782c7fa7a3e9 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/handlers/WebBackendConnectionsHandler.java +++ b/airbyte-server/src/main/java/io/airbyte/server/handlers/WebBackendConnectionsHandler.java @@ -37,8 +37,8 @@ import io.airbyte.api.model.WbConnectionReadList; import io.airbyte.api.model.WorkspaceIdRequestBody; import io.airbyte.commons.enums.Enums; -import io.airbyte.commons.json.JsonValidationException; import io.airbyte.config.persistence.ConfigNotFoundException; +import io.airbyte.validation.json.JsonValidationException; import java.io.IOException; import java.util.List; diff --git a/airbyte-server/src/main/java/io/airbyte/server/handlers/WebBackendDestinationImplementationHandler.java b/airbyte-server/src/main/java/io/airbyte/server/handlers/WebBackendDestinationImplementationHandler.java index 5542645a7881..da3be1290db0 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/handlers/WebBackendDestinationImplementationHandler.java +++ b/airbyte-server/src/main/java/io/airbyte/server/handlers/WebBackendDestinationImplementationHandler.java @@ -30,9 +30,9 @@ import io.airbyte.api.model.DestinationImplementationIdRequestBody; import io.airbyte.api.model.DestinationImplementationRead; import io.airbyte.api.model.DestinationImplementationRecreate; -import io.airbyte.commons.json.JsonValidationException; import io.airbyte.config.persistence.ConfigNotFoundException; import io.airbyte.server.errors.KnownException; +import io.airbyte.validation.json.JsonValidationException; import java.io.IOException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airbyte-server/src/main/java/io/airbyte/server/handlers/WebBackendSourceImplementationHandler.java b/airbyte-server/src/main/java/io/airbyte/server/handlers/WebBackendSourceImplementationHandler.java index 30f6c362b23e..eb6bbe4d469a 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/handlers/WebBackendSourceImplementationHandler.java +++ b/airbyte-server/src/main/java/io/airbyte/server/handlers/WebBackendSourceImplementationHandler.java @@ -30,9 +30,9 @@ import io.airbyte.api.model.SourceImplementationIdRequestBody; import io.airbyte.api.model.SourceImplementationRead; import io.airbyte.api.model.SourceImplementationRecreate; -import io.airbyte.commons.json.JsonValidationException; import io.airbyte.config.persistence.ConfigNotFoundException; import io.airbyte.server.errors.KnownException; +import io.airbyte.validation.json.JsonValidationException; import java.io.IOException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airbyte-server/src/main/java/io/airbyte/server/handlers/WorkspacesHandler.java b/airbyte-server/src/main/java/io/airbyte/server/handlers/WorkspacesHandler.java index 30de64924282..1ca36ad481dd 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/handlers/WorkspacesHandler.java +++ b/airbyte-server/src/main/java/io/airbyte/server/handlers/WorkspacesHandler.java @@ -30,11 +30,11 @@ import io.airbyte.api.model.WorkspaceIdRequestBody; import io.airbyte.api.model.WorkspaceRead; import io.airbyte.api.model.WorkspaceUpdate; -import io.airbyte.commons.json.JsonValidationException; import io.airbyte.config.StandardWorkspace; import io.airbyte.config.persistence.ConfigNotFoundException; import io.airbyte.config.persistence.ConfigRepository; import io.airbyte.config.persistence.PersistenceConstants; +import io.airbyte.validation.json.JsonValidationException; import java.io.IOException; import java.util.UUID; diff --git a/airbyte-server/src/test/java/io/airbyte/server/handlers/ConnectionsHandlerTest.java b/airbyte-server/src/test/java/io/airbyte/server/handlers/ConnectionsHandlerTest.java index a9078ff5c4ba..0c9593c9f221 100644 --- a/airbyte-server/src/test/java/io/airbyte/server/handlers/ConnectionsHandlerTest.java +++ b/airbyte-server/src/test/java/io/airbyte/server/handlers/ConnectionsHandlerTest.java @@ -41,7 +41,6 @@ import io.airbyte.api.model.SourceSchema; import io.airbyte.api.model.WorkspaceIdRequestBody; import io.airbyte.commons.enums.Enums; -import io.airbyte.commons.json.JsonValidationException; import io.airbyte.config.DataType; import io.airbyte.config.Schedule; import io.airbyte.config.Schema; @@ -52,6 +51,7 @@ import io.airbyte.config.persistence.ConfigRepository; import io.airbyte.server.helpers.ConnectionHelpers; import io.airbyte.server.helpers.SourceImplementationHelpers; +import io.airbyte.validation.json.JsonValidationException; import java.io.IOException; import java.util.UUID; import java.util.function.Supplier; diff --git a/airbyte-server/src/test/java/io/airbyte/server/handlers/DebugInfoHandlerTest.java b/airbyte-server/src/test/java/io/airbyte/server/handlers/DebugInfoHandlerTest.java index 949ae1a05dbb..80e527f9e399 100644 --- a/airbyte-server/src/test/java/io/airbyte/server/handlers/DebugInfoHandlerTest.java +++ b/airbyte-server/src/test/java/io/airbyte/server/handlers/DebugInfoHandlerTest.java @@ -29,11 +29,11 @@ import static org.mockito.Mockito.when; import com.google.common.collect.Lists; -import io.airbyte.commons.json.JsonValidationException; import io.airbyte.config.persistence.ConfigNotFoundException; import io.airbyte.config.persistence.ConfigRepository; import io.airbyte.server.helpers.DestinationHelpers; import io.airbyte.server.helpers.SourceHelpers; +import io.airbyte.validation.json.JsonValidationException; import java.io.IOException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/airbyte-server/src/test/java/io/airbyte/server/handlers/DestinationImplementationsHandlerTest.java b/airbyte-server/src/test/java/io/airbyte/server/handlers/DestinationImplementationsHandlerTest.java index 8646e1edc479..858c305c0ec7 100644 --- a/airbyte-server/src/test/java/io/airbyte/server/handlers/DestinationImplementationsHandlerTest.java +++ b/airbyte-server/src/test/java/io/airbyte/server/handlers/DestinationImplementationsHandlerTest.java @@ -44,8 +44,6 @@ import io.airbyte.api.model.DestinationImplementationUpdate; import io.airbyte.api.model.DestinationSpecificationRead; import io.airbyte.api.model.WorkspaceIdRequestBody; -import io.airbyte.commons.json.JsonSchemaValidator; -import io.airbyte.commons.json.JsonValidationException; import io.airbyte.commons.json.Jsons; import io.airbyte.config.ConnectorSpecification; import io.airbyte.config.DestinationConnectionImplementation; @@ -57,6 +55,8 @@ import io.airbyte.server.helpers.ConnectorSpecificationHelpers; import io.airbyte.server.helpers.DestinationHelpers; import io.airbyte.server.helpers.DestinationImplementationHelpers; +import io.airbyte.validation.json.JsonSchemaValidator; +import io.airbyte.validation.json.JsonValidationException; import java.io.IOException; import java.util.Collections; import java.util.UUID; diff --git a/airbyte-server/src/test/java/io/airbyte/server/handlers/DestinationsHandlerTest.java b/airbyte-server/src/test/java/io/airbyte/server/handlers/DestinationsHandlerTest.java index 50e5afb94bae..b007de84d059 100644 --- a/airbyte-server/src/test/java/io/airbyte/server/handlers/DestinationsHandlerTest.java +++ b/airbyte-server/src/test/java/io/airbyte/server/handlers/DestinationsHandlerTest.java @@ -35,11 +35,11 @@ import io.airbyte.api.model.DestinationRead; import io.airbyte.api.model.DestinationReadList; import io.airbyte.api.model.DestinationUpdate; -import io.airbyte.commons.json.JsonValidationException; import io.airbyte.config.StandardDestination; import io.airbyte.config.persistence.ConfigNotFoundException; import io.airbyte.config.persistence.ConfigRepository; import io.airbyte.server.validators.DockerImageValidator; +import io.airbyte.validation.json.JsonValidationException; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; diff --git a/airbyte-server/src/test/java/io/airbyte/server/handlers/SchedulerHandlerTest.java b/airbyte-server/src/test/java/io/airbyte/server/handlers/SchedulerHandlerTest.java index 089ee0f7d9c3..d0775b18f1f8 100644 --- a/airbyte-server/src/test/java/io/airbyte/server/handlers/SchedulerHandlerTest.java +++ b/airbyte-server/src/test/java/io/airbyte/server/handlers/SchedulerHandlerTest.java @@ -39,7 +39,6 @@ import io.airbyte.api.model.SourceImplementationIdRequestBody; import io.airbyte.commons.docker.DockerUtils; import io.airbyte.commons.enums.Enums; -import io.airbyte.commons.json.JsonValidationException; import io.airbyte.commons.json.Jsons; import io.airbyte.config.ConnectorSpecification; import io.airbyte.config.DestinationConnectionImplementation; @@ -58,6 +57,7 @@ import io.airbyte.server.helpers.ConnectionHelpers; import io.airbyte.server.helpers.DestinationImplementationHelpers; import io.airbyte.server.helpers.SourceImplementationHelpers; +import io.airbyte.validation.json.JsonValidationException; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; diff --git a/airbyte-server/src/test/java/io/airbyte/server/handlers/SourceImplementationsHandlerTest.java b/airbyte-server/src/test/java/io/airbyte/server/handlers/SourceImplementationsHandlerTest.java index 2836ddaab24f..ce0a0869f439 100644 --- a/airbyte-server/src/test/java/io/airbyte/server/handlers/SourceImplementationsHandlerTest.java +++ b/airbyte-server/src/test/java/io/airbyte/server/handlers/SourceImplementationsHandlerTest.java @@ -44,8 +44,6 @@ import io.airbyte.api.model.SourceImplementationUpdate; import io.airbyte.api.model.SourceSpecificationRead; import io.airbyte.api.model.WorkspaceIdRequestBody; -import io.airbyte.commons.json.JsonSchemaValidator; -import io.airbyte.commons.json.JsonValidationException; import io.airbyte.commons.json.Jsons; import io.airbyte.config.ConnectorSpecification; import io.airbyte.config.SourceConnectionImplementation; @@ -57,6 +55,8 @@ import io.airbyte.server.helpers.ConnectorSpecificationHelpers; import io.airbyte.server.helpers.SourceHelpers; import io.airbyte.server.helpers.SourceImplementationHelpers; +import io.airbyte.validation.json.JsonSchemaValidator; +import io.airbyte.validation.json.JsonValidationException; import java.io.IOException; import java.util.Collections; import java.util.UUID; diff --git a/airbyte-server/src/test/java/io/airbyte/server/handlers/SourcesHandlerTest.java b/airbyte-server/src/test/java/io/airbyte/server/handlers/SourcesHandlerTest.java index fd1b3c7d2ac5..d2f1094a3ad4 100644 --- a/airbyte-server/src/test/java/io/airbyte/server/handlers/SourcesHandlerTest.java +++ b/airbyte-server/src/test/java/io/airbyte/server/handlers/SourcesHandlerTest.java @@ -36,11 +36,11 @@ import io.airbyte.api.model.SourceRead; import io.airbyte.api.model.SourceReadList; import io.airbyte.api.model.SourceUpdate; -import io.airbyte.commons.json.JsonValidationException; import io.airbyte.config.StandardSource; import io.airbyte.config.persistence.ConfigNotFoundException; import io.airbyte.config.persistence.ConfigRepository; import io.airbyte.server.validators.DockerImageValidator; +import io.airbyte.validation.json.JsonValidationException; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; diff --git a/airbyte-server/src/test/java/io/airbyte/server/handlers/WebBackendConnectionsHandlerTest.java b/airbyte-server/src/test/java/io/airbyte/server/handlers/WebBackendConnectionsHandlerTest.java index 369dabc8141a..3f7d84f362cd 100644 --- a/airbyte-server/src/test/java/io/airbyte/server/handlers/WebBackendConnectionsHandlerTest.java +++ b/airbyte-server/src/test/java/io/airbyte/server/handlers/WebBackendConnectionsHandlerTest.java @@ -41,7 +41,6 @@ import io.airbyte.api.model.WbConnectionReadList; import io.airbyte.api.model.WorkspaceIdRequestBody; import io.airbyte.commons.enums.Enums; -import io.airbyte.commons.json.JsonValidationException; import io.airbyte.config.SourceConnectionImplementation; import io.airbyte.config.StandardSource; import io.airbyte.config.StandardSync; @@ -49,6 +48,7 @@ import io.airbyte.server.helpers.ConnectionHelpers; import io.airbyte.server.helpers.SourceHelpers; import io.airbyte.server.helpers.SourceImplementationHelpers; +import io.airbyte.validation.json.JsonValidationException; import java.io.IOException; import java.time.Instant; import java.util.Collections; diff --git a/airbyte-server/src/test/java/io/airbyte/server/handlers/WebBackendDestinationImplementationHandlerTest.java b/airbyte-server/src/test/java/io/airbyte/server/handlers/WebBackendDestinationImplementationHandlerTest.java index bfbbd41cf723..2f33b59a93e9 100644 --- a/airbyte-server/src/test/java/io/airbyte/server/handlers/WebBackendDestinationImplementationHandlerTest.java +++ b/airbyte-server/src/test/java/io/airbyte/server/handlers/WebBackendDestinationImplementationHandlerTest.java @@ -36,13 +36,13 @@ import io.airbyte.api.model.DestinationImplementationIdRequestBody; import io.airbyte.api.model.DestinationImplementationRead; import io.airbyte.api.model.DestinationImplementationRecreate; -import io.airbyte.commons.json.JsonValidationException; import io.airbyte.config.DestinationConnectionImplementation; import io.airbyte.config.StandardDestination; import io.airbyte.config.persistence.ConfigNotFoundException; import io.airbyte.server.errors.KnownException; import io.airbyte.server.helpers.DestinationHelpers; import io.airbyte.server.helpers.DestinationImplementationHelpers; +import io.airbyte.validation.json.JsonValidationException; import java.io.IOException; import java.util.UUID; import org.junit.jupiter.api.Assertions; diff --git a/airbyte-server/src/test/java/io/airbyte/server/handlers/WebBackendSourceImplementationHandlerTest.java b/airbyte-server/src/test/java/io/airbyte/server/handlers/WebBackendSourceImplementationHandlerTest.java index bd1f5eb3e0fa..26d5e58d878d 100644 --- a/airbyte-server/src/test/java/io/airbyte/server/handlers/WebBackendSourceImplementationHandlerTest.java +++ b/airbyte-server/src/test/java/io/airbyte/server/handlers/WebBackendSourceImplementationHandlerTest.java @@ -36,13 +36,13 @@ import io.airbyte.api.model.SourceImplementationIdRequestBody; import io.airbyte.api.model.SourceImplementationRead; import io.airbyte.api.model.SourceImplementationRecreate; -import io.airbyte.commons.json.JsonValidationException; import io.airbyte.config.SourceConnectionImplementation; import io.airbyte.config.StandardSource; import io.airbyte.config.persistence.ConfigNotFoundException; import io.airbyte.server.errors.KnownException; import io.airbyte.server.helpers.SourceHelpers; import io.airbyte.server.helpers.SourceImplementationHelpers; +import io.airbyte.validation.json.JsonValidationException; import java.io.IOException; import java.util.UUID; import org.junit.jupiter.api.Assertions; diff --git a/airbyte-server/src/test/java/io/airbyte/server/handlers/WorkspacesHandlerTest.java b/airbyte-server/src/test/java/io/airbyte/server/handlers/WorkspacesHandlerTest.java index 343d14f6c75b..3b15aa3c063d 100644 --- a/airbyte-server/src/test/java/io/airbyte/server/handlers/WorkspacesHandlerTest.java +++ b/airbyte-server/src/test/java/io/airbyte/server/handlers/WorkspacesHandlerTest.java @@ -33,11 +33,11 @@ import io.airbyte.api.model.WorkspaceIdRequestBody; import io.airbyte.api.model.WorkspaceRead; import io.airbyte.api.model.WorkspaceUpdate; -import io.airbyte.commons.json.JsonValidationException; import io.airbyte.config.StandardWorkspace; import io.airbyte.config.persistence.ConfigNotFoundException; import io.airbyte.config.persistence.ConfigRepository; import io.airbyte.config.persistence.PersistenceConstants; +import io.airbyte.validation.json.JsonValidationException; import java.io.IOException; import java.util.UUID; import org.junit.jupiter.api.BeforeEach; diff --git a/airbyte-workers/build.gradle b/airbyte-workers/build.gradle index cb639b568b8d..1cc6fccfc173 100644 --- a/airbyte-workers/build.gradle +++ b/airbyte-workers/build.gradle @@ -12,6 +12,7 @@ dependencies { implementation project(':airbyte-config:models') implementation project(':airbyte-db') implementation project(':airbyte-integrations') + implementation project(':airbyte-json-validation') implementation project(':airbyte-protocol:models') implementation project(':airbyte-singer') diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/AirbyteProtocolPredicate.java b/airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/AirbyteProtocolPredicate.java index 526c364fed6a..ba0be1d62610 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/AirbyteProtocolPredicate.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/AirbyteProtocolPredicate.java @@ -25,8 +25,8 @@ package io.airbyte.workers.protocols.airbyte; import com.fasterxml.jackson.databind.JsonNode; -import io.airbyte.commons.json.JsonSchemaValidator; import io.airbyte.protocol.models.AirbyteProtocolSchema; +import io.airbyte.validation.json.JsonSchemaValidator; import java.util.function.Predicate; public class AirbyteProtocolPredicate implements Predicate { diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/SingerProtocolPredicate.java b/airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/SingerProtocolPredicate.java index 28edf08dfff5..e3e6d0d13f97 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/SingerProtocolPredicate.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/protocols/singer/SingerProtocolPredicate.java @@ -25,8 +25,8 @@ package io.airbyte.workers.protocols.singer; import com.fasterxml.jackson.databind.JsonNode; -import io.airbyte.commons.json.JsonSchemaValidator; import io.airbyte.singer.SingerProtocolSchema; +import io.airbyte.validation.json.JsonSchemaValidator; import java.util.function.Predicate; public class SingerProtocolPredicate implements Predicate { diff --git a/settings.gradle b/settings.gradle index e81475c1431a..edf136faac38 100644 --- a/settings.gradle +++ b/settings.gradle @@ -10,6 +10,7 @@ include ':airbyte-config:init' include ':airbyte-config:persistence' include ':airbyte-db' include ':airbyte-integrations' +include ':airbyte-json-validation' include ':airbyte-protocol:models' include ':airbyte-queue' include ':airbyte-scheduler' @@ -28,3 +29,4 @@ integrationsPath.eachFileRecurse(FileType.FILES) { path -> include ":airbyte-integrations:${relativePath.parent.join(':')}" } } +