Bmoric/extract notification api

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

@@ -59,8 +59,14 @@
 import io.airbyte.server.handlers.DbMigrationHandler;
 import io.airbyte.server.handlers.DestinationDefinitionsHandler;
 import io.airbyte.server.handlers.DestinationHandler;
+import io.airbyte.server.handlers.HealthCheckHandler;
+import io.airbyte.server.handlers.JobHistoryHandler;
+import io.airbyte.server.handlers.LogsHandler;
 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.WorkspacesHandler;
 import io.airbyte.server.scheduler.DefaultSynchronousSchedulerClient;
 import io.airbyte.server.scheduler.EventRunner;
 import io.airbyte.server.scheduler.TemporalEventRunner;
@@ -299,6 +305,37 @@ public static ServerRunnable getServer(final ServerFactory apiFactory,
     final DestinationDefinitionsHandler destinationDefinitionsHandler = new DestinationDefinitionsHandler(configRepository, syncSchedulerClient,
         destinationHandler);
 
+    final HealthCheckHandler healthCheckHandler = new HealthCheckHandler(configRepository);
+
+    final SourceHandler sourceHandler = new SourceHandler(
+        configRepository,
+        secretsRepositoryReader,
+        secretsRepositoryWriter,
+        schemaValidator,
+        connectionsHandler);
+
+    final SourceDefinitionsHandler sourceDefinitionsHandler = new SourceDefinitionsHandler(configRepository, syncSchedulerClient, sourceHandler);
+
+    final JobHistoryHandler jobHistoryHandler = new JobHistoryHandler(
+        jobPersistence,
+        configs.getWorkerEnvironment(),
+        configs.getLogConfigs(),
+        connectionsHandler,
+        sourceHandler,
+        sourceDefinitionsHandler,
+        destinationHandler,
+        destinationDefinitionsHandler,
+        configs.getAirbyteVersion());
+
+    final LogsHandler logsHandler = new LogsHandler(configs);
+
+    final WorkspacesHandler workspacesHandler = new WorkspacesHandler(
+        configRepository,
+        secretsRepositoryWriter,
+        connectionsHandler,
+        destinationHandler,
+        sourceHandler);
+
     LOGGER.info("Starting server...");
 
     return apiFactory.create(
@@ -323,8 +360,12 @@ public static ServerRunnable getServer(final ServerFactory apiFactory,
         dbMigrationHandler,
         destinationDefinitionsHandler,
         destinationHandler,
+        healthCheckHandler,
+        jobHistoryHandler,
+        logsHandler,
         operationsHandler,
-        schedulerHandler);
+        schedulerHandler,
+        workspacesHandler);
   }
 
   @VisibleForTesting

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

@@ -21,25 +21,41 @@
 import io.airbyte.server.apis.DestinationApiController;
 import io.airbyte.server.apis.DestinationDefinitionApiController;
 import io.airbyte.server.apis.DestinationDefinitionSpecificationApiController;
+import io.airbyte.server.apis.HealthApiController;
+import io.airbyte.server.apis.JobsApiController;
+import io.airbyte.server.apis.LogsApiController;
+import io.airbyte.server.apis.NotificationsApiController;
 import io.airbyte.server.apis.binders.AttemptApiBinder;
 import io.airbyte.server.apis.binders.ConnectionApiBinder;
 import io.airbyte.server.apis.binders.DbMigrationBinder;
 import io.airbyte.server.apis.binders.DestinationApiBinder;
 import io.airbyte.server.apis.binders.DestinationDefinitionApiBinder;
 import io.airbyte.server.apis.binders.DestinationDefinitionSpecificationApiBinder;
+import io.airbyte.server.apis.binders.HealthApiBinder;
+import io.airbyte.server.apis.binders.JobsApiBinder;
+import io.airbyte.server.apis.binders.LogsApiBinder;
+import io.airbyte.server.apis.binders.NotificationApiBinder;
 import io.airbyte.server.apis.factories.AttemptApiFactory;
 import io.airbyte.server.apis.factories.ConnectionApiFactory;
 import io.airbyte.server.apis.factories.DbMigrationApiFactory;
 import io.airbyte.server.apis.factories.DestinationApiFactory;
 import io.airbyte.server.apis.factories.DestinationDefinitionApiFactory;
 import io.airbyte.server.apis.factories.DestinationDefinitionSpecificationApiFactory;
+import io.airbyte.server.apis.factories.HealthApiFactory;
+import io.airbyte.server.apis.factories.JobsApiFactory;
+import io.airbyte.server.apis.factories.LogsApiFactory;
+import io.airbyte.server.apis.factories.NotificationsApiFactory;
 import io.airbyte.server.handlers.AttemptHandler;
 import io.airbyte.server.handlers.ConnectionsHandler;
 import io.airbyte.server.handlers.DbMigrationHandler;
 import io.airbyte.server.handlers.DestinationDefinitionsHandler;
 import io.airbyte.server.handlers.DestinationHandler;
+import io.airbyte.server.handlers.HealthCheckHandler;
+import io.airbyte.server.handlers.JobHistoryHandler;
+import io.airbyte.server.handlers.LogsHandler;
 import io.airbyte.server.handlers.OperationsHandler;
 import io.airbyte.server.handlers.SchedulerHandler;
+import io.airbyte.server.handlers.WorkspacesHandler;
 import io.airbyte.server.scheduler.EventRunner;
 import io.airbyte.server.scheduler.SynchronousSchedulerClient;
 import java.net.http.HttpClient;
@@ -72,8 +88,12 @@ ServerRunnable create(final SynchronousSchedulerClient synchronousSchedulerClien
                         final DbMigrationHandler dbMigrationHandler,
                         final DestinationDefinitionsHandler destinationDefinitionsHandler,
                         final DestinationHandler destinationApiHandler,
+                        final HealthCheckHandler healthCheckHandler,
+                        final JobHistoryHandler jobHistoryHandler,
+                        final LogsHandler logsHandler,
                         final OperationsHandler operationsHandler,
-                        final SchedulerHandler schedulerHandler);
+                        final SchedulerHandler schedulerHandler,
+                        final WorkspacesHandler workspacesHandler);
 
   class Api implements ServerFactory {
 
@@ -99,8 +119,12 @@ public ServerRunnable create(final SynchronousSchedulerClient synchronousSchedul
                                  final DbMigrationHandler dbMigrationHandler,
                                  final DestinationDefinitionsHandler destinationDefinitionsHandler,
                                  final DestinationHandler destinationApiHandler,
+                                 final HealthCheckHandler healthCheckHandler,
+                                 final JobHistoryHandler jobHistoryHandler,
+                                 final LogsHandler logsHandler,
                                  final OperationsHandler operationsHandler,
-                                 final SchedulerHandler schedulerHandler) {
+                                 final SchedulerHandler schedulerHandler,
+                                 final WorkspacesHandler workspacesHandler) {
       final Map<String, String> mdc = MDC.getCopyOfContextMap();
 
       // set static values for factory
@@ -140,13 +164,41 @@ public ServerRunnable create(final SynchronousSchedulerClient synchronousSchedul
 
       DestinationDefinitionSpecificationApiFactory.setValues(schedulerHandler);
 
+      HealthApiFactory.setValues(healthCheckHandler);
+
+      JobsApiFactory.setValues(jobHistoryHandler, schedulerHandler);
+
+      LogsApiFactory.setValues(logsHandler);
+
+      NotificationsApiFactory.setValues(workspacesHandler);
+
       // server configurations
-      final Set<Class<?>> componentClasses = Set.of(ConfigurationApi.class, AttemptApiController.class, ConnectionApiController.class,
-          DbMigrationApiController.class, DestinationApiController.class, DestinationDefinitionApiController.class,
-          DestinationDefinitionSpecificationApiController.class);
-      final Set<Object> components = Set.of(new CorsFilter(), new ConfigurationApiBinder(), new AttemptApiBinder(), new ConnectionApiBinder(),
-          new DbMigrationBinder(), new DestinationApiBinder(), new DestinationDefinitionApiBinder(),
-          new DestinationDefinitionSpecificationApiBinder());
+      final Set<Class<?>> componentClasses = Set.of(
+          ConfigurationApi.class,
+          AttemptApiController.class,
+          ConnectionApiController.class,
+          DbMigrationApiController.class,
+          DestinationApiController.class,
+          DestinationDefinitionApiController.class,
+          DestinationDefinitionSpecificationApiController.class,
+          HealthApiController.class,
+          JobsApiController.class,
+          LogsApiController.class,
+          NotificationsApiController.class);
+
+      final Set<Object> components = Set.of(
+          new CorsFilter(),
+          new ConfigurationApiBinder(),
+          new AttemptApiBinder(),
+          new ConnectionApiBinder(),
+          new DbMigrationBinder(),
+          new DestinationApiBinder(),
+          new DestinationDefinitionApiBinder(),
+          new DestinationDefinitionSpecificationApiBinder(),
+          new HealthApiBinder(),
+          new JobsApiBinder(),
+          new LogsApiBinder(),
+          new NotificationApiBinder());
 
       // construct server
       return new ServerApp(airbyteVersion, componentClasses, components);

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

@@ -116,9 +116,7 @@
 import io.airbyte.server.handlers.ConnectionsHandler;
 import io.airbyte.server.handlers.DestinationDefinitionsHandler;
 import io.airbyte.server.handlers.DestinationHandler;
-import io.airbyte.server.handlers.HealthCheckHandler;
 import io.airbyte.server.handlers.JobHistoryHandler;
-import io.airbyte.server.handlers.LogsHandler;
 import io.airbyte.server.handlers.OAuthHandler;
 import io.airbyte.server.handlers.OpenApiConfigHandler;
 import io.airbyte.server.handlers.OperationsHandler;
@@ -157,8 +155,6 @@ public class ConfigurationApi implements io.airbyte.api.generated.V1Api {
   private final JobHistoryHandler jobHistoryHandler;
   private final WebBackendConnectionsHandler webBackendConnectionsHandler;
   private final WebBackendGeographiesHandler webBackendGeographiesHandler;
-  private final HealthCheckHandler healthCheckHandler;
-  private final LogsHandler logsHandler;
   private final OpenApiConfigHandler openApiConfigHandler;
   private final OAuthHandler oAuthHandler;
   private final WorkerEnvironment workerEnvironment;
@@ -169,7 +165,6 @@ public ConfigurationApi(final ConfigRepository configRepository,
                           final JobPersistence jobPersistence,
                           final SecretsRepositoryReader secretsRepositoryReader,
                           final SecretsRepositoryWriter secretsRepositoryWriter,
-
                           final SynchronousSchedulerClient synchronousSchedulerClient,
                           final StatePersistence statePersistence,
                           final TrackingClient trackingClient,
@@ -238,8 +233,6 @@ public ConfigurationApi(final ConfigRepository configRepository,
         eventRunner,
         configRepository);
     webBackendGeographiesHandler = new WebBackendGeographiesHandler();
-    healthCheckHandler = new HealthCheckHandler(configRepository);
-    logsHandler = new LogsHandler();
     openApiConfigHandler = new OpenApiConfigHandler();
   }
 
@@ -291,9 +284,13 @@ public void updateWorkspaceFeedback(final WorkspaceGiveFeedback workspaceGiveFee
     });
   }
 
+  /**
+   * 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) {
-    return execute(() -> workspacesHandler.tryNotification(notification));
+    throw new NotImplementedException();
   }
 
   // SOURCE
@@ -893,41 +890,69 @@ public SourceDiscoverSchemaRead executeSourceDiscoverSchema(final SourceCoreConf
     return execute(() -> schedulerHandler.discoverSchemaForSourceFromSourceCreate(sourceCreate));
   }
 
+  /**
+   * 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) {
-    return execute(() -> schedulerHandler.cancelJob(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) {
-    return execute(() -> jobHistoryHandler.listJobsFor(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) {
-    return execute(() -> jobHistoryHandler.getJobInfo(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) {
-    return execute(() -> jobHistoryHandler.getJobInfoLight(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) {
-    return execute(() -> jobHistoryHandler.getJobDebugInfo(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) {
     return execute(() -> jobHistoryHandler.getAttemptNormalizationStatuses(jobIdRequestBody));
   }
 
+  /**
+   * 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) {
-    return execute(() -> logsHandler.getLogs(workspaceRoot, workerEnvironment, logConfigs, logsRequestBody));
+    throw new NotImplementedException();
   }
 
   @Override
@@ -936,9 +961,13 @@ public File getOpenApiSpec() {
   }
 
   // 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() {
-    return healthCheckHandler.health();
+    throw new NotImplementedException();
   }
 
   // WEB BACKEND

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

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.server.apis;
+
+import io.airbyte.api.generated.HealthApi;
+import io.airbyte.api.model.generated.HealthCheckRead;
+import io.airbyte.server.handlers.HealthCheckHandler;
+import javax.ws.rs.Path;
+import lombok.AllArgsConstructor;
+
+@Path("/v1/health")
+@AllArgsConstructor
+public class HealthApiController implements HealthApi {
+
+  private final HealthCheckHandler healthCheckHandler;
+
+  @Override
+  public HealthCheckRead getHealthCheck() {
+    return healthCheckHandler.health();
+  }
+
+}