Move JsonSchemaValidator into its own module airbyte-json-validation (#…

…234) (#647)
airbytehq · Oct 20, 2020 · 0fac6a9 · 0fac6a9
1 parent efe1059
commit 0fac6a9
Show file tree

Hide file tree

Showing 46 changed files with 62 additions and 49 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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/...yte-config/persistence/src/main/java/io/airbyte/config/persistence/ConfigPersistence.java b/...yte-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
@@ -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/...fig/persistence/src/main/java/io/airbyte/config/persistence/DefaultConfigPersistence.java b/...fig/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/...persistence/src/test/java/io/airbyte/config/persistence/DefaultConfigPersistenceTest.java b/...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
@@ -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/...yte/commons/json/JsonSchemaValidator.java → .../validation/json/JsonSchemaValidator.java b/...yte/commons/json/JsonSchemaValidator.java → .../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/...commons/json/JsonValidationException.java → ...idation/json/JsonValidationException.java b/...commons/json/JsonValidationException.java → ...idation/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/...commons/json/JsonSchemaValidatorTest.java → ...idation/json/JsonSchemaValidatorTest.java b/...commons/json/JsonSchemaValidatorTest.java → ...idation/json/JsonSchemaValidatorTest.java
@@ -22,14 +22,15 @@
  * 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;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 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
@@ -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
@@ -25,14 +25,14 @@
 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;
 import io.airbyte.config.persistence.ConfigRepository;
 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
@@ -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
@@ -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/...e-scheduler/src/test/java/io/airbyte/scheduler/job_factory/DefaultSyncJobFactoryTest.java b/...e-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
@@ -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
@@ -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
@@ -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
@@ -35,14 +35,14 @@
 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;
 import io.airbyte.config.StandardSyncSchedule;
 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/...te-server/src/main/java/io/airbyte/server/handlers/DestinationImplementationsHandler.java b/...te-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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/.../src/main/java/io/airbyte/server/handlers/WebBackendDestinationImplementationHandler.java b/.../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/...erver/src/main/java/io/airbyte/server/handlers/WebBackendSourceImplementationHandler.java b/...erver/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
@@ -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;