jprdonnelly/airbyte
1
0
Fork 0
mirror of synced 2026-01-01 09:02:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "Remove configuration API (#18998)" (#19440)" (#19443)

Browse Source 
* Revert "Revert "Remove configuration API (#18998)" (#19440)"

This reverts commit 3d0a9deb2c.

* Re add parameters needed by cloud
This commit is contained in:
Benoit Moriceau
2022-11-15 15:09:46 -08:00
committed by GitHub
parent f59709ea66
commit 89b7740507
25 changed files with 138 additions and 1278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
airbyte-server/src/main/java/io/airbyte/server/ConfigurationApiBinder.java
View File

@@ -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);
}
}

33
airbyte-server/src/main/java/io/airbyte/server/ConfigurationApiFactory.java
View File

@@ -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<ConfigurationApi> {
private static Map<String, String> mdc;
public static void setValues(
final Map<String, String> mdc) {
ConfigurationApiFactory.mdc = mdc;
}
@Override
public ConfigurationApi provide() {
MDC.setContextMap(ConfigurationApiFactory.mdc);
return new ConfigurationApi();
}
@Override
public void dispose(final ConfigurationApi service) {
/* noop */
}
}

6
airbyte-server/src/main/java/io/airbyte/server/ServerFactory.java
View File

@@ -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<String, String> 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<Class<?>> componentClasses = Set.of(
ConfigurationApi.class,
AttemptApiController.class,
ConnectionApiController.class,
DbMigrationApiController.class,
@@ -256,7 +251,6 @@ public interface ServerFactory {
final Set<Object> components = Set.of(
new CorsFilter(),
new ConfigurationApiBinder(),
new AttemptApiBinder(),
new ConnectionApiBinder(),
new DbMigrationBinder(),

35
airbyte-server/src/main/java/io/airbyte/server/apis/ApiHelper.java Normal file
View File

@@ -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> T execute(final HandlerCall<T> 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> {
T call() throws ConfigNotFoundException, IOException, JsonValidationException;
}
}

2
airbyte-server/src/main/java/io/airbyte/server/apis/AttemptApiController.java
View File

@@ -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));
}
}

1116
airbyte-server/src/main/java/io/airbyte/server/apis/ConfigurationApi.java
View File

File diff suppressed because it is too large Load Diff

18
airbyte-server/src/main/java/io/airbyte/server/apis/ConnectionApiController.java
View File

@@ -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));
}
}

4
airbyte-server/src/main/java/io/airbyte/server/apis/DbMigrationApiController.java
View File

@@ -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));
}
}

18
airbyte-server/src/main/java/io/airbyte/server/apis/DestinationApiController.java
View File

@@ -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));
}
}

28
airbyte-server/src/main/java/io/airbyte/server/apis/DestinationDefinitionApiController.java
View File

@@ -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));
}
}

2
airbyte-server/src/main/java/io/airbyte/server/apis/DestinationDefinitionSpecificationApiController.java
View File

@@ -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));
}
}

6
airbyte-server/src/main/java/io/airbyte/server/apis/DestinationOauthApiController.java
View File

@@ -22,17 +22,17 @@ public class DestinationOauthApiController implements DestinationOauthApi {
@Override
public Map<String, Object> 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;
});

12
airbyte-server/src/main/java/io/airbyte/server/apis/JobsApiController.java
View File

@@ -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));
}
}

2
airbyte-server/src/main/java/io/airbyte/server/apis/LogsApiController.java
View File

@@ -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));
}
}

2
airbyte-server/src/main/java/io/airbyte/server/apis/NotificationsApiController.java
View File

@@ -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));
}
}

2
airbyte-server/src/main/java/io/airbyte/server/apis/OpenapiApiController.java
View File

@@ -18,7 +18,7 @@ public class OpenapiApiController implements OpenapiApi {
@Override
public File getOpenApiSpec() {
return ConfigurationApi.execute(openApiConfigHandler::getFile);
return ApiHelper.execute(openApiConfigHandler::getFile);
}
}

12
airbyte-server/src/main/java/io/airbyte/server/apis/OperationApiController.java
View File

@@ -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));
}
}

6
airbyte-server/src/main/java/io/airbyte/server/apis/SchedulerApiController.java
View File

@@ -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));
}
}

20
airbyte-server/src/main/java/io/airbyte/server/apis/SourceApiController.java
View File

@@ -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));
}
}

28
airbyte-server/src/main/java/io/airbyte/server/apis/SourceDefinitionApiController.java
View File

@@ -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));
}
}

2
airbyte-server/src/main/java/io/airbyte/server/apis/SourceDefinitionSpecificationApiController.java
View File

@@ -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));
}
}

6
airbyte-server/src/main/java/io/airbyte/server/apis/SourceOauthApiController.java
View File

@@ -22,17 +22,17 @@ public class SourceOauthApiController implements SourceOauthApi {
@Override
public Map<String, Object> 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;
});

4
airbyte-server/src/main/java/io/airbyte/server/apis/StateApiController.java
View File

@@ -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));
}
}

14
airbyte-server/src/main/java/io/airbyte/server/apis/WebBackendApiController.java
View File

@@ -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));
}
}

18
airbyte-server/src/main/java/io/airbyte/server/apis/WorkspaceApiController.java
View File

@@ -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));
}
}