Bmoric/convert source micronaut

airbyte-api/src/main/java/io/airbyte/api/client/AirbyteApiClient.java

@@ -69,7 +69,7 @@ public AirbyteApiClient(final ApiClient apiClient, final ApiClient micronautApiC
     logsApi = new PatchedLogsApi(apiClient);
     operationApi = new OperationApi(micronautApiClient);
     sourceDefinitionApi = new SourceDefinitionApi(apiClient);
-    sourceApi = new SourceApi(apiClient);
+    sourceApi = new SourceApi(micronautApiClient);
     sourceDefinitionSpecificationApi = new SourceDefinitionSpecificationApi(apiClient);
     workspaceApi = new WorkspaceApi(apiClient);
     healthApi = new HealthApi(micronautApiClient);

airbyte-proxy/nginx-auth.conf.template

@@ -38,7 +38,7 @@ http {
       }
     }
 
-    location ~ ^/api/v1/(connections|destinations|destination_definitions|destination_oauths|operations|state)/.* {
+    location ~ ^/api/v1/(connections|destinations|destination_definitions|destination_oauths|operations|sources|state)/.* {
       proxy_set_header Host $host;
       proxy_set_header X-Real-IP $remote_addr;
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -93,7 +93,7 @@ http {
       }
     }
 
-    location ~ ^/api/v1/(connections|destinations|destination_definitions|destination_oauths|operations|state)/.* {
+    location ~ ^/api/v1/(connections|destinations|destination_definitions|destination_oauths|operations|sources|state)/.* {
       proxy_set_header Host $host;
       proxy_set_header X-Real-IP $remote_addr;
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

airbyte-proxy/nginx-no-auth.conf.template

@@ -20,7 +20,7 @@ http {
       proxy_pass "${PROXY_PASS_MICRONAUT_API}";
     }
 
-    location ~ ^/api/v1/(connections|destinations|destination_definitions|destination_oauths|operations|state)/.* {
+    location ~ ^/api/v1/(connections|destinations|destination_definitions|destination_oauths|operations|sources|state)/.* {
       proxy_set_header Host $host;
       proxy_set_header X-Real-IP $remote_addr;
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -48,7 +48,7 @@ http {
       proxy_pass "${PROXY_PASS_MICRONAUT_API}";
     }
 
-    location ~ ^/api/v1/(connections|destinations|destination_definitions|destination_oauths|operations|state)/.* {
+    location ~ ^/api/v1/(connections|destinations|destination_definitions|destination_oauths|operations|sources|state)/.* {
       proxy_set_header Host $host;
       proxy_set_header X-Real-IP $remote_addr;
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

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

@@ -24,14 +24,14 @@
 import io.airbyte.server.apis.SourceDefinitionApiController;
 import io.airbyte.server.apis.SourceDefinitionSpecificationApiController;
 import io.airbyte.server.apis.SourceOauthApiController;
+import io.airbyte.server.apis.StateApiController;
 import io.airbyte.server.apis.WebBackendApiController;
 import io.airbyte.server.apis.WorkspaceApiController;
 import io.airbyte.server.apis.binders.DestinationDefinitionSpecificationApiBinder;
 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.binders.SchedulerApiBinder;
-import io.airbyte.server.apis.binders.SourceApiBinder;
 import io.airbyte.server.apis.binders.SourceDefinitionApiBinder;
 import io.airbyte.server.apis.binders.SourceDefinitionSpecificationApiBinder;
 import io.airbyte.server.apis.binders.SourceOauthApiBinder;
@@ -42,7 +42,6 @@
 import io.airbyte.server.apis.factories.LogsApiFactory;
 import io.airbyte.server.apis.factories.NotificationsApiFactory;
 import io.airbyte.server.apis.factories.SchedulerApiFactory;
-import io.airbyte.server.apis.factories.SourceApiFactory;
 import io.airbyte.server.apis.factories.SourceDefinitionApiFactory;
 import io.airbyte.server.apis.factories.SourceDefinitionSpecificationApiFactory;
 import io.airbyte.server.apis.factories.SourceOauthApiFactory;
@@ -157,8 +156,6 @@ public ServerRunnable create(final SynchronousSchedulerClient synchronousSchedul
 
       SchedulerApiFactory.setValues(schedulerHandler);
 
-      SourceApiFactory.setValues(schedulerHandler, sourceHandler);
-
       SourceDefinitionApiFactory.setValues(sourceDefinitionsHandler);
 
       SourceDefinitionSpecificationApiFactory.setValues(schedulerHandler);
@@ -180,6 +177,7 @@ public ServerRunnable create(final SynchronousSchedulerClient synchronousSchedul
           SourceDefinitionApiController.class,
           SourceDefinitionSpecificationApiController.class,
           SourceOauthApiController.class,
+          StateApiController.class,
           WebBackendApiController.class,
           WorkspaceApiController.class);
 
@@ -189,7 +187,6 @@ public ServerRunnable create(final SynchronousSchedulerClient synchronousSchedul
           new LogsApiBinder(),
           new NotificationApiBinder(),
           new SchedulerApiBinder(),
-          new SourceApiBinder(),
           new SourceDefinitionApiBinder(),
           new SourceDefinitionSpecificationApiBinder(),
           new SourceOauthApiBinder(),

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

@@ -18,36 +18,45 @@
 import io.airbyte.api.model.generated.WorkspaceIdRequestBody;
 import io.airbyte.server.handlers.SchedulerHandler;
 import io.airbyte.server.handlers.SourceHandler;
-import javax.ws.rs.Path;
-import lombok.AllArgsConstructor;
+import io.micronaut.http.annotation.Controller;
+import io.micronaut.http.annotation.Post;
 
-@Path("/v1/sources")
-@AllArgsConstructor
+@Controller("/api/v1/sources")
 public class SourceApiController implements SourceApi {
 
   private final SchedulerHandler schedulerHandler;
   private final SourceHandler sourceHandler;
 
+  public SourceApiController(final SchedulerHandler schedulerHandler, final SourceHandler sourceHandler) {
+    this.schedulerHandler = schedulerHandler;
+    this.sourceHandler = sourceHandler;
+  }
+
+  @Post("/check_connection")
   @Override
   public CheckConnectionRead checkConnectionToSource(final SourceIdRequestBody sourceIdRequestBody) {
     return ApiHelper.execute(() -> schedulerHandler.checkSourceConnectionFromSourceId(sourceIdRequestBody));
   }
 
+  @Post("/check_connection_for_update")
   @Override
   public CheckConnectionRead checkConnectionToSourceForUpdate(final SourceUpdate sourceUpdate) {
     return ApiHelper.execute(() -> schedulerHandler.checkSourceConnectionFromSourceIdForUpdate(sourceUpdate));
   }
 
+  @Post("/clone")
   @Override
   public SourceRead cloneSource(final SourceCloneRequestBody sourceCloneRequestBody) {
     return ApiHelper.execute(() -> sourceHandler.cloneSource(sourceCloneRequestBody));
   }
 
+  @Post("/create")
   @Override
   public SourceRead createSource(final SourceCreate sourceCreate) {
     return ApiHelper.execute(() -> sourceHandler.createSource(sourceCreate));
   }
 
+  @Post("/delete")
   @Override
   public void deleteSource(final SourceIdRequestBody sourceIdRequestBody) {
     ApiHelper.execute(() -> {
@@ -56,26 +65,31 @@ public void deleteSource(final SourceIdRequestBody sourceIdRequestBody) {
     });
   }
 
+  @Post("/discover_schema")
   @Override
   public SourceDiscoverSchemaRead discoverSchemaForSource(final SourceDiscoverSchemaRequestBody sourceDiscoverSchemaRequestBody) {
     return ApiHelper.execute(() -> schedulerHandler.discoverSchemaForSourceFromSourceId(sourceDiscoverSchemaRequestBody));
   }
 
+  @Post("/get")
   @Override
   public SourceRead getSource(final SourceIdRequestBody sourceIdRequestBody) {
     return ApiHelper.execute(() -> sourceHandler.getSource(sourceIdRequestBody));
   }
 
+  @Post("/list")
   @Override
   public SourceReadList listSourcesForWorkspace(final WorkspaceIdRequestBody workspaceIdRequestBody) {
     return ApiHelper.execute(() -> sourceHandler.listSourcesForWorkspace(workspaceIdRequestBody));
   }
 
+  @Post("/search")
   @Override
   public SourceReadList searchSources(final SourceSearch sourceSearch) {
     return ApiHelper.execute(() -> sourceHandler.searchSources(sourceSearch));
   }
 
+  @Post("/update")
   @Override
   public SourceRead updateSource(final SourceUpdate sourceUpdate) {
     return ApiHelper.execute(() -> sourceHandler.updateSource(sourceUpdate));

airbyte-server/src/main/java/io/airbyte/server/config/ApplicationBeanFactory.java

@@ -19,6 +19,7 @@
 import io.airbyte.persistence.job.tracker.JobTracker;
 import io.airbyte.server.scheduler.EventRunner;
 import io.airbyte.server.scheduler.TemporalEventRunner;
+import io.airbyte.validation.json.JsonSchemaValidator;
 import io.micronaut.context.annotation.Factory;
 import io.micronaut.context.annotation.Requires;
 import io.micronaut.context.annotation.Value;
@@ -99,6 +100,11 @@ public JsonSecretsProcessor jsonSecretsProcessor(final FeatureFlags featureFlags
         .build();
   }
 
+  @Singleton
+  public JsonSchemaValidator jsonSchemaValidator() {
+    return new JsonSchemaValidator();
+  }
+
   private <T> T convertToEnum(final String value, final Function<String, T> creatorFunction, final T defaultValue) {
     return StringUtils.isNotEmpty(value) ? creatorFunction.apply(value.toUpperCase(Locale.ROOT)) : defaultValue;
   }

airbyte-server/src/main/java/io/airbyte/server/handlers/SourceHandler.java

@@ -28,11 +28,13 @@
 import io.airbyte.server.converters.ConfigurationUpdate;
 import io.airbyte.validation.json.JsonSchemaValidator;
 import io.airbyte.validation.json.JsonValidationException;
+import jakarta.inject.Singleton;
 import java.io.IOException;
 import java.util.List;
 import java.util.UUID;
 import java.util.function.Supplier;
 
+@Singleton
 public class SourceHandler {
 
   private final Supplier<UUID> uuidGenerator;