Revert "Bmoric/extract webbackend api (#18988)"

This reverts commit b05a5b2.

Author: colesnodgrass

airbyte-server/src/main/java/io/airbyte/server/ConfigurationApiFactory.java

@@ -31,6 +31,7 @@ public class ConfigurationApiFactory implements Factory<ConfigurationApi> {
   private static SecretsRepositoryReader secretsRepositoryReader;
   private static SecretsRepositoryWriter secretsRepositoryWriter;
   private static SynchronousSchedulerClient synchronousSchedulerClient;
+  private static StatePersistence statePersistence;
   private static Map<String, String> mdc;
   private static TrackingClient trackingClient;
   private static WorkerEnvironment workerEnvironment;
@@ -68,6 +69,7 @@ public static void setValues(
     ConfigurationApiFactory.logConfigs = logConfigs;
     ConfigurationApiFactory.airbyteVersion = airbyteVersion;
     ConfigurationApiFactory.eventRunner = eventRunner;
+    ConfigurationApiFactory.statePersistence = statePersistence;
   }
 
   @Override
@@ -80,6 +82,7 @@ public ConfigurationApi provide() {
         ConfigurationApiFactory.secretsRepositoryReader,
         ConfigurationApiFactory.secretsRepositoryWriter,
         ConfigurationApiFactory.synchronousSchedulerClient,
+        ConfigurationApiFactory.statePersistence,
         ConfigurationApiFactory.trackingClient,
         ConfigurationApiFactory.workerEnvironment,
         ConfigurationApiFactory.logConfigs,

airbyte-server/src/main/java/io/airbyte/server/ServerApp.java

@@ -63,8 +63,6 @@
 import io.airbyte.server.handlers.SourceDefinitionsHandler;
 import io.airbyte.server.handlers.SourceHandler;
 import io.airbyte.server.handlers.StateHandler;
-import io.airbyte.server.handlers.WebBackendConnectionsHandler;
-import io.airbyte.server.handlers.WebBackendGeographiesHandler;
 import io.airbyte.server.handlers.WorkspacesHandler;
 import io.airbyte.server.scheduler.DefaultSynchronousSchedulerClient;
 import io.airbyte.server.scheduler.EventRunner;
@@ -328,19 +326,6 @@ public static ServerRunnable getServer(final ServerFactory apiFactory,
 
     final StateHandler stateHandler = new StateHandler(statePersistence);
 
-    final WebBackendConnectionsHandler webBackendConnectionsHandler = new WebBackendConnectionsHandler(
-        connectionsHandler,
-        stateHandler,
-        sourceHandler,
-        destinationHandler,
-        jobHistoryHandler,
-        schedulerHandler,
-        operationsHandler,
-        eventRunner,
-        configRepository);
-
-    final WebBackendGeographiesHandler webBackendGeographiesHandler = new WebBackendGeographiesHandler();
-
     LOGGER.info("Starting server...");
 
     return apiFactory.create(
@@ -375,9 +360,7 @@ public static ServerRunnable getServer(final ServerFactory apiFactory,
         sourceHandler,
         sourceDefinitionsHandler,
         stateHandler,
-        workspacesHandler,
-        webBackendConnectionsHandler,
-        webBackendGeographiesHandler);
+        workspacesHandler);
   }
 
   public static void main(final String[] args) {

airbyte-server/src/main/java/io/airbyte/server/ServerFactory.java

@@ -33,7 +33,6 @@
 import io.airbyte.server.apis.SourceDefinitionApiController;
 import io.airbyte.server.apis.SourceOauthApiController;
 import io.airbyte.server.apis.StateApiController;
-import io.airbyte.server.apis.WebBackendApiController;
 import io.airbyte.server.apis.binders.AttemptApiBinder;
 import io.airbyte.server.apis.binders.ConnectionApiBinder;
 import io.airbyte.server.apis.binders.DbMigrationBinder;
@@ -52,7 +51,6 @@
 import io.airbyte.server.apis.binders.SourceDefinitionApiBinder;
 import io.airbyte.server.apis.binders.SourceOauthApiBinder;
 import io.airbyte.server.apis.binders.StateApiBinder;
-import io.airbyte.server.apis.binders.WebBackendApiBinder;
 import io.airbyte.server.apis.factories.AttemptApiFactory;
 import io.airbyte.server.apis.factories.ConnectionApiFactory;
 import io.airbyte.server.apis.factories.DbMigrationApiFactory;
@@ -71,7 +69,6 @@
 import io.airbyte.server.apis.factories.SourceDefinitionApiFactory;
 import io.airbyte.server.apis.factories.SourceOauthApiFactory;
 import io.airbyte.server.apis.factories.StateApiFactory;
-import io.airbyte.server.apis.factories.WebBackendApiFactory;
 import io.airbyte.server.handlers.AttemptHandler;
 import io.airbyte.server.handlers.ConnectionsHandler;
 import io.airbyte.server.handlers.DbMigrationHandler;
@@ -87,8 +84,6 @@
 import io.airbyte.server.handlers.SourceDefinitionsHandler;
 import io.airbyte.server.handlers.SourceHandler;
 import io.airbyte.server.handlers.StateHandler;
-import io.airbyte.server.handlers.WebBackendConnectionsHandler;
-import io.airbyte.server.handlers.WebBackendGeographiesHandler;
 import io.airbyte.server.handlers.WorkspacesHandler;
 import io.airbyte.server.scheduler.EventRunner;
 import io.airbyte.server.scheduler.SynchronousSchedulerClient;
@@ -132,9 +127,7 @@ ServerRunnable create(final SynchronousSchedulerClient synchronousSchedulerClien
                         final SourceHandler sourceHandler,
                         final SourceDefinitionsHandler sourceDefinitionsHandler,
                         final StateHandler stateHandler,
-                        final WorkspacesHandler workspacesHandler,
-                        final WebBackendConnectionsHandler webBackendConnectionsHandler,
-                        final WebBackendGeographiesHandler webBackendGeographiesHandler);
+                        final WorkspacesHandler workspacesHandler);
 
   class Api implements ServerFactory {
 
@@ -170,9 +163,7 @@ public ServerRunnable create(final SynchronousSchedulerClient synchronousSchedul
                                  final SourceHandler sourceHandler,
                                  final SourceDefinitionsHandler sourceDefinitionsHandler,
                                  final StateHandler stateHandler,
-                                 final WorkspacesHandler workspacesHandler,
-                                 final WebBackendConnectionsHandler webBackendConnectionsHandler,
-                                 final WebBackendGeographiesHandler webBackendGeographiesHandler) {
+                                 final WorkspacesHandler workspacesHandler) {
       final Map<String, String> mdc = MDC.getCopyOfContextMap();
 
       // set static values for factory
@@ -236,8 +227,6 @@ public ServerRunnable create(final SynchronousSchedulerClient synchronousSchedul
 
       StateApiFactory.setValues(stateHandler);
 
-      WebBackendApiFactory.setValues(webBackendConnectionsHandler, webBackendGeographiesHandler);
-
       // server configurations
       final Set<Class<?>> componentClasses = Set.of(
           ConfigurationApi.class,
@@ -258,8 +247,7 @@ public ServerRunnable create(final SynchronousSchedulerClient synchronousSchedul
           SourceApiController.class,
           SourceDefinitionApiController.class,
           SourceOauthApiController.class,
-          StateApiController.class,
-          WebBackendApiController.class);
+          StateApiController.class);
 
       final Set<Object> components = Set.of(
           new CorsFilter(),
@@ -281,8 +269,7 @@ public ServerRunnable create(final SynchronousSchedulerClient synchronousSchedul
           new SourceApiBinder(),
           new SourceDefinitionApiBinder(),
           new SourceOauthApiBinder(),
-          new StateApiBinder(),
-          new WebBackendApiBinder());
+          new StateApiBinder());
 
       // construct server
       return new ServerApp(airbyteVersion, componentClasses, components);

airbyte-server/src/main/java/io/airbyte/server/apis/ConfigurationApi.java

@@ -109,6 +109,7 @@
 import io.airbyte.config.persistence.ConfigRepository;
 import io.airbyte.config.persistence.SecretsRepositoryReader;
 import io.airbyte.config.persistence.SecretsRepositoryWriter;
+import io.airbyte.config.persistence.StatePersistence;
 import io.airbyte.persistence.job.JobPersistence;
 import io.airbyte.persistence.job.WorkspaceHelper;
 import io.airbyte.server.errors.BadObjectSchemaKnownException;
@@ -117,9 +118,13 @@
 import io.airbyte.server.handlers.DestinationDefinitionsHandler;
 import io.airbyte.server.handlers.DestinationHandler;
 import io.airbyte.server.handlers.JobHistoryHandler;
+import io.airbyte.server.handlers.OperationsHandler;
 import io.airbyte.server.handlers.SchedulerHandler;
 import io.airbyte.server.handlers.SourceDefinitionsHandler;
 import io.airbyte.server.handlers.SourceHandler;
+import io.airbyte.server.handlers.StateHandler;
+import io.airbyte.server.handlers.WebBackendConnectionsHandler;
+import io.airbyte.server.handlers.WebBackendGeographiesHandler;
 import io.airbyte.server.handlers.WorkspacesHandler;
 import io.airbyte.server.scheduler.EventRunner;
 import io.airbyte.server.scheduler.SynchronousSchedulerClient;
@@ -141,14 +146,19 @@ public class ConfigurationApi implements io.airbyte.api.generated.V1Api {
   private final DestinationDefinitionsHandler destinationDefinitionsHandler;
   private final DestinationHandler destinationHandler;
   private final ConnectionsHandler connectionsHandler;
+  private final OperationsHandler operationsHandler;
   private final SchedulerHandler schedulerHandler;
+  private final StateHandler stateHandler;
   private final JobHistoryHandler jobHistoryHandler;
+  private final WebBackendConnectionsHandler webBackendConnectionsHandler;
+  private final WebBackendGeographiesHandler webBackendGeographiesHandler;
 
   public ConfigurationApi(final ConfigRepository configRepository,
                           final JobPersistence jobPersistence,
                           final SecretsRepositoryReader secretsRepositoryReader,
                           final SecretsRepositoryWriter secretsRepositoryWriter,
                           final SynchronousSchedulerClient synchronousSchedulerClient,
+                          final StatePersistence statePersistence,
                           final TrackingClient trackingClient,
                           final WorkerEnvironment workerEnvironment,
                           final LogConfigs logConfigs,
@@ -176,13 +186,15 @@ public ConfigurationApi(final ConfigRepository configRepository,
         eventRunner,
         connectionsHandler);
 
+    stateHandler = new StateHandler(statePersistence);
     sourceHandler = new SourceHandler(
         configRepository,
         secretsRepositoryReader,
         secretsRepositoryWriter,
         schemaValidator,
         connectionsHandler);
     sourceDefinitionsHandler = new SourceDefinitionsHandler(configRepository, synchronousSchedulerClient, sourceHandler);
+    operationsHandler = new OperationsHandler(configRepository);
     destinationHandler = new DestinationHandler(
         configRepository,
         secretsRepositoryReader,
@@ -198,6 +210,17 @@ public ConfigurationApi(final ConfigRepository configRepository,
         sourceHandler);
     jobHistoryHandler = new JobHistoryHandler(jobPersistence, workerEnvironment, logConfigs, connectionsHandler, sourceHandler,
         sourceDefinitionsHandler, destinationHandler, destinationDefinitionsHandler, airbyteVersion);
+    webBackendConnectionsHandler = new WebBackendConnectionsHandler(
+        connectionsHandler,
+        stateHandler,
+        sourceHandler,
+        destinationHandler,
+        jobHistoryHandler,
+        schedulerHandler,
+        operationsHandler,
+        eventRunner,
+        configRepository);
+    webBackendGeographiesHandler = new WebBackendGeographiesHandler();
   }
 
   // WORKSPACE
@@ -394,7 +417,7 @@ public void revokeSourceDefinitionFromWorkspace(final SourceDefinitionIdWithWork
 
   @Override
   public InternalOperationResult saveStats(final SaveStatsRequestBody saveStatsRequestBody) {
-    throw new NotImplementedException();
+    throw new UnsupportedOperationException();
   }
 
   // SOURCE SPECIFICATION
@@ -1093,67 +1116,39 @@ public HealthCheckRead getHealthCheck() {
 
   // 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();
+    return execute(() -> webBackendConnectionsHandler.webBackendListConnectionsForWorkspace(workspaceIdRequestBody));
   }
 
-  /**
-   * 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();
+    return execute(webBackendGeographiesHandler::listGeographiesOSS);
   }
 
-  /**
-   * 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();
+    return execute(() -> webBackendConnectionsHandler.webBackendGetConnection(webBackendConnectionRequestBody));
   }
 
-  /**
-   * 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();
+    return execute(() -> webBackendConnectionsHandler.webBackendCreateConnection(webBackendConnectionCreate));
   }
 
-  /**
-   * 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();
+    return execute(() -> webBackendConnectionsHandler.webBackendUpdateConnection(webBackendConnectionUpdate));
   }
 
-  /**
-   * 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();
+    return ConfigurationApi.execute(() -> webBackendConnectionsHandler.getStateType(connectionIdRequestBody));
   }
 
-  /**
-   * 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();
+    return execute(() -> webBackendConnectionsHandler.getWorkspaceState(webBackendWorkspaceState));
   }
 
   // TODO: Move to common when all the api are moved