From 896c2c975147f59d33028bea54172e3a88af2236 Mon Sep 17 00:00:00 2001 From: Jonathan Pearlin Date: Tue, 27 Sep 2022 11:18:22 -0400 Subject: [PATCH] Switch to jakarta annotations (#17251) --- .../io/airbyte/config/helpers/LogConfigs.java | 4 +- .../io/airbyte/cron/selfhealing/Temporal.java | 2 +- .../cron/selfhealing/WorkspaceCleaner.java | 2 +- .../workers/ApplicationInitializer.java | 6 +-- .../workers/config/ActivityBeanFactory.java | 4 +- .../workers/config/ApiClientBeanFactory.java | 4 +- .../config/ApplicationBeanFactory.java | 4 +- .../config/CloudStorageBeanFactory.java | 4 +- ...ontainerOrchestratorConfigBeanFactory.java | 4 +- .../workers/config/DatabaseBeanFactory.java | 4 +- .../config/JobErrorReportingBeanFactory.java | 4 +- .../config/ProcessFactoryBeanFactory.java | 4 +- .../config/SecretPersistenceBeanFactory.java | 4 +- .../workers/config/TemporalBeanFactory.java | 2 +- .../WorkerConfigurationBeanFactory.java | 4 +- .../workers/helper/ConnectionHelper.java | 14 +++---- .../temporal/ConnectionManagerUtils.java | 2 +- .../temporal/StreamResetRecordsHelper.java | 17 ++++---- .../workers/temporal/TemporalClient.java | 42 ++++++++++--------- .../workers/temporal/TemporalUtils.java | 2 +- .../CheckConnectionActivityImpl.java | 4 +- .../CheckConnectionWorkflowImpl.java | 2 - .../catalog/DiscoverCatalogActivityImpl.java | 4 +- .../catalog/DiscoverCatalogWorkflowImpl.java | 2 - .../AutoDisableConnectionActivityImpl.java | 2 +- .../activities/ConfigFetchActivityImpl.java | 4 +- .../ConnectionDeletionActivityImpl.java | 2 +- .../activities/GenerateInputActivityImpl.java | 2 +- ...obCreationAndStatusUpdateActivityImpl.java | 2 +- .../activities/RecordMetricActivityImpl.java | 2 +- .../RouteToSyncTaskQueueActivityImpl.java | 2 +- .../activities/StreamResetActivityImpl.java | 2 +- .../WorkflowConfigActivityImpl.java | 2 +- .../temporal/spec/SpecActivityImpl.java | 4 +- .../temporal/spec/SpecWorkflowImpl.java | 2 - .../temporal/support/TemporalProxyHelper.java | 8 +--- .../sync/DbtTransformationActivityImpl.java | 4 +- .../sync/NormalizationActivityImpl.java | 4 +- ...NormalizationSummaryCheckActivityImpl.java | 2 +- .../sync/PersistStateActivityImpl.java | 2 +- .../sync/ReplicationActivityImpl.java | 4 +- .../workers/temporal/sync/RouterService.java | 2 +- .../temporal/sync/SyncWorkflowImpl.java | 2 - deps.toml | 6 +-- 44 files changed, 96 insertions(+), 109 deletions(-) diff --git a/airbyte-config/config-models/src/main/java/io/airbyte/config/helpers/LogConfigs.java b/airbyte-config/config-models/src/main/java/io/airbyte/config/helpers/LogConfigs.java index 7495001227f3a..25465c4e4dfa7 100644 --- a/airbyte-config/config-models/src/main/java/io/airbyte/config/helpers/LogConfigs.java +++ b/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, diff --git a/airbyte-cron/src/main/java/io/airbyte/cron/selfhealing/Temporal.java b/airbyte-cron/src/main/java/io/airbyte/cron/selfhealing/Temporal.java index 38787b128a16f..a7f9f59be3740 100644 --- a/airbyte-cron/src/main/java/io/airbyte/cron/selfhealing/Temporal.java +++ b/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 diff --git a/airbyte-cron/src/main/java/io/airbyte/cron/selfhealing/WorkspaceCleaner.java b/airbyte-cron/src/main/java/io/airbyte/cron/selfhealing/WorkspaceCleaner.java index 574574fe59824..156aef8cf2500 100644 --- a/airbyte-cron/src/main/java/io/airbyte/cron/selfhealing/WorkspaceCleaner.java +++ b/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; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/ApplicationInitializer.java b/airbyte-workers/src/main/java/io/airbyte/workers/ApplicationInitializer.java index ef2cea7d4ddc4..0be29f050e608 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/ApplicationInitializer.java +++ b/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; /** diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/config/ActivityBeanFactory.java b/airbyte-workers/src/main/java/io/airbyte/workers/config/ActivityBeanFactory.java index a4fbbf66ef50c..9592cb918ec30 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/config/ActivityBeanFactory.java +++ b/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. diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/config/ApiClientBeanFactory.java b/airbyte-workers/src/main/java/io/airbyte/workers/config/ApiClientBeanFactory.java index 5dd30b9954d55..ce4cee032610d 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/config/ApiClientBeanFactory.java +++ b/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; /** diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/config/ApplicationBeanFactory.java b/airbyte-workers/src/main/java/io/airbyte/workers/config/ApplicationBeanFactory.java index 257226fa10879..91a5341f84a41 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/config/ApplicationBeanFactory.java +++ b/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; /** diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/config/CloudStorageBeanFactory.java b/airbyte-workers/src/main/java/io/airbyte/workers/config/CloudStorageBeanFactory.java index 865b74d429cf0..aa3b6a1e104b0 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/config/CloudStorageBeanFactory.java +++ b/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. diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/config/ContainerOrchestratorConfigBeanFactory.java b/airbyte-workers/src/main/java/io/airbyte/workers/config/ContainerOrchestratorConfigBeanFactory.java index aac3d7cf8e3d8..aae4afc894371 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/config/ContainerOrchestratorConfigBeanFactory.java +++ b/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. diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/config/DatabaseBeanFactory.java b/airbyte-workers/src/main/java/io/airbyte/workers/config/DatabaseBeanFactory.java index c3d588a724080..844fc4188b60a 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/config/DatabaseBeanFactory.java +++ b/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; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/config/JobErrorReportingBeanFactory.java b/airbyte-workers/src/main/java/io/airbyte/workers/config/JobErrorReportingBeanFactory.java index c22a14cf032c9..9faf2acf27904 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/config/JobErrorReportingBeanFactory.java +++ b/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. diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/config/ProcessFactoryBeanFactory.java b/airbyte-workers/src/main/java/io/airbyte/workers/config/ProcessFactoryBeanFactory.java index e5d35cc5331a0..5bb15020bfb46 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/config/ProcessFactoryBeanFactory.java +++ b/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. diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/config/SecretPersistenceBeanFactory.java b/airbyte-workers/src/main/java/io/airbyte/workers/config/SecretPersistenceBeanFactory.java index 2943a5166ed99..fb42c04e7eca3 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/config/SecretPersistenceBeanFactory.java +++ b/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. diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/config/TemporalBeanFactory.java b/airbyte-workers/src/main/java/io/airbyte/workers/config/TemporalBeanFactory.java index b4c332373f8e9..2678b7c12b09c 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/config/TemporalBeanFactory.java +++ b/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. diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/config/WorkerConfigurationBeanFactory.java b/airbyte-workers/src/main/java/io/airbyte/workers/config/WorkerConfigurationBeanFactory.java index 5654cb6cce1ce..f14fa91cc8c69 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/config/WorkerConfigurationBeanFactory.java +++ b/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; /** diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/helper/ConnectionHelper.java b/airbyte-workers/src/main/java/io/airbyte/workers/helper/ConnectionHelper.java index 7fcfbfdadad3a..1714d90e0cc29 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/helper/ConnectionHelper.java +++ b/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); diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/ConnectionManagerUtils.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/ConnectionManagerUtils.java index f468ea5275fe1..36d9cc90ccb58 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/ConnectionManagerUtils.java +++ b/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; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/StreamResetRecordsHelper.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/StreamResetRecordsHelper.java index 142acaf9fcc3f..e12149e806007 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/StreamResetRecordsHelper.java +++ b/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. diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/TemporalClient.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/TemporalClient.java index feb70822d83a5..59dba45b602af 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/TemporalClient.java +++ b/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 diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/TemporalUtils.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/TemporalUtils.java index 2bf6e9004936a..c6ea472be7715 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/TemporalUtils.java +++ b/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; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/check/connection/CheckConnectionActivityImpl.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/check/connection/CheckConnectionActivityImpl.java index 46f1c779c901e..cd9e7c137618e 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/check/connection/CheckConnectionActivityImpl.java +++ b/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", diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/check/connection/CheckConnectionWorkflowImpl.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/check/connection/CheckConnectionWorkflowImpl.java index 5ffdd784cac97..070a5b01758ec 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/check/connection/CheckConnectionWorkflowImpl.java +++ b/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"; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/discover/catalog/DiscoverCatalogActivityImpl.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/discover/catalog/DiscoverCatalogActivityImpl.java index ba21d75c3c0f4..09a30a1b7e1f7 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/discover/catalog/DiscoverCatalogActivityImpl.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/discover/catalog/DiscoverCatalogActivityImpl.java @@ -28,9 +28,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; import lombok.extern.slf4j.Slf4j; @Singleton diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/discover/catalog/DiscoverCatalogWorkflowImpl.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/discover/catalog/DiscoverCatalogWorkflowImpl.java index 7a6b9cbf330d0..273acfb210c21 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/discover/catalog/DiscoverCatalogWorkflowImpl.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/discover/catalog/DiscoverCatalogWorkflowImpl.java @@ -9,9 +9,7 @@ import io.airbyte.persistence.job.models.IntegrationLauncherConfig; import io.airbyte.persistence.job.models.JobRunConfig; import io.airbyte.workers.temporal.annotations.TemporalActivityStub; -import javax.inject.Singleton; -@Singleton public class DiscoverCatalogWorkflowImpl implements DiscoverCatalogWorkflow { @TemporalActivityStub(activityOptionsBeanName = "discoveryActivityOptions") diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/AutoDisableConnectionActivityImpl.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/AutoDisableConnectionActivityImpl.java index 6f74f3ee4edc1..502fa89ccb2f5 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/AutoDisableConnectionActivityImpl.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/AutoDisableConnectionActivityImpl.java @@ -22,11 +22,11 @@ import io.airbyte.workers.temporal.exception.RetryableException; import io.micronaut.context.annotation.Requires; import io.micronaut.context.annotation.Value; +import jakarta.inject.Singleton; import java.io.IOException; import java.util.List; import java.util.Optional; import java.util.concurrent.TimeUnit; -import javax.inject.Singleton; @Singleton @Requires(property = "airbyte.worker.plane", diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/ConfigFetchActivityImpl.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/ConfigFetchActivityImpl.java index d40807c7f9ca4..d6345f1287476 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/ConfigFetchActivityImpl.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/ConfigFetchActivityImpl.java @@ -17,6 +17,8 @@ import io.airbyte.workers.temporal.exception.RetryableException; import io.micronaut.context.annotation.Requires; import io.micronaut.context.annotation.Value; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import java.io.IOException; import java.text.ParseException; import java.time.DateTimeException; @@ -26,8 +28,6 @@ import java.util.TimeZone; import java.util.UUID; import java.util.function.Supplier; -import javax.inject.Named; -import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; import org.joda.time.DateTimeZone; import org.quartz.CronExpression; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/ConnectionDeletionActivityImpl.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/ConnectionDeletionActivityImpl.java index 66b26d81f4f9c..593b3dec9b67c 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/ConnectionDeletionActivityImpl.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/ConnectionDeletionActivityImpl.java @@ -9,8 +9,8 @@ import io.airbyte.workers.helper.ConnectionHelper; import io.airbyte.workers.temporal.exception.RetryableException; import io.micronaut.context.annotation.Requires; +import jakarta.inject.Singleton; import java.io.IOException; -import javax.inject.Singleton; @Singleton @Requires(property = "airbyte.worker.plane", diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/GenerateInputActivityImpl.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/GenerateInputActivityImpl.java index 6456e43433bae..09dd8146e674a 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/GenerateInputActivityImpl.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/GenerateInputActivityImpl.java @@ -18,8 +18,8 @@ import io.airbyte.workers.temporal.TemporalWorkflowUtils; import io.airbyte.workers.temporal.exception.RetryableException; import io.micronaut.context.annotation.Requires; +import jakarta.inject.Singleton; import java.util.List; -import javax.inject.Singleton; @Singleton @Requires(property = "airbyte.worker.plane", diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/JobCreationAndStatusUpdateActivityImpl.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/JobCreationAndStatusUpdateActivityImpl.java index 864a45ebc2a3c..ecf64d808fd33 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/JobCreationAndStatusUpdateActivityImpl.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/JobCreationAndStatusUpdateActivityImpl.java @@ -46,12 +46,12 @@ import io.airbyte.workers.run.WorkerRun; import io.airbyte.workers.temporal.exception.RetryableException; import io.micronaut.context.annotation.Requires; +import jakarta.inject.Singleton; import java.io.IOException; import java.nio.file.Path; import java.util.List; import java.util.Optional; import java.util.UUID; -import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/RecordMetricActivityImpl.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/RecordMetricActivityImpl.java index 3318e36afe75a..a5f41ae2f45ab 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/RecordMetricActivityImpl.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/RecordMetricActivityImpl.java @@ -9,11 +9,11 @@ import io.airbyte.metrics.lib.MetricTags; import io.airbyte.workers.temporal.scheduling.ConnectionUpdaterInput; import io.micronaut.context.annotation.Requires; +import jakarta.inject.Singleton; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; /** diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/RouteToSyncTaskQueueActivityImpl.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/RouteToSyncTaskQueueActivityImpl.java index 8f58f9dff9fd4..bae0ecbe978d6 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/RouteToSyncTaskQueueActivityImpl.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/RouteToSyncTaskQueueActivityImpl.java @@ -5,7 +5,7 @@ package io.airbyte.workers.temporal.scheduling.activities; import io.airbyte.workers.temporal.sync.RouterService; -import javax.inject.Singleton; +import jakarta.inject.Singleton; @Singleton public class RouteToSyncTaskQueueActivityImpl implements RouteToSyncTaskQueueActivity { diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/StreamResetActivityImpl.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/StreamResetActivityImpl.java index 64bd3a3ee5206..90fa9e9341a6a 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/StreamResetActivityImpl.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/StreamResetActivityImpl.java @@ -6,7 +6,7 @@ import io.airbyte.workers.temporal.StreamResetRecordsHelper; import io.micronaut.context.annotation.Requires; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/WorkflowConfigActivityImpl.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/WorkflowConfigActivityImpl.java index ad42e0f5e78b7..6806ed1052f7b 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/WorkflowConfigActivityImpl.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/activities/WorkflowConfigActivityImpl.java @@ -6,8 +6,8 @@ import io.micronaut.context.annotation.Property; import io.micronaut.context.annotation.Requires; +import jakarta.inject.Singleton; import java.time.Duration; -import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; /** diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/spec/SpecActivityImpl.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/spec/SpecActivityImpl.java index ab2f691777678..2931e2dd5ed28 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/spec/SpecActivityImpl.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/spec/SpecActivityImpl.java @@ -24,10 +24,10 @@ 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 java.util.function.Supplier; -import javax.inject.Named; -import javax.inject.Singleton; @Singleton @Requires(property = "airbyte.worker.plane", diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/spec/SpecWorkflowImpl.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/spec/SpecWorkflowImpl.java index afaece3bf59e0..5766301fe8169 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/spec/SpecWorkflowImpl.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/spec/SpecWorkflowImpl.java @@ -8,9 +8,7 @@ import io.airbyte.persistence.job.models.IntegrationLauncherConfig; import io.airbyte.persistence.job.models.JobRunConfig; import io.airbyte.workers.temporal.annotations.TemporalActivityStub; -import javax.inject.Singleton; -@Singleton public class SpecWorkflowImpl implements SpecWorkflow { @TemporalActivityStub(activityOptionsBeanName = "specActivityOptions") diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/support/TemporalProxyHelper.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/support/TemporalProxyHelper.java index 722bdaba9a05e..8575aaee7365b 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/support/TemporalProxyHelper.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/support/TemporalProxyHelper.java @@ -10,6 +10,7 @@ import io.temporal.workflow.QueryMethod; import io.temporal.workflow.SignalMethod; import io.temporal.workflow.WorkflowMethod; +import jakarta.inject.Singleton; import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.util.Collection; @@ -17,9 +18,6 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.inject.Singleton; -import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; import net.bytebuddy.ByteBuddy; import net.bytebuddy.TypeCache; @@ -37,7 +35,6 @@ * https://github.com/applicaai/spring-boot-starter-temporal. */ @Singleton -@NoArgsConstructor @Slf4j public class TemporalProxyHelper { @@ -50,8 +47,7 @@ public class TemporalProxyHelper { * Collection of available {@link ActivityOptions} beans which will be used to initialize Temporal * activity stubs in each registered Temporal workflow. */ - @Inject - private Collection> availableActivityOptions; + private final Collection> availableActivityOptions; private Optional, ActivityOptions, Object>> activityStubGenerator = Optional.empty(); diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/DbtTransformationActivityImpl.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/DbtTransformationActivityImpl.java index 332b2c8797517..69420d21ed372 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/DbtTransformationActivityImpl.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/DbtTransformationActivityImpl.java @@ -31,12 +31,12 @@ 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 java.util.Optional; import java.util.UUID; import java.util.function.Supplier; -import javax.inject.Named; -import javax.inject.Singleton; @Singleton public class DbtTransformationActivityImpl implements DbtTransformationActivity { diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/NormalizationActivityImpl.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/NormalizationActivityImpl.java index bb086fc819528..14727e2f1afb3 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/NormalizationActivityImpl.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/NormalizationActivityImpl.java @@ -33,12 +33,12 @@ 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 java.util.Optional; import java.util.UUID; import java.util.function.Supplier; -import javax.inject.Named; -import javax.inject.Singleton; @Singleton public class NormalizationActivityImpl implements NormalizationActivity { diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/NormalizationSummaryCheckActivityImpl.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/NormalizationSummaryCheckActivityImpl.java index 513b74272c3de..99a2bf2964a39 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/NormalizationSummaryCheckActivityImpl.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/NormalizationSummaryCheckActivityImpl.java @@ -6,13 +6,13 @@ import io.airbyte.persistence.job.JobPersistence; import io.airbyte.persistence.job.models.AttemptNormalizationStatus; +import jakarta.inject.Singleton; import java.io.IOException; import java.util.Comparator; import java.util.List; import java.util.Optional; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; -import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/PersistStateActivityImpl.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/PersistStateActivityImpl.java index ba0b317d78757..767d9320d8833 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/PersistStateActivityImpl.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/PersistStateActivityImpl.java @@ -23,10 +23,10 @@ import io.airbyte.protocol.models.ConfiguredAirbyteCatalog; import io.airbyte.protocol.models.StreamDescriptor; import io.airbyte.workers.helper.StateConverter; +import jakarta.inject.Singleton; import java.util.List; import java.util.Optional; import java.util.UUID; -import javax.inject.Singleton; @Singleton public class PersistStateActivityImpl implements PersistStateActivity { diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/ReplicationActivityImpl.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/ReplicationActivityImpl.java index 88e58a26b0d48..76af4059a6083 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/ReplicationActivityImpl.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/ReplicationActivityImpl.java @@ -48,12 +48,12 @@ 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 java.util.Optional; import java.util.UUID; import java.util.function.Supplier; -import javax.inject.Named; -import javax.inject.Singleton; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/RouterService.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/RouterService.java index 84017b83e7785..65993fb811a8a 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/RouterService.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/RouterService.java @@ -8,11 +8,11 @@ import io.airbyte.workers.temporal.TemporalJobType; import io.micronaut.context.annotation.Value; import io.micronaut.core.util.StringUtils; +import jakarta.inject.Singleton; import java.util.Arrays; import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; -import javax.inject.Singleton; @Singleton public class RouterService { diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/SyncWorkflowImpl.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/SyncWorkflowImpl.java index a5dbbe3ecc79d..85016ffa21de3 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/SyncWorkflowImpl.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/sync/SyncWorkflowImpl.java @@ -19,11 +19,9 @@ import java.io.IOException; import java.util.Optional; import java.util.UUID; -import javax.inject.Singleton; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@Singleton @SuppressWarnings("PMD.AvoidDuplicateLiterals") public class SyncWorkflowImpl implements SyncWorkflow { diff --git a/deps.toml b/deps.toml index da8e4a490cd1c..482af20f36ec0 100644 --- a/deps.toml +++ b/deps.toml @@ -96,7 +96,7 @@ quartz-scheduler = {module="org.quartz-scheduler:quartz", version = "2.3.2"} # Micronaut-related dependencies h2-database = { module = "com.h2database:h2", version = "2.1.214" } hibernate-types = { module = "com.vladmihalcea:hibernate-types-52", version = "2.16.3" } -javax-inject = { module = "javax.inject:javax.inject", version = "1" } +jakarta-inject = { module = "jakarta.annotation:jakarta.annotation-api", version = "2.1.1'" } javax-transaction = { module = "javax.transaction:javax.transaction-api", version = "1.3" } micronaut-bom = { module = "io.micronaut:micronaut-bom", version.ref = "micronaut" } micronaut-data-processor = { module = "io.micronaut.data:micronaut-data-processor", version = "3.7.2" } @@ -122,8 +122,8 @@ apache = ["apache-commons", "apache-commons-lang"] log4j = ["log4j-api", "log4j-core", "log4j-impl", "log4j-web"] slf4j = ["jul-to-slf4j", "jcl-over-slf4j", "log4j-over-slf4j"] junit = ["junit-jupiter-api", "junit-jupiter-params", "mockito-junit-jupiter"] -micronaut = ["javax-inject", "javax-transaction", "micronaut-http-server-netty", "micronaut-http-client", "micronaut-inject", "micronaut-validation", "micronaut-runtime", "micronaut-management", "micronaut-security", "micronaut-jaxrs-server", "micronaut-flyway", "micronaut-jdbc-hikari", "micronaut-jooq"] -micronaut-annotation = ["javax-inject", "micronaut-inject-java"] +micronaut = ["jakarta-inject", "javax-transaction", "micronaut-http-server-netty", "micronaut-http-client", "micronaut-inject", "micronaut-validation", "micronaut-runtime", "micronaut-management", "micronaut-security", "micronaut-jaxrs-server", "micronaut-flyway", "micronaut-jdbc-hikari", "micronaut-jooq"] +micronaut-annotation = ["jakarta-inject", "micronaut-inject-java"] micronaut-annotation-processor = ["micronaut-inject-java", "micronaut-management", "micronaut-validation", "micronaut-data-processor", "micronaut-jaxrs-processor"] micronaut-test = ["micronaut-test-core", "micronaut-test-junit5", "h2-database"] micronaut-test-annotation-processor = ["micronaut-inject-java"]