Extract split the server into 2 modules

airbyte-commons-server/build.gradle

@@ -0,0 +1,69 @@
+plugins {
+    id "java-library"
+}
+
+dependencies {
+    annotationProcessor platform(libs.micronaut.bom)
+    annotationProcessor libs.bundles.micronaut.annotation.processor
+    annotationProcessor libs.micronaut.jaxrs.processor
+
+    implementation platform(libs.micronaut.bom)
+    implementation libs.bundles.micronaut
+    implementation libs.micronaut.jaxrs.server
+
+    // Ensure that the versions defined in deps.toml are used
+    // instead of versions from transitive dependencies
+    implementation(libs.flyway.core) {
+        force = true
+    }
+    implementation(libs.s3) {
+        // Force to avoid updated version brought in transitively from Micronaut 3.8+
+        // that is incompatible with our current Helm setup
+        force = true
+    }
+    implementation(libs.aws.java.sdk.s3) {
+        // Force to avoid updated version brought in transitively from Micronaut 3.8+
+        // that is incompatible with our current Helm setup
+        force = true
+    }
+
+    implementation project(':airbyte-analytics')
+    implementation project(':airbyte-api')
+    implementation project(':airbyte-commons-docker')
+    implementation project(':airbyte-commons-temporal')
+    implementation project(':airbyte-commons-worker')
+    implementation project(':airbyte-config:init')
+    implementation project(':airbyte-config:config-models')
+    implementation project(':airbyte-config:config-persistence')
+    implementation project(':airbyte-config:specs')
+    implementation project(':airbyte-metrics:metrics-lib')
+    implementation project(':airbyte-db:db-lib')
+    implementation project(":airbyte-json-validation")
+    implementation project(':airbyte-notification')
+    implementation project(':airbyte-oauth')
+    implementation project(':airbyte-protocol:protocol-models')
+    implementation project(':airbyte-persistence:job-persistence')
+
+    implementation 'com.github.slugify:slugify:2.4'
+    implementation 'commons-cli:commons-cli:1.4'
+    implementation libs.temporal.sdk
+    implementation 'org.apache.cxf:cxf-core:3.4.2'
+    implementation 'org.eclipse.jetty:jetty-server:9.4.31.v20200723'
+    implementation 'org.eclipse.jetty:jetty-servlet:9.4.31.v20200723'
+    implementation 'org.glassfish.jaxb:jaxb-runtime:3.0.2'
+    implementation 'org.glassfish.jersey.containers:jersey-container-servlet'
+    implementation 'org.glassfish.jersey.inject:jersey-hk2'
+    implementation 'org.glassfish.jersey.media:jersey-media-json-jackson'
+    implementation 'org.glassfish.jersey.ext:jersey-bean-validation'
+    implementation 'org.quartz-scheduler:quartz:2.3.2'
+    implementation 'io.sentry:sentry:6.3.1'
+    implementation 'io.swagger:swagger-annotations:1.6.2'
+
+    testImplementation project(':airbyte-test-utils')
+    testImplementation libs.postgresql
+    testImplementation libs.platform.testcontainers.postgresql
+    testImplementation 'com.squareup.okhttp3:mockwebserver:4.9.1'
+    testImplementation 'org.mockito:mockito-inline:4.7.0'
+}
+
+Task publishArtifactsTask = getPublishArtifactsTask("$rootProject.ext.version", project)

airbyte-server/src/main/java/io/airbyte/server/ServerConstants.java → airbyte-commons-server/src/main/java/io/airbyte/commons/server/ServerConstants.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
  */
 
-package io.airbyte.server;
+package io.airbyte.commons.server;
 
 public class ServerConstants {
 

airbyte-server/src/main/java/io/airbyte/server/converters/ApiPojoConverters.java → airbyte-commons-server/src/main/java/io/airbyte/commons/server/converters/ApiPojoConverters.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
  */
 
-package io.airbyte.server.converters;
+package io.airbyte.commons.server.converters;
 
 import io.airbyte.api.model.generated.ActorDefinitionResourceRequirements;
 import io.airbyte.api.model.generated.ConnectionRead;
@@ -18,10 +18,10 @@
 import io.airbyte.api.model.generated.NormalizationDestinationDefinitionConfig;
 import io.airbyte.api.model.generated.ResourceRequirements;
 import io.airbyte.commons.enums.Enums;
+import io.airbyte.commons.server.handlers.helpers.CatalogConverter;
 import io.airbyte.config.BasicSchedule;
 import io.airbyte.config.Schedule;
 import io.airbyte.config.StandardSync;
-import io.airbyte.server.handlers.helpers.CatalogConverter;
 import java.util.stream.Collectors;
 
 public class ApiPojoConverters {

airbyte-server/src/main/java/io/airbyte/server/converters/CatalogDiffConverters.java → airbyte-commons-server/src/main/java/io/airbyte/commons/server/converters/CatalogDiffConverters.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
  */
 
-package io.airbyte.server.converters;
+package io.airbyte.commons.server.converters;
 
 import io.airbyte.api.model.generated.FieldAdd;
 import io.airbyte.api.model.generated.FieldRemove;

airbyte-server/src/main/java/io/airbyte/server/converters/ConfigurationUpdate.java → airbyte-commons-server/src/main/java/io/airbyte/commons/server/converters/ConfigurationUpdate.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
  */
 
-package io.airbyte.server.converters;
+package io.airbyte.commons.server.converters;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import io.airbyte.commons.json.Jsons;

airbyte-server/src/main/java/io/airbyte/server/converters/JobConverter.java → airbyte-commons-server/src/main/java/io/airbyte/commons/server/converters/JobConverter.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
  */
 
-package io.airbyte.server.converters;
+package io.airbyte.commons.server.converters;
 
 import io.airbyte.api.model.generated.AttemptFailureOrigin;
 import io.airbyte.api.model.generated.AttemptFailureReason;
@@ -28,6 +28,8 @@
 import io.airbyte.api.model.generated.SourceDefinitionRead;
 import io.airbyte.api.model.generated.SynchronousJobRead;
 import io.airbyte.commons.enums.Enums;
+import io.airbyte.commons.server.scheduler.SynchronousJobMetadata;
+import io.airbyte.commons.server.scheduler.SynchronousResponse;
 import io.airbyte.commons.version.AirbyteVersion;
 import io.airbyte.config.Configs.WorkerEnvironment;
 import io.airbyte.config.JobConfig.ConfigType;
@@ -42,8 +44,6 @@
 import io.airbyte.persistence.job.models.Attempt;
 import io.airbyte.persistence.job.models.AttemptNormalizationStatus;
 import io.airbyte.persistence.job.models.Job;
-import io.airbyte.server.scheduler.SynchronousJobMetadata;
-import io.airbyte.server.scheduler.SynchronousResponse;
 import io.airbyte.workers.helper.ProtocolConverters;
 import jakarta.inject.Singleton;
 import java.io.IOException;

airbyte-server/src/main/java/io/airbyte/server/converters/NotificationConverter.java → airbyte-commons-server/src/main/java/io/airbyte/commons/server/converters/NotificationConverter.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
  */
 
-package io.airbyte.server.converters;
+package io.airbyte.commons.server.converters;
 
 import io.airbyte.commons.enums.Enums;
 import java.util.Collections;

airbyte-server/src/main/java/io/airbyte/server/converters/OauthModelConverter.java → airbyte-commons-server/src/main/java/io/airbyte/commons/server/converters/OauthModelConverter.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
  */
 
-package io.airbyte.server.converters;
+package io.airbyte.commons.server.converters;
 
 import io.airbyte.api.model.generated.AdvancedAuth;
 import io.airbyte.api.model.generated.AdvancedAuth.AuthFlowTypeEnum;

airbyte-server/src/main/java/io/airbyte/server/converters/OperationsConverter.java → airbyte-commons-server/src/main/java/io/airbyte/commons/server/converters/OperationsConverter.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
  */
 
-package io.airbyte.server.converters;
+package io.airbyte.commons.server.converters;
 
 import static io.airbyte.api.model.generated.OperatorWebhook.WebhookTypeEnum.DBTCLOUD;
 

airbyte-server/src/main/java/io/airbyte/server/converters/SpecFetcher.java → airbyte-commons-server/src/main/java/io/airbyte/commons/server/converters/SpecFetcher.java

@@ -2,11 +2,11 @@
  * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
  */
 
-package io.airbyte.server.converters;
+package io.airbyte.commons.server.converters;
 
 import com.google.common.base.Preconditions;
+import io.airbyte.commons.server.scheduler.SynchronousResponse;
 import io.airbyte.protocol.models.ConnectorSpecification;
-import io.airbyte.server.scheduler.SynchronousResponse;
 
 public class SpecFetcher {
 

airbyte-server/src/main/java/io/airbyte/server/converters/WorkflowStateConverter.java → airbyte-commons-server/src/main/java/io/airbyte/commons/server/converters/WorkflowStateConverter.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
  */
 
-package io.airbyte.server.converters;
+package io.airbyte.commons.server.converters;
 
 import io.airbyte.api.model.generated.WorkflowStateRead;
 import io.airbyte.commons.temporal.scheduling.state.WorkflowState;

airbyte-server/src/main/java/io/airbyte/server/converters/WorkspaceWebhookConfigsConverter.java → airbyte-commons-server/src/main/java/io/airbyte/commons/server/converters/WorkspaceWebhookConfigsConverter.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
  */
 
-package io.airbyte.server.converters;
+package io.airbyte.commons.server.converters;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import io.airbyte.api.model.generated.WebhookConfigRead;

airbyte-server/src/main/java/io/airbyte/server/errors/ApplicationErrorKnownException.java → airbyte-commons-server/src/main/java/io/airbyte/commons/server/errors/ApplicationErrorKnownException.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
  */
 
-package io.airbyte.server.errors;
+package io.airbyte.commons.server.errors;
 
 public class ApplicationErrorKnownException extends KnownException {
 

airbyte-server/src/main/java/io/airbyte/server/errors/BadObjectSchemaKnownException.java → airbyte-commons-server/src/main/java/io/airbyte/commons/server/errors/BadObjectSchemaKnownException.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
  */
 
-package io.airbyte.server.errors;
+package io.airbyte.commons.server.errors;
 
 public class BadObjectSchemaKnownException extends KnownException {
 

airbyte-server/src/main/java/io/airbyte/server/errors/ConnectFailureKnownException.java → airbyte-commons-server/src/main/java/io/airbyte/commons/server/errors/ConnectFailureKnownException.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
  */
 
-package io.airbyte.server.errors;
+package io.airbyte.commons.server.errors;
 
 public class ConnectFailureKnownException extends KnownException {
 

airbyte-server/src/main/java/io/airbyte/server/errors/IdNotFoundKnownException.java → airbyte-commons-server/src/main/java/io/airbyte/commons/server/errors/IdNotFoundKnownException.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
  */
 
-package io.airbyte.server.errors;
+package io.airbyte.commons.server.errors;
 
 import io.airbyte.api.model.generated.NotFoundKnownExceptionInfo;
 import org.apache.logging.log4j.core.util.Throwables;

airbyte-server/src/main/java/io/airbyte/server/errors/InternalServerKnownException.java → airbyte-commons-server/src/main/java/io/airbyte/commons/server/errors/InternalServerKnownException.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
  */
 
-package io.airbyte.server.errors;
+package io.airbyte.commons.server.errors;
 
 public class InternalServerKnownException extends KnownException {
 

airbyte-server/src/main/java/io/airbyte/server/errors/KnownException.java → airbyte-commons-server/src/main/java/io/airbyte/commons/server/errors/KnownException.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
  */
 
-package io.airbyte.server.errors;
+package io.airbyte.commons.server.errors;
 
 import io.airbyte.api.model.generated.KnownExceptionInfo;
 import org.apache.logging.log4j.core.util.Throwables;

airbyte-server/src/main/java/io/airbyte/server/errors/UnsupportedProtocolVersionException.java → airbyte-commons-server/src/main/java/io/airbyte/commons/server/errors/UnsupportedProtocolVersionException.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
  */
 
-package io.airbyte.server.errors;
+package io.airbyte.commons.server.errors;
 
 import io.airbyte.commons.version.Version;
 

airbyte-server/src/main/java/io/airbyte/server/errors/ValueConflictKnownException.java → airbyte-commons-server/src/main/java/io/airbyte/commons/server/errors/ValueConflictKnownException.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
  */
 
-package io.airbyte.server.errors;
+package io.airbyte.commons.server.errors;
 
 public class ValueConflictKnownException extends KnownException {
 

airbyte-server/src/main/java/io/airbyte/server/handlers/AttemptHandler.java → airbyte-commons-server/src/main/java/io/airbyte/commons/server/handlers/AttemptHandler.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
  */
 
-package io.airbyte.server.handlers;
+package io.airbyte.commons.server.handlers;
 
 import io.airbyte.api.model.generated.InternalOperationResult;
 import io.airbyte.api.model.generated.SaveStatsRequestBody;

airbyte-server/src/main/java/io/airbyte/server/handlers/ConnectionsHandler.java → airbyte-commons-server/src/main/java/io/airbyte/commons/server/handlers/ConnectionsHandler.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
  */
 
-package io.airbyte.server.handlers;
+package io.airbyte.commons.server.handlers;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
@@ -26,6 +26,14 @@
 import io.airbyte.api.model.generated.WorkspaceIdRequestBody;
 import io.airbyte.commons.enums.Enums;
 import io.airbyte.commons.json.Jsons;
+import io.airbyte.commons.server.converters.ApiPojoConverters;
+import io.airbyte.commons.server.converters.CatalogDiffConverters;
+import io.airbyte.commons.server.handlers.helpers.CatalogConverter;
+import io.airbyte.commons.server.handlers.helpers.ConnectionMatcher;
+import io.airbyte.commons.server.handlers.helpers.ConnectionScheduleHelper;
+import io.airbyte.commons.server.handlers.helpers.DestinationMatcher;
+import io.airbyte.commons.server.handlers.helpers.SourceMatcher;
+import io.airbyte.commons.server.scheduler.EventRunner;
 import io.airbyte.config.ActorCatalog;
 import io.airbyte.config.BasicSchedule;
 import io.airbyte.config.DestinationConnection;
@@ -46,14 +54,6 @@
 import io.airbyte.persistence.job.WorkspaceHelper;
 import io.airbyte.protocol.models.CatalogHelpers;
 import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
-import io.airbyte.server.converters.ApiPojoConverters;
-import io.airbyte.server.converters.CatalogDiffConverters;
-import io.airbyte.server.handlers.helpers.CatalogConverter;
-import io.airbyte.server.handlers.helpers.ConnectionMatcher;
-import io.airbyte.server.handlers.helpers.ConnectionScheduleHelper;
-import io.airbyte.server.handlers.helpers.DestinationMatcher;
-import io.airbyte.server.handlers.helpers.SourceMatcher;
-import io.airbyte.server.scheduler.EventRunner;
 import io.airbyte.validation.json.JsonValidationException;
 import io.airbyte.workers.helper.ConnectionHelper;
 import jakarta.inject.Singleton;

airbyte-server/src/main/java/io/airbyte/server/handlers/DestinationDefinitionsHandler.java → airbyte-commons-server/src/main/java/io/airbyte/commons/server/handlers/DestinationDefinitionsHandler.java

@@ -2,9 +2,7 @@
  * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
  */
 
-package io.airbyte.server.handlers;
-
-import static io.airbyte.server.ServerConstants.DEV_IMAGE_TAG;
+package io.airbyte.commons.server.handlers;
 
 import com.google.common.annotations.VisibleForTesting;
 import io.airbyte.api.model.generated.CustomDestinationDefinitionCreate;
@@ -21,6 +19,15 @@
 import io.airbyte.api.model.generated.WorkspaceIdRequestBody;
 import io.airbyte.commons.docker.DockerUtils;
 import io.airbyte.commons.resources.MoreResources;
+import io.airbyte.commons.server.ServerConstants;
+import io.airbyte.commons.server.converters.ApiPojoConverters;
+import io.airbyte.commons.server.converters.SpecFetcher;
+import io.airbyte.commons.server.errors.IdNotFoundKnownException;
+import io.airbyte.commons.server.errors.InternalServerKnownException;
+import io.airbyte.commons.server.errors.UnsupportedProtocolVersionException;
+import io.airbyte.commons.server.scheduler.SynchronousResponse;
+import io.airbyte.commons.server.scheduler.SynchronousSchedulerClient;
+import io.airbyte.commons.server.services.AirbyteGithubStore;
 import io.airbyte.commons.util.MoreLists;
 import io.airbyte.commons.version.AirbyteProtocolVersion;
 import io.airbyte.commons.version.AirbyteProtocolVersionRange;
@@ -29,14 +36,6 @@
 import io.airbyte.config.persistence.ConfigNotFoundException;
 import io.airbyte.config.persistence.ConfigRepository;
 import io.airbyte.protocol.models.ConnectorSpecification;
-import io.airbyte.server.converters.ApiPojoConverters;
-import io.airbyte.server.converters.SpecFetcher;
-import io.airbyte.server.errors.IdNotFoundKnownException;
-import io.airbyte.server.errors.InternalServerKnownException;
-import io.airbyte.server.errors.UnsupportedProtocolVersionException;
-import io.airbyte.server.scheduler.SynchronousResponse;
-import io.airbyte.server.scheduler.SynchronousSchedulerClient;
-import io.airbyte.server.services.AirbyteGithubStore;
 import io.airbyte.validation.json.JsonValidationException;
 import jakarta.inject.Singleton;
 import java.io.IOException;
@@ -240,7 +239,7 @@ public DestinationDefinitionRead updateDestinationDefinition(final DestinationDe
     // specs are re-fetched from the container if the image tag has changed, or if the tag is "dev",
     // to allow for easier iteration of dev images
     final boolean specNeedsUpdate = !currentDestination.getDockerImageTag().equals(destinationDefinitionUpdate.getDockerImageTag())
-        || destinationDefinitionUpdate.getDockerImageTag().equals(DEV_IMAGE_TAG);
+        || ServerConstants.DEV_IMAGE_TAG.equals(destinationDefinitionUpdate.getDockerImageTag());
     final ConnectorSpecification spec = specNeedsUpdate
         ? getSpecForImage(currentDestination.getDockerRepository(), destinationDefinitionUpdate.getDockerImageTag(), currentDestination.getCustom())
         : currentDestination.getSpec();