From 89b77405073762c8e3b8b59637fdb6bea27e656e Mon Sep 17 00:00:00 2001 From: Benoit Moriceau Date: Tue, 15 Nov 2022 15:09:46 -0800 Subject: [PATCH] Revert "Revert "Remove configuration API (#18998)" (#19440)" (#19443) * Revert "Revert "Remove configuration API (#18998)" (#19440)" This reverts commit 3d0a9deb2c51e44ffcbed8fc8762e3478ce9f784. * Re add parameters needed by cloud --- .../server/ConfigurationApiBinder.java | 20 - .../server/ConfigurationApiFactory.java | 33 - .../java/io/airbyte/server/ServerFactory.java | 6 - .../io/airbyte/server/apis/ApiHelper.java | 35 + .../server/apis/AttemptApiController.java | 2 +- .../airbyte/server/apis/ConfigurationApi.java | 1116 ----------------- .../server/apis/ConnectionApiController.java | 18 +- .../server/apis/DbMigrationApiController.java | 4 +- .../server/apis/DestinationApiController.java | 18 +- .../DestinationDefinitionApiController.java | 28 +- ...nDefinitionSpecificationApiController.java | 2 +- .../apis/DestinationOauthApiController.java | 6 +- .../server/apis/JobsApiController.java | 12 +- .../server/apis/LogsApiController.java | 2 +- .../apis/NotificationsApiController.java | 2 +- .../server/apis/OpenapiApiController.java | 2 +- .../server/apis/OperationApiController.java | 12 +- .../server/apis/SchedulerApiController.java | 6 +- .../server/apis/SourceApiController.java | 20 +- .../apis/SourceDefinitionApiController.java | 28 +- ...eDefinitionSpecificationApiController.java | 2 +- .../server/apis/SourceOauthApiController.java | 6 +- .../server/apis/StateApiController.java | 4 +- .../server/apis/WebBackendApiController.java | 14 +- .../server/apis/WorkspaceApiController.java | 18 +- 25 files changed, 138 insertions(+), 1278 deletions(-) delete mode 100644 airbyte-server/src/main/java/io/airbyte/server/ConfigurationApiBinder.java delete mode 100644 airbyte-server/src/main/java/io/airbyte/server/ConfigurationApiFactory.java create mode 100644 airbyte-server/src/main/java/io/airbyte/server/apis/ApiHelper.java delete mode 100644 airbyte-server/src/main/java/io/airbyte/server/apis/ConfigurationApi.java diff --git a/airbyte-server/src/main/java/io/airbyte/server/ConfigurationApiBinder.java b/airbyte-server/src/main/java/io/airbyte/server/ConfigurationApiBinder.java deleted file mode 100644 index c4ddb4f0149..00000000000 --- a/airbyte-server/src/main/java/io/airbyte/server/ConfigurationApiBinder.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2022 Airbyte, Inc., all rights reserved. - */ - -package io.airbyte.server; - -import io.airbyte.server.apis.ConfigurationApi; -import org.glassfish.hk2.utilities.binding.AbstractBinder; -import org.glassfish.jersey.process.internal.RequestScoped; - -public class ConfigurationApiBinder extends AbstractBinder { - - @Override - protected void configure() { - bindFactory(ConfigurationApiFactory.class) - .to(ConfigurationApi.class) - .in(RequestScoped.class); - } - -} diff --git a/airbyte-server/src/main/java/io/airbyte/server/ConfigurationApiFactory.java b/airbyte-server/src/main/java/io/airbyte/server/ConfigurationApiFactory.java deleted file mode 100644 index 36d86ce0284..00000000000 --- a/airbyte-server/src/main/java/io/airbyte/server/ConfigurationApiFactory.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2022 Airbyte, Inc., all rights reserved. - */ - -package io.airbyte.server; - -import io.airbyte.server.apis.ConfigurationApi; -import java.util.Map; -import org.glassfish.hk2.api.Factory; -import org.slf4j.MDC; - -public class ConfigurationApiFactory implements Factory { - - private static Map mdc; - - public static void setValues( - final Map mdc) { - ConfigurationApiFactory.mdc = mdc; - } - - @Override - public ConfigurationApi provide() { - MDC.setContextMap(ConfigurationApiFactory.mdc); - - return new ConfigurationApi(); - } - - @Override - public void dispose(final ConfigurationApi service) { - /* noop */ - } - -} diff --git a/airbyte-server/src/main/java/io/airbyte/server/ServerFactory.java b/airbyte-server/src/main/java/io/airbyte/server/ServerFactory.java index 8de87e06c95..cd861f698dc 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/ServerFactory.java +++ b/airbyte-server/src/main/java/io/airbyte/server/ServerFactory.java @@ -14,7 +14,6 @@ import io.airbyte.config.persistence.SecretsRepositoryWriter; import io.airbyte.db.Database; import io.airbyte.persistence.job.JobPersistence; import io.airbyte.server.apis.AttemptApiController; -import io.airbyte.server.apis.ConfigurationApi; import io.airbyte.server.apis.ConnectionApiController; import io.airbyte.server.apis.DbMigrationApiController; import io.airbyte.server.apis.DestinationApiController; @@ -180,9 +179,6 @@ public interface ServerFactory { final WebBackendGeographiesHandler webBackendGeographiesHandler) { final Map mdc = MDC.getCopyOfContextMap(); - // set static values for factory - ConfigurationApiFactory.setValues(mdc); - AttemptApiFactory.setValues(attemptHandler, mdc); ConnectionApiFactory.setValues( @@ -231,7 +227,6 @@ public interface ServerFactory { // server configurations final Set> componentClasses = Set.of( - ConfigurationApi.class, AttemptApiController.class, ConnectionApiController.class, DbMigrationApiController.class, @@ -256,7 +251,6 @@ public interface ServerFactory { final Set components = Set.of( new CorsFilter(), - new ConfigurationApiBinder(), new AttemptApiBinder(), new ConnectionApiBinder(), new DbMigrationBinder(), diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/ApiHelper.java b/airbyte-server/src/main/java/io/airbyte/server/apis/ApiHelper.java new file mode 100644 index 00000000000..5164ea9135f --- /dev/null +++ b/airbyte-server/src/main/java/io/airbyte/server/apis/ApiHelper.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2022 Airbyte, Inc., all rights reserved. + */ + +package io.airbyte.server.apis; + +import io.airbyte.config.persistence.ConfigNotFoundException; +import io.airbyte.server.errors.BadObjectSchemaKnownException; +import io.airbyte.server.errors.IdNotFoundKnownException; +import io.airbyte.validation.json.JsonValidationException; +import java.io.IOException; + +public class ApiHelper { + + static T execute(final HandlerCall call) { + try { + return call.call(); + } catch (final ConfigNotFoundException e) { + throw new IdNotFoundKnownException(String.format("Could not find configuration for %s: %s.", e.getType(), e.getConfigId()), + e.getConfigId(), e); + } catch (final JsonValidationException e) { + throw new BadObjectSchemaKnownException( + String.format("The provided configuration does not fulfill the specification. Errors: %s", e.getMessage()), e); + } catch (final IOException e) { + throw new RuntimeException(e); + } + } + + interface HandlerCall { + + T call() throws ConfigNotFoundException, IOException, JsonValidationException; + + } + +} diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/AttemptApiController.java b/airbyte-server/src/main/java/io/airbyte/server/apis/AttemptApiController.java index 4f83d98358e..e5856dc8848 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/apis/AttemptApiController.java +++ b/airbyte-server/src/main/java/io/airbyte/server/apis/AttemptApiController.java @@ -27,7 +27,7 @@ public class AttemptApiController implements AttemptApi { @Override public InternalOperationResult setWorkflowInAttempt(final SetWorkflowInAttemptRequestBody requestBody) { - return ConfigurationApi.execute(() -> attemptHandler.setWorkflowInAttempt(requestBody)); + return ApiHelper.execute(() -> attemptHandler.setWorkflowInAttempt(requestBody)); } } 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 deleted file mode 100644 index 8c452bae33b..00000000000 --- a/airbyte-server/src/main/java/io/airbyte/server/apis/ConfigurationApi.java +++ /dev/null @@ -1,1116 +0,0 @@ -/* - * Copyright (c) 2022 Airbyte, Inc., all rights reserved. - */ - -package io.airbyte.server.apis; - -import io.airbyte.api.model.generated.AttemptNormalizationStatusReadList; -import io.airbyte.api.model.generated.CheckConnectionRead; -import io.airbyte.api.model.generated.CheckOperationRead; -import io.airbyte.api.model.generated.CompleteDestinationOAuthRequest; -import io.airbyte.api.model.generated.CompleteSourceOauthRequest; -import io.airbyte.api.model.generated.ConnectionCreate; -import io.airbyte.api.model.generated.ConnectionIdRequestBody; -import io.airbyte.api.model.generated.ConnectionRead; -import io.airbyte.api.model.generated.ConnectionReadList; -import io.airbyte.api.model.generated.ConnectionSearch; -import io.airbyte.api.model.generated.ConnectionState; -import io.airbyte.api.model.generated.ConnectionStateCreateOrUpdate; -import io.airbyte.api.model.generated.ConnectionStateType; -import io.airbyte.api.model.generated.ConnectionUpdate; -import io.airbyte.api.model.generated.CustomDestinationDefinitionCreate; -import io.airbyte.api.model.generated.CustomDestinationDefinitionUpdate; -import io.airbyte.api.model.generated.CustomSourceDefinitionCreate; -import io.airbyte.api.model.generated.CustomSourceDefinitionUpdate; -import io.airbyte.api.model.generated.DbMigrationExecutionRead; -import io.airbyte.api.model.generated.DbMigrationReadList; -import io.airbyte.api.model.generated.DbMigrationRequestBody; -import io.airbyte.api.model.generated.DestinationCloneRequestBody; -import io.airbyte.api.model.generated.DestinationCoreConfig; -import io.airbyte.api.model.generated.DestinationCreate; -import io.airbyte.api.model.generated.DestinationDefinitionCreate; -import io.airbyte.api.model.generated.DestinationDefinitionIdRequestBody; -import io.airbyte.api.model.generated.DestinationDefinitionIdWithWorkspaceId; -import io.airbyte.api.model.generated.DestinationDefinitionRead; -import io.airbyte.api.model.generated.DestinationDefinitionReadList; -import io.airbyte.api.model.generated.DestinationDefinitionSpecificationRead; -import io.airbyte.api.model.generated.DestinationDefinitionUpdate; -import io.airbyte.api.model.generated.DestinationIdRequestBody; -import io.airbyte.api.model.generated.DestinationOauthConsentRequest; -import io.airbyte.api.model.generated.DestinationRead; -import io.airbyte.api.model.generated.DestinationReadList; -import io.airbyte.api.model.generated.DestinationSearch; -import io.airbyte.api.model.generated.DestinationUpdate; -import io.airbyte.api.model.generated.HealthCheckRead; -import io.airbyte.api.model.generated.InternalOperationResult; -import io.airbyte.api.model.generated.JobDebugInfoRead; -import io.airbyte.api.model.generated.JobIdRequestBody; -import io.airbyte.api.model.generated.JobInfoLightRead; -import io.airbyte.api.model.generated.JobInfoRead; -import io.airbyte.api.model.generated.JobListRequestBody; -import io.airbyte.api.model.generated.JobReadList; -import io.airbyte.api.model.generated.LogsRequestBody; -import io.airbyte.api.model.generated.Notification; -import io.airbyte.api.model.generated.NotificationRead; -import io.airbyte.api.model.generated.OAuthConsentRead; -import io.airbyte.api.model.generated.OperationCreate; -import io.airbyte.api.model.generated.OperationIdRequestBody; -import io.airbyte.api.model.generated.OperationRead; -import io.airbyte.api.model.generated.OperationReadList; -import io.airbyte.api.model.generated.OperationUpdate; -import io.airbyte.api.model.generated.OperatorConfiguration; -import io.airbyte.api.model.generated.PrivateDestinationDefinitionRead; -import io.airbyte.api.model.generated.PrivateDestinationDefinitionReadList; -import io.airbyte.api.model.generated.PrivateSourceDefinitionRead; -import io.airbyte.api.model.generated.PrivateSourceDefinitionReadList; -import io.airbyte.api.model.generated.SaveStatsRequestBody; -import io.airbyte.api.model.generated.SetInstancewideDestinationOauthParamsRequestBody; -import io.airbyte.api.model.generated.SetInstancewideSourceOauthParamsRequestBody; -import io.airbyte.api.model.generated.SetWorkflowInAttemptRequestBody; -import io.airbyte.api.model.generated.SlugRequestBody; -import io.airbyte.api.model.generated.SourceCloneRequestBody; -import io.airbyte.api.model.generated.SourceCoreConfig; -import io.airbyte.api.model.generated.SourceCreate; -import io.airbyte.api.model.generated.SourceDefinitionCreate; -import io.airbyte.api.model.generated.SourceDefinitionIdRequestBody; -import io.airbyte.api.model.generated.SourceDefinitionIdWithWorkspaceId; -import io.airbyte.api.model.generated.SourceDefinitionRead; -import io.airbyte.api.model.generated.SourceDefinitionReadList; -import io.airbyte.api.model.generated.SourceDefinitionSpecificationRead; -import io.airbyte.api.model.generated.SourceDefinitionUpdate; -import io.airbyte.api.model.generated.SourceDiscoverSchemaRead; -import io.airbyte.api.model.generated.SourceDiscoverSchemaRequestBody; -import io.airbyte.api.model.generated.SourceIdRequestBody; -import io.airbyte.api.model.generated.SourceOauthConsentRequest; -import io.airbyte.api.model.generated.SourceRead; -import io.airbyte.api.model.generated.SourceReadList; -import io.airbyte.api.model.generated.SourceSearch; -import io.airbyte.api.model.generated.SourceUpdate; -import io.airbyte.api.model.generated.WebBackendConnectionCreate; -import io.airbyte.api.model.generated.WebBackendConnectionRead; -import io.airbyte.api.model.generated.WebBackendConnectionReadList; -import io.airbyte.api.model.generated.WebBackendConnectionRequestBody; -import io.airbyte.api.model.generated.WebBackendConnectionUpdate; -import io.airbyte.api.model.generated.WebBackendGeographiesListResult; -import io.airbyte.api.model.generated.WebBackendWorkspaceState; -import io.airbyte.api.model.generated.WebBackendWorkspaceStateResult; -import io.airbyte.api.model.generated.WorkspaceCreate; -import io.airbyte.api.model.generated.WorkspaceGiveFeedback; -import io.airbyte.api.model.generated.WorkspaceIdRequestBody; -import io.airbyte.api.model.generated.WorkspaceRead; -import io.airbyte.api.model.generated.WorkspaceReadList; -import io.airbyte.api.model.generated.WorkspaceUpdate; -import io.airbyte.api.model.generated.WorkspaceUpdateName; -import io.airbyte.config.persistence.ConfigNotFoundException; -import io.airbyte.server.errors.BadObjectSchemaKnownException; -import io.airbyte.server.errors.IdNotFoundKnownException; -import io.airbyte.validation.json.JsonValidationException; -import java.io.File; -import java.io.IOException; -import java.util.Map; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.NotImplementedException; - -@javax.ws.rs.Path("/v1") -@Slf4j -public class ConfigurationApi implements io.airbyte.api.generated.V1Api { - - public ConfigurationApi() {} - - // WORKSPACE - - /** - * This implementation has been moved to {@link WorkspaceApiController}. Since the path of - * {@link WorkspaceApiController} is more granular, it will override this implementation - */ - @Override - public WorkspaceReadList listWorkspaces() { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link WorkspaceApiController}. Since the path of - * {@link WorkspaceApiController} is more granular, it will override this implementation - */ - @Override - public WorkspaceRead createWorkspace(final WorkspaceCreate workspaceCreate) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link WorkspaceApiController}. Since the path of - * {@link WorkspaceApiController} is more granular, it will override this implementation - */ - @Override - public void deleteWorkspace(final WorkspaceIdRequestBody workspaceIdRequestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link WorkspaceApiController}. Since the path of - * {@link WorkspaceApiController} is more granular, it will override this implementation - */ - @Override - public WorkspaceRead getWorkspace(final WorkspaceIdRequestBody workspaceIdRequestBody) { - throw new NotImplementedException(); - } - - @Override - public WorkspaceRead getWorkspaceBySlug(final SlugRequestBody slugRequestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link WorkspaceApiController}. Since the path of - * {@link WorkspaceApiController} is more granular, it will override this implementation - */ - @Override - public WorkspaceRead getWorkspaceByConnectionId(final ConnectionIdRequestBody connectionIdRequestBody) { - throw new NotImplementedException(); - } - - @Override - public WorkspaceRead updateWorkspace(final WorkspaceUpdate workspaceUpdate) { - throw new NotImplementedException(); - } - - @Override - public WorkspaceRead updateWorkspaceName(final WorkspaceUpdateName workspaceUpdateName) { - throw new NotImplementedException(); - } - - @Override - public void updateWorkspaceFeedback(final WorkspaceGiveFeedback workspaceGiveFeedback) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link AttemptApiController}. Since the path of - * {@link AttemptApiController} is more granular, it will override this implementation - */ - @Override - public NotificationRead tryNotificationConfig(final Notification notification) { - throw new NotImplementedException(); - } - - // SOURCE - - /** - * This implementation has been moved to {@link SourceDefinitionApiController}. Since the path of - * {@link SourceDefinitionApiController} is more granular, it will override this implementation - */ - @Override - public SourceDefinitionReadList listSourceDefinitions() { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link SourceDefinitionApiController}. Since the path of - * {@link SourceDefinitionApiController} is more granular, it will override this implementation - */ - @Override - public SourceDefinitionReadList listSourceDefinitionsForWorkspace(final WorkspaceIdRequestBody workspaceIdRequestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link SourceDefinitionApiController}. Since the path of - * {@link SourceDefinitionApiController} is more granular, it will override this implementation - */ - @Override - public SourceDefinitionReadList listLatestSourceDefinitions() { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link SourceDefinitionApiController}. Since the path of - * {@link SourceDefinitionApiController} is more granular, it will override this implementation - */ - @Override - public PrivateSourceDefinitionReadList listPrivateSourceDefinitions(final WorkspaceIdRequestBody workspaceIdRequestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link SourceDefinitionApiController}. Since the path of - * {@link SourceDefinitionApiController} is more granular, it will override this implementation - */ - @Override - public SourceDefinitionRead getSourceDefinition(final SourceDefinitionIdRequestBody sourceDefinitionIdRequestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link SourceDefinitionApiController}. Since the path of - * {@link SourceDefinitionApiController} is more granular, it will override this implementation - */ - @Override - public SourceDefinitionRead getSourceDefinitionForWorkspace(final SourceDefinitionIdWithWorkspaceId sourceDefinitionIdWithWorkspaceId) { - throw new NotImplementedException(); - } - - // TODO: Deprecate this route in favor of createCustomSourceDefinition - // since all connector definitions created through the API are custom - /** - * This implementation has been moved to {@link SourceDefinitionApiController}. Since the path of - * {@link SourceDefinitionApiController} is more granular, it will override this implementation - */ - @Override - public SourceDefinitionRead createSourceDefinition(final SourceDefinitionCreate sourceDefinitionCreate) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link SourceDefinitionApiController}. Since the path of - * {@link SourceDefinitionApiController} is more granular, it will override this implementation - */ - @Override - public SourceDefinitionRead createCustomSourceDefinition(final CustomSourceDefinitionCreate customSourceDefinitionCreate) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link SourceDefinitionApiController}. Since the path of - * {@link SourceDefinitionApiController} is more granular, it will override this implementation - */ - @Override - public SourceDefinitionRead updateSourceDefinition(final SourceDefinitionUpdate sourceDefinitionUpdate) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link SourceDefinitionApiController}. Since the path of - * {@link SourceDefinitionApiController} is more granular, it will override this implementation - */ - @Override - public SourceDefinitionRead updateCustomSourceDefinition(final CustomSourceDefinitionUpdate customSourceDefinitionUpdate) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link SourceDefinitionApiController}. Since the path of - * {@link SourceDefinitionApiController} is more granular, it will override this implementation - */ - @Override - public void deleteSourceDefinition(final SourceDefinitionIdRequestBody sourceDefinitionIdRequestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link SourceDefinitionApiController}. Since the path of - * {@link SourceDefinitionApiController} is more granular, it will override this implementation - */ - @Override - public void deleteCustomSourceDefinition(final SourceDefinitionIdWithWorkspaceId sourceDefinitionIdWithWorkspaceId) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link SourceDefinitionApiController}. Since the path of - * {@link SourceDefinitionApiController} is more granular, it will override this implementation - */ - @Override - public PrivateSourceDefinitionRead grantSourceDefinitionToWorkspace(final SourceDefinitionIdWithWorkspaceId sourceDefinitionIdWithWorkspaceId) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link SourceDefinitionApiController}. Since the path of - * {@link SourceDefinitionApiController} is more granular, it will override this implementation - */ - @Override - public void revokeSourceDefinitionFromWorkspace(final SourceDefinitionIdWithWorkspaceId sourceDefinitionIdWithWorkspaceId) { - throw new NotImplementedException(); - } - - @Override - public InternalOperationResult saveStats(final SaveStatsRequestBody saveStatsRequestBody) { - throw new NotImplementedException(); - } - - // SOURCE SPECIFICATION - - /** - * This implementation has been moved to {@link SourceDefinitionSpecificationApiController}. Since - * the path of {@link SourceDefinitionSpecificationApiController} is more granular, it will override - * this implementation - */ - @Override - public SourceDefinitionSpecificationRead getSourceDefinitionSpecification(final SourceDefinitionIdWithWorkspaceId sourceDefinitionIdWithWorkspaceId) { - throw new NotImplementedException(); - } - - // OAUTH - - /** - * This implementation has been moved to {@link SourceOauthApiController}. Since the path of - * {@link SourceOauthApiController} is more granular, it will override this implementation - */ - @Override - public OAuthConsentRead getSourceOAuthConsent(final SourceOauthConsentRequest sourceOauthConsentRequest) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link SourceOauthApiController}. Since the path of - * {@link SourceOauthApiController} is more granular, it will override this implementation - */ - @Override - public Map completeSourceOAuth(final CompleteSourceOauthRequest completeSourceOauthRequest) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link DestinationOauthApiController}. Since the path of - * {@link DestinationOauthApiController} is more granular, it will override this implementation - */ - @Override - public OAuthConsentRead getDestinationOAuthConsent(final DestinationOauthConsentRequest destinationOauthConsentRequest) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link DestinationOauthApiController}. Since the path of - * {@link DestinationOauthApiController} is more granular, it will override this implementation - */ - @Override - public Map completeDestinationOAuth(final CompleteDestinationOAuthRequest requestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link DestinationOauthApiController}. Since the path of - * {@link DestinationOauthApiController} is more granular, it will override this implementation - */ - @Override - public void setInstancewideDestinationOauthParams(final SetInstancewideDestinationOauthParamsRequestBody requestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link SourceOauthApiController}. Since the path of - * {@link SourceOauthApiController} is more granular, it will override this implementation - */ - @Override - public void setInstancewideSourceOauthParams(final SetInstancewideSourceOauthParamsRequestBody requestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link AttemptApiController}. Since the path of - * {@link AttemptApiController} is more granular, it will override this implementation - */ - @Override - public InternalOperationResult setWorkflowInAttempt(final SetWorkflowInAttemptRequestBody setWorkflowInAttemptRequestBody) { - throw new NotImplementedException(); - } - - // SOURCE IMPLEMENTATION - - /** - * This implementation has been moved to {@link SourceApiController}. Since the path of - * {@link SourceApiController} is more granular, it will override this implementation - */ - @Override - public SourceRead createSource(final SourceCreate sourceCreate) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link SourceApiController}. Since the path of - * {@link SourceApiController} is more granular, it will override this implementation - */ - @Override - public SourceRead updateSource(final SourceUpdate sourceUpdate) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link SourceApiController}. Since the path of - * {@link SourceApiController} is more granular, it will override this implementation - */ - @Override - public SourceReadList listSourcesForWorkspace(final WorkspaceIdRequestBody workspaceIdRequestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link SourceApiController}. Since the path of - * {@link SourceApiController} is more granular, it will override this implementation - */ - @Override - public SourceReadList searchSources(final SourceSearch sourceSearch) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link SourceApiController}. Since the path of - * {@link SourceApiController} is more granular, it will override this implementation - */ - @Override - public SourceRead getSource(final SourceIdRequestBody sourceIdRequestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link SourceApiController}. Since the path of - * {@link SourceApiController} is more granular, it will override this implementation - */ - @Override - public void deleteSource(final SourceIdRequestBody sourceIdRequestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link SourceApiController}. Since the path of - * {@link SourceApiController} is more granular, it will override this implementation - */ - @Override - public SourceRead cloneSource(final SourceCloneRequestBody sourceCloneRequestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link SourceApiController}. Since the path of - * {@link SourceApiController} is more granular, it will override this implementation - */ - @Override - public CheckConnectionRead checkConnectionToSource(final SourceIdRequestBody sourceIdRequestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link SourceApiController}. Since the path of - * {@link SourceApiController} is more granular, it will override this implementation - */ - @Override - public CheckConnectionRead checkConnectionToSourceForUpdate(final SourceUpdate sourceUpdate) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link SourceApiController}. Since the path of - * {@link SourceApiController} is more granular, it will override this implementation - */ - @Override - public SourceDiscoverSchemaRead discoverSchemaForSource(final SourceDiscoverSchemaRequestBody discoverSchemaRequestBody) { - throw new NotImplementedException(); - } - - // DB MIGRATION - - /** - * This implementation has been moved to {@link DbMigrationApiController}. Since the path of - * {@link DbMigrationApiController} is more granular, it will override this implementation - */ - @Override - public DbMigrationReadList listMigrations(final DbMigrationRequestBody request) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link DbMigrationApiController}. Since the path of - * {@link DbMigrationApiController} is more granular, it will override this implementation - */ - @Override - public DbMigrationExecutionRead executeMigrations(final DbMigrationRequestBody request) { - throw new NotImplementedException(); - } - - // DESTINATION - - /** - * This implementation has been moved to {@link DestinationDefinitionApiController}. Since the path - * of {@link DestinationDefinitionApiController} is more granular, it will override this - * implementation - */ - @Override - public DestinationDefinitionReadList listDestinationDefinitions() { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link DestinationDefinitionApiController}. Since the path - * of {@link DestinationDefinitionApiController} is more granular, it will override this - * implementation - */ - @Override - public DestinationDefinitionReadList listDestinationDefinitionsForWorkspace(final WorkspaceIdRequestBody workspaceIdRequestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link DestinationDefinitionApiController}. Since the path - * of {@link DestinationDefinitionApiController} is more granular, it will override this - * implementation - */ - @Override - public DestinationDefinitionReadList listLatestDestinationDefinitions() { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link DestinationDefinitionApiController}. Since the path - * of {@link DestinationDefinitionApiController} is more granular, it will override this - * implementation - */ - @Override - public PrivateDestinationDefinitionReadList listPrivateDestinationDefinitions(final WorkspaceIdRequestBody workspaceIdRequestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link DestinationDefinitionApiController}. Since the path - * of {@link DestinationDefinitionApiController} is more granular, it will override this - * implementation - */ - @Override - public DestinationDefinitionRead getDestinationDefinition(final DestinationDefinitionIdRequestBody destinationDefinitionIdRequestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link DestinationDefinitionApiController}. Since the path - * of {@link DestinationDefinitionApiController} is more granular, it will override this - * implementation - */ - @Override - public DestinationDefinitionRead getDestinationDefinitionForWorkspace( - final DestinationDefinitionIdWithWorkspaceId destinationDefinitionIdWithWorkspaceId) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link DestinationDefinitionApiController}. Since the path - * of {@link DestinationDefinitionApiController} is more granular, it will override this - * implementation - */ - // TODO: Deprecate this route in favor of createCustomDestinationDefinition - // since all connector definitions created through the API are custom - @Override - public DestinationDefinitionRead createDestinationDefinition(final DestinationDefinitionCreate destinationDefinitionCreate) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link DestinationDefinitionApiController}. Since the path - * of {@link DestinationDefinitionApiController} is more granular, it will override this - * implementation - */ - @Override - public DestinationDefinitionRead createCustomDestinationDefinition(final CustomDestinationDefinitionCreate customDestinationDefinitionCreate) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link DestinationDefinitionApiController}. Since the path - * of {@link DestinationDefinitionApiController} is more granular, it will override this - * implementation - */ - @Override - public DestinationDefinitionRead updateDestinationDefinition(final DestinationDefinitionUpdate destinationDefinitionUpdate) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link DestinationDefinitionApiController}. Since the path - * of {@link DestinationDefinitionApiController} is more granular, it will override this - * implementation - */ - @Override - public DestinationDefinitionRead updateCustomDestinationDefinition(final CustomDestinationDefinitionUpdate customDestinationDefinitionUpdate) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link DestinationDefinitionApiController}. Since the path - * of {@link DestinationDefinitionApiController} is more granular, it will override this - * implementation - */ - @Override - public void deleteDestinationDefinition(final DestinationDefinitionIdRequestBody destinationDefinitionIdRequestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link DestinationDefinitionApiController}. Since the path - * of {@link DestinationDefinitionApiController} is more granular, it will override this - * implementation - */ - @Override - public void deleteCustomDestinationDefinition(final DestinationDefinitionIdWithWorkspaceId destinationDefinitionIdWithWorkspaceId) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link DestinationDefinitionApiController}. Since the path - * of {@link DestinationDefinitionApiController} is more granular, it will override this - * implementation - */ - @Override - public PrivateDestinationDefinitionRead grantDestinationDefinitionToWorkspace( - final DestinationDefinitionIdWithWorkspaceId destinationDefinitionIdWithWorkspaceId) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link DestinationDefinitionApiController}. Since the path - * of {@link DestinationDefinitionApiController} is more granular, it will override this - * implementation - */ - @Override - public void revokeDestinationDefinitionFromWorkspace(final DestinationDefinitionIdWithWorkspaceId destinationDefinitionIdWithWorkspaceId) { - throw new NotImplementedException(); - } - - // DESTINATION SPECIFICATION - /** - * This implementation has been moved to {@link DestinationDefinitionSpecificationApiController}. - * Since the path of {@link DestinationDefinitionSpecificationApiController} is more granular, it - * will override this implementation - */ - @Override - public DestinationDefinitionSpecificationRead getDestinationDefinitionSpecification( - final DestinationDefinitionIdWithWorkspaceId destinationDefinitionIdWithWorkspaceId) { - throw new NotImplementedException(); - } - - // DESTINATION IMPLEMENTATION - - /** - * This implementation has been moved to {@link DestinationApiController}. Since the path of - * {@link DestinationApiController} is more granular, it will override this implementation - */ - @Override - public DestinationRead createDestination(final DestinationCreate destinationCreate) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link DestinationApiController}. Since the path of - * {@link DestinationApiController} is more granular, it will override this implementation - */ - @Override - public void deleteDestination(final DestinationIdRequestBody destinationIdRequestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link DestinationApiController}. Since the path of - * {@link DestinationApiController} is more granular, it will override this implementation - */ - @Override - public DestinationRead updateDestination(final DestinationUpdate destinationUpdate) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link DestinationApiController}. Since the path of - * {@link DestinationApiController} is more granular, it will override this implementation - */ - @Override - public DestinationReadList listDestinationsForWorkspace(final WorkspaceIdRequestBody workspaceIdRequestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link DestinationApiController}. Since the path of - * {@link DestinationApiController} is more granular, it will override this implementation - */ - @Override - public DestinationReadList searchDestinations(final DestinationSearch destinationSearch) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link DestinationApiController}. Since the path of - * {@link DestinationApiController} is more granular, it will override this implementation - */ - @Override - public DestinationRead getDestination(final DestinationIdRequestBody destinationIdRequestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link DestinationApiController}. Since the path of - * {@link DestinationApiController} is more granular, it will override this implementation - */ - @Override - public DestinationRead cloneDestination(final DestinationCloneRequestBody destinationCloneRequestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link DestinationApiController}. Since the path of - * {@link DestinationApiController} is more granular, it will override this implementation - */ - @Override - public CheckConnectionRead checkConnectionToDestination(final DestinationIdRequestBody destinationIdRequestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link DestinationApiController}. Since the path of - * {@link DestinationApiController} is more granular, it will override this implementation - */ - @Override - public CheckConnectionRead checkConnectionToDestinationForUpdate(final DestinationUpdate destinationUpdate) { - throw new NotImplementedException(); - } - - // CONNECTION - - /** - * This implementation has been moved to {@link ConnectionApiController}. Since the path of - * {@link ConnectionApiController} is more granular, it will override this implementation - */ - @Override - public ConnectionRead createConnection(final ConnectionCreate connectionCreate) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link ConnectionApiController}. Since the path of - * {@link ConnectionApiController} is more granular, it will override this implementation - */ - @Override - public ConnectionRead updateConnection(final ConnectionUpdate connectionUpdate) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link ConnectionApiController}. Since the path of - * {@link ConnectionApiController} is more granular, it will override this implementation - */ - @Override - public ConnectionReadList listConnectionsForWorkspace(final WorkspaceIdRequestBody workspaceIdRequestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link ConnectionApiController}. Since the path of - * {@link ConnectionApiController} is more granular, it will override this implementation - */ - @Override - public ConnectionReadList listAllConnectionsForWorkspace(final WorkspaceIdRequestBody workspaceIdRequestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link ConnectionApiController}. Since the path of - * {@link ConnectionApiController} is more granular, it will override this implementation - */ - @Override - public ConnectionReadList searchConnections(final ConnectionSearch connectionSearch) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link ConnectionApiController}. Since the path of - * {@link ConnectionApiController} is more granular, it will override this implementation - */ - @Override - public ConnectionRead getConnection(final ConnectionIdRequestBody connectionIdRequestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link ConnectionApiController}. Since the path of - * {@link ConnectionApiController} is more granular, it will override this implementation - */ - @Override - public void deleteConnection(final ConnectionIdRequestBody connectionIdRequestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link ConnectionApiController}. Since the path of - * {@link ConnectionApiController} is more granular, it will override this implementation - */ - @Override - public JobInfoRead syncConnection(final ConnectionIdRequestBody connectionIdRequestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link ConnectionApiController}. Since the path of - * {@link ConnectionApiController} is more granular, it will override this implementation - */ - @Override - public JobInfoRead resetConnection(final ConnectionIdRequestBody connectionIdRequestBody) { - throw new NotImplementedException(); - } - - // Operations - - /** - * This implementation has been moved to {@link OperationApiController}. Since the path of - * {@link OperationApiController} is more granular, it will override this implementation - */ - @Override - public CheckOperationRead checkOperation(final OperatorConfiguration operatorConfiguration) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link OperationApiController}. Since the path of - * {@link OperationApiController} is more granular, it will override this implementation - */ - @Override - public OperationRead createOperation(final OperationCreate operationCreate) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link StateApiController}. Since the path of - * {@link StateApiController} is more granular, it will override this implementation - */ - @Override - public ConnectionState createOrUpdateState(final ConnectionStateCreateOrUpdate connectionStateCreateOrUpdate) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link OperationApiController}. Since the path of - * {@link OperationApiController} is more granular, it will override this implementation - */ - @Override - public void deleteOperation(final OperationIdRequestBody operationIdRequestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link OperationApiController}. Since the path of - * {@link OperationApiController} is more granular, it will override this implementation - */ - @Override - public OperationReadList listOperationsForConnection(final ConnectionIdRequestBody connectionIdRequestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link OperationApiController}. Since the path of - * {@link OperationApiController} is more granular, it will override this implementation - */ - @Override - public OperationRead getOperation(final OperationIdRequestBody operationIdRequestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link OperationApiController}. Since the path of - * {@link OperationApiController} is more granular, it will override this implementation - */ - @Override - public OperationRead updateOperation(final OperationUpdate operationUpdate) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link StateApiController}. Since the path of - * {@link StateApiController} is more granular, it will override this implementation - */ - @Override - public ConnectionState getState(final ConnectionIdRequestBody connectionIdRequestBody) { - throw new NotImplementedException(); - } - - // SCHEDULER - /** - * This implementation has been moved to {@link SchedulerApiController}. Since the path of - * {@link SchedulerApiController} is more granular, it will override this implementation - */ - @Override - public CheckConnectionRead executeSourceCheckConnection(final SourceCoreConfig sourceConfig) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link SchedulerApiController}. Since the path of - * {@link SchedulerApiController} is more granular, it will override this implementation - */ - @Override - public CheckConnectionRead executeDestinationCheckConnection(final DestinationCoreConfig destinationConfig) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link SchedulerApiController}. Since the path of - * {@link SchedulerApiController} is more granular, it will override this implementation - */ - @Override - public SourceDiscoverSchemaRead executeSourceDiscoverSchema(final SourceCoreConfig sourceCreate) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link JobsApiController}. Since the path of - * {@link JobsApiController} is more granular, it will override this implementation - */ - @Override - public JobInfoRead cancelJob(final JobIdRequestBody jobIdRequestBody) { - throw new NotImplementedException(); - } - - // JOB HISTORY - - /** - * This implementation has been moved to {@link JobsApiController}. Since the path of - * {@link JobsApiController} is more granular, it will override this implementation - */ - @Override - public JobReadList listJobsFor(final JobListRequestBody jobListRequestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link JobsApiController}. Since the path of - * {@link JobsApiController} is more granular, it will override this implementation - */ - @Override - public JobInfoRead getJobInfo(final JobIdRequestBody jobIdRequestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link JobsApiController}. Since the path of - * {@link JobsApiController} is more granular, it will override this implementation - */ - @Override - public JobInfoLightRead getJobInfoLight(final JobIdRequestBody jobIdRequestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link JobsApiController}. Since the path of - * {@link JobsApiController} is more granular, it will override this implementation - */ - @Override - public JobDebugInfoRead getJobDebugInfo(final JobIdRequestBody jobIdRequestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link JobsApiController}. Since the path of - * {@link JobsApiController} is more granular, it will override this implementation - */ - @Override - public AttemptNormalizationStatusReadList getAttemptNormalizationStatusesForJob(final JobIdRequestBody jobIdRequestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link LogsApiController}. Since the path of - * {@link LogsApiController} is more granular, it will override this implementation - */ - @Override - public File getLogs(final LogsRequestBody logsRequestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link HealthApiController}. Since the path of - * {@link HealthApiController} is more granular, it will override this implementation - */ - @Override - public File getOpenApiSpec() { - throw new NotImplementedException(); - } - - // HEALTH - /** - * This implementation has been moved to {@link HealthApiController}. Since the path of - * {@link HealthApiController} is more granular, it will override this implementation - */ - @Override - public HealthCheckRead getHealthCheck() { - throw new NotImplementedException(); - } - - // WEB BACKEND - - /** - * This implementation has been moved to {@link HealthApiController}. Since the path of - * {@link HealthApiController} is more granular, it will override this implementation - */ - @Override - public WebBackendConnectionReadList webBackendListConnectionsForWorkspace(final WorkspaceIdRequestBody workspaceIdRequestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link HealthApiController}. Since the path of - * {@link HealthApiController} is more granular, it will override this implementation - */ - @Override - public WebBackendGeographiesListResult webBackendListGeographies() { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link HealthApiController}. Since the path of - * {@link HealthApiController} is more granular, it will override this implementation - */ - @Override - public WebBackendConnectionRead webBackendGetConnection(final WebBackendConnectionRequestBody webBackendConnectionRequestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link HealthApiController}. Since the path of - * {@link HealthApiController} is more granular, it will override this implementation - */ - @Override - public WebBackendConnectionRead webBackendCreateConnection(final WebBackendConnectionCreate webBackendConnectionCreate) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link HealthApiController}. Since the path of - * {@link HealthApiController} is more granular, it will override this implementation - */ - @Override - public WebBackendConnectionRead webBackendUpdateConnection(final WebBackendConnectionUpdate webBackendConnectionUpdate) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link HealthApiController}. Since the path of - * {@link HealthApiController} is more granular, it will override this implementation - */ - @Override - public ConnectionStateType getStateType(final ConnectionIdRequestBody connectionIdRequestBody) { - throw new NotImplementedException(); - } - - /** - * This implementation has been moved to {@link HealthApiController}. Since the path of - * {@link HealthApiController} is more granular, it will override this implementation - */ - @Override - public WebBackendWorkspaceStateResult webBackendGetWorkspaceState(final WebBackendWorkspaceState webBackendWorkspaceState) { - throw new NotImplementedException(); - } - - // TODO: Move to common when all the api are moved - static T execute(final HandlerCall call) { - try { - return call.call(); - } catch (final ConfigNotFoundException e) { - throw new IdNotFoundKnownException(String.format("Could not find configuration for %s: %s.", e.getType(), e.getConfigId()), - e.getConfigId(), e); - } catch (final JsonValidationException e) { - throw new BadObjectSchemaKnownException( - String.format("The provided configuration does not fulfill the specification. Errors: %s", e.getMessage()), e); - } catch (final IOException e) { - throw new RuntimeException(e); - } - } - - interface HandlerCall { - - T call() throws ConfigNotFoundException, IOException, JsonValidationException; - - } - -} diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/ConnectionApiController.java b/airbyte-server/src/main/java/io/airbyte/server/apis/ConnectionApiController.java index 21d80c04e84..fe29b42e1f3 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/apis/ConnectionApiController.java +++ b/airbyte-server/src/main/java/io/airbyte/server/apis/ConnectionApiController.java @@ -35,37 +35,37 @@ public class ConnectionApiController implements ConnectionApi { @Override public ConnectionRead createConnection(final ConnectionCreate connectionCreate) { - return ConfigurationApi.execute(() -> connectionsHandler.createConnection(connectionCreate)); + return ApiHelper.execute(() -> connectionsHandler.createConnection(connectionCreate)); } @Override public ConnectionRead updateConnection(final ConnectionUpdate connectionUpdate) { - return ConfigurationApi.execute(() -> connectionsHandler.updateConnection(connectionUpdate)); + return ApiHelper.execute(() -> connectionsHandler.updateConnection(connectionUpdate)); } @Override public ConnectionReadList listConnectionsForWorkspace(final WorkspaceIdRequestBody workspaceIdRequestBody) { - return ConfigurationApi.execute(() -> connectionsHandler.listConnectionsForWorkspace(workspaceIdRequestBody)); + return ApiHelper.execute(() -> connectionsHandler.listConnectionsForWorkspace(workspaceIdRequestBody)); } @Override public ConnectionReadList listAllConnectionsForWorkspace(final WorkspaceIdRequestBody workspaceIdRequestBody) { - return ConfigurationApi.execute(() -> connectionsHandler.listAllConnectionsForWorkspace(workspaceIdRequestBody)); + return ApiHelper.execute(() -> connectionsHandler.listAllConnectionsForWorkspace(workspaceIdRequestBody)); } @Override public ConnectionReadList searchConnections(final ConnectionSearch connectionSearch) { - return ConfigurationApi.execute(() -> connectionsHandler.searchConnections(connectionSearch)); + return ApiHelper.execute(() -> connectionsHandler.searchConnections(connectionSearch)); } @Override public ConnectionRead getConnection(final ConnectionIdRequestBody connectionIdRequestBody) { - return ConfigurationApi.execute(() -> connectionsHandler.getConnection(connectionIdRequestBody.getConnectionId())); + return ApiHelper.execute(() -> connectionsHandler.getConnection(connectionIdRequestBody.getConnectionId())); } @Override public void deleteConnection(final ConnectionIdRequestBody connectionIdRequestBody) { - ConfigurationApi.execute(() -> { + ApiHelper.execute(() -> { operationsHandler.deleteOperationsForConnection(connectionIdRequestBody); connectionsHandler.deleteConnection(connectionIdRequestBody.getConnectionId()); return null; @@ -74,12 +74,12 @@ public class ConnectionApiController implements ConnectionApi { @Override public JobInfoRead syncConnection(final ConnectionIdRequestBody connectionIdRequestBody) { - return ConfigurationApi.execute(() -> schedulerHandler.syncConnection(connectionIdRequestBody)); + return ApiHelper.execute(() -> schedulerHandler.syncConnection(connectionIdRequestBody)); } @Override public JobInfoRead resetConnection(final ConnectionIdRequestBody connectionIdRequestBody) { - return ConfigurationApi.execute(() -> schedulerHandler.resetConnection(connectionIdRequestBody)); + return ApiHelper.execute(() -> schedulerHandler.resetConnection(connectionIdRequestBody)); } } diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/DbMigrationApiController.java b/airbyte-server/src/main/java/io/airbyte/server/apis/DbMigrationApiController.java index 93cb85dd33a..202b1c4da55 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/apis/DbMigrationApiController.java +++ b/airbyte-server/src/main/java/io/airbyte/server/apis/DbMigrationApiController.java @@ -22,12 +22,12 @@ public class DbMigrationApiController implements DbMigrationApi { @Override public DbMigrationExecutionRead executeMigrations(final DbMigrationRequestBody dbMigrationRequestBody) { - return ConfigurationApi.execute(() -> dbMigrationHandler.migrate(dbMigrationRequestBody)); + return ApiHelper.execute(() -> dbMigrationHandler.migrate(dbMigrationRequestBody)); } @Override public DbMigrationReadList listMigrations(final DbMigrationRequestBody dbMigrationRequestBody) { - return ConfigurationApi.execute(() -> dbMigrationHandler.list(dbMigrationRequestBody)); + return ApiHelper.execute(() -> dbMigrationHandler.list(dbMigrationRequestBody)); } } diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/DestinationApiController.java b/airbyte-server/src/main/java/io/airbyte/server/apis/DestinationApiController.java index 99148027a59..8cbdbb5cd6d 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/apis/DestinationApiController.java +++ b/airbyte-server/src/main/java/io/airbyte/server/apis/DestinationApiController.java @@ -28,27 +28,27 @@ public class DestinationApiController implements DestinationApi { @Override public CheckConnectionRead checkConnectionToDestination(final DestinationIdRequestBody destinationIdRequestBody) { - return ConfigurationApi.execute(() -> schedulerHandler.checkDestinationConnectionFromDestinationId(destinationIdRequestBody)); + return ApiHelper.execute(() -> schedulerHandler.checkDestinationConnectionFromDestinationId(destinationIdRequestBody)); } @Override public CheckConnectionRead checkConnectionToDestinationForUpdate(final DestinationUpdate destinationUpdate) { - return ConfigurationApi.execute(() -> schedulerHandler.checkDestinationConnectionFromDestinationIdForUpdate(destinationUpdate)); + return ApiHelper.execute(() -> schedulerHandler.checkDestinationConnectionFromDestinationIdForUpdate(destinationUpdate)); } @Override public DestinationRead cloneDestination(final DestinationCloneRequestBody destinationCloneRequestBody) { - return ConfigurationApi.execute(() -> destinationHandler.cloneDestination(destinationCloneRequestBody)); + return ApiHelper.execute(() -> destinationHandler.cloneDestination(destinationCloneRequestBody)); } @Override public DestinationRead createDestination(final DestinationCreate destinationCreate) { - return ConfigurationApi.execute(() -> destinationHandler.createDestination(destinationCreate)); + return ApiHelper.execute(() -> destinationHandler.createDestination(destinationCreate)); } @Override public void deleteDestination(final DestinationIdRequestBody destinationIdRequestBody) { - ConfigurationApi.execute(() -> { + ApiHelper.execute(() -> { destinationHandler.deleteDestination(destinationIdRequestBody); return null; }); @@ -56,22 +56,22 @@ public class DestinationApiController implements DestinationApi { @Override public DestinationRead getDestination(final DestinationIdRequestBody destinationIdRequestBody) { - return ConfigurationApi.execute(() -> destinationHandler.getDestination(destinationIdRequestBody)); + return ApiHelper.execute(() -> destinationHandler.getDestination(destinationIdRequestBody)); } @Override public DestinationReadList listDestinationsForWorkspace(final WorkspaceIdRequestBody workspaceIdRequestBody) { - return ConfigurationApi.execute(() -> destinationHandler.listDestinationsForWorkspace(workspaceIdRequestBody)); + return ApiHelper.execute(() -> destinationHandler.listDestinationsForWorkspace(workspaceIdRequestBody)); } @Override public DestinationReadList searchDestinations(final DestinationSearch destinationSearch) { - return ConfigurationApi.execute(() -> destinationHandler.searchDestinations(destinationSearch)); + return ApiHelper.execute(() -> destinationHandler.searchDestinations(destinationSearch)); } @Override public DestinationRead updateDestination(final DestinationUpdate destinationUpdate) { - return ConfigurationApi.execute(() -> destinationHandler.updateDestination(destinationUpdate)); + return ApiHelper.execute(() -> destinationHandler.updateDestination(destinationUpdate)); } } diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/DestinationDefinitionApiController.java b/airbyte-server/src/main/java/io/airbyte/server/apis/DestinationDefinitionApiController.java index 209a1f1c3eb..f5916639534 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/apis/DestinationDefinitionApiController.java +++ b/airbyte-server/src/main/java/io/airbyte/server/apis/DestinationDefinitionApiController.java @@ -28,19 +28,19 @@ public class DestinationDefinitionApiController implements DestinationDefinition @Override public DestinationDefinitionRead createCustomDestinationDefinition(final CustomDestinationDefinitionCreate customDestinationDefinitionCreate) { - return ConfigurationApi.execute(() -> destinationDefinitionsHandler.createCustomDestinationDefinition(customDestinationDefinitionCreate)); + return ApiHelper.execute(() -> destinationDefinitionsHandler.createCustomDestinationDefinition(customDestinationDefinitionCreate)); } // TODO: Deprecate this route in favor of createCustomDestinationDefinition // since all connector definitions created through the API are custom @Override public DestinationDefinitionRead createDestinationDefinition(final DestinationDefinitionCreate destinationDefinitionCreate) { - return ConfigurationApi.execute(() -> destinationDefinitionsHandler.createPrivateDestinationDefinition(destinationDefinitionCreate)); + return ApiHelper.execute(() -> destinationDefinitionsHandler.createPrivateDestinationDefinition(destinationDefinitionCreate)); } @Override public void deleteCustomDestinationDefinition(final DestinationDefinitionIdWithWorkspaceId destinationDefinitionIdWithWorkspaceId) { - ConfigurationApi.execute(() -> { + ApiHelper.execute(() -> { destinationDefinitionsHandler.deleteCustomDestinationDefinition(destinationDefinitionIdWithWorkspaceId); return null; }); @@ -48,7 +48,7 @@ public class DestinationDefinitionApiController implements DestinationDefinition @Override public void deleteDestinationDefinition(final DestinationDefinitionIdRequestBody destinationDefinitionIdRequestBody) { - ConfigurationApi.execute(() -> { + ApiHelper.execute(() -> { destinationDefinitionsHandler.deleteDestinationDefinition(destinationDefinitionIdRequestBody); return null; }); @@ -56,43 +56,43 @@ public class DestinationDefinitionApiController implements DestinationDefinition @Override public DestinationDefinitionRead getDestinationDefinition(final DestinationDefinitionIdRequestBody destinationDefinitionIdRequestBody) { - return ConfigurationApi.execute(() -> destinationDefinitionsHandler.getDestinationDefinition(destinationDefinitionIdRequestBody)); + return ApiHelper.execute(() -> destinationDefinitionsHandler.getDestinationDefinition(destinationDefinitionIdRequestBody)); } @Override public DestinationDefinitionRead getDestinationDefinitionForWorkspace(final DestinationDefinitionIdWithWorkspaceId destinationDefinitionIdWithWorkspaceId) { - return ConfigurationApi.execute(() -> destinationDefinitionsHandler.getDestinationDefinitionForWorkspace(destinationDefinitionIdWithWorkspaceId)); + return ApiHelper.execute(() -> destinationDefinitionsHandler.getDestinationDefinitionForWorkspace(destinationDefinitionIdWithWorkspaceId)); } @Override public PrivateDestinationDefinitionRead grantDestinationDefinitionToWorkspace(final DestinationDefinitionIdWithWorkspaceId destinationDefinitionIdWithWorkspaceId) { - return ConfigurationApi + return ApiHelper .execute(() -> destinationDefinitionsHandler.grantDestinationDefinitionToWorkspace(destinationDefinitionIdWithWorkspaceId)); } @Override public DestinationDefinitionReadList listDestinationDefinitions() { - return ConfigurationApi.execute(destinationDefinitionsHandler::listDestinationDefinitions); + return ApiHelper.execute(destinationDefinitionsHandler::listDestinationDefinitions); } @Override public DestinationDefinitionReadList listDestinationDefinitionsForWorkspace(final WorkspaceIdRequestBody workspaceIdRequestBody) { - return ConfigurationApi.execute(() -> destinationDefinitionsHandler.listDestinationDefinitionsForWorkspace(workspaceIdRequestBody)); + return ApiHelper.execute(() -> destinationDefinitionsHandler.listDestinationDefinitionsForWorkspace(workspaceIdRequestBody)); } @Override public DestinationDefinitionReadList listLatestDestinationDefinitions() { - return ConfigurationApi.execute(destinationDefinitionsHandler::listLatestDestinationDefinitions); + return ApiHelper.execute(destinationDefinitionsHandler::listLatestDestinationDefinitions); } @Override public PrivateDestinationDefinitionReadList listPrivateDestinationDefinitions(final WorkspaceIdRequestBody workspaceIdRequestBody) { - return ConfigurationApi.execute(() -> destinationDefinitionsHandler.listPrivateDestinationDefinitions(workspaceIdRequestBody)); + return ApiHelper.execute(() -> destinationDefinitionsHandler.listPrivateDestinationDefinitions(workspaceIdRequestBody)); } @Override public void revokeDestinationDefinitionFromWorkspace(final DestinationDefinitionIdWithWorkspaceId destinationDefinitionIdWithWorkspaceId) { - ConfigurationApi.execute(() -> { + ApiHelper.execute(() -> { destinationDefinitionsHandler.revokeDestinationDefinitionFromWorkspace(destinationDefinitionIdWithWorkspaceId); return null; }); @@ -100,12 +100,12 @@ public class DestinationDefinitionApiController implements DestinationDefinition @Override public DestinationDefinitionRead updateCustomDestinationDefinition(final CustomDestinationDefinitionUpdate customDestinationDefinitionUpdate) { - return ConfigurationApi.execute(() -> destinationDefinitionsHandler.updateCustomDestinationDefinition(customDestinationDefinitionUpdate)); + return ApiHelper.execute(() -> destinationDefinitionsHandler.updateCustomDestinationDefinition(customDestinationDefinitionUpdate)); } @Override public DestinationDefinitionRead updateDestinationDefinition(final DestinationDefinitionUpdate destinationDefinitionUpdate) { - return ConfigurationApi.execute(() -> destinationDefinitionsHandler.updateDestinationDefinition(destinationDefinitionUpdate)); + return ApiHelper.execute(() -> destinationDefinitionsHandler.updateDestinationDefinition(destinationDefinitionUpdate)); } } diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/DestinationDefinitionSpecificationApiController.java b/airbyte-server/src/main/java/io/airbyte/server/apis/DestinationDefinitionSpecificationApiController.java index 18405935674..74853019c8d 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/apis/DestinationDefinitionSpecificationApiController.java +++ b/airbyte-server/src/main/java/io/airbyte/server/apis/DestinationDefinitionSpecificationApiController.java @@ -19,7 +19,7 @@ public class DestinationDefinitionSpecificationApiController implements Destinat @Override public DestinationDefinitionSpecificationRead getDestinationDefinitionSpecification(final DestinationDefinitionIdWithWorkspaceId destinationDefinitionIdWithWorkspaceId) { - return ConfigurationApi.execute(() -> schedulerHandler.getDestinationSpecification(destinationDefinitionIdWithWorkspaceId)); + return ApiHelper.execute(() -> schedulerHandler.getDestinationSpecification(destinationDefinitionIdWithWorkspaceId)); } } diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/DestinationOauthApiController.java b/airbyte-server/src/main/java/io/airbyte/server/apis/DestinationOauthApiController.java index 0a58c40a741..fcbaa9a2675 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/apis/DestinationOauthApiController.java +++ b/airbyte-server/src/main/java/io/airbyte/server/apis/DestinationOauthApiController.java @@ -22,17 +22,17 @@ public class DestinationOauthApiController implements DestinationOauthApi { @Override public Map completeDestinationOAuth(final CompleteDestinationOAuthRequest completeDestinationOAuthRequest) { - return ConfigurationApi.execute(() -> oAuthHandler.completeDestinationOAuth(completeDestinationOAuthRequest)); + return ApiHelper.execute(() -> oAuthHandler.completeDestinationOAuth(completeDestinationOAuthRequest)); } @Override public OAuthConsentRead getDestinationOAuthConsent(final DestinationOauthConsentRequest destinationOauthConsentRequest) { - return ConfigurationApi.execute(() -> oAuthHandler.getDestinationOAuthConsent(destinationOauthConsentRequest)); + return ApiHelper.execute(() -> oAuthHandler.getDestinationOAuthConsent(destinationOauthConsentRequest)); } @Override public void setInstancewideDestinationOauthParams(final SetInstancewideDestinationOauthParamsRequestBody setInstancewideDestinationOauthParamsRequestBody) { - ConfigurationApi.execute(() -> { + ApiHelper.execute(() -> { oAuthHandler.setDestinationInstancewideOauthParams(setInstancewideDestinationOauthParamsRequestBody); return null; }); diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/JobsApiController.java b/airbyte-server/src/main/java/io/airbyte/server/apis/JobsApiController.java index 0c1eb3a276a..197a861a63e 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/apis/JobsApiController.java +++ b/airbyte-server/src/main/java/io/airbyte/server/apis/JobsApiController.java @@ -26,32 +26,32 @@ public class JobsApiController implements JobsApi { @Override public JobInfoRead cancelJob(final JobIdRequestBody jobIdRequestBody) { - return ConfigurationApi.execute(() -> schedulerHandler.cancelJob(jobIdRequestBody)); + return ApiHelper.execute(() -> schedulerHandler.cancelJob(jobIdRequestBody)); } @Override public AttemptNormalizationStatusReadList getAttemptNormalizationStatusesForJob(final JobIdRequestBody jobIdRequestBody) { - return ConfigurationApi.execute(() -> jobHistoryHandler.getAttemptNormalizationStatuses(jobIdRequestBody)); + return ApiHelper.execute(() -> jobHistoryHandler.getAttemptNormalizationStatuses(jobIdRequestBody)); } @Override public JobDebugInfoRead getJobDebugInfo(final JobIdRequestBody jobIdRequestBody) { - return ConfigurationApi.execute(() -> jobHistoryHandler.getJobDebugInfo(jobIdRequestBody)); + return ApiHelper.execute(() -> jobHistoryHandler.getJobDebugInfo(jobIdRequestBody)); } @Override public JobInfoRead getJobInfo(final JobIdRequestBody jobIdRequestBody) { - return ConfigurationApi.execute(() -> jobHistoryHandler.getJobInfo(jobIdRequestBody)); + return ApiHelper.execute(() -> jobHistoryHandler.getJobInfo(jobIdRequestBody)); } @Override public JobInfoLightRead getJobInfoLight(final JobIdRequestBody jobIdRequestBody) { - return ConfigurationApi.execute(() -> jobHistoryHandler.getJobInfoLight(jobIdRequestBody)); + return ApiHelper.execute(() -> jobHistoryHandler.getJobInfoLight(jobIdRequestBody)); } @Override public JobReadList listJobsFor(final JobListRequestBody jobListRequestBody) { - return ConfigurationApi.execute(() -> jobHistoryHandler.listJobsFor(jobListRequestBody)); + return ApiHelper.execute(() -> jobHistoryHandler.listJobsFor(jobListRequestBody)); } } diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/LogsApiController.java b/airbyte-server/src/main/java/io/airbyte/server/apis/LogsApiController.java index b3c1e5f5861..95e7758f4f6 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/apis/LogsApiController.java +++ b/airbyte-server/src/main/java/io/airbyte/server/apis/LogsApiController.java @@ -19,7 +19,7 @@ public class LogsApiController implements LogsApi { @Override public File getLogs(final LogsRequestBody logsRequestBody) { - return ConfigurationApi.execute(() -> logsHandler.getLogs(logsRequestBody)); + return ApiHelper.execute(() -> logsHandler.getLogs(logsRequestBody)); } } diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/NotificationsApiController.java b/airbyte-server/src/main/java/io/airbyte/server/apis/NotificationsApiController.java index e6f6df3b637..981ad80f7e8 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/apis/NotificationsApiController.java +++ b/airbyte-server/src/main/java/io/airbyte/server/apis/NotificationsApiController.java @@ -19,7 +19,7 @@ public class NotificationsApiController implements NotificationsApi { @Override public NotificationRead tryNotificationConfig(final Notification notification) { - return ConfigurationApi.execute(() -> workspacesHandler.tryNotification(notification)); + return ApiHelper.execute(() -> workspacesHandler.tryNotification(notification)); } } diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/OpenapiApiController.java b/airbyte-server/src/main/java/io/airbyte/server/apis/OpenapiApiController.java index c93ebd290fd..ae749403b42 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/apis/OpenapiApiController.java +++ b/airbyte-server/src/main/java/io/airbyte/server/apis/OpenapiApiController.java @@ -18,7 +18,7 @@ public class OpenapiApiController implements OpenapiApi { @Override public File getOpenApiSpec() { - return ConfigurationApi.execute(openApiConfigHandler::getFile); + return ApiHelper.execute(openApiConfigHandler::getFile); } } diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/OperationApiController.java b/airbyte-server/src/main/java/io/airbyte/server/apis/OperationApiController.java index fb6f9b04b0f..3b4eeb9ee43 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/apis/OperationApiController.java +++ b/airbyte-server/src/main/java/io/airbyte/server/apis/OperationApiController.java @@ -25,17 +25,17 @@ public class OperationApiController implements OperationApi { @Override public CheckOperationRead checkOperation(final OperatorConfiguration operatorConfiguration) { - return ConfigurationApi.execute(() -> operationsHandler.checkOperation(operatorConfiguration)); + return ApiHelper.execute(() -> operationsHandler.checkOperation(operatorConfiguration)); } @Override public OperationRead createOperation(final OperationCreate operationCreate) { - return ConfigurationApi.execute(() -> operationsHandler.createOperation(operationCreate)); + return ApiHelper.execute(() -> operationsHandler.createOperation(operationCreate)); } @Override public void deleteOperation(final OperationIdRequestBody operationIdRequestBody) { - ConfigurationApi.execute(() -> { + ApiHelper.execute(() -> { operationsHandler.deleteOperation(operationIdRequestBody); return null; }); @@ -43,17 +43,17 @@ public class OperationApiController implements OperationApi { @Override public OperationRead getOperation(final OperationIdRequestBody operationIdRequestBody) { - return ConfigurationApi.execute(() -> operationsHandler.getOperation(operationIdRequestBody)); + return ApiHelper.execute(() -> operationsHandler.getOperation(operationIdRequestBody)); } @Override public OperationReadList listOperationsForConnection(final ConnectionIdRequestBody connectionIdRequestBody) { - return ConfigurationApi.execute(() -> operationsHandler.listOperationsForConnection(connectionIdRequestBody)); + return ApiHelper.execute(() -> operationsHandler.listOperationsForConnection(connectionIdRequestBody)); } @Override public OperationRead updateOperation(final OperationUpdate operationUpdate) { - return ConfigurationApi.execute(() -> operationsHandler.updateOperation(operationUpdate)); + return ApiHelper.execute(() -> operationsHandler.updateOperation(operationUpdate)); } } diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/SchedulerApiController.java b/airbyte-server/src/main/java/io/airbyte/server/apis/SchedulerApiController.java index a3cd0baecbe..addc445d3c0 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/apis/SchedulerApiController.java +++ b/airbyte-server/src/main/java/io/airbyte/server/apis/SchedulerApiController.java @@ -19,17 +19,17 @@ public class SchedulerApiController implements SchedulerApi { @Override public CheckConnectionRead executeDestinationCheckConnection(final DestinationCoreConfig destinationCoreConfig) { - return ConfigurationApi.execute(() -> schedulerHandler.checkDestinationConnectionFromDestinationCreate(destinationCoreConfig)); + return ApiHelper.execute(() -> schedulerHandler.checkDestinationConnectionFromDestinationCreate(destinationCoreConfig)); } @Override public CheckConnectionRead executeSourceCheckConnection(final SourceCoreConfig sourceCoreConfig) { - return ConfigurationApi.execute(() -> schedulerHandler.checkSourceConnectionFromSourceCreate(sourceCoreConfig)); + return ApiHelper.execute(() -> schedulerHandler.checkSourceConnectionFromSourceCreate(sourceCoreConfig)); } @Override public SourceDiscoverSchemaRead executeSourceDiscoverSchema(final SourceCoreConfig sourceCoreConfig) { - return ConfigurationApi.execute(() -> schedulerHandler.discoverSchemaForSourceFromSourceCreate(sourceCoreConfig)); + return ApiHelper.execute(() -> schedulerHandler.discoverSchemaForSourceFromSourceCreate(sourceCoreConfig)); } } diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/SourceApiController.java b/airbyte-server/src/main/java/io/airbyte/server/apis/SourceApiController.java index 4086da7f60f..595087e0d19 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/apis/SourceApiController.java +++ b/airbyte-server/src/main/java/io/airbyte/server/apis/SourceApiController.java @@ -30,27 +30,27 @@ public class SourceApiController implements SourceApi { @Override public CheckConnectionRead checkConnectionToSource(final SourceIdRequestBody sourceIdRequestBody) { - return ConfigurationApi.execute(() -> schedulerHandler.checkSourceConnectionFromSourceId(sourceIdRequestBody)); + return ApiHelper.execute(() -> schedulerHandler.checkSourceConnectionFromSourceId(sourceIdRequestBody)); } @Override public CheckConnectionRead checkConnectionToSourceForUpdate(final SourceUpdate sourceUpdate) { - return ConfigurationApi.execute(() -> schedulerHandler.checkSourceConnectionFromSourceIdForUpdate(sourceUpdate)); + return ApiHelper.execute(() -> schedulerHandler.checkSourceConnectionFromSourceIdForUpdate(sourceUpdate)); } @Override public SourceRead cloneSource(final SourceCloneRequestBody sourceCloneRequestBody) { - return ConfigurationApi.execute(() -> sourceHandler.cloneSource(sourceCloneRequestBody)); + return ApiHelper.execute(() -> sourceHandler.cloneSource(sourceCloneRequestBody)); } @Override public SourceRead createSource(final SourceCreate sourceCreate) { - return ConfigurationApi.execute(() -> sourceHandler.createSource(sourceCreate)); + return ApiHelper.execute(() -> sourceHandler.createSource(sourceCreate)); } @Override public void deleteSource(final SourceIdRequestBody sourceIdRequestBody) { - ConfigurationApi.execute(() -> { + ApiHelper.execute(() -> { sourceHandler.deleteSource(sourceIdRequestBody); return null; }); @@ -58,27 +58,27 @@ public class SourceApiController implements SourceApi { @Override public SourceDiscoverSchemaRead discoverSchemaForSource(final SourceDiscoverSchemaRequestBody sourceDiscoverSchemaRequestBody) { - return ConfigurationApi.execute(() -> schedulerHandler.discoverSchemaForSourceFromSourceId(sourceDiscoverSchemaRequestBody)); + return ApiHelper.execute(() -> schedulerHandler.discoverSchemaForSourceFromSourceId(sourceDiscoverSchemaRequestBody)); } @Override public SourceRead getSource(final SourceIdRequestBody sourceIdRequestBody) { - return ConfigurationApi.execute(() -> sourceHandler.getSource(sourceIdRequestBody)); + return ApiHelper.execute(() -> sourceHandler.getSource(sourceIdRequestBody)); } @Override public SourceReadList listSourcesForWorkspace(final WorkspaceIdRequestBody workspaceIdRequestBody) { - return ConfigurationApi.execute(() -> sourceHandler.listSourcesForWorkspace(workspaceIdRequestBody)); + return ApiHelper.execute(() -> sourceHandler.listSourcesForWorkspace(workspaceIdRequestBody)); } @Override public SourceReadList searchSources(final SourceSearch sourceSearch) { - return ConfigurationApi.execute(() -> sourceHandler.searchSources(sourceSearch)); + return ApiHelper.execute(() -> sourceHandler.searchSources(sourceSearch)); } @Override public SourceRead updateSource(final SourceUpdate sourceUpdate) { - return ConfigurationApi.execute(() -> sourceHandler.updateSource(sourceUpdate)); + return ApiHelper.execute(() -> sourceHandler.updateSource(sourceUpdate)); } } diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/SourceDefinitionApiController.java b/airbyte-server/src/main/java/io/airbyte/server/apis/SourceDefinitionApiController.java index 0369a05e486..c47ab1fac43 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/apis/SourceDefinitionApiController.java +++ b/airbyte-server/src/main/java/io/airbyte/server/apis/SourceDefinitionApiController.java @@ -28,19 +28,19 @@ public class SourceDefinitionApiController implements SourceDefinitionApi { @Override public SourceDefinitionRead createCustomSourceDefinition(final CustomSourceDefinitionCreate customSourceDefinitionCreate) { - return ConfigurationApi.execute(() -> sourceDefinitionsHandler.createCustomSourceDefinition(customSourceDefinitionCreate)); + return ApiHelper.execute(() -> sourceDefinitionsHandler.createCustomSourceDefinition(customSourceDefinitionCreate)); } // TODO: Deprecate this route in favor of createCustomSourceDefinition // since all connector definitions created through the API are custom @Override public SourceDefinitionRead createSourceDefinition(final SourceDefinitionCreate sourceDefinitionCreate) { - return ConfigurationApi.execute(() -> sourceDefinitionsHandler.createPrivateSourceDefinition(sourceDefinitionCreate)); + return ApiHelper.execute(() -> sourceDefinitionsHandler.createPrivateSourceDefinition(sourceDefinitionCreate)); } @Override public void deleteCustomSourceDefinition(final SourceDefinitionIdWithWorkspaceId sourceDefinitionIdWithWorkspaceId) { - ConfigurationApi.execute(() -> { + ApiHelper.execute(() -> { sourceDefinitionsHandler.deleteCustomSourceDefinition(sourceDefinitionIdWithWorkspaceId); return null; }); @@ -48,7 +48,7 @@ public class SourceDefinitionApiController implements SourceDefinitionApi { @Override public void deleteSourceDefinition(final SourceDefinitionIdRequestBody sourceDefinitionIdRequestBody) { - ConfigurationApi.execute(() -> { + ApiHelper.execute(() -> { sourceDefinitionsHandler.deleteSourceDefinition(sourceDefinitionIdRequestBody); return null; }); @@ -56,42 +56,42 @@ public class SourceDefinitionApiController implements SourceDefinitionApi { @Override public SourceDefinitionRead getSourceDefinition(final SourceDefinitionIdRequestBody sourceDefinitionIdRequestBody) { - return ConfigurationApi.execute(() -> sourceDefinitionsHandler.getSourceDefinition(sourceDefinitionIdRequestBody)); + return ApiHelper.execute(() -> sourceDefinitionsHandler.getSourceDefinition(sourceDefinitionIdRequestBody)); } @Override public SourceDefinitionRead getSourceDefinitionForWorkspace(final SourceDefinitionIdWithWorkspaceId sourceDefinitionIdWithWorkspaceId) { - return ConfigurationApi.execute(() -> sourceDefinitionsHandler.getSourceDefinitionForWorkspace(sourceDefinitionIdWithWorkspaceId)); + return ApiHelper.execute(() -> sourceDefinitionsHandler.getSourceDefinitionForWorkspace(sourceDefinitionIdWithWorkspaceId)); } @Override public PrivateSourceDefinitionRead grantSourceDefinitionToWorkspace(final SourceDefinitionIdWithWorkspaceId sourceDefinitionIdWithWorkspaceId) { - return ConfigurationApi.execute(() -> sourceDefinitionsHandler.grantSourceDefinitionToWorkspace(sourceDefinitionIdWithWorkspaceId)); + return ApiHelper.execute(() -> sourceDefinitionsHandler.grantSourceDefinitionToWorkspace(sourceDefinitionIdWithWorkspaceId)); } @Override public SourceDefinitionReadList listLatestSourceDefinitions() { - return ConfigurationApi.execute(sourceDefinitionsHandler::listLatestSourceDefinitions); + return ApiHelper.execute(sourceDefinitionsHandler::listLatestSourceDefinitions); } @Override public PrivateSourceDefinitionReadList listPrivateSourceDefinitions(final WorkspaceIdRequestBody workspaceIdRequestBody) { - return ConfigurationApi.execute(() -> sourceDefinitionsHandler.listPrivateSourceDefinitions(workspaceIdRequestBody)); + return ApiHelper.execute(() -> sourceDefinitionsHandler.listPrivateSourceDefinitions(workspaceIdRequestBody)); } @Override public SourceDefinitionReadList listSourceDefinitions() { - return ConfigurationApi.execute(sourceDefinitionsHandler::listSourceDefinitions); + return ApiHelper.execute(sourceDefinitionsHandler::listSourceDefinitions); } @Override public SourceDefinitionReadList listSourceDefinitionsForWorkspace(final WorkspaceIdRequestBody workspaceIdRequestBody) { - return ConfigurationApi.execute(() -> sourceDefinitionsHandler.listSourceDefinitionsForWorkspace(workspaceIdRequestBody)); + return ApiHelper.execute(() -> sourceDefinitionsHandler.listSourceDefinitionsForWorkspace(workspaceIdRequestBody)); } @Override public void revokeSourceDefinitionFromWorkspace(final SourceDefinitionIdWithWorkspaceId sourceDefinitionIdWithWorkspaceId) { - ConfigurationApi.execute(() -> { + ApiHelper.execute(() -> { sourceDefinitionsHandler.revokeSourceDefinitionFromWorkspace(sourceDefinitionIdWithWorkspaceId); return null; }); @@ -99,12 +99,12 @@ public class SourceDefinitionApiController implements SourceDefinitionApi { @Override public SourceDefinitionRead updateCustomSourceDefinition(final CustomSourceDefinitionUpdate customSourceDefinitionUpdate) { - return ConfigurationApi.execute(() -> sourceDefinitionsHandler.updateCustomSourceDefinition(customSourceDefinitionUpdate)); + return ApiHelper.execute(() -> sourceDefinitionsHandler.updateCustomSourceDefinition(customSourceDefinitionUpdate)); } @Override public SourceDefinitionRead updateSourceDefinition(final SourceDefinitionUpdate sourceDefinitionUpdate) { - return ConfigurationApi.execute(() -> sourceDefinitionsHandler.updateSourceDefinition(sourceDefinitionUpdate)); + return ApiHelper.execute(() -> sourceDefinitionsHandler.updateSourceDefinition(sourceDefinitionUpdate)); } } diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/SourceDefinitionSpecificationApiController.java b/airbyte-server/src/main/java/io/airbyte/server/apis/SourceDefinitionSpecificationApiController.java index 001b75b7433..4068f117404 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/apis/SourceDefinitionSpecificationApiController.java +++ b/airbyte-server/src/main/java/io/airbyte/server/apis/SourceDefinitionSpecificationApiController.java @@ -19,7 +19,7 @@ public class SourceDefinitionSpecificationApiController implements SourceDefinit @Override public SourceDefinitionSpecificationRead getSourceDefinitionSpecification(final SourceDefinitionIdWithWorkspaceId sourceDefinitionIdWithWorkspaceId) { - return ConfigurationApi.execute(() -> schedulerHandler.getSourceDefinitionSpecification(sourceDefinitionIdWithWorkspaceId)); + return ApiHelper.execute(() -> schedulerHandler.getSourceDefinitionSpecification(sourceDefinitionIdWithWorkspaceId)); } } diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/SourceOauthApiController.java b/airbyte-server/src/main/java/io/airbyte/server/apis/SourceOauthApiController.java index fc454fa10cc..84e0782a302 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/apis/SourceOauthApiController.java +++ b/airbyte-server/src/main/java/io/airbyte/server/apis/SourceOauthApiController.java @@ -22,17 +22,17 @@ public class SourceOauthApiController implements SourceOauthApi { @Override public Map completeSourceOAuth(final CompleteSourceOauthRequest completeSourceOauthRequest) { - return ConfigurationApi.execute(() -> oAuthHandler.completeSourceOAuth(completeSourceOauthRequest)); + return ApiHelper.execute(() -> oAuthHandler.completeSourceOAuth(completeSourceOauthRequest)); } @Override public OAuthConsentRead getSourceOAuthConsent(final SourceOauthConsentRequest sourceOauthConsentRequest) { - return ConfigurationApi.execute(() -> oAuthHandler.getSourceOAuthConsent(sourceOauthConsentRequest)); + return ApiHelper.execute(() -> oAuthHandler.getSourceOAuthConsent(sourceOauthConsentRequest)); } @Override public void setInstancewideSourceOauthParams(final SetInstancewideSourceOauthParamsRequestBody setInstancewideSourceOauthParamsRequestBody) { - ConfigurationApi.execute(() -> { + ApiHelper.execute(() -> { oAuthHandler.setSourceInstancewideOauthParams(setInstancewideSourceOauthParamsRequestBody); return null; }); diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/StateApiController.java b/airbyte-server/src/main/java/io/airbyte/server/apis/StateApiController.java index 4a317db9869..e148c1010fe 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/apis/StateApiController.java +++ b/airbyte-server/src/main/java/io/airbyte/server/apis/StateApiController.java @@ -20,12 +20,12 @@ public class StateApiController implements StateApi { @Override public ConnectionState createOrUpdateState(final ConnectionStateCreateOrUpdate connectionStateCreateOrUpdate) { - return ConfigurationApi.execute(() -> stateHandler.createOrUpdateState(connectionStateCreateOrUpdate)); + return ApiHelper.execute(() -> stateHandler.createOrUpdateState(connectionStateCreateOrUpdate)); } @Override public ConnectionState getState(final ConnectionIdRequestBody connectionIdRequestBody) { - return ConfigurationApi.execute(() -> stateHandler.getState(connectionIdRequestBody)); + return ApiHelper.execute(() -> stateHandler.getState(connectionIdRequestBody)); } } diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/WebBackendApiController.java b/airbyte-server/src/main/java/io/airbyte/server/apis/WebBackendApiController.java index b9aea8f3cf2..e08cef94ee0 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/apis/WebBackendApiController.java +++ b/airbyte-server/src/main/java/io/airbyte/server/apis/WebBackendApiController.java @@ -30,37 +30,37 @@ public class WebBackendApiController implements WebBackendApi { @Override public ConnectionStateType getStateType(final ConnectionIdRequestBody connectionIdRequestBody) { - return ConfigurationApi.execute(() -> webBackendConnectionsHandler.getStateType(connectionIdRequestBody)); + return ApiHelper.execute(() -> webBackendConnectionsHandler.getStateType(connectionIdRequestBody)); } @Override public WebBackendConnectionRead webBackendCreateConnection(final WebBackendConnectionCreate webBackendConnectionCreate) { - return ConfigurationApi.execute(() -> webBackendConnectionsHandler.webBackendCreateConnection(webBackendConnectionCreate)); + return ApiHelper.execute(() -> webBackendConnectionsHandler.webBackendCreateConnection(webBackendConnectionCreate)); } @Override public WebBackendConnectionRead webBackendGetConnection(final WebBackendConnectionRequestBody webBackendConnectionRequestBody) { - return ConfigurationApi.execute(() -> webBackendConnectionsHandler.webBackendGetConnection(webBackendConnectionRequestBody)); + return ApiHelper.execute(() -> webBackendConnectionsHandler.webBackendGetConnection(webBackendConnectionRequestBody)); } @Override public WebBackendWorkspaceStateResult webBackendGetWorkspaceState(final WebBackendWorkspaceState webBackendWorkspaceState) { - return ConfigurationApi.execute(() -> webBackendConnectionsHandler.getWorkspaceState(webBackendWorkspaceState)); + return ApiHelper.execute(() -> webBackendConnectionsHandler.getWorkspaceState(webBackendWorkspaceState)); } @Override public WebBackendConnectionReadList webBackendListConnectionsForWorkspace(final WorkspaceIdRequestBody workspaceIdRequestBody) { - return ConfigurationApi.execute(() -> webBackendConnectionsHandler.webBackendListConnectionsForWorkspace(workspaceIdRequestBody)); + return ApiHelper.execute(() -> webBackendConnectionsHandler.webBackendListConnectionsForWorkspace(workspaceIdRequestBody)); } @Override public WebBackendGeographiesListResult webBackendListGeographies() { - return ConfigurationApi.execute(webBackendGeographiesHandler::listGeographiesOSS); + return ApiHelper.execute(webBackendGeographiesHandler::listGeographiesOSS); } @Override public WebBackendConnectionRead webBackendUpdateConnection(final WebBackendConnectionUpdate webBackendConnectionUpdate) { - return ConfigurationApi.execute(() -> webBackendConnectionsHandler.webBackendUpdateConnection(webBackendConnectionUpdate)); + return ApiHelper.execute(() -> webBackendConnectionsHandler.webBackendUpdateConnection(webBackendConnectionUpdate)); } } diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/WorkspaceApiController.java b/airbyte-server/src/main/java/io/airbyte/server/apis/WorkspaceApiController.java index f2d9283ecea..bfba9954cfa 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/apis/WorkspaceApiController.java +++ b/airbyte-server/src/main/java/io/airbyte/server/apis/WorkspaceApiController.java @@ -26,12 +26,12 @@ public class WorkspaceApiController implements WorkspaceApi { @Override public WorkspaceRead createWorkspace(final WorkspaceCreate workspaceCreate) { - return ConfigurationApi.execute(() -> workspacesHandler.createWorkspace(workspaceCreate)); + return ApiHelper.execute(() -> workspacesHandler.createWorkspace(workspaceCreate)); } @Override public void deleteWorkspace(final WorkspaceIdRequestBody workspaceIdRequestBody) { - ConfigurationApi.execute(() -> { + ApiHelper.execute(() -> { workspacesHandler.deleteWorkspace(workspaceIdRequestBody); return null; }); @@ -39,27 +39,27 @@ public class WorkspaceApiController implements WorkspaceApi { @Override public WorkspaceRead getWorkspace(final WorkspaceIdRequestBody workspaceIdRequestBody) { - return ConfigurationApi.execute(() -> workspacesHandler.getWorkspace(workspaceIdRequestBody)); + return ApiHelper.execute(() -> workspacesHandler.getWorkspace(workspaceIdRequestBody)); } @Override public WorkspaceRead getWorkspaceBySlug(final SlugRequestBody slugRequestBody) { - return ConfigurationApi.execute(() -> workspacesHandler.getWorkspaceBySlug(slugRequestBody)); + return ApiHelper.execute(() -> workspacesHandler.getWorkspaceBySlug(slugRequestBody)); } @Override public WorkspaceReadList listWorkspaces() { - return ConfigurationApi.execute(workspacesHandler::listWorkspaces); + return ApiHelper.execute(workspacesHandler::listWorkspaces); } @Override public WorkspaceRead updateWorkspace(final WorkspaceUpdate workspaceUpdate) { - return ConfigurationApi.execute(() -> workspacesHandler.updateWorkspace(workspaceUpdate)); + return ApiHelper.execute(() -> workspacesHandler.updateWorkspace(workspaceUpdate)); } @Override public void updateWorkspaceFeedback(final WorkspaceGiveFeedback workspaceGiveFeedback) { - ConfigurationApi.execute(() -> { + ApiHelper.execute(() -> { workspacesHandler.setFeedbackDone(workspaceGiveFeedback); return null; }); @@ -67,12 +67,12 @@ public class WorkspaceApiController implements WorkspaceApi { @Override public WorkspaceRead updateWorkspaceName(final WorkspaceUpdateName workspaceUpdateName) { - return ConfigurationApi.execute(() -> workspacesHandler.updateWorkspaceName(workspaceUpdateName)); + return ApiHelper.execute(() -> workspacesHandler.updateWorkspaceName(workspaceUpdateName)); } @Override public WorkspaceRead getWorkspaceByConnectionId(final ConnectionIdRequestBody connectionIdRequestBody) { - return ConfigurationApi.execute(() -> workspacesHandler.getWorkspaceByConnectionId(connectionIdRequestBody)); + return ApiHelper.execute(() -> workspacesHandler.getWorkspaceByConnectionId(connectionIdRequestBody)); } }