Switch to jakarta annotations (#17251)

airbyte-config/config-models/src/main/java/io/airbyte/config/helpers/LogConfigs.java

@@ -5,9 +5,9 @@
 package io.airbyte.config.helpers;
 
 import io.airbyte.config.storage.CloudStorageConfigs;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 import java.util.Optional;
-import javax.inject.Named;
-import javax.inject.Singleton;
 
 /**
  * Describes logging configuration. For now it just contains configuration around storage medium,

airbyte-cron/src/main/java/io/airbyte/cron/selfhealing/Temporal.java

@@ -5,7 +5,7 @@
 package io.airbyte.cron.selfhealing;
 
 import io.micronaut.scheduling.annotation.Scheduled;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 
 @Singleton

airbyte-cron/src/main/java/io/airbyte/cron/selfhealing/WorkspaceCleaner.java

@@ -7,6 +7,7 @@
 import io.airbyte.config.Configs;
 import io.airbyte.config.EnvConfigs;
 import io.micronaut.scheduling.annotation.Scheduled;
+import jakarta.inject.Singleton;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -15,7 +16,6 @@
 import java.time.OffsetDateTime;
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicInteger;
-import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.filefilter.AgeFileFilter;

airbyte-workers/src/main/java/io/airbyte/workers/ApplicationInitializer.java

@@ -43,6 +43,9 @@
 import io.temporal.worker.Worker;
 import io.temporal.worker.WorkerFactory;
 import io.temporal.worker.WorkerOptions;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Arrays;
@@ -54,9 +57,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 
 /**

airbyte-workers/src/main/java/io/airbyte/workers/config/ActivityBeanFactory.java

@@ -30,10 +30,10 @@
 import io.temporal.activity.ActivityCancellationType;
 import io.temporal.activity.ActivityOptions;
 import io.temporal.common.RetryOptions;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 import java.time.Duration;
 import java.util.List;
-import javax.inject.Named;
-import javax.inject.Singleton;
 
 /**
  * Micronaut bean factory for activity-related singletons.

airbyte-workers/src/main/java/io/airbyte/workers/config/ApiClientBeanFactory.java

@@ -14,14 +14,14 @@
 import io.micronaut.context.annotation.Factory;
 import io.micronaut.context.annotation.Prototype;
 import io.micronaut.context.annotation.Value;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 import java.io.FileInputStream;
 import java.net.http.HttpClient;
 import java.net.http.HttpClient.Version;
 import java.security.interfaces.RSAPrivateKey;
 import java.util.Date;
 import java.util.concurrent.TimeUnit;
-import javax.inject.Named;
-import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 
 /**

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

@@ -30,13 +30,13 @@
 import io.micronaut.context.annotation.Requires;
 import io.micronaut.context.annotation.Value;
 import io.micronaut.core.util.StringUtils;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 import java.nio.file.Path;
 import java.time.Instant;
 import java.util.Locale;
 import java.util.function.Function;
 import java.util.function.Supplier;
-import javax.inject.Named;
-import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 
 /**

airbyte-workers/src/main/java/io/airbyte/workers/config/CloudStorageBeanFactory.java

@@ -11,8 +11,8 @@
 import io.micronaut.context.annotation.Factory;
 import io.micronaut.context.annotation.Requires;
 import io.micronaut.context.annotation.Value;
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 
 /**
  * Micronaut bean factory for cloud storage-related singletons.

airbyte-workers/src/main/java/io/airbyte/workers/config/ContainerOrchestratorConfigBeanFactory.java

@@ -13,10 +13,10 @@
 import io.micronaut.context.annotation.Requires;
 import io.micronaut.context.annotation.Value;
 import io.micronaut.core.util.StringUtils;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 import java.nio.file.Path;
 import java.util.Optional;
-import javax.inject.Named;
-import javax.inject.Singleton;
 
 /**
  * Micronaut bean factory for container orchestrator configuration-related singletons.

airbyte-workers/src/main/java/io/airbyte/workers/config/DatabaseBeanFactory.java

@@ -21,9 +21,9 @@
 import io.micronaut.context.annotation.Requires;
 import io.micronaut.context.annotation.Value;
 import io.micronaut.flyway.FlywayConfigurationProperties;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 import java.io.IOException;
-import javax.inject.Named;
-import javax.inject.Singleton;
 import javax.sql.DataSource;
 import lombok.extern.slf4j.Slf4j;
 import org.flywaydb.core.Flyway;

airbyte-workers/src/main/java/io/airbyte/workers/config/JobErrorReportingBeanFactory.java

@@ -16,9 +16,9 @@
 import io.micronaut.context.annotation.Factory;
 import io.micronaut.context.annotation.Requires;
 import io.micronaut.context.annotation.Value;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 import java.util.Optional;
-import javax.inject.Named;
-import javax.inject.Singleton;
 
 /**
  * Micronaut bean factory for job error reporting-related singletons.

airbyte-workers/src/main/java/io/airbyte/workers/config/ProcessFactoryBeanFactory.java

@@ -14,11 +14,11 @@
 import io.micronaut.context.annotation.Requires;
 import io.micronaut.context.annotation.Value;
 import io.micronaut.core.util.StringUtils;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.nio.file.Path;
-import javax.inject.Named;
-import javax.inject.Singleton;
 
 /**
  * Micronaut bean factory for process factory-related singletons.

airbyte-workers/src/main/java/io/airbyte/workers/config/SecretPersistenceBeanFactory.java

@@ -14,8 +14,8 @@
 import io.micronaut.context.annotation.Factory;
 import io.micronaut.context.annotation.Requires;
 import io.micronaut.context.annotation.Value;
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 
 /**
  * Micronaut bean factory for secret persistence-related singletons.

airbyte-workers/src/main/java/io/airbyte/workers/config/TemporalBeanFactory.java

@@ -23,8 +23,8 @@
 import io.temporal.client.WorkflowClient;
 import io.temporal.serviceclient.WorkflowServiceStubs;
 import io.temporal.worker.WorkerFactory;
+import jakarta.inject.Singleton;
 import java.nio.file.Path;
-import javax.inject.Singleton;
 
 /**
  * Micronaut bean factory for Temporal-related singletons.

airbyte-workers/src/main/java/io/airbyte/workers/config/WorkerConfigurationBeanFactory.java

@@ -15,14 +15,14 @@
 import io.micronaut.context.annotation.Factory;
 import io.micronaut.context.annotation.Requires;
 import io.micronaut.context.annotation.Value;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import javax.inject.Named;
-import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 
 /**

airbyte-workers/src/main/java/io/airbyte/workers/helper/ConnectionHelper.java

@@ -18,27 +18,27 @@
 import io.airbyte.persistence.job.WorkspaceHelper;
 import io.airbyte.validation.json.JsonValidationException;
 import io.micronaut.context.annotation.Requires;
+import jakarta.inject.Singleton;
 import java.io.IOException;
 import java.util.List;
 import java.util.UUID;
 import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import lombok.AllArgsConstructor;
 
 // todo (cgardens) - we are not getting any value out of instantiating this class. we should just
 // use it as statics. not doing it now, because already in the middle of another refactor.
-@AllArgsConstructor
 @Singleton
 @Requires(property = "airbyte.worker.plane",
           pattern = "(?i)^(?!data_plane).*")
 public class ConnectionHelper {
 
-  @Inject
-  private ConfigRepository configRepository;
-  @Inject
+  private final ConfigRepository configRepository;
   private final WorkspaceHelper workspaceHelper;
 
+  public ConnectionHelper(final ConfigRepository configRepository, final WorkspaceHelper workspaceHelper) {
+    this.configRepository = configRepository;
+    this.workspaceHelper = workspaceHelper;
+  }
+
   public void deleteConnection(final UUID connectionId) throws JsonValidationException, ConfigNotFoundException, IOException {
     final StandardSync update = Jsons.clone(configRepository.getStandardSync(connectionId).withStatus(StandardSync.Status.DEPRECATED));
     updateConnection(update);

airbyte-workers/src/main/java/io/airbyte/workers/temporal/ConnectionManagerUtils.java

@@ -19,10 +19,10 @@
 import io.temporal.workflow.Functions.Proc;
 import io.temporal.workflow.Functions.Proc1;
 import io.temporal.workflow.Functions.TemporalFunctionalInterfaceMarker;
+import jakarta.inject.Singleton;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.function.Function;
-import javax.inject.Singleton;
 import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 

airbyte-workers/src/main/java/io/airbyte/workers/temporal/StreamResetRecordsHelper.java

@@ -10,29 +10,26 @@
 import io.airbyte.persistence.job.models.Job;
 import io.airbyte.protocol.models.StreamDescriptor;
 import io.airbyte.workers.temporal.exception.RetryableException;
+import jakarta.inject.Singleton;
 import java.io.IOException;
 import java.util.List;
 import java.util.UUID;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import lombok.AllArgsConstructor;
-import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 /**
  * Helper class that provides methods for dealing with stream reset records.
  */
 @Singleton
-@AllArgsConstructor
-@NoArgsConstructor
 @Slf4j
 public class StreamResetRecordsHelper {
 
-  @Inject
-  private JobPersistence jobPersistence;
+  private final JobPersistence jobPersistence;
+  private final StreamResetPersistence streamResetPersistence;
 
-  @Inject
-  private StreamResetPersistence streamResetPersistence;
+  public StreamResetRecordsHelper(final JobPersistence jobPersistence, final StreamResetPersistence streamResetPersistence) {
+    this.jobPersistence = jobPersistence;
+    this.streamResetPersistence = streamResetPersistence;
+  }
 
   /**
    * Deletes all stream reset records related to the provided job and connection.

airbyte-workers/src/main/java/io/airbyte/workers/temporal/TemporalClient.java

@@ -38,6 +38,8 @@
 import io.temporal.api.workflowservice.v1.ListWorkflowExecutionsResponse;
 import io.temporal.client.WorkflowClient;
 import io.temporal.serviceclient.WorkflowServiceStubs;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.time.Duration;
@@ -53,19 +55,12 @@
 import java.util.concurrent.TimeoutException;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.NoArgsConstructor;
 import lombok.Value;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.StopWatch;
 
-@AllArgsConstructor
-@NoArgsConstructor
 @Slf4j
 @Singleton
 @Requires(property = "airbyte.worker.plane",
@@ -79,19 +74,26 @@ public class TemporalClient {
    */
   private static final int DELAY_BETWEEN_QUERY_MS = 10;
 
-  @Inject
-  @Named("workspaceRoot")
-  private Path workspaceRoot;
-  @Inject
-  private WorkflowClient client;
-  @Inject
-  private WorkflowServiceStubs service;
-  @Inject
-  private StreamResetPersistence streamResetPersistence;
-  @Inject
-  private ConnectionManagerUtils connectionManagerUtils;
-  @Inject
-  private StreamResetRecordsHelper streamResetRecordsHelper;
+  private final Path workspaceRoot;
+  private final WorkflowClient client;
+  private final WorkflowServiceStubs service;
+  private final StreamResetPersistence streamResetPersistence;
+  private final ConnectionManagerUtils connectionManagerUtils;
+  private final StreamResetRecordsHelper streamResetRecordsHelper;
+
+  public TemporalClient(@Named("workspaceRoot") final Path workspaceRoot,
+                        final WorkflowClient client,
+                        final WorkflowServiceStubs service,
+                        final StreamResetPersistence streamResetPersistence,
+                        final ConnectionManagerUtils connectionManagerUtils,
+                        final StreamResetRecordsHelper streamResetRecordsHelper) {
+    this.workspaceRoot = workspaceRoot;
+    this.client = client;
+    this.service = service;
+    this.streamResetPersistence = streamResetPersistence;
+    this.connectionManagerUtils = connectionManagerUtils;
+    this.streamResetRecordsHelper = streamResetRecordsHelper;
+  }
 
   /**
    * Direct termination of Temporal Workflows should generally be avoided. This method exists for some

airbyte-workers/src/main/java/io/airbyte/workers/temporal/TemporalUtils.java

@@ -27,6 +27,7 @@
 import io.temporal.serviceclient.WorkflowServiceStubs;
 import io.temporal.serviceclient.WorkflowServiceStubsOptions;
 import io.temporal.workflow.Functions;
+import jakarta.inject.Singleton;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.Serializable;
@@ -40,7 +41,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
-import javax.inject.Singleton;
 import javax.net.ssl.SSLException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.time.DurationFormatUtils;

airbyte-workers/src/main/java/io/airbyte/workers/temporal/check/connection/CheckConnectionActivityImpl.java

@@ -27,9 +27,9 @@
 import io.micronaut.context.annotation.Value;
 import io.temporal.activity.Activity;
 import io.temporal.activity.ActivityExecutionContext;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 import java.nio.file.Path;
-import javax.inject.Named;
-import javax.inject.Singleton;
 
 @Singleton
 @Requires(property = "airbyte.worker.plane",

airbyte-workers/src/main/java/io/airbyte/workers/temporal/check/connection/CheckConnectionWorkflowImpl.java

@@ -13,9 +13,7 @@
 import io.airbyte.workers.temporal.annotations.TemporalActivityStub;
 import io.airbyte.workers.temporal.check.connection.CheckConnectionActivity.CheckConnectionInput;
 import io.temporal.workflow.Workflow;
-import javax.inject.Singleton;
 
-@Singleton
 public class CheckConnectionWorkflowImpl implements CheckConnectionWorkflow {
 
   private static final String CHECK_JOB_OUTPUT_TAG = "check_job_output";