Skip to content

Bmoric/extract scheduler api #18941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Nov 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import io.airbyte.server.apis.NotificationsApiController;
import io.airbyte.server.apis.OpenapiApiController;
import io.airbyte.server.apis.OperationApiController;
import io.airbyte.server.apis.SchedulerApiController;
import io.airbyte.server.apis.binders.AttemptApiBinder;
import io.airbyte.server.apis.binders.ConnectionApiBinder;
import io.airbyte.server.apis.binders.DbMigrationBinder;
Expand All @@ -41,6 +42,7 @@
import io.airbyte.server.apis.binders.NotificationApiBinder;
import io.airbyte.server.apis.binders.OpenapiApiBinder;
import io.airbyte.server.apis.binders.OperationApiBinder;
import io.airbyte.server.apis.binders.SchedulerApiBinder;
import io.airbyte.server.apis.binders.SourceOauthApiBinder;
import io.airbyte.server.apis.factories.AttemptApiFactory;
import io.airbyte.server.apis.factories.ConnectionApiFactory;
Expand All @@ -55,6 +57,7 @@
import io.airbyte.server.apis.factories.NotificationsApiFactory;
import io.airbyte.server.apis.factories.OpenapiApiFactory;
import io.airbyte.server.apis.factories.OperationApiFactory;
import io.airbyte.server.apis.factories.SchedulerApiFactory;
import io.airbyte.server.apis.factories.SourceOauthApiFactory;
import io.airbyte.server.handlers.AttemptHandler;
import io.airbyte.server.handlers.ConnectionsHandler;
Expand Down Expand Up @@ -197,6 +200,8 @@ public ServerRunnable create(final SynchronousSchedulerClient synchronousSchedul

OpenapiApiFactory.setValues(openApiConfigHandler);

SchedulerApiFactory.setValues(schedulerHandler);

// server configurations
final Set<Class<?>> componentClasses = Set.of(
ConfigurationApi.class,
Expand All @@ -213,6 +218,7 @@ public ServerRunnable create(final SynchronousSchedulerClient synchronousSchedul
NotificationsApiController.class,
OpenapiApiController.class,
OperationApiController.class,
SchedulerApiController.class,
SourceOauthApiFactory.class);

final Set<Object> components = Set.of(
Expand All @@ -231,6 +237,7 @@ public ServerRunnable create(final SynchronousSchedulerClient synchronousSchedul
new NotificationApiBinder(),
new OpenapiApiBinder(),
new OperationApiBinder(),
new SchedulerApiBinder(),
new SourceOauthApiBinder());

// construct server
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -900,19 +900,31 @@ public ConnectionState getState(final ConnectionIdRequestBody connectionIdReques
}

// 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) {
return execute(() -> schedulerHandler.checkSourceConnectionFromSourceCreate(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) {
return execute(() -> schedulerHandler.checkDestinationConnectionFromDestinationCreate(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) {
return execute(() -> schedulerHandler.discoverSchemaForSourceFromSourceCreate(sourceCreate));
throw new NotImplementedException();
}

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/*
* Copyright (c) 2022 Airbyte, Inc., all rights reserved.
*/

package io.airbyte.server.apis;

import io.airbyte.api.generated.SchedulerApi;
import io.airbyte.api.model.generated.CheckConnectionRead;
import io.airbyte.api.model.generated.DestinationCoreConfig;
import io.airbyte.api.model.generated.SourceCoreConfig;
import io.airbyte.api.model.generated.SourceDiscoverSchemaRead;
import io.airbyte.server.handlers.SchedulerHandler;
import lombok.AllArgsConstructor;

@AllArgsConstructor
public class SchedulerApiController implements SchedulerApi {

private final SchedulerHandler schedulerHandler;

@Override
public CheckConnectionRead executeDestinationCheckConnection(final DestinationCoreConfig destinationCoreConfig) {
return ConfigurationApi.execute(() -> schedulerHandler.checkDestinationConnectionFromDestinationCreate(destinationCoreConfig));
}

@Override
public CheckConnectionRead executeSourceCheckConnection(final SourceCoreConfig sourceCoreConfig) {
return ConfigurationApi.execute(() -> schedulerHandler.checkSourceConnectionFromSourceCreate(sourceCoreConfig));
}

@Override
public SourceDiscoverSchemaRead executeSourceDiscoverSchema(final SourceCoreConfig sourceCoreConfig) {
return ConfigurationApi.execute(() -> schedulerHandler.discoverSchemaForSourceFromSourceCreate(sourceCoreConfig));
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/*
* Copyright (c) 2022 Airbyte, Inc., all rights reserved.
*/

package io.airbyte.server.apis.binders;

import io.airbyte.server.apis.SchedulerApiController;
import io.airbyte.server.apis.factories.SchedulerApiFactory;
import org.glassfish.hk2.utilities.binding.AbstractBinder;
import org.glassfish.jersey.process.internal.RequestScoped;

public class SchedulerApiBinder extends AbstractBinder {

@Override
protected void configure() {
bindFactory(SchedulerApiFactory.class)
.to(SchedulerApiController.class)
.in(RequestScoped.class);
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/*
* Copyright (c) 2022 Airbyte, Inc., all rights reserved.
*/

package io.airbyte.server.apis.factories;

import io.airbyte.server.apis.SchedulerApiController;
import io.airbyte.server.handlers.SchedulerHandler;
import org.glassfish.hk2.api.Factory;

public class SchedulerApiFactory implements Factory<SchedulerApiController> {

private static SchedulerHandler schedulerHandler;

public static void setValues(final SchedulerHandler schedulerHandler) {
SchedulerApiFactory.schedulerHandler = schedulerHandler;
}

@Override
public SchedulerApiController provide() {
return new SchedulerApiController(SchedulerApiFactory.schedulerHandler);
}

@Override
public void dispose(final SchedulerApiController instance) {
/* no op */
}

}