diff --git a/common/gradle.lockfile b/common/gradle.lockfile index 041970aa3..3d317197c 100644 --- a/common/gradle.lockfile +++ b/common/gradle.lockfile @@ -38,7 +38,7 @@ info.picocli:picocli:4.6.2=checkstyle io.github.eisop:dataflow-errorprone:3.34.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor io.github.java-diff-utils:java-diff-utils:4.15=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath -jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath +jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor,testingAnnotationProcessor joda-time:joda-time:2.13.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath,testing,testingCompileClasspath diff --git a/common/src/main/java/google/registry/util/SystemClock.java b/common/src/main/java/google/registry/util/SystemClock.java index 7ae85df27..eb553678d 100644 --- a/common/src/main/java/google/registry/util/SystemClock.java +++ b/common/src/main/java/google/registry/util/SystemClock.java @@ -16,8 +16,8 @@ package google.registry.util; import static org.joda.time.DateTimeZone.UTC; +import jakarta.inject.Inject; import javax.annotation.concurrent.ThreadSafe; -import javax.inject.Inject; import org.joda.time.DateTime; /** Clock implementation that proxies to the real system clock. */ diff --git a/common/src/main/java/google/registry/util/SystemSleeper.java b/common/src/main/java/google/registry/util/SystemSleeper.java index 437d8e422..35fd07770 100644 --- a/common/src/main/java/google/registry/util/SystemSleeper.java +++ b/common/src/main/java/google/registry/util/SystemSleeper.java @@ -17,9 +17,9 @@ package google.registry.util; import static com.google.common.base.Preconditions.checkArgument; import com.google.common.util.concurrent.Uninterruptibles; +import jakarta.inject.Inject; import java.io.Serializable; import javax.annotation.concurrent.ThreadSafe; -import javax.inject.Inject; import org.joda.time.ReadableDuration; /** Implementation of {@link Sleeper} for production use. */ diff --git a/config/presubmits.py b/config/presubmits.py index ca733456f..153a4fd6c 100644 --- a/config/presubmits.py +++ b/config/presubmits.py @@ -208,6 +208,12 @@ PRESUBMITS = { {"/node_modules/"}, ): "Do not use javax.servlet.* Use jakarta.servlet.* instead.", + PresubmitCheck( + r".*javax\.inject\..*", + "java", + {"/node_modules/"}, + ): + "Do not use javax.inject.* Use jakarta.inject.* instead.", } # Note that this regex only works for one kind of Flyway file. If we want to diff --git a/core/gradle.lockfile b/core/gradle.lockfile index 19d65f7e2..77481a671 100644 --- a/core/gradle.lockfile +++ b/core/gradle.lockfile @@ -157,10 +157,10 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClas com.google.code.gson:gson:2.10.1=soy com.google.code.gson:gson:2.12.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.common.html.types:types:1.0.8=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,soy,testCompileClasspath,testRuntimeClasspath -com.google.dagger:dagger-compiler:2.51.1=annotationProcessor,testAnnotationProcessor -com.google.dagger:dagger-spi:2.51.1=annotationProcessor,testAnnotationProcessor -com.google.dagger:dagger:2.51.1=annotationProcessor,compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.google.devtools.ksp:symbol-processing-api:1.9.20-1.0.14=annotationProcessor,testAnnotationProcessor +com.google.dagger:dagger-compiler:2.55=annotationProcessor,testAnnotationProcessor +com.google.dagger:dagger-spi:2.55=annotationProcessor,testAnnotationProcessor +com.google.dagger:dagger:2.55=annotationProcessor,compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.devtools.ksp:symbol-processing-api:2.0.21-1.0.28=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotation:2.23.0=annotationProcessor,errorprone,nonprodAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.20.0=soy com.google.errorprone:error_prone_annotations:2.23.0=annotationProcessor,errorprone,nonprodAnnotationProcessor,testAnnotationProcessor @@ -372,8 +372,7 @@ io.perfmark:perfmark-api:0.27.0=deploy_jar,nonprodRuntimeClasspath,runtimeClassp io.smallrye:jandex:3.1.2=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath jakarta-regexp:jakarta-regexp:1.4=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.3=compileClasspath,deploy_jar,jaxb,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -jakarta.inject:jakarta.inject-api:2.0.1=soy +jakarta.inject:jakarta.inject-api:2.0.1=annotationProcessor,compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,soy,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath jakarta.mail:jakarta.mail-api:2.1.3=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.persistence:jakarta.persistence-api:3.2.0=annotationProcessor,compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath jakarta.servlet:jakarta.servlet-api:6.0.0=testCompileClasspath,testRuntimeClasspath @@ -502,11 +501,12 @@ org.jetbrains.kotlin:kotlin-bom:1.4.0=deploy_jar,nonprodRuntimeClasspath,runtime org.jetbrains.kotlin:kotlin-reflect:1.6.10=annotationProcessor,testAnnotationProcessor org.jetbrains.kotlin:kotlin-reflect:1.9.20=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0=annotationProcessor,testAnnotationProcessor +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0=annotationProcessor,testAnnotationProcessor org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0=annotationProcessor,testAnnotationProcessor +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0=annotationProcessor,testAnnotationProcessor org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:1.9.20=annotationProcessor,compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:1.9.20=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:2.0.21=annotationProcessor,testAnnotationProcessor org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.2=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2=deploy_jar,nonprodRuntimeClasspath,runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.4.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -520,7 +520,7 @@ org.joda:joda-money:2.0.1=compileClasspath,deploy_jar,nonprodCompileClasspath,no org.json:json:20230618=soy org.json:json:20250107=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jsoup:jsoup:1.19.1=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jspecify:jspecify:1.0.0=compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,deploy_jar,nonprodCompileClasspath,nonprodRuntimeClasspath,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath org.junit-pioneer:junit-pioneer:2.3.0=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.12.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.12.1=testCompileClasspath,testRuntimeClasspath diff --git a/core/src/main/java/google/registry/batch/AsyncTaskEnqueuer.java b/core/src/main/java/google/registry/batch/AsyncTaskEnqueuer.java index aa4366d53..e1db52808 100644 --- a/core/src/main/java/google/registry/batch/AsyncTaskEnqueuer.java +++ b/core/src/main/java/google/registry/batch/AsyncTaskEnqueuer.java @@ -25,7 +25,7 @@ import com.google.common.flogger.FluentLogger; import google.registry.model.EppResource; import google.registry.persistence.VKey; import google.registry.request.Action; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/core/src/main/java/google/registry/batch/CannedScriptExecutionAction.java b/core/src/main/java/google/registry/batch/CannedScriptExecutionAction.java index da874f0b8..31a8905f3 100644 --- a/core/src/main/java/google/registry/batch/CannedScriptExecutionAction.java +++ b/core/src/main/java/google/registry/batch/CannedScriptExecutionAction.java @@ -26,8 +26,8 @@ import google.registry.request.Response; import google.registry.request.UrlConnectionService; import google.registry.request.UrlConnectionUtils; import google.registry.request.auth.Auth; +import jakarta.inject.Inject; import java.net.URL; -import javax.inject.Inject; import javax.net.ssl.HttpsURLConnection; /** diff --git a/core/src/main/java/google/registry/batch/CheckBulkComplianceAction.java b/core/src/main/java/google/registry/batch/CheckBulkComplianceAction.java index 67faa10bd..5f33f7ba3 100644 --- a/core/src/main/java/google/registry/batch/CheckBulkComplianceAction.java +++ b/core/src/main/java/google/registry/batch/CheckBulkComplianceAction.java @@ -31,8 +31,8 @@ import google.registry.request.Action.GaeService; import google.registry.request.auth.Auth; import google.registry.ui.server.SendEmailUtils; import google.registry.util.Clock; +import jakarta.inject.Inject; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.Days; /** diff --git a/core/src/main/java/google/registry/batch/CloudTasksUtils.java b/core/src/main/java/google/registry/batch/CloudTasksUtils.java index 3110b2da2..64eed46b2 100644 --- a/core/src/main/java/google/registry/batch/CloudTasksUtils.java +++ b/core/src/main/java/google/registry/batch/CloudTasksUtils.java @@ -49,6 +49,7 @@ import google.registry.util.CollectionUtils; import google.registry.util.GoogleCredentialsBundle; import google.registry.util.RegistryEnvironment; import google.registry.util.Retrier; +import jakarta.inject.Inject; import java.io.Serial; import java.io.Serializable; import java.nio.charset.StandardCharsets; @@ -58,7 +59,6 @@ import java.util.Random; import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.function.Supplier; -import javax.inject.Inject; import org.joda.time.Duration; /** Utilities for dealing with Cloud Tasks. */ diff --git a/core/src/main/java/google/registry/batch/DeleteExpiredDomainsAction.java b/core/src/main/java/google/registry/batch/DeleteExpiredDomainsAction.java index 28185be9e..356eb0485 100644 --- a/core/src/main/java/google/registry/batch/DeleteExpiredDomainsAction.java +++ b/core/src/main/java/google/registry/batch/DeleteExpiredDomainsAction.java @@ -42,10 +42,10 @@ import google.registry.request.Response; import google.registry.request.auth.Auth; import google.registry.request.lock.LockHandler; import google.registry.util.Clock; +import jakarta.inject.Inject; import java.util.Optional; import java.util.concurrent.Callable; import java.util.logging.Level; -import javax.inject.Inject; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/core/src/main/java/google/registry/batch/DeleteLoadTestDataAction.java b/core/src/main/java/google/registry/batch/DeleteLoadTestDataAction.java index da2debe01..5cf8141d9 100644 --- a/core/src/main/java/google/registry/batch/DeleteLoadTestDataAction.java +++ b/core/src/main/java/google/registry/batch/DeleteLoadTestDataAction.java @@ -42,7 +42,7 @@ import google.registry.request.Parameter; import google.registry.request.auth.Auth; import google.registry.util.Clock; import google.registry.util.RegistryEnvironment; -import javax.inject.Inject; +import jakarta.inject.Inject; /** * Hard deletes load-test Contacts, Hosts, their subordinate history entries, and the associated diff --git a/core/src/main/java/google/registry/batch/DeleteProberDataAction.java b/core/src/main/java/google/registry/batch/DeleteProberDataAction.java index 4e0bdacb8..f22913e81 100644 --- a/core/src/main/java/google/registry/batch/DeleteProberDataAction.java +++ b/core/src/main/java/google/registry/batch/DeleteProberDataAction.java @@ -46,11 +46,11 @@ import google.registry.request.Action.GaeService; import google.registry.request.Parameter; import google.registry.request.auth.Auth; import google.registry.util.RegistryEnvironment; +import jakarta.inject.Inject; import jakarta.persistence.TypedQuery; import java.util.Optional; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import javax.inject.Inject; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/core/src/main/java/google/registry/batch/ExpandBillingRecurrencesAction.java b/core/src/main/java/google/registry/batch/ExpandBillingRecurrencesAction.java index 204608824..f03b4c995 100644 --- a/core/src/main/java/google/registry/batch/ExpandBillingRecurrencesAction.java +++ b/core/src/main/java/google/registry/batch/ExpandBillingRecurrencesAction.java @@ -41,9 +41,9 @@ import google.registry.request.Response; import google.registry.request.auth.Auth; import google.registry.util.Clock; import google.registry.util.RegistryEnvironment; +import jakarta.inject.Inject; import java.io.IOException; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/batch/RelockDomainAction.java b/core/src/main/java/google/registry/batch/RelockDomainAction.java index c8c2cb197..efed4fc1b 100644 --- a/core/src/main/java/google/registry/batch/RelockDomainAction.java +++ b/core/src/main/java/google/registry/batch/RelockDomainAction.java @@ -42,10 +42,10 @@ import google.registry.request.auth.Auth; import google.registry.tools.DomainLockUtils; import google.registry.util.DateTimeUtils; import google.registry.util.EmailMessage; +import jakarta.inject.Inject; import jakarta.mail.internet.AddressException; import jakarta.mail.internet.InternetAddress; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.Duration; /** Task that re-locks a previously-Registry-Locked domain after a predetermined period of time. */ @@ -68,14 +68,14 @@ public class RelockDomainAction implements Runnable { private static final String RELOCK_SUCCESS_EMAIL_TEMPLATE = """ - The domain %s was successfully re-locked. + The domain %s was successfully re-locked. - Please contact support at %s if you have any questions."""; + Please contact support at %s if you have any questions."""; private static final String RELOCK_NON_RETRYABLE_FAILURE_EMAIL_TEMPLATE = """ - There was an error when automatically re-locking %s. Error message: %s + There was an error when automatically re-locking %s. Error message: %s - Please contact support at %s if you have any questions."""; + Please contact support at %s if you have any questions."""; private static final String RELOCK_TRANSIENT_FAILURE_EMAIL_TEMPLATE = "There was an unexpected error when automatically re-locking %s. We will continue retrying " + "the lock for five hours. Please contact support at %s if you have any questions"; diff --git a/core/src/main/java/google/registry/batch/ResaveAllEppResourcesPipelineAction.java b/core/src/main/java/google/registry/batch/ResaveAllEppResourcesPipelineAction.java index 17c10e9d2..c2acbc274 100644 --- a/core/src/main/java/google/registry/batch/ResaveAllEppResourcesPipelineAction.java +++ b/core/src/main/java/google/registry/batch/ResaveAllEppResourcesPipelineAction.java @@ -34,7 +34,7 @@ import google.registry.request.Response; import google.registry.request.auth.Auth; import google.registry.util.Clock; import google.registry.util.RegistryEnvironment; -import javax.inject.Inject; +import jakarta.inject.Inject; /** * Starts a Dataflow pipeline that resaves all EPP resources projected to the current time. diff --git a/core/src/main/java/google/registry/batch/ResaveEntityAction.java b/core/src/main/java/google/registry/batch/ResaveEntityAction.java index f5b98d3c1..60ef77810 100644 --- a/core/src/main/java/google/registry/batch/ResaveEntityAction.java +++ b/core/src/main/java/google/registry/batch/ResaveEntityAction.java @@ -30,8 +30,8 @@ import google.registry.request.Action.Method; import google.registry.request.Parameter; import google.registry.request.Response; import google.registry.request.auth.Auth; +import jakarta.inject.Inject; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/batch/SendExpiringCertificateNotificationEmailAction.java b/core/src/main/java/google/registry/batch/SendExpiringCertificateNotificationEmailAction.java index e0277c178..709dfc8bb 100644 --- a/core/src/main/java/google/registry/batch/SendExpiringCertificateNotificationEmailAction.java +++ b/core/src/main/java/google/registry/batch/SendExpiringCertificateNotificationEmailAction.java @@ -39,10 +39,10 @@ import google.registry.request.Action.GaeService; import google.registry.request.Response; import google.registry.request.auth.Auth; import google.registry.util.EmailMessage; +import jakarta.inject.Inject; import jakarta.mail.internet.AddressException; import jakarta.mail.internet.InternetAddress; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.DateTime; import org.joda.time.Duration; import org.joda.time.format.DateTimeFormat; diff --git a/core/src/main/java/google/registry/batch/WipeOutContactHistoryPiiAction.java b/core/src/main/java/google/registry/batch/WipeOutContactHistoryPiiAction.java index dd6d63029..9e36ac15b 100644 --- a/core/src/main/java/google/registry/batch/WipeOutContactHistoryPiiAction.java +++ b/core/src/main/java/google/registry/batch/WipeOutContactHistoryPiiAction.java @@ -36,9 +36,9 @@ import google.registry.request.Response; import google.registry.request.auth.Auth; import google.registry.util.Clock; import google.registry.util.RegistryEnvironment; +import jakarta.inject.Inject; import java.io.IOException; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/beam/billing/ExpandBillingRecurrencesPipeline.java b/core/src/main/java/google/registry/beam/billing/ExpandBillingRecurrencesPipeline.java index cb867dd6b..a62c6059f 100644 --- a/core/src/main/java/google/registry/beam/billing/ExpandBillingRecurrencesPipeline.java +++ b/core/src/main/java/google/registry/beam/billing/ExpandBillingRecurrencesPipeline.java @@ -53,10 +53,10 @@ import google.registry.model.tld.Tld; import google.registry.persistence.PersistenceModule.TransactionIsolationLevel; import google.registry.util.Clock; import google.registry.util.SystemClock; +import jakarta.inject.Singleton; import java.io.Serializable; import java.util.Optional; import java.util.Set; -import javax.inject.Singleton; import org.apache.beam.sdk.Pipeline; import org.apache.beam.sdk.PipelineResult; import org.apache.beam.sdk.coders.KvCoder; diff --git a/core/src/main/java/google/registry/beam/common/RegistryPipelineComponent.java b/core/src/main/java/google/registry/beam/common/RegistryPipelineComponent.java index 3bf10ab95..e016bd175 100644 --- a/core/src/main/java/google/registry/beam/common/RegistryPipelineComponent.java +++ b/core/src/main/java/google/registry/beam/common/RegistryPipelineComponent.java @@ -28,8 +28,8 @@ import google.registry.persistence.PersistenceModule.TransactionIsolationLevel; import google.registry.persistence.transaction.JpaTransactionManager; import google.registry.privileges.secretmanager.SecretManagerModule; import google.registry.util.UtilsModule; +import jakarta.inject.Singleton; import javax.annotation.Nullable; -import javax.inject.Singleton; /** Component that provides everything needed on a Pipeline worker. */ @Singleton diff --git a/core/src/main/java/google/registry/beam/rde/RdePipeline.java b/core/src/main/java/google/registry/beam/rde/RdePipeline.java index 8c32b8623..7dbd8a708 100644 --- a/core/src/main/java/google/registry/beam/rde/RdePipeline.java +++ b/core/src/main/java/google/registry/beam/rde/RdePipeline.java @@ -69,11 +69,11 @@ import google.registry.rde.PendingDeposit.PendingDepositCoder; import google.registry.rde.RdeMarshaller; import google.registry.util.UtilsModule; import google.registry.xml.ValidationMode; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import java.io.IOException; import java.io.Serializable; import java.util.HashSet; -import javax.inject.Inject; -import javax.inject.Singleton; import org.apache.beam.sdk.Pipeline; import org.apache.beam.sdk.PipelineResult; import org.apache.beam.sdk.coders.KvCoder; diff --git a/core/src/main/java/google/registry/beam/spec11/Spec11Pipeline.java b/core/src/main/java/google/registry/beam/spec11/Spec11Pipeline.java index eb255869b..8f0bc467d 100644 --- a/core/src/main/java/google/registry/beam/spec11/Spec11Pipeline.java +++ b/core/src/main/java/google/registry/beam/spec11/Spec11Pipeline.java @@ -32,8 +32,8 @@ import google.registry.persistence.PersistenceModule.TransactionIsolationLevel; import google.registry.persistence.VKey; import google.registry.util.Retrier; import google.registry.util.UtilsModule; +import jakarta.inject.Singleton; import java.io.Serializable; -import javax.inject.Singleton; import org.apache.beam.sdk.Pipeline; import org.apache.beam.sdk.PipelineResult; import org.apache.beam.sdk.coders.KvCoder; diff --git a/core/src/main/java/google/registry/bigquery/BigqueryConnection.java b/core/src/main/java/google/registry/bigquery/BigqueryConnection.java index 8e6873128..4f542896c 100644 --- a/core/src/main/java/google/registry/bigquery/BigqueryConnection.java +++ b/core/src/main/java/google/registry/bigquery/BigqueryConnection.java @@ -62,13 +62,13 @@ import google.registry.util.NonFinalForTesting; import google.registry.util.Sleeper; import google.registry.util.SqlTemplate; import google.registry.util.SystemSleeper; +import jakarta.inject.Inject; import java.io.IOException; import java.util.Iterator; import java.util.List; import java.util.Random; import java.util.concurrent.ExecutorService; import javax.annotation.Nullable; -import javax.inject.Inject; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/core/src/main/java/google/registry/bigquery/CheckedBigquery.java b/core/src/main/java/google/registry/bigquery/CheckedBigquery.java index f8dc88fe0..72ed8c7e8 100644 --- a/core/src/main/java/google/registry/bigquery/CheckedBigquery.java +++ b/core/src/main/java/google/registry/bigquery/CheckedBigquery.java @@ -26,11 +26,11 @@ import com.google.api.services.bigquery.model.TableReference; import com.google.api.services.bigquery.model.TableSchema; import com.google.common.collect.ImmutableList; import com.google.common.flogger.FluentLogger; +import jakarta.inject.Inject; import java.io.IOException; import java.util.List; import java.util.Map; import java.util.Set; -import javax.inject.Inject; /** Wrapper of {@link Bigquery} with validation helpers. */ public class CheckedBigquery { diff --git a/core/src/main/java/google/registry/bsa/BlockListFetcher.java b/core/src/main/java/google/registry/bsa/BlockListFetcher.java index 16d5a7a09..06a6bbb55 100644 --- a/core/src/main/java/google/registry/bsa/BlockListFetcher.java +++ b/core/src/main/java/google/registry/bsa/BlockListFetcher.java @@ -26,6 +26,7 @@ import google.registry.bsa.api.BsaException; import google.registry.config.RegistryConfig.Config; import google.registry.request.UrlConnectionService; import google.registry.util.Retrier; +import jakarta.inject.Inject; import java.io.BufferedInputStream; import java.io.Closeable; import java.io.IOException; @@ -33,7 +34,6 @@ import java.io.InputStream; import java.net.URL; import java.security.GeneralSecurityException; import java.util.function.BiConsumer; -import javax.inject.Inject; import javax.net.ssl.HttpsURLConnection; /** Fetches data from the BSA API. */ diff --git a/core/src/main/java/google/registry/bsa/BsaDiffCreator.java b/core/src/main/java/google/registry/bsa/BsaDiffCreator.java index d3280c9e9..e7fe88eee 100644 --- a/core/src/main/java/google/registry/bsa/BsaDiffCreator.java +++ b/core/src/main/java/google/registry/bsa/BsaDiffCreator.java @@ -37,12 +37,12 @@ import google.registry.bsa.api.BlockOrder.OrderType; import google.registry.bsa.persistence.DownloadSchedule; import google.registry.bsa.persistence.DownloadSchedule.CompletedJob; import google.registry.tldconfig.idn.IdnTableEnum; +import jakarta.inject.Inject; import java.util.HashMap; import java.util.List; import java.util.Objects; import java.util.Optional; import java.util.stream.Stream; -import javax.inject.Inject; /** Creates diffs between the most recent download and the previous one. */ class BsaDiffCreator { diff --git a/core/src/main/java/google/registry/bsa/BsaDownloadAction.java b/core/src/main/java/google/registry/bsa/BsaDownloadAction.java index 9090a93b6..f99df1575 100644 --- a/core/src/main/java/google/registry/bsa/BsaDownloadAction.java +++ b/core/src/main/java/google/registry/bsa/BsaDownloadAction.java @@ -45,10 +45,10 @@ import google.registry.request.Action.GaeService; import google.registry.request.Response; import google.registry.request.auth.Auth; import google.registry.util.Clock; +import jakarta.inject.Inject; import java.util.Objects; import java.util.Optional; import java.util.stream.Stream; -import javax.inject.Inject; @Action( service = GaeService.BSA, diff --git a/core/src/main/java/google/registry/bsa/BsaEmailSender.java b/core/src/main/java/google/registry/bsa/BsaEmailSender.java index 7c02237d1..798fd6336 100644 --- a/core/src/main/java/google/registry/bsa/BsaEmailSender.java +++ b/core/src/main/java/google/registry/bsa/BsaEmailSender.java @@ -17,8 +17,8 @@ package google.registry.bsa; import google.registry.config.RegistryConfig.Config; import google.registry.groups.GmailClient; import google.registry.util.EmailMessage; +import jakarta.inject.Inject; import jakarta.mail.internet.InternetAddress; -import javax.inject.Inject; /** Sends BSA-related email notifications. */ class BsaEmailSender { diff --git a/core/src/main/java/google/registry/bsa/BsaLock.java b/core/src/main/java/google/registry/bsa/BsaLock.java index 88a71f8e3..aa5d498c0 100644 --- a/core/src/main/java/google/registry/bsa/BsaLock.java +++ b/core/src/main/java/google/registry/bsa/BsaLock.java @@ -16,8 +16,8 @@ package google.registry.bsa; import google.registry.config.RegistryConfig.Config; import google.registry.request.lock.LockHandler; +import jakarta.inject.Inject; import java.util.concurrent.Callable; -import javax.inject.Inject; import org.joda.time.Duration; /** Helper for guarding all BSA related work with a common lock. */ diff --git a/core/src/main/java/google/registry/bsa/BsaRefreshAction.java b/core/src/main/java/google/registry/bsa/BsaRefreshAction.java index de23e0a29..acee8f7fc 100644 --- a/core/src/main/java/google/registry/bsa/BsaRefreshAction.java +++ b/core/src/main/java/google/registry/bsa/BsaRefreshAction.java @@ -36,9 +36,9 @@ import google.registry.request.Response; import google.registry.request.auth.Auth; import google.registry.util.BatchedStreams; import google.registry.util.Clock; +import jakarta.inject.Inject; import java.util.Optional; import java.util.stream.Stream; -import javax.inject.Inject; import org.joda.time.Duration; @Action( diff --git a/core/src/main/java/google/registry/bsa/BsaValidateAction.java b/core/src/main/java/google/registry/bsa/BsaValidateAction.java index beb7d6074..98a042c16 100644 --- a/core/src/main/java/google/registry/bsa/BsaValidateAction.java +++ b/core/src/main/java/google/registry/bsa/BsaValidateAction.java @@ -59,10 +59,10 @@ import google.registry.request.Action.GaeService; import google.registry.request.Response; import google.registry.request.auth.Auth; import google.registry.util.Clock; +import jakarta.inject.Inject; import java.util.Objects; import java.util.Optional; import java.util.stream.Stream; -import javax.inject.Inject; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/core/src/main/java/google/registry/bsa/GcsClient.java b/core/src/main/java/google/registry/bsa/GcsClient.java index c257cae07..67e1fea5f 100644 --- a/core/src/main/java/google/registry/bsa/GcsClient.java +++ b/core/src/main/java/google/registry/bsa/GcsClient.java @@ -26,6 +26,7 @@ import google.registry.bsa.api.UnblockableDomain; import google.registry.bsa.api.UnblockableDomainChange; import google.registry.config.RegistryConfig.Config; import google.registry.gcs.GcsUtils; +import jakarta.inject.Inject; import java.io.BufferedOutputStream; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -36,7 +37,6 @@ import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.stream.Stream; -import javax.inject.Inject; /** Stores and accesses BSA-related data, including original downloads and processed data. */ public class GcsClient { diff --git a/core/src/main/java/google/registry/bsa/IdnChecker.java b/core/src/main/java/google/registry/bsa/IdnChecker.java index f90c489c7..4a478119d 100644 --- a/core/src/main/java/google/registry/bsa/IdnChecker.java +++ b/core/src/main/java/google/registry/bsa/IdnChecker.java @@ -28,7 +28,7 @@ import google.registry.model.tld.Tlds; import google.registry.tldconfig.idn.IdnLabelValidator; import google.registry.tldconfig.idn.IdnTableEnum; import google.registry.util.Clock; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/bsa/UploadBsaUnavailableDomainsAction.java b/core/src/main/java/google/registry/bsa/UploadBsaUnavailableDomainsAction.java index 71d724826..c30ea788a 100644 --- a/core/src/main/java/google/registry/bsa/UploadBsaUnavailableDomainsAction.java +++ b/core/src/main/java/google/registry/bsa/UploadBsaUnavailableDomainsAction.java @@ -45,6 +45,7 @@ import google.registry.request.Action; import google.registry.request.Action.GaeService; import google.registry.request.auth.Auth; import google.registry.util.Clock; +import jakarta.inject.Inject; import jakarta.persistence.TypedQuery; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -53,7 +54,6 @@ import java.io.OutputStreamWriter; import java.io.Writer; import java.util.Optional; import java.util.zip.GZIPOutputStream; -import javax.inject.Inject; import okhttp3.MediaType; import okhttp3.MultipartBody; import okhttp3.OkHttpClient; diff --git a/core/src/main/java/google/registry/bsa/api/BsaCredential.java b/core/src/main/java/google/registry/bsa/api/BsaCredential.java index 76e41f32f..de20e81a6 100644 --- a/core/src/main/java/google/registry/bsa/api/BsaCredential.java +++ b/core/src/main/java/google/registry/bsa/api/BsaCredential.java @@ -27,13 +27,13 @@ import google.registry.keyring.api.Keyring; import google.registry.request.UrlConnectionService; import google.registry.request.UrlConnectionUtils; import google.registry.util.Clock; +import jakarta.inject.Inject; import java.io.IOException; import java.net.URL; import java.security.GeneralSecurityException; import java.util.Map; import javax.annotation.Nullable; import javax.annotation.concurrent.ThreadSafe; -import javax.inject.Inject; import javax.net.ssl.HttpsURLConnection; import org.joda.time.Duration; import org.joda.time.Instant; diff --git a/core/src/main/java/google/registry/bsa/api/BsaReportSender.java b/core/src/main/java/google/registry/bsa/api/BsaReportSender.java index f27589a9f..cd482138a 100644 --- a/core/src/main/java/google/registry/bsa/api/BsaReportSender.java +++ b/core/src/main/java/google/registry/bsa/api/BsaReportSender.java @@ -26,11 +26,11 @@ import google.registry.config.RegistryConfig.Config; import google.registry.request.UrlConnectionService; import google.registry.request.UrlConnectionUtils; import google.registry.util.Retrier; +import jakarta.inject.Inject; import java.io.IOException; import java.io.InputStream; import java.net.URL; import java.security.GeneralSecurityException; -import javax.inject.Inject; import javax.net.ssl.HttpsURLConnection; /** diff --git a/core/src/main/java/google/registry/bsa/persistence/DownloadScheduler.java b/core/src/main/java/google/registry/bsa/persistence/DownloadScheduler.java index a944597f2..028242a92 100644 --- a/core/src/main/java/google/registry/bsa/persistence/DownloadScheduler.java +++ b/core/src/main/java/google/registry/bsa/persistence/DownloadScheduler.java @@ -27,9 +27,9 @@ import com.google.common.collect.ImmutableList; import google.registry.bsa.persistence.DownloadSchedule.CompletedJob; import google.registry.config.RegistryConfig.Config; import google.registry.util.Clock; +import jakarta.inject.Inject; import java.util.Objects; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.Duration; /** diff --git a/core/src/main/java/google/registry/bsa/persistence/RefreshScheduler.java b/core/src/main/java/google/registry/bsa/persistence/RefreshScheduler.java index cfd877d2c..40676effc 100644 --- a/core/src/main/java/google/registry/bsa/persistence/RefreshScheduler.java +++ b/core/src/main/java/google/registry/bsa/persistence/RefreshScheduler.java @@ -19,8 +19,8 @@ import static google.registry.persistence.transaction.TransactionManagerFactory. import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; +import jakarta.inject.Inject; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.DateTime; /** Assigns work for each cron invocation of domain refresh job. */ diff --git a/core/src/main/java/google/registry/config/CredentialModule.java b/core/src/main/java/google/registry/config/CredentialModule.java index 25e1170af..bee6f0fdf 100644 --- a/core/src/main/java/google/registry/config/CredentialModule.java +++ b/core/src/main/java/google/registry/config/CredentialModule.java @@ -24,13 +24,13 @@ import dagger.Provides; import google.registry.config.RegistryConfig.Config; import google.registry.util.Clock; import google.registry.util.GoogleCredentialsBundle; +import jakarta.inject.Qualifier; +import jakarta.inject.Singleton; import java.io.IOException; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.time.Duration; -import javax.inject.Qualifier; -import javax.inject.Singleton; /** Dagger module that provides all {@link GoogleCredentials} used in the application. */ @Module diff --git a/core/src/main/java/google/registry/config/RegistryConfig.java b/core/src/main/java/google/registry/config/RegistryConfig.java index 189133dd0..fd8b4afbc 100644 --- a/core/src/main/java/google/registry/config/RegistryConfig.java +++ b/core/src/main/java/google/registry/config/RegistryConfig.java @@ -40,6 +40,9 @@ import google.registry.persistence.transaction.JpaTransactionManager; import google.registry.request.Action.GkeService; import google.registry.util.RegistryEnvironment; import google.registry.util.YamlUtils; +import jakarta.inject.Named; +import jakarta.inject.Qualifier; +import jakarta.inject.Singleton; import jakarta.mail.internet.AddressException; import jakarta.mail.internet.InternetAddress; import java.lang.annotation.Documented; @@ -51,9 +54,6 @@ import java.util.Optional; import java.util.function.Supplier; import java.util.stream.Collectors; import javax.annotation.Nullable; -import javax.inject.Named; -import javax.inject.Qualifier; -import javax.inject.Singleton; import org.joda.time.DateTime; import org.joda.time.DateTimeConstants; import org.joda.time.Duration; diff --git a/core/src/main/java/google/registry/cron/TldFanoutAction.java b/core/src/main/java/google/registry/cron/TldFanoutAction.java index 6e77fab9c..1324550c5 100644 --- a/core/src/main/java/google/registry/cron/TldFanoutAction.java +++ b/core/src/main/java/google/registry/cron/TldFanoutAction.java @@ -48,9 +48,9 @@ import google.registry.request.RequestParameters; import google.registry.request.Response; import google.registry.request.auth.Auth; import google.registry.util.RegistryEnvironment; +import jakarta.inject.Inject; import java.util.Optional; import java.util.stream.Stream; -import javax.inject.Inject; /** * Action for fanning out cron tasks shared by TLD. diff --git a/core/src/main/java/google/registry/dns/DnsMetrics.java b/core/src/main/java/google/registry/dns/DnsMetrics.java index 840334580..093ee88d9 100644 --- a/core/src/main/java/google/registry/dns/DnsMetrics.java +++ b/core/src/main/java/google/registry/dns/DnsMetrics.java @@ -25,7 +25,7 @@ import com.google.monitoring.metrics.IncrementableMetric; import com.google.monitoring.metrics.LabelDescriptor; import com.google.monitoring.metrics.MetricRegistryImpl; import google.registry.util.RegistryEnvironment; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.joda.time.Duration; /** DNS instrumentation. */ diff --git a/core/src/main/java/google/registry/dns/DnsWriterProxy.java b/core/src/main/java/google/registry/dns/DnsWriterProxy.java index 0dd70997d..07333b4d4 100644 --- a/core/src/main/java/google/registry/dns/DnsWriterProxy.java +++ b/core/src/main/java/google/registry/dns/DnsWriterProxy.java @@ -20,8 +20,8 @@ import com.google.common.collect.ImmutableMap; import com.google.common.flogger.FluentLogger; import google.registry.dns.writer.DnsWriter; import google.registry.model.tld.Tld; +import jakarta.inject.Inject; import java.util.Map; -import javax.inject.Inject; /** Proxy for retrieving {@link DnsWriter} implementations. */ public final class DnsWriterProxy { diff --git a/core/src/main/java/google/registry/dns/PublishDnsUpdatesAction.java b/core/src/main/java/google/registry/dns/PublishDnsUpdatesAction.java index ea626028c..66728e30f 100644 --- a/core/src/main/java/google/registry/dns/PublishDnsUpdatesAction.java +++ b/core/src/main/java/google/registry/dns/PublishDnsUpdatesAction.java @@ -63,11 +63,11 @@ import google.registry.request.lock.LockHandler; import google.registry.util.Clock; import google.registry.util.DomainNameUtils; import google.registry.util.EmailMessage; +import jakarta.inject.Inject; import jakarta.mail.internet.InternetAddress; import java.util.Optional; import java.util.Set; import java.util.concurrent.Callable; -import javax.inject.Inject; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/core/src/main/java/google/registry/dns/ReadDnsRefreshRequestsAction.java b/core/src/main/java/google/registry/dns/ReadDnsRefreshRequestsAction.java index c78a20ef6..184ca8d3c 100644 --- a/core/src/main/java/google/registry/dns/ReadDnsRefreshRequestsAction.java +++ b/core/src/main/java/google/registry/dns/ReadDnsRefreshRequestsAction.java @@ -49,9 +49,9 @@ import google.registry.request.Action.GaeService; import google.registry.request.Parameter; import google.registry.request.auth.Auth; import google.registry.util.Clock; +import jakarta.inject.Inject; import java.util.Collection; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/core/src/main/java/google/registry/dns/RefreshDnsAction.java b/core/src/main/java/google/registry/dns/RefreshDnsAction.java index 0a92a277c..c32942374 100644 --- a/core/src/main/java/google/registry/dns/RefreshDnsAction.java +++ b/core/src/main/java/google/registry/dns/RefreshDnsAction.java @@ -32,7 +32,7 @@ import google.registry.request.HttpException.NotFoundException; import google.registry.request.Parameter; import google.registry.request.auth.Auth; import google.registry.util.Clock; -import javax.inject.Inject; +import jakarta.inject.Inject; /** Action that manually triggers refresh of DNS information. */ @Action( diff --git a/core/src/main/java/google/registry/dns/RefreshDnsOnHostRenameAction.java b/core/src/main/java/google/registry/dns/RefreshDnsOnHostRenameAction.java index 2384f3dce..d0d629278 100644 --- a/core/src/main/java/google/registry/dns/RefreshDnsOnHostRenameAction.java +++ b/core/src/main/java/google/registry/dns/RefreshDnsOnHostRenameAction.java @@ -30,7 +30,7 @@ import google.registry.request.Action.GaeService; import google.registry.request.Parameter; import google.registry.request.Response; import google.registry.request.auth.Auth; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.joda.time.DateTime; @Action( diff --git a/core/src/main/java/google/registry/dns/writer/DnsWriterZone.java b/core/src/main/java/google/registry/dns/writer/DnsWriterZone.java index 8ef576740..a18b871f2 100644 --- a/core/src/main/java/google/registry/dns/writer/DnsWriterZone.java +++ b/core/src/main/java/google/registry/dns/writer/DnsWriterZone.java @@ -14,8 +14,8 @@ package google.registry.dns.writer; +import jakarta.inject.Qualifier; import java.lang.annotation.Documented; -import javax.inject.Qualifier; /** Dagger qualifier for the fully-qualified zone name that's being updated. */ @Qualifier diff --git a/core/src/main/java/google/registry/dns/writer/VoidDnsWriter.java b/core/src/main/java/google/registry/dns/writer/VoidDnsWriter.java index e8115f41c..343bc8414 100644 --- a/core/src/main/java/google/registry/dns/writer/VoidDnsWriter.java +++ b/core/src/main/java/google/registry/dns/writer/VoidDnsWriter.java @@ -15,9 +15,9 @@ package google.registry.dns.writer; import com.google.common.flogger.FluentLogger; +import jakarta.inject.Inject; import java.util.HashSet; import java.util.Set; -import javax.inject.Inject; /** * {@link DnsWriter} that doesn't actually update records in a DNS server. diff --git a/core/src/main/java/google/registry/dns/writer/VoidDnsWriterModule.java b/core/src/main/java/google/registry/dns/writer/VoidDnsWriterModule.java index 9ace1ce36..23f7bdf93 100644 --- a/core/src/main/java/google/registry/dns/writer/VoidDnsWriterModule.java +++ b/core/src/main/java/google/registry/dns/writer/VoidDnsWriterModule.java @@ -20,7 +20,7 @@ import dagger.Provides; import dagger.multibindings.IntoMap; import dagger.multibindings.IntoSet; import dagger.multibindings.StringKey; -import javax.inject.Named; +import jakarta.inject.Named; /** Dagger module that disables DNS updates. */ @Module diff --git a/core/src/main/java/google/registry/dns/writer/clouddns/CloudDnsWriter.java b/core/src/main/java/google/registry/dns/writer/clouddns/CloudDnsWriter.java index cca04250a..e3707ab85 100644 --- a/core/src/main/java/google/registry/dns/writer/clouddns/CloudDnsWriter.java +++ b/core/src/main/java/google/registry/dns/writer/clouddns/CloudDnsWriter.java @@ -45,6 +45,8 @@ import google.registry.model.tld.Tlds; import google.registry.util.Clock; import google.registry.util.Concurrent; import google.registry.util.Retrier; +import jakarta.inject.Inject; +import jakarta.inject.Named; import java.io.IOException; import java.net.Inet4Address; import java.net.Inet6Address; @@ -57,8 +59,6 @@ import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Named; import org.joda.time.Duration; /** diff --git a/core/src/main/java/google/registry/dns/writer/clouddns/CloudDnsWriterModule.java b/core/src/main/java/google/registry/dns/writer/clouddns/CloudDnsWriterModule.java index b88eaf527..18bbc1304 100644 --- a/core/src/main/java/google/registry/dns/writer/clouddns/CloudDnsWriterModule.java +++ b/core/src/main/java/google/registry/dns/writer/clouddns/CloudDnsWriterModule.java @@ -26,8 +26,8 @@ import google.registry.config.CredentialModule.ApplicationDefaultCredential; import google.registry.config.RegistryConfig.Config; import google.registry.dns.writer.DnsWriter; import google.registry.util.GoogleCredentialsBundle; +import jakarta.inject.Named; import java.util.Optional; -import javax.inject.Named; /** Dagger module for Google Cloud DNS service connection objects. */ @Module diff --git a/core/src/main/java/google/registry/dns/writer/dnsupdate/DnsMessageTransport.java b/core/src/main/java/google/registry/dns/writer/dnsupdate/DnsMessageTransport.java index 79f9950d4..1198dcbf0 100644 --- a/core/src/main/java/google/registry/dns/writer/dnsupdate/DnsMessageTransport.java +++ b/core/src/main/java/google/registry/dns/writer/dnsupdate/DnsMessageTransport.java @@ -20,6 +20,7 @@ import static com.google.common.base.Verify.verify; import com.google.common.annotations.VisibleForTesting; import com.google.common.primitives.Ints; import google.registry.config.RegistryConfig.Config; +import jakarta.inject.Inject; import java.io.DataInputStream; import java.io.IOException; import java.io.InputStream; @@ -27,7 +28,6 @@ import java.io.OutputStream; import java.net.InetAddress; import java.net.Socket; import java.nio.ByteBuffer; -import javax.inject.Inject; import javax.net.SocketFactory; import org.joda.time.Duration; import org.xbill.DNS.Message; diff --git a/core/src/main/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriter.java b/core/src/main/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriter.java index 62037c631..86489f3d1 100644 --- a/core/src/main/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriter.java +++ b/core/src/main/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriter.java @@ -34,12 +34,12 @@ import google.registry.model.host.Host; import google.registry.model.tld.Tld; import google.registry.model.tld.Tlds; import google.registry.util.Clock; +import jakarta.inject.Inject; import java.io.IOException; import java.net.Inet4Address; import java.net.Inet6Address; import java.net.InetAddress; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.Duration; import org.xbill.DNS.AAAARecord; import org.xbill.DNS.ARecord; diff --git a/core/src/main/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriterModule.java b/core/src/main/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriterModule.java index 3329fe2af..7fcca5b8e 100644 --- a/core/src/main/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriterModule.java +++ b/core/src/main/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriterModule.java @@ -21,7 +21,7 @@ import dagger.multibindings.IntoMap; import dagger.multibindings.IntoSet; import dagger.multibindings.StringKey; import google.registry.dns.writer.DnsWriter; -import javax.inject.Named; +import jakarta.inject.Named; import javax.net.SocketFactory; /** Dagger module that provides a DnsUpdateWriter. */ diff --git a/core/src/main/java/google/registry/export/DriveModule.java b/core/src/main/java/google/registry/export/DriveModule.java index 871a5d3e4..cb7f4ccd0 100644 --- a/core/src/main/java/google/registry/export/DriveModule.java +++ b/core/src/main/java/google/registry/export/DriveModule.java @@ -24,7 +24,7 @@ import google.registry.config.RegistryConfig.Config; import google.registry.config.RegistryConfig.ConfigModule; import google.registry.storage.drive.DriveConnection; import google.registry.util.GoogleCredentialsBundle; -import javax.inject.Singleton; +import jakarta.inject.Singleton; /** Dagger module for Google {@link Drive} service connection objects. */ @Module diff --git a/core/src/main/java/google/registry/export/ExportDomainListsAction.java b/core/src/main/java/google/registry/export/ExportDomainListsAction.java index bf3e98df6..ba86797c3 100644 --- a/core/src/main/java/google/registry/export/ExportDomainListsAction.java +++ b/core/src/main/java/google/registry/export/ExportDomainListsAction.java @@ -39,12 +39,12 @@ import google.registry.request.Action.GaeService; import google.registry.request.auth.Auth; import google.registry.storage.drive.DriveConnection; import google.registry.util.Clock; +import jakarta.inject.Inject; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.Writer; import java.time.Instant; import java.util.List; -import javax.inject.Inject; import org.hibernate.query.NativeQuery; import org.hibernate.query.TupleTransformer; import org.joda.time.DateTime; diff --git a/core/src/main/java/google/registry/export/ExportPremiumTermsAction.java b/core/src/main/java/google/registry/export/ExportPremiumTermsAction.java index 03696d273..6a7b44cc1 100644 --- a/core/src/main/java/google/registry/export/ExportPremiumTermsAction.java +++ b/core/src/main/java/google/registry/export/ExportPremiumTermsAction.java @@ -39,10 +39,10 @@ import google.registry.request.RequestParameters; import google.registry.request.Response; import google.registry.request.auth.Auth; import google.registry.storage.drive.DriveConnection; +import jakarta.inject.Inject; import java.io.IOException; import java.util.Optional; import java.util.SortedSet; -import javax.inject.Inject; /** Action that exports the premium terms list for a TLD to Google Drive. */ @Action( diff --git a/core/src/main/java/google/registry/export/ExportReservedTermsAction.java b/core/src/main/java/google/registry/export/ExportReservedTermsAction.java index 8046f280a..36398d639 100644 --- a/core/src/main/java/google/registry/export/ExportReservedTermsAction.java +++ b/core/src/main/java/google/registry/export/ExportReservedTermsAction.java @@ -31,7 +31,7 @@ import google.registry.request.RequestParameters; import google.registry.request.Response; import google.registry.request.auth.Auth; import google.registry.storage.drive.DriveConnection; -import javax.inject.Inject; +import jakarta.inject.Inject; /** Action that exports the publicly viewable reserved terms list for a TLD to Google Drive. */ @Action( diff --git a/core/src/main/java/google/registry/export/ExportUtils.java b/core/src/main/java/google/registry/export/ExportUtils.java index 1507e69a7..99e7cf302 100644 --- a/core/src/main/java/google/registry/export/ExportUtils.java +++ b/core/src/main/java/google/registry/export/ExportUtils.java @@ -20,9 +20,9 @@ import google.registry.model.tld.Tld; import google.registry.model.tld.label.ReservedList; import google.registry.model.tld.label.ReservedList.ReservedListEntry; import google.registry.model.tld.label.ReservedListDao; +import jakarta.inject.Inject; import java.util.Set; import java.util.TreeSet; -import javax.inject.Inject; /** Container class for exported-related utility methods. */ public final class ExportUtils { diff --git a/core/src/main/java/google/registry/export/SyncGroupMembersAction.java b/core/src/main/java/google/registry/export/SyncGroupMembersAction.java index 296a4391f..c07477587 100644 --- a/core/src/main/java/google/registry/export/SyncGroupMembersAction.java +++ b/core/src/main/java/google/registry/export/SyncGroupMembersAction.java @@ -39,6 +39,7 @@ import google.registry.request.Action.GaeService; import google.registry.request.Response; import google.registry.request.auth.Auth; import google.registry.util.Retrier; +import jakarta.inject.Inject; import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -46,7 +47,6 @@ import java.util.Map; import java.util.Optional; import java.util.Set; import javax.annotation.Nullable; -import javax.inject.Inject; /** * Action that syncs changes to {@link RegistrarPoc} entities with Google Groups. diff --git a/core/src/main/java/google/registry/export/sheet/SheetSynchronizer.java b/core/src/main/java/google/registry/export/sheet/SheetSynchronizer.java index c1a46eca7..e989ee31a 100644 --- a/core/src/main/java/google/registry/export/sheet/SheetSynchronizer.java +++ b/core/src/main/java/google/registry/export/sheet/SheetSynchronizer.java @@ -26,10 +26,10 @@ import com.google.api.services.sheets.v4.model.ValueRange; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.flogger.FluentLogger; +import jakarta.inject.Inject; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import javax.inject.Inject; /** Generic data synchronization utility for Google Spreadsheets. */ class SheetSynchronizer { diff --git a/core/src/main/java/google/registry/export/sheet/SyncRegistrarsSheet.java b/core/src/main/java/google/registry/export/sheet/SyncRegistrarsSheet.java index 86fc00ab5..35926d3bb 100644 --- a/core/src/main/java/google/registry/export/sheet/SyncRegistrarsSheet.java +++ b/core/src/main/java/google/registry/export/sheet/SyncRegistrarsSheet.java @@ -39,11 +39,11 @@ import google.registry.model.registrar.RegistrarPoc; import google.registry.model.registrar.RegistrarPocBase; import google.registry.util.Clock; import google.registry.util.DateTimeUtils; +import jakarta.inject.Inject; import java.io.IOException; import java.util.Optional; import java.util.function.Predicate; import javax.annotation.Nullable; -import javax.inject.Inject; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/export/sheet/SyncRegistrarsSheetAction.java b/core/src/main/java/google/registry/export/sheet/SyncRegistrarsSheetAction.java index b2f476ed2..ba3a41ec4 100644 --- a/core/src/main/java/google/registry/export/sheet/SyncRegistrarsSheetAction.java +++ b/core/src/main/java/google/registry/export/sheet/SyncRegistrarsSheetAction.java @@ -29,11 +29,11 @@ import google.registry.request.Parameter; import google.registry.request.Response; import google.registry.request.auth.Auth; import google.registry.request.lock.LockHandler; +import jakarta.inject.Inject; import java.io.IOException; import java.util.Optional; import java.util.concurrent.Callable; import javax.annotation.Nullable; -import javax.inject.Inject; import org.joda.time.Duration; /** diff --git a/core/src/main/java/google/registry/flows/CheckApiAction.java b/core/src/main/java/google/registry/flows/CheckApiAction.java index f5d3f13c7..092a80f6a 100644 --- a/core/src/main/java/google/registry/flows/CheckApiAction.java +++ b/core/src/main/java/google/registry/flows/CheckApiAction.java @@ -60,10 +60,10 @@ import google.registry.request.Parameter; import google.registry.request.RequestParameters; import google.registry.request.Response; import google.registry.request.auth.Auth; +import jakarta.inject.Inject; import jakarta.servlet.http.HttpServletRequest; import java.util.Map; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/flows/CheckApiMetrics.java b/core/src/main/java/google/registry/flows/CheckApiMetrics.java index 51d22488b..6508e8a8d 100644 --- a/core/src/main/java/google/registry/flows/CheckApiMetrics.java +++ b/core/src/main/java/google/registry/flows/CheckApiMetrics.java @@ -24,7 +24,7 @@ import com.google.monitoring.metrics.MetricRegistryImpl; import google.registry.monitoring.whitebox.CheckApiMetric; import google.registry.monitoring.whitebox.CheckApiMetric.Availability; import google.registry.monitoring.whitebox.CheckApiMetric.Tier; -import javax.inject.Inject; +import jakarta.inject.Inject; /** Helpers for updating domain check metrics. */ public class CheckApiMetrics { diff --git a/core/src/main/java/google/registry/flows/EppController.java b/core/src/main/java/google/registry/flows/EppController.java index 5e98f7e46..d69776d96 100644 --- a/core/src/main/java/google/registry/flows/EppController.java +++ b/core/src/main/java/google/registry/flows/EppController.java @@ -32,8 +32,8 @@ import google.registry.model.eppoutput.EppResponse; import google.registry.model.eppoutput.Result; import google.registry.model.eppoutput.Result.Code; import google.registry.monitoring.whitebox.EppMetric; +import jakarta.inject.Inject; import java.util.Optional; -import javax.inject.Inject; import org.json.simple.JSONValue; /** diff --git a/core/src/main/java/google/registry/flows/EppMetrics.java b/core/src/main/java/google/registry/flows/EppMetrics.java index f097c16a3..76968f5ee 100644 --- a/core/src/main/java/google/registry/flows/EppMetrics.java +++ b/core/src/main/java/google/registry/flows/EppMetrics.java @@ -22,7 +22,7 @@ import com.google.monitoring.metrics.IncrementableMetric; import com.google.monitoring.metrics.LabelDescriptor; import com.google.monitoring.metrics.MetricRegistryImpl; import google.registry.monitoring.whitebox.EppMetric; -import javax.inject.Inject; +import jakarta.inject.Inject; /** EPP Instrumentation. */ public class EppMetrics { diff --git a/core/src/main/java/google/registry/flows/EppRequestHandler.java b/core/src/main/java/google/registry/flows/EppRequestHandler.java index bc5bc5102..fa073f5f3 100644 --- a/core/src/main/java/google/registry/flows/EppRequestHandler.java +++ b/core/src/main/java/google/registry/flows/EppRequestHandler.java @@ -26,7 +26,7 @@ import com.google.common.net.MediaType; import google.registry.model.eppoutput.EppOutput; import google.registry.request.Response; import google.registry.util.ProxyHttpHeaders; -import javax.inject.Inject; +import jakarta.inject.Inject; /** Handle an EPP request and response. */ public class EppRequestHandler { diff --git a/core/src/main/java/google/registry/flows/EppTlsAction.java b/core/src/main/java/google/registry/flows/EppTlsAction.java index 4ef0590ba..2d3cbcf91 100644 --- a/core/src/main/java/google/registry/flows/EppTlsAction.java +++ b/core/src/main/java/google/registry/flows/EppTlsAction.java @@ -19,8 +19,8 @@ import google.registry.request.Action.GaeService; import google.registry.request.Action.Method; import google.registry.request.Payload; import google.registry.request.auth.Auth; +import jakarta.inject.Inject; import jakarta.servlet.http.HttpSession; -import javax.inject.Inject; /** * Establishes a transport for EPP+TLS over HTTP. All commands and responses are EPP XML according diff --git a/core/src/main/java/google/registry/flows/EppToolAction.java b/core/src/main/java/google/registry/flows/EppToolAction.java index 047d3ca6a..ba3edd10a 100644 --- a/core/src/main/java/google/registry/flows/EppToolAction.java +++ b/core/src/main/java/google/registry/flows/EppToolAction.java @@ -26,8 +26,8 @@ import google.registry.request.Action.GaeService; import google.registry.request.Action.Method; import google.registry.request.Parameter; import google.registry.request.auth.Auth; +import jakarta.inject.Inject; import jakarta.servlet.http.HttpServletRequest; -import javax.inject.Inject; /** Runs EPP commands directly without logging in, verifying an XSRF token from the tool. */ @Action( diff --git a/core/src/main/java/google/registry/flows/ExtensionManager.java b/core/src/main/java/google/registry/flows/ExtensionManager.java index ef894549c..539281b02 100644 --- a/core/src/main/java/google/registry/flows/ExtensionManager.java +++ b/core/src/main/java/google/registry/flows/ExtensionManager.java @@ -34,8 +34,8 @@ import google.registry.model.domain.metadata.MetadataExtension; import google.registry.model.domain.superuser.SuperuserExtension; import google.registry.model.eppinput.EppInput; import google.registry.model.eppinput.EppInput.CommandExtension; +import jakarta.inject.Inject; import java.util.Set; -import javax.inject.Inject; /** * Helper to validate extensions on an EPP command. diff --git a/core/src/main/java/google/registry/flows/FlowModule.java b/core/src/main/java/google/registry/flows/FlowModule.java index 0aa634655..81749ad90 100644 --- a/core/src/main/java/google/registry/flows/FlowModule.java +++ b/core/src/main/java/google/registry/flows/FlowModule.java @@ -39,9 +39,9 @@ import google.registry.model.reporting.HistoryEntry; import google.registry.persistence.IsolationLevel; import google.registry.persistence.PersistenceModule.TransactionIsolationLevel; import google.registry.persistence.transaction.JpaTransactionManager; +import jakarta.inject.Qualifier; import java.lang.annotation.Documented; import java.util.Optional; -import javax.inject.Qualifier; /** Module to choose and instantiate an EPP flow. */ @Module diff --git a/core/src/main/java/google/registry/flows/FlowReporter.java b/core/src/main/java/google/registry/flows/FlowReporter.java index 82b158cf7..3674cfbab 100644 --- a/core/src/main/java/google/registry/flows/FlowReporter.java +++ b/core/src/main/java/google/registry/flows/FlowReporter.java @@ -28,8 +28,8 @@ import google.registry.flows.FlowModule.RegistrarId; import google.registry.flows.annotations.ReportingSpec; import google.registry.model.eppcommon.Trid; import google.registry.model.eppinput.EppInput; +import jakarta.inject.Inject; import java.util.Optional; -import javax.inject.Inject; import org.json.simple.JSONValue; /** Reporter used by {@link FlowRunner} to record flow execution data for reporting. */ diff --git a/core/src/main/java/google/registry/flows/FlowRunner.java b/core/src/main/java/google/registry/flows/FlowRunner.java index 41c97d29c..f634afa21 100644 --- a/core/src/main/java/google/registry/flows/FlowRunner.java +++ b/core/src/main/java/google/registry/flows/FlowRunner.java @@ -29,9 +29,9 @@ import google.registry.model.eppoutput.EppOutput; import google.registry.monitoring.whitebox.EppMetric; import google.registry.persistence.PersistenceModule.TransactionIsolationLevel; import google.registry.persistence.transaction.JpaTransactionManager; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Provider; /** Run a flow, either transactionally or not, with logging and retrying as needed. */ public class FlowRunner { diff --git a/core/src/main/java/google/registry/flows/FlowScope.java b/core/src/main/java/google/registry/flows/FlowScope.java index 9866d7e20..5ef7e00c3 100644 --- a/core/src/main/java/google/registry/flows/FlowScope.java +++ b/core/src/main/java/google/registry/flows/FlowScope.java @@ -14,12 +14,12 @@ package google.registry.flows; +import jakarta.inject.Scope; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Scope; /** * Dagger annotation for flow-scoped components. diff --git a/core/src/main/java/google/registry/flows/ServerTridProviderImpl.java b/core/src/main/java/google/registry/flows/ServerTridProviderImpl.java index b158f003b..b94e4e17d 100644 --- a/core/src/main/java/google/registry/flows/ServerTridProviderImpl.java +++ b/core/src/main/java/google/registry/flows/ServerTridProviderImpl.java @@ -17,10 +17,10 @@ package google.registry.flows; import static com.google.common.primitives.Longs.BYTES; import com.google.common.io.BaseEncoding; +import jakarta.inject.Inject; import java.nio.ByteBuffer; import java.util.UUID; import java.util.concurrent.atomic.AtomicLong; -import javax.inject.Inject; /** A server Trid provider that generates globally incrementing UUIDs. */ public class ServerTridProviderImpl implements ServerTridProvider { diff --git a/core/src/main/java/google/registry/flows/TlsCredentials.java b/core/src/main/java/google/registry/flows/TlsCredentials.java index f69db23e2..3394f5fcb 100644 --- a/core/src/main/java/google/registry/flows/TlsCredentials.java +++ b/core/src/main/java/google/registry/flows/TlsCredentials.java @@ -34,11 +34,11 @@ import google.registry.request.Header; import google.registry.util.CidrAddressBlock; import google.registry.util.ProxyHttpHeaders; import google.registry.util.RegistryEnvironment; +import jakarta.inject.Inject; import jakarta.servlet.http.HttpServletRequest; import java.net.InetAddress; import java.security.MessageDigest; import java.util.Optional; -import javax.inject.Inject; /** * Container and validation for TLS certificate and IP-allow-listing. diff --git a/core/src/main/java/google/registry/flows/certs/CertificateChecker.java b/core/src/main/java/google/registry/flows/certs/CertificateChecker.java index 6e548d132..e18283396 100644 --- a/core/src/main/java/google/registry/flows/certs/CertificateChecker.java +++ b/core/src/main/java/google/registry/flows/certs/CertificateChecker.java @@ -23,6 +23,7 @@ import com.google.common.collect.ImmutableSortedMap; import google.registry.config.RegistryConfig.Config; import google.registry.util.Clock; import google.registry.util.DateTimeUtils; +import jakarta.inject.Inject; import java.io.ByteArrayInputStream; import java.io.StringWriter; import java.security.PublicKey; @@ -32,7 +33,6 @@ import java.security.cert.X509Certificate; import java.security.interfaces.ECPublicKey; import java.security.interfaces.RSAPublicKey; import java.util.stream.Collectors; -import javax.inject.Inject; import org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util; import org.bouncycastle.jce.ECNamedCurveTable; import org.bouncycastle.jce.spec.ECNamedCurveParameterSpec; diff --git a/core/src/main/java/google/registry/flows/contact/ContactCheckFlow.java b/core/src/main/java/google/registry/flows/contact/ContactCheckFlow.java index 7ed71c299..fe5a9da54 100644 --- a/core/src/main/java/google/registry/flows/contact/ContactCheckFlow.java +++ b/core/src/main/java/google/registry/flows/contact/ContactCheckFlow.java @@ -34,7 +34,7 @@ import google.registry.model.eppoutput.CheckData.ContactCheckData; import google.registry.model.eppoutput.EppResponse; import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; import google.registry.util.Clock; -import javax.inject.Inject; +import jakarta.inject.Inject; /** * An EPP flow that checks whether a contact can be provisioned. diff --git a/core/src/main/java/google/registry/flows/contact/ContactCreateFlow.java b/core/src/main/java/google/registry/flows/contact/ContactCreateFlow.java index db1251302..a12eca9cc 100644 --- a/core/src/main/java/google/registry/flows/contact/ContactCreateFlow.java +++ b/core/src/main/java/google/registry/flows/contact/ContactCreateFlow.java @@ -40,7 +40,7 @@ import google.registry.model.eppoutput.CreateData.ContactCreateData; import google.registry.model.eppoutput.EppResponse; import google.registry.model.reporting.HistoryEntry; import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/flows/contact/ContactDeleteFlow.java b/core/src/main/java/google/registry/flows/contact/ContactDeleteFlow.java index 5983783ee..eb7daf165 100644 --- a/core/src/main/java/google/registry/flows/contact/ContactDeleteFlow.java +++ b/core/src/main/java/google/registry/flows/contact/ContactDeleteFlow.java @@ -43,8 +43,8 @@ import google.registry.model.eppcommon.Trid; import google.registry.model.eppoutput.EppResponse; import google.registry.model.reporting.HistoryEntry.Type; import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; +import jakarta.inject.Inject; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/flows/contact/ContactInfoFlow.java b/core/src/main/java/google/registry/flows/contact/ContactInfoFlow.java index 88994949a..0f5a1f4d2 100644 --- a/core/src/main/java/google/registry/flows/contact/ContactInfoFlow.java +++ b/core/src/main/java/google/registry/flows/contact/ContactInfoFlow.java @@ -34,8 +34,8 @@ import google.registry.model.eppcommon.StatusValue; import google.registry.model.eppoutput.EppResponse; import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; import google.registry.util.Clock; +import jakarta.inject.Inject; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/flows/contact/ContactTransferApproveFlow.java b/core/src/main/java/google/registry/flows/contact/ContactTransferApproveFlow.java index 7e2c4bdd0..bf04f6361 100644 --- a/core/src/main/java/google/registry/flows/contact/ContactTransferApproveFlow.java +++ b/core/src/main/java/google/registry/flows/contact/ContactTransferApproveFlow.java @@ -41,8 +41,8 @@ import google.registry.model.eppoutput.EppResponse; import google.registry.model.poll.PollMessage; import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; import google.registry.model.transfer.TransferStatus; +import jakarta.inject.Inject; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/flows/contact/ContactTransferCancelFlow.java b/core/src/main/java/google/registry/flows/contact/ContactTransferCancelFlow.java index 6128759f6..c126451e9 100644 --- a/core/src/main/java/google/registry/flows/contact/ContactTransferCancelFlow.java +++ b/core/src/main/java/google/registry/flows/contact/ContactTransferCancelFlow.java @@ -41,8 +41,8 @@ import google.registry.model.eppoutput.EppResponse; import google.registry.model.poll.PollMessage; import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; import google.registry.model.transfer.TransferStatus; +import jakarta.inject.Inject; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/flows/contact/ContactTransferQueryFlow.java b/core/src/main/java/google/registry/flows/contact/ContactTransferQueryFlow.java index 08ad280cc..deee73fdd 100644 --- a/core/src/main/java/google/registry/flows/contact/ContactTransferQueryFlow.java +++ b/core/src/main/java/google/registry/flows/contact/ContactTransferQueryFlow.java @@ -32,8 +32,8 @@ import google.registry.model.eppcommon.AuthInfo; import google.registry.model.eppoutput.EppResponse; import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; import google.registry.util.Clock; +import jakarta.inject.Inject; import java.util.Optional; -import javax.inject.Inject; /** * An EPP flow that queries a pending transfer on a contact. diff --git a/core/src/main/java/google/registry/flows/contact/ContactTransferRejectFlow.java b/core/src/main/java/google/registry/flows/contact/ContactTransferRejectFlow.java index 906311919..dddce31da 100644 --- a/core/src/main/java/google/registry/flows/contact/ContactTransferRejectFlow.java +++ b/core/src/main/java/google/registry/flows/contact/ContactTransferRejectFlow.java @@ -40,8 +40,8 @@ import google.registry.model.eppoutput.EppResponse; import google.registry.model.poll.PollMessage; import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; import google.registry.model.transfer.TransferStatus; +import jakarta.inject.Inject; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/flows/contact/ContactTransferRequestFlow.java b/core/src/main/java/google/registry/flows/contact/ContactTransferRequestFlow.java index 0a5b48e1e..af662cc5e 100644 --- a/core/src/main/java/google/registry/flows/contact/ContactTransferRequestFlow.java +++ b/core/src/main/java/google/registry/flows/contact/ContactTransferRequestFlow.java @@ -49,8 +49,8 @@ import google.registry.model.reporting.HistoryEntry.HistoryEntryId; import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; import google.registry.model.transfer.ContactTransferData; import google.registry.model.transfer.TransferStatus; +import jakarta.inject.Inject; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/core/src/main/java/google/registry/flows/contact/ContactUpdateFlow.java b/core/src/main/java/google/registry/flows/contact/ContactUpdateFlow.java index 63d510516..20050d462 100644 --- a/core/src/main/java/google/registry/flows/contact/ContactUpdateFlow.java +++ b/core/src/main/java/google/registry/flows/contact/ContactUpdateFlow.java @@ -47,9 +47,9 @@ import google.registry.model.eppcommon.StatusValue; import google.registry.model.eppinput.ResourceCommand; import google.registry.model.eppoutput.EppResponse; import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; +import jakarta.inject.Inject; import java.util.Optional; import javax.annotation.Nullable; -import javax.inject.Inject; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/flows/domain/DomainCheckFlow.java b/core/src/main/java/google/registry/flows/domain/DomainCheckFlow.java index 933dacded..8542de60f 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainCheckFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainCheckFlow.java @@ -89,13 +89,13 @@ import google.registry.model.tld.label.ReservationType; import google.registry.persistence.VKey; import google.registry.pricing.PricingEngineProxy; import google.registry.util.Clock; +import jakarta.inject.Inject; import java.util.Collection; import java.util.HashSet; import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/flows/domain/DomainClaimsCheckFlow.java b/core/src/main/java/google/registry/flows/domain/DomainClaimsCheckFlow.java index 8ffb60e88..749158c03 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainClaimsCheckFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainClaimsCheckFlow.java @@ -48,10 +48,10 @@ import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; import google.registry.model.tld.Tld; import google.registry.model.tmch.ClaimsListDao; import google.registry.util.Clock; +import jakarta.inject.Inject; import java.util.HashSet; import java.util.Optional; import java.util.Set; -import javax.inject.Inject; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/flows/domain/DomainCreateFlow.java b/core/src/main/java/google/registry/flows/domain/DomainCreateFlow.java index bf4f3569c..db86f8ff4 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainCreateFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainCreateFlow.java @@ -118,8 +118,8 @@ import google.registry.model.tld.label.ReservationType; import google.registry.model.tmch.ClaimsList; import google.registry.model.tmch.ClaimsListDao; import google.registry.tmch.LordnTaskUtils.LordnPhase; +import jakarta.inject.Inject; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/core/src/main/java/google/registry/flows/domain/DomainDeleteFlow.java b/core/src/main/java/google/registry/flows/domain/DomainDeleteFlow.java index 3c97cdc26..357545234 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainDeleteFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainDeleteFlow.java @@ -95,11 +95,11 @@ import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; import google.registry.model.tld.Tld; import google.registry.model.tld.Tld.TldType; import google.registry.model.transfer.TransferStatus; +import jakarta.inject.Inject; import java.util.Collections; import java.util.Optional; import java.util.Set; import javax.annotation.Nullable; -import javax.inject.Inject; import org.joda.money.Money; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/core/src/main/java/google/registry/flows/domain/DomainFlowTmchUtils.java b/core/src/main/java/google/registry/flows/domain/DomainFlowTmchUtils.java index 765e363fa..ec1a144b0 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainFlowTmchUtils.java +++ b/core/src/main/java/google/registry/flows/domain/DomainFlowTmchUtils.java @@ -31,13 +31,13 @@ import google.registry.model.smd.SignedMark; import google.registry.model.smd.SignedMarkRevocationList; import google.registry.tmch.TmchXmlSignature; import google.registry.tmch.TmchXmlSignature.CertificateSignatureException; +import jakarta.inject.Inject; import java.io.IOException; import java.security.GeneralSecurityException; import java.security.SignatureException; import java.security.cert.CertificateExpiredException; import java.security.cert.CertificateNotYetValidException; import java.security.cert.CertificateRevokedException; -import javax.inject.Inject; import javax.xml.crypto.MarshalException; import javax.xml.crypto.dsig.XMLSignatureException; import javax.xml.parsers.ParserConfigurationException; diff --git a/core/src/main/java/google/registry/flows/domain/DomainInfoFlow.java b/core/src/main/java/google/registry/flows/domain/DomainInfoFlow.java index e4640e6d4..fee8622fc 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainInfoFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainInfoFlow.java @@ -54,8 +54,8 @@ import google.registry.model.eppoutput.EppResponse; import google.registry.model.eppoutput.EppResponse.ResponseExtension; import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; import google.registry.util.Clock; +import jakarta.inject.Inject; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/flows/domain/DomainPricingLogic.java b/core/src/main/java/google/registry/flows/domain/DomainPricingLogic.java index 4f22cc621..f40bb11a4 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainPricingLogic.java +++ b/core/src/main/java/google/registry/flows/domain/DomainPricingLogic.java @@ -40,10 +40,10 @@ import google.registry.model.domain.token.AllocationToken.RegistrationBehavior; import google.registry.model.domain.token.AllocationToken.TokenBehavior; import google.registry.model.pricing.PremiumPricingEngine.DomainPrices; import google.registry.model.tld.Tld; +import jakarta.inject.Inject; import java.math.RoundingMode; import java.util.Optional; import javax.annotation.Nullable; -import javax.inject.Inject; import org.joda.money.CurrencyUnit; import org.joda.money.Money; import org.joda.time.DateTime; diff --git a/core/src/main/java/google/registry/flows/domain/DomainRenewFlow.java b/core/src/main/java/google/registry/flows/domain/DomainRenewFlow.java index f56d43cc7..8f31b402e 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainRenewFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainRenewFlow.java @@ -85,8 +85,8 @@ import google.registry.model.reporting.DomainTransactionRecord.TransactionReport import google.registry.model.reporting.HistoryEntry.HistoryEntryId; import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; import google.registry.model.tld.Tld; +import jakarta.inject.Inject; import java.util.Optional; -import javax.inject.Inject; import org.joda.money.Money; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/core/src/main/java/google/registry/flows/domain/DomainRestoreRequestFlow.java b/core/src/main/java/google/registry/flows/domain/DomainRestoreRequestFlow.java index b34c5f6bd..cb36d82b6 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainRestoreRequestFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainRestoreRequestFlow.java @@ -68,8 +68,8 @@ import google.registry.model.reporting.DomainTransactionRecord.TransactionReport import google.registry.model.reporting.HistoryEntry.HistoryEntryId; import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; import google.registry.model.tld.Tld; +import jakarta.inject.Inject; import java.util.Optional; -import javax.inject.Inject; import org.joda.money.Money; import org.joda.time.DateTime; diff --git a/core/src/main/java/google/registry/flows/domain/DomainTransferApproveFlow.java b/core/src/main/java/google/registry/flows/domain/DomainTransferApproveFlow.java index dcf210ad6..bcae01cf5 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainTransferApproveFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainTransferApproveFlow.java @@ -68,8 +68,8 @@ import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; import google.registry.model.tld.Tld; import google.registry.model.transfer.DomainTransferData; import google.registry.model.transfer.TransferStatus; +import jakarta.inject.Inject; import java.util.Optional; -import javax.inject.Inject; import org.joda.money.Money; import org.joda.time.DateTime; diff --git a/core/src/main/java/google/registry/flows/domain/DomainTransferCancelFlow.java b/core/src/main/java/google/registry/flows/domain/DomainTransferCancelFlow.java index 9c8b4ba07..0dc29671c 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainTransferCancelFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainTransferCancelFlow.java @@ -50,8 +50,8 @@ import google.registry.model.reporting.HistoryEntry.HistoryEntryId; import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; import google.registry.model.tld.Tld; import google.registry.model.transfer.TransferStatus; +import jakarta.inject.Inject; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/flows/domain/DomainTransferQueryFlow.java b/core/src/main/java/google/registry/flows/domain/DomainTransferQueryFlow.java index feb724c01..b562422b6 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainTransferQueryFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainTransferQueryFlow.java @@ -35,8 +35,8 @@ import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; import google.registry.model.transfer.DomainTransferData; import google.registry.model.transfer.TransferStatus; import google.registry.util.Clock; +import jakarta.inject.Inject; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/flows/domain/DomainTransferRejectFlow.java b/core/src/main/java/google/registry/flows/domain/DomainTransferRejectFlow.java index 885840048..b9c6d39ed 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainTransferRejectFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainTransferRejectFlow.java @@ -52,8 +52,8 @@ import google.registry.model.reporting.HistoryEntry.HistoryEntryId; import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; import google.registry.model.tld.Tld; import google.registry.model.transfer.TransferStatus; +import jakarta.inject.Inject; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/flows/domain/DomainTransferRequestFlow.java b/core/src/main/java/google/registry/flows/domain/DomainTransferRequestFlow.java index d9aed6315..89b2e9c37 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainTransferRequestFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainTransferRequestFlow.java @@ -80,8 +80,8 @@ import google.registry.model.transfer.DomainTransferData; import google.registry.model.transfer.TransferData.TransferServerApproveEntity; import google.registry.model.transfer.TransferResponse.DomainTransferResponse; import google.registry.model.transfer.TransferStatus; +import jakarta.inject.Inject; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/flows/domain/DomainUpdateFlow.java b/core/src/main/java/google/registry/flows/domain/DomainUpdateFlow.java index 044f28acc..a3363ef86 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainUpdateFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainUpdateFlow.java @@ -90,9 +90,9 @@ import google.registry.model.poll.PollMessage; import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; import google.registry.model.tld.Tld; import google.registry.persistence.VKey; +import jakarta.inject.Inject; import java.util.Objects; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/flows/domain/token/AllocationTokenFlowUtils.java b/core/src/main/java/google/registry/flows/domain/token/AllocationTokenFlowUtils.java index 3e3c46bf2..01a7d20f0 100644 --- a/core/src/main/java/google/registry/flows/domain/token/AllocationTokenFlowUtils.java +++ b/core/src/main/java/google/registry/flows/domain/token/AllocationTokenFlowUtils.java @@ -40,9 +40,9 @@ import google.registry.model.domain.token.AllocationTokenExtension; import google.registry.model.reporting.HistoryEntry.HistoryEntryId; import google.registry.model.tld.Tld; import google.registry.persistence.VKey; +import jakarta.inject.Inject; import java.util.List; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.DateTime; /** Utility functions for dealing with {@link AllocationToken}s in domain flows. */ diff --git a/core/src/main/java/google/registry/flows/host/HostCheckFlow.java b/core/src/main/java/google/registry/flows/host/HostCheckFlow.java index 636e15f20..790e7bf1c 100644 --- a/core/src/main/java/google/registry/flows/host/HostCheckFlow.java +++ b/core/src/main/java/google/registry/flows/host/HostCheckFlow.java @@ -34,7 +34,7 @@ import google.registry.model.host.Host; import google.registry.model.host.HostCommand.Check; import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; import google.registry.util.Clock; -import javax.inject.Inject; +import jakarta.inject.Inject; /** * An EPP flow that checks whether a host can be provisioned. diff --git a/core/src/main/java/google/registry/flows/host/HostCreateFlow.java b/core/src/main/java/google/registry/flows/host/HostCreateFlow.java index ed513e89d..8f1fbfb65 100644 --- a/core/src/main/java/google/registry/flows/host/HostCreateFlow.java +++ b/core/src/main/java/google/registry/flows/host/HostCreateFlow.java @@ -48,8 +48,8 @@ import google.registry.model.host.Host; import google.registry.model.host.HostCommand.Create; import google.registry.model.host.HostHistory; import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; +import jakarta.inject.Inject; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/flows/host/HostDeleteFlow.java b/core/src/main/java/google/registry/flows/host/HostDeleteFlow.java index 71fa9c58b..93d7d973f 100644 --- a/core/src/main/java/google/registry/flows/host/HostDeleteFlow.java +++ b/core/src/main/java/google/registry/flows/host/HostDeleteFlow.java @@ -41,7 +41,7 @@ import google.registry.model.host.Host; import google.registry.model.host.HostHistory; import google.registry.model.reporting.HistoryEntry.Type; import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/flows/host/HostInfoFlow.java b/core/src/main/java/google/registry/flows/host/HostInfoFlow.java index 532dfbf9a..af5a5b258 100644 --- a/core/src/main/java/google/registry/flows/host/HostInfoFlow.java +++ b/core/src/main/java/google/registry/flows/host/HostInfoFlow.java @@ -34,7 +34,7 @@ import google.registry.model.host.Host; import google.registry.model.host.HostInfoData; import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; import google.registry.util.Clock; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/flows/host/HostUpdateFlow.java b/core/src/main/java/google/registry/flows/host/HostUpdateFlow.java index df5205d0b..8e4433f5d 100644 --- a/core/src/main/java/google/registry/flows/host/HostUpdateFlow.java +++ b/core/src/main/java/google/registry/flows/host/HostUpdateFlow.java @@ -66,9 +66,9 @@ import google.registry.model.host.HostHistory; import google.registry.model.reporting.IcannReportingTypes.ActivityReportField; import google.registry.persistence.VKey; import google.registry.request.Action; +import jakarta.inject.Inject; import java.util.Objects; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/flows/poll/PollAckFlow.java b/core/src/main/java/google/registry/flows/poll/PollAckFlow.java index 368835e7b..d73a96673 100644 --- a/core/src/main/java/google/registry/flows/poll/PollAckFlow.java +++ b/core/src/main/java/google/registry/flows/poll/PollAckFlow.java @@ -40,8 +40,8 @@ import google.registry.model.poll.PollMessageExternalKeyConverter.PollMessageExt import google.registry.persistence.IsolationLevel; import google.registry.persistence.PersistenceModule.TransactionIsolationLevel; import google.registry.persistence.VKey; +import jakarta.inject.Inject; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/flows/poll/PollRequestFlow.java b/core/src/main/java/google/registry/flows/poll/PollRequestFlow.java index 14a4beb7d..04b00ed93 100644 --- a/core/src/main/java/google/registry/flows/poll/PollRequestFlow.java +++ b/core/src/main/java/google/registry/flows/poll/PollRequestFlow.java @@ -34,8 +34,8 @@ import google.registry.model.poll.PollMessage; import google.registry.model.poll.PollMessageExternalKeyConverter; import google.registry.persistence.IsolationLevel; import google.registry.persistence.PersistenceModule.TransactionIsolationLevel; +import jakarta.inject.Inject; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/flows/session/HelloFlow.java b/core/src/main/java/google/registry/flows/session/HelloFlow.java index a3051d8ef..5e17b1ea6 100644 --- a/core/src/main/java/google/registry/flows/session/HelloFlow.java +++ b/core/src/main/java/google/registry/flows/session/HelloFlow.java @@ -20,7 +20,7 @@ import google.registry.flows.ExtensionManager; import google.registry.flows.Flow; import google.registry.model.eppoutput.Greeting; import google.registry.util.Clock; -import javax.inject.Inject; +import jakarta.inject.Inject; /** * A flow for an Epp "hello". diff --git a/core/src/main/java/google/registry/flows/session/LoginFlow.java b/core/src/main/java/google/registry/flows/session/LoginFlow.java index 1d2d04e88..50ef6bce6 100644 --- a/core/src/main/java/google/registry/flows/session/LoginFlow.java +++ b/core/src/main/java/google/registry/flows/session/LoginFlow.java @@ -47,9 +47,9 @@ import google.registry.model.eppinput.EppInput.Options; import google.registry.model.eppinput.EppInput.Services; import google.registry.model.eppoutput.EppResponse; import google.registry.model.registrar.Registrar; +import jakarta.inject.Inject; import java.util.Optional; import java.util.Set; -import javax.inject.Inject; /** * An EPP flow for login. diff --git a/core/src/main/java/google/registry/flows/session/LogoutFlow.java b/core/src/main/java/google/registry/flows/session/LogoutFlow.java index 450e47d5a..4e15623e4 100644 --- a/core/src/main/java/google/registry/flows/session/LogoutFlow.java +++ b/core/src/main/java/google/registry/flows/session/LogoutFlow.java @@ -23,7 +23,7 @@ import google.registry.flows.Flow; import google.registry.flows.FlowModule.RegistrarId; import google.registry.flows.SessionMetadata; import google.registry.model.eppoutput.EppResponse; -import javax.inject.Inject; +import jakarta.inject.Inject; /** * An EPP flow for logout. diff --git a/core/src/main/java/google/registry/gcs/GcsUtils.java b/core/src/main/java/google/registry/gcs/GcsUtils.java index 95d090c83..21f32c345 100644 --- a/core/src/main/java/google/registry/gcs/GcsUtils.java +++ b/core/src/main/java/google/registry/gcs/GcsUtils.java @@ -33,13 +33,13 @@ import com.google.common.flogger.FluentLogger; import com.google.common.net.MediaType; import google.registry.config.CredentialModule.ApplicationDefaultCredential; import google.registry.util.GoogleCredentialsBundle; +import jakarta.inject.Inject; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.io.Serializable; import java.nio.channels.Channels; import javax.annotation.CheckReturnValue; -import javax.inject.Inject; /** * Utilities for working with Google Cloud Storage. diff --git a/core/src/main/java/google/registry/groups/DirectoryGroupsConnection.java b/core/src/main/java/google/registry/groups/DirectoryGroupsConnection.java index e6b3a0b47..dc95ee09c 100644 --- a/core/src/main/java/google/registry/groups/DirectoryGroupsConnection.java +++ b/core/src/main/java/google/registry/groups/DirectoryGroupsConnection.java @@ -31,9 +31,9 @@ import com.google.common.base.Strings; import com.google.common.collect.ImmutableSet; import com.google.common.flogger.FluentLogger; import google.registry.config.RegistryConfig.Config; +import jakarta.inject.Inject; import java.io.IOException; import java.util.Set; -import javax.inject.Inject; /** * Class encapsulating methods to access Google Groups API. diff --git a/core/src/main/java/google/registry/groups/GmailClient.java b/core/src/main/java/google/registry/groups/GmailClient.java index cc24ebc38..90f1a975e 100644 --- a/core/src/main/java/google/registry/groups/GmailClient.java +++ b/core/src/main/java/google/registry/groups/GmailClient.java @@ -28,6 +28,7 @@ import google.registry.config.RegistryConfig.Config; import google.registry.util.EmailMessage; import google.registry.util.EmailMessage.Attachment; import google.registry.util.Retrier; +import jakarta.inject.Inject; import jakarta.mail.Address; import jakarta.mail.BodyPart; import jakarta.mail.Message.RecipientType; @@ -43,7 +44,6 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.util.Properties; import java.util.function.Predicate; -import javax.inject.Inject; /** Sends {@link EmailMessage EmailMessages} through Google Workspace using {@link Gmail}. */ public final class GmailClient { diff --git a/core/src/main/java/google/registry/groups/GmailModule.java b/core/src/main/java/google/registry/groups/GmailModule.java index d7b241520..5d91fe74f 100644 --- a/core/src/main/java/google/registry/groups/GmailModule.java +++ b/core/src/main/java/google/registry/groups/GmailModule.java @@ -20,7 +20,7 @@ import dagger.Provides; import google.registry.config.CredentialModule.GmailDelegatedCredential; import google.registry.config.RegistryConfig.Config; import google.registry.util.GoogleCredentialsBundle; -import javax.inject.Singleton; +import jakarta.inject.Singleton; /** Dagger module providing {@link Gmail} API. */ @Module diff --git a/core/src/main/java/google/registry/keyring/KeyringModule.java b/core/src/main/java/google/registry/keyring/KeyringModule.java index 3f990cf81..6cefbb851 100644 --- a/core/src/main/java/google/registry/keyring/KeyringModule.java +++ b/core/src/main/java/google/registry/keyring/KeyringModule.java @@ -20,8 +20,8 @@ import dagger.Provides; import google.registry.config.RegistryConfig.Config; import google.registry.keyring.api.Keyring; import google.registry.keyring.secretmanager.SecretManagerKeyring; +import jakarta.inject.Singleton; import java.util.Optional; -import javax.inject.Singleton; /** Dagger module for {@link Keyring} */ @Module diff --git a/core/src/main/java/google/registry/keyring/api/KeyModule.java b/core/src/main/java/google/registry/keyring/api/KeyModule.java index ef39243cc..227c03b1f 100644 --- a/core/src/main/java/google/registry/keyring/api/KeyModule.java +++ b/core/src/main/java/google/registry/keyring/api/KeyModule.java @@ -18,9 +18,9 @@ import static com.google.common.base.Strings.emptyToNull; import dagger.Module; import dagger.Provides; +import jakarta.inject.Qualifier; import java.lang.annotation.Documented; import java.util.Optional; -import javax.inject.Qualifier; import org.bouncycastle.openpgp.PGPKeyPair; import org.bouncycastle.openpgp.PGPPrivateKey; import org.bouncycastle.openpgp.PGPPublicKey; diff --git a/core/src/main/java/google/registry/keyring/secretmanager/SecretManagerKeyring.java b/core/src/main/java/google/registry/keyring/secretmanager/SecretManagerKeyring.java index b1a28dedb..6fc18b510 100644 --- a/core/src/main/java/google/registry/keyring/secretmanager/SecretManagerKeyring.java +++ b/core/src/main/java/google/registry/keyring/secretmanager/SecretManagerKeyring.java @@ -21,8 +21,8 @@ import google.registry.keyring.api.KeySerializer; import google.registry.keyring.api.Keyring; import google.registry.keyring.api.KeyringException; import google.registry.privileges.secretmanager.KeyringSecretStore; +import jakarta.inject.Inject; import java.io.IOException; -import javax.inject.Inject; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPKeyPair; import org.bouncycastle.openpgp.PGPPrivateKey; diff --git a/core/src/main/java/google/registry/keyring/secretmanager/SecretManagerKeyringUpdater.java b/core/src/main/java/google/registry/keyring/secretmanager/SecretManagerKeyringUpdater.java index d6a2884a4..553c5ba1f 100644 --- a/core/src/main/java/google/registry/keyring/secretmanager/SecretManagerKeyringUpdater.java +++ b/core/src/main/java/google/registry/keyring/secretmanager/SecretManagerKeyringUpdater.java @@ -42,11 +42,11 @@ import google.registry.keyring.secretmanager.SecretManagerKeyring.PrivateKeyLabe import google.registry.keyring.secretmanager.SecretManagerKeyring.PublicKeyLabel; import google.registry.keyring.secretmanager.SecretManagerKeyring.StringKeyLabel; import google.registry.privileges.secretmanager.KeyringSecretStore; +import jakarta.inject.Inject; import java.io.IOException; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; -import javax.inject.Inject; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPKeyPair; import org.bouncycastle.openpgp.PGPPublicKey; diff --git a/core/src/main/java/google/registry/loadtest/LoadTestAction.java b/core/src/main/java/google/registry/loadtest/LoadTestAction.java index 4076c0b12..7d7e7824a 100644 --- a/core/src/main/java/google/registry/loadtest/LoadTestAction.java +++ b/core/src/main/java/google/registry/loadtest/LoadTestAction.java @@ -36,13 +36,13 @@ import google.registry.request.Parameter; import google.registry.request.auth.Auth; import google.registry.security.XsrfTokenManager; import google.registry.util.RegistryEnvironment; +import jakarta.inject.Inject; import java.time.Instant; import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.Random; import java.util.function.Function; -import javax.inject.Inject; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/model/pricing/StaticPremiumListPricingEngine.java b/core/src/main/java/google/registry/model/pricing/StaticPremiumListPricingEngine.java index e7bb93f96..8e27679a3 100644 --- a/core/src/main/java/google/registry/model/pricing/StaticPremiumListPricingEngine.java +++ b/core/src/main/java/google/registry/model/pricing/StaticPremiumListPricingEngine.java @@ -20,8 +20,8 @@ import static google.registry.util.DomainNameUtils.getTldFromDomainName; import com.google.common.net.InternetDomainName; import google.registry.model.tld.Tld; import google.registry.model.tld.label.PremiumListDao; +import jakarta.inject.Inject; import java.util.Optional; -import javax.inject.Inject; import org.joda.money.Money; import org.joda.time.DateTime; diff --git a/core/src/main/java/google/registry/module/RegistryComponent.java b/core/src/main/java/google/registry/module/RegistryComponent.java index 978e31b43..afd01c12b 100644 --- a/core/src/main/java/google/registry/module/RegistryComponent.java +++ b/core/src/main/java/google/registry/module/RegistryComponent.java @@ -50,8 +50,8 @@ import google.registry.request.auth.AuthModule; import google.registry.request.auth.RequestAuthenticator; import google.registry.ui.ConsoleDebug.ConsoleConfigModule; import google.registry.util.UtilsModule; -import javax.inject.Provider; -import javax.inject.Singleton; +import jakarta.inject.Provider; +import jakarta.inject.Singleton; /** Dagger component with instance lifetime. */ @Singleton diff --git a/core/src/main/java/google/registry/module/backend/BackendComponent.java b/core/src/main/java/google/registry/module/backend/BackendComponent.java index 0e10d3ee3..e698b86d8 100644 --- a/core/src/main/java/google/registry/module/backend/BackendComponent.java +++ b/core/src/main/java/google/registry/module/backend/BackendComponent.java @@ -43,7 +43,7 @@ import google.registry.request.Modules.NetHttpTransportModule; import google.registry.request.Modules.UrlConnectionServiceModule; import google.registry.request.auth.AuthModule; import google.registry.util.UtilsModule; -import javax.inject.Singleton; +import jakarta.inject.Singleton; /** Dagger component with instance lifetime for "backend" App Engine module. */ @Singleton diff --git a/core/src/main/java/google/registry/module/backend/BackendRequestHandler.java b/core/src/main/java/google/registry/module/backend/BackendRequestHandler.java index 884332c84..f53861eef 100644 --- a/core/src/main/java/google/registry/module/backend/BackendRequestHandler.java +++ b/core/src/main/java/google/registry/module/backend/BackendRequestHandler.java @@ -16,8 +16,8 @@ package google.registry.module.backend; import google.registry.request.RequestHandler; import google.registry.request.auth.RequestAuthenticator; -import javax.inject.Inject; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Provider; /** Request handler for the backend module. */ public class BackendRequestHandler extends RequestHandler { diff --git a/core/src/main/java/google/registry/module/bsa/BsaComponent.java b/core/src/main/java/google/registry/module/bsa/BsaComponent.java index 3d313b533..b7ee2b875 100644 --- a/core/src/main/java/google/registry/module/bsa/BsaComponent.java +++ b/core/src/main/java/google/registry/module/bsa/BsaComponent.java @@ -29,7 +29,7 @@ import google.registry.request.Modules.GsonModule; import google.registry.request.Modules.UrlConnectionServiceModule; import google.registry.request.auth.AuthModule; import google.registry.util.UtilsModule; -import javax.inject.Singleton; +import jakarta.inject.Singleton; @Singleton @Component( diff --git a/core/src/main/java/google/registry/module/bsa/BsaRequestHandler.java b/core/src/main/java/google/registry/module/bsa/BsaRequestHandler.java index 50e4e380b..9db9cdd15 100644 --- a/core/src/main/java/google/registry/module/bsa/BsaRequestHandler.java +++ b/core/src/main/java/google/registry/module/bsa/BsaRequestHandler.java @@ -16,8 +16,8 @@ package google.registry.module.bsa; import google.registry.request.RequestHandler; import google.registry.request.auth.RequestAuthenticator; -import javax.inject.Inject; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Provider; public class BsaRequestHandler extends RequestHandler { @Inject diff --git a/core/src/main/java/google/registry/module/frontend/FrontendComponent.java b/core/src/main/java/google/registry/module/frontend/FrontendComponent.java index 0ca20f13d..74835b1f5 100644 --- a/core/src/main/java/google/registry/module/frontend/FrontendComponent.java +++ b/core/src/main/java/google/registry/module/frontend/FrontendComponent.java @@ -36,7 +36,7 @@ import google.registry.request.Modules.NetHttpTransportModule; import google.registry.request.auth.AuthModule; import google.registry.ui.ConsoleDebug.ConsoleConfigModule; import google.registry.util.UtilsModule; -import javax.inject.Singleton; +import jakarta.inject.Singleton; /** Dagger component with instance lifetime for "default" App Engine module. */ @Singleton diff --git a/core/src/main/java/google/registry/module/frontend/FrontendRequestHandler.java b/core/src/main/java/google/registry/module/frontend/FrontendRequestHandler.java index 99f619667..1a2ea260b 100644 --- a/core/src/main/java/google/registry/module/frontend/FrontendRequestHandler.java +++ b/core/src/main/java/google/registry/module/frontend/FrontendRequestHandler.java @@ -16,8 +16,8 @@ package google.registry.module.frontend; import google.registry.request.RequestHandler; import google.registry.request.auth.RequestAuthenticator; -import javax.inject.Inject; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Provider; /** Request handler for the frontend module. */ public class FrontendRequestHandler extends RequestHandler { diff --git a/core/src/main/java/google/registry/module/pubapi/PubApiComponent.java b/core/src/main/java/google/registry/module/pubapi/PubApiComponent.java index 7df480527..3aa912b33 100644 --- a/core/src/main/java/google/registry/module/pubapi/PubApiComponent.java +++ b/core/src/main/java/google/registry/module/pubapi/PubApiComponent.java @@ -34,7 +34,7 @@ import google.registry.request.Modules.GsonModule; import google.registry.request.Modules.NetHttpTransportModule; import google.registry.request.auth.AuthModule; import google.registry.util.UtilsModule; -import javax.inject.Singleton; +import jakarta.inject.Singleton; /** Dagger component with instance lifetime for "pubapi" App Engine module. */ @Singleton diff --git a/core/src/main/java/google/registry/module/pubapi/PubApiRequestHandler.java b/core/src/main/java/google/registry/module/pubapi/PubApiRequestHandler.java index 71a263c89..c822912bd 100644 --- a/core/src/main/java/google/registry/module/pubapi/PubApiRequestHandler.java +++ b/core/src/main/java/google/registry/module/pubapi/PubApiRequestHandler.java @@ -16,8 +16,8 @@ package google.registry.module.pubapi; import google.registry.request.RequestHandler; import google.registry.request.auth.RequestAuthenticator; -import javax.inject.Inject; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Provider; /** Request handler for the frontend module. */ public class PubApiRequestHandler extends RequestHandler { diff --git a/core/src/main/java/google/registry/module/tools/ToolsComponent.java b/core/src/main/java/google/registry/module/tools/ToolsComponent.java index 10f0b6d50..74dfbc050 100644 --- a/core/src/main/java/google/registry/module/tools/ToolsComponent.java +++ b/core/src/main/java/google/registry/module/tools/ToolsComponent.java @@ -35,7 +35,7 @@ import google.registry.request.Modules.GsonModule; import google.registry.request.Modules.NetHttpTransportModule; import google.registry.request.auth.AuthModule; import google.registry.util.UtilsModule; -import javax.inject.Singleton; +import jakarta.inject.Singleton; /** Dagger component with instance lifetime for "tools" App Engine module. */ @Singleton diff --git a/core/src/main/java/google/registry/module/tools/ToolsRequestHandler.java b/core/src/main/java/google/registry/module/tools/ToolsRequestHandler.java index 80f1591c4..68c888176 100644 --- a/core/src/main/java/google/registry/module/tools/ToolsRequestHandler.java +++ b/core/src/main/java/google/registry/module/tools/ToolsRequestHandler.java @@ -16,8 +16,8 @@ package google.registry.module.tools; import google.registry.request.RequestHandler; import google.registry.request.auth.RequestAuthenticator; -import javax.inject.Inject; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Provider; /** Request handler for the tools module. */ public class ToolsRequestHandler extends RequestHandler { diff --git a/core/src/main/java/google/registry/monitoring/whitebox/StackdriverModule.java b/core/src/main/java/google/registry/monitoring/whitebox/StackdriverModule.java index 5b05d0ce2..100beea22 100644 --- a/core/src/main/java/google/registry/monitoring/whitebox/StackdriverModule.java +++ b/core/src/main/java/google/registry/monitoring/whitebox/StackdriverModule.java @@ -30,8 +30,8 @@ import google.registry.util.Clock; import google.registry.util.GoogleCredentialsBundle; import google.registry.util.MetricParameters; import google.registry.util.RegistryEnvironment; -import javax.inject.Named; -import javax.inject.Singleton; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import org.joda.time.Duration; /** Dagger module for Google Stackdriver service connection objects. */ diff --git a/core/src/main/java/google/registry/persistence/PersistenceComponent.java b/core/src/main/java/google/registry/persistence/PersistenceComponent.java index e296345c6..4332c426b 100644 --- a/core/src/main/java/google/registry/persistence/PersistenceComponent.java +++ b/core/src/main/java/google/registry/persistence/PersistenceComponent.java @@ -23,8 +23,8 @@ import google.registry.persistence.PersistenceModule.ReadOnlyReplicaJpaTm; import google.registry.persistence.transaction.JpaTransactionManager; import google.registry.privileges.secretmanager.SecretManagerModule; import google.registry.util.UtilsModule; +import jakarta.inject.Singleton; import jakarta.persistence.EntityManagerFactory; -import javax.inject.Singleton; /** Dagger component to provide {@link EntityManagerFactory} instances. */ @Singleton diff --git a/core/src/main/java/google/registry/persistence/PersistenceModule.java b/core/src/main/java/google/registry/persistence/PersistenceModule.java index f292eac55..7e1fdd9e2 100644 --- a/core/src/main/java/google/registry/persistence/PersistenceModule.java +++ b/core/src/main/java/google/registry/persistence/PersistenceModule.java @@ -31,6 +31,7 @@ import com.google.common.base.Ascii; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import dagger.BindsOptionalOf; +import dagger.Lazy; import dagger.Module; import dagger.Provides; import google.registry.config.RegistryConfig.Config; @@ -45,6 +46,9 @@ import google.registry.privileges.secretmanager.SqlUser.RobotId; import google.registry.privileges.secretmanager.SqlUser.RobotUser; import google.registry.tools.AuthModule.CloudSqlClientCredential; import google.registry.util.Clock; +import jakarta.inject.Provider; +import jakarta.inject.Qualifier; +import jakarta.inject.Singleton; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.Persistence; import java.lang.annotation.Documented; @@ -57,9 +61,6 @@ import java.util.Optional; import java.util.Properties; import java.util.function.Supplier; import javax.annotation.Nullable; -import javax.inject.Provider; -import javax.inject.Qualifier; -import javax.inject.Singleton; import org.hibernate.cfg.Environment; /** Dagger module class for the persistence layer. */ @@ -131,7 +132,13 @@ public abstract class PersistenceModule { *

The binding for {@link TransactionIsolationLevel} may be {@link Nullable}. As a result, it * is a compile-time error to inject {@code Optional} (See {@link * BindsOptionalOf} for more information). User should inject {@code - * Optional>} instead. + * Optional>} instead. + * + *

Note that newer version of Dagger provides {@code dagger.internal.Provider} instead of + * {@code jakarta.inject.Provider}, so we cannot request {@code Optional>} when there + * is an {@code BindsOptionalOf} binding for {@code T} in the graph, as {@code + * Optional>} is invariant to {@code + * Optional>}. */ @BindsOptionalOf @Config("beamIsolationOverride") @@ -154,8 +161,7 @@ public abstract class PersistenceModule { SqlCredentialStore credentialStore, @Config("instanceConnectionNameOverride") Optional> instanceConnectionNameOverride, - @Config("beamIsolationOverride") - Optional> isolationOverride, + @Config("beamIsolationOverride") Optional> isolationOverride, @PartialCloudSqlConfigs ImmutableMap cloudSqlConfigs) { HashMap overrides = Maps.newHashMap(cloudSqlConfigs); // TODO(b/175700623): make sql username configurable from config file. @@ -176,7 +182,7 @@ public abstract class PersistenceModule { instanceConnectionName -> overrides.put(HIKARI_DS_CLOUD_SQL_INSTANCE, instanceConnectionName)); isolationOverride - .map(Provider::get) + .map(Lazy::get) .ifPresent(isolation -> overrides.put(Environment.ISOLATION, isolation.name())); return ImmutableMap.copyOf(overrides); } diff --git a/core/src/main/java/google/registry/pricing/PricingComponent.java b/core/src/main/java/google/registry/pricing/PricingComponent.java index 1149f3880..96af61d03 100644 --- a/core/src/main/java/google/registry/pricing/PricingComponent.java +++ b/core/src/main/java/google/registry/pricing/PricingComponent.java @@ -16,8 +16,8 @@ package google.registry.pricing; import dagger.Component; import google.registry.model.pricing.PremiumPricingEngine; +import jakarta.inject.Singleton; import java.util.Map; -import javax.inject.Singleton; /** * Dagger component with instance lifetime for pricing engines. diff --git a/core/src/main/java/google/registry/privileges/secretmanager/KeyringSecretStore.java b/core/src/main/java/google/registry/privileges/secretmanager/KeyringSecretStore.java index 1054b3014..abcfac03e 100644 --- a/core/src/main/java/google/registry/privileges/secretmanager/KeyringSecretStore.java +++ b/core/src/main/java/google/registry/privileges/secretmanager/KeyringSecretStore.java @@ -17,9 +17,9 @@ package google.registry.privileges.secretmanager; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Strings.isNullOrEmpty; +import jakarta.inject.Inject; import java.nio.charset.StandardCharsets; import java.util.Optional; -import javax.inject.Inject; /** * Storage for 'keyring' secrets, backed by the Secret Manager. diff --git a/core/src/main/java/google/registry/privileges/secretmanager/SecretManagerModule.java b/core/src/main/java/google/registry/privileges/secretmanager/SecretManagerModule.java index 34a82eb32..761c6726a 100644 --- a/core/src/main/java/google/registry/privileges/secretmanager/SecretManagerModule.java +++ b/core/src/main/java/google/registry/privileges/secretmanager/SecretManagerModule.java @@ -23,8 +23,8 @@ import google.registry.config.CredentialModule.ApplicationDefaultCredential; import google.registry.config.RegistryConfig.Config; import google.registry.util.GoogleCredentialsBundle; import google.registry.util.Retrier; +import jakarta.inject.Singleton; import java.io.IOException; -import javax.inject.Singleton; /** Provides bindings for {@link SecretManagerClient}. */ @Module diff --git a/core/src/main/java/google/registry/privileges/secretmanager/SqlCredentialStore.java b/core/src/main/java/google/registry/privileges/secretmanager/SqlCredentialStore.java index 1c81c7a95..4e7ad1442 100644 --- a/core/src/main/java/google/registry/privileges/secretmanager/SqlCredentialStore.java +++ b/core/src/main/java/google/registry/privileges/secretmanager/SqlCredentialStore.java @@ -17,8 +17,8 @@ package google.registry.privileges.secretmanager; import com.google.cloud.secretmanager.v1.SecretVersionName; import google.registry.config.RegistryConfig.Config; import google.registry.privileges.secretmanager.SecretManagerClient.NoSuchSecretResourceException; +import jakarta.inject.Inject; import java.util.Optional; -import javax.inject.Inject; /** * Storage of SQL users' login credentials, backed by Cloud Secret Manager. diff --git a/core/src/main/java/google/registry/rdap/RdapActionBase.java b/core/src/main/java/google/registry/rdap/RdapActionBase.java index d81952067..66389eb18 100644 --- a/core/src/main/java/google/registry/rdap/RdapActionBase.java +++ b/core/src/main/java/google/registry/rdap/RdapActionBase.java @@ -43,10 +43,10 @@ import google.registry.request.RequestMethod; import google.registry.request.RequestPath; import google.registry.request.Response; import google.registry.util.Clock; +import jakarta.inject.Inject; import java.net.URI; import java.net.URISyntaxException; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/rdap/RdapAutnumAction.java b/core/src/main/java/google/registry/rdap/RdapAutnumAction.java index d32e0cb20..30b9da327 100644 --- a/core/src/main/java/google/registry/rdap/RdapAutnumAction.java +++ b/core/src/main/java/google/registry/rdap/RdapAutnumAction.java @@ -23,7 +23,7 @@ import google.registry.request.Action; import google.registry.request.Action.GaeService; import google.registry.request.HttpException.NotImplementedException; import google.registry.request.auth.Auth; -import javax.inject.Inject; +import jakarta.inject.Inject; /** * RDAP (new WHOIS) action for RDAP autonomous system number requests. diff --git a/core/src/main/java/google/registry/rdap/RdapDomainAction.java b/core/src/main/java/google/registry/rdap/RdapDomainAction.java index 5738eb2ce..9a66dabed 100644 --- a/core/src/main/java/google/registry/rdap/RdapDomainAction.java +++ b/core/src/main/java/google/registry/rdap/RdapDomainAction.java @@ -33,8 +33,8 @@ import google.registry.request.Action.GaeService; import google.registry.request.HttpException.BadRequestException; import google.registry.request.HttpException.NotFoundException; import google.registry.request.auth.Auth; +import jakarta.inject.Inject; import java.util.Optional; -import javax.inject.Inject; /** RDAP (new WHOIS) action for domain requests. */ @Action( diff --git a/core/src/main/java/google/registry/rdap/RdapDomainSearchAction.java b/core/src/main/java/google/registry/rdap/RdapDomainSearchAction.java index e21fc7d4e..1f3eec462 100644 --- a/core/src/main/java/google/registry/rdap/RdapDomainSearchAction.java +++ b/core/src/main/java/google/registry/rdap/RdapDomainSearchAction.java @@ -50,13 +50,13 @@ import google.registry.request.HttpException.UnprocessableEntityException; import google.registry.request.Parameter; import google.registry.request.auth.Auth; import google.registry.util.NonFinalForTesting; +import jakarta.inject.Inject; import jakarta.persistence.criteria.CriteriaBuilder; import java.net.InetAddress; import java.util.Comparator; import java.util.List; import java.util.Optional; import java.util.stream.Stream; -import javax.inject.Inject; import org.hibernate.Hibernate; /** diff --git a/core/src/main/java/google/registry/rdap/RdapEntityAction.java b/core/src/main/java/google/registry/rdap/RdapEntityAction.java index 7510a6664..e0c29dfd3 100644 --- a/core/src/main/java/google/registry/rdap/RdapEntityAction.java +++ b/core/src/main/java/google/registry/rdap/RdapEntityAction.java @@ -33,8 +33,8 @@ import google.registry.request.Action; import google.registry.request.Action.GaeService; import google.registry.request.HttpException.NotFoundException; import google.registry.request.auth.Auth; +import jakarta.inject.Inject; import java.util.Optional; -import javax.inject.Inject; /** * RDAP (new WHOIS) action for entity (contact and registrar) requests. the ICANN operational diff --git a/core/src/main/java/google/registry/rdap/RdapEntitySearchAction.java b/core/src/main/java/google/registry/rdap/RdapEntitySearchAction.java index 282cd4bdc..1c55d1d9e 100644 --- a/core/src/main/java/google/registry/rdap/RdapEntitySearchAction.java +++ b/core/src/main/java/google/registry/rdap/RdapEntitySearchAction.java @@ -43,10 +43,10 @@ import google.registry.request.HttpException.NotFoundException; import google.registry.request.HttpException.UnprocessableEntityException; import google.registry.request.Parameter; import google.registry.request.auth.Auth; +import jakarta.inject.Inject; import java.util.Comparator; import java.util.List; import java.util.Optional; -import javax.inject.Inject; /** * RDAP (new WHOIS) action for entity (contact and registrar) search requests. diff --git a/core/src/main/java/google/registry/rdap/RdapHelpAction.java b/core/src/main/java/google/registry/rdap/RdapHelpAction.java index fe1403f2e..b66d4216f 100644 --- a/core/src/main/java/google/registry/rdap/RdapHelpAction.java +++ b/core/src/main/java/google/registry/rdap/RdapHelpAction.java @@ -25,8 +25,8 @@ import google.registry.request.Action; import google.registry.request.Action.GaeService; import google.registry.request.HttpException.NotFoundException; import google.registry.request.auth.Auth; +import jakarta.inject.Inject; import java.util.Optional; -import javax.inject.Inject; /** RDAP (new WHOIS) action for help requests. */ @Action( diff --git a/core/src/main/java/google/registry/rdap/RdapIpAction.java b/core/src/main/java/google/registry/rdap/RdapIpAction.java index 4121e0892..a5f6c3826 100644 --- a/core/src/main/java/google/registry/rdap/RdapIpAction.java +++ b/core/src/main/java/google/registry/rdap/RdapIpAction.java @@ -23,7 +23,7 @@ import google.registry.request.Action; import google.registry.request.Action.GaeService; import google.registry.request.HttpException.NotImplementedException; import google.registry.request.auth.Auth; -import javax.inject.Inject; +import jakarta.inject.Inject; /** * RDAP (new WHOIS) action for RDAP IP address requests. diff --git a/core/src/main/java/google/registry/rdap/RdapJsonFormatter.java b/core/src/main/java/google/registry/rdap/RdapJsonFormatter.java index dc4496116..d79056b41 100644 --- a/core/src/main/java/google/registry/rdap/RdapJsonFormatter.java +++ b/core/src/main/java/google/registry/rdap/RdapJsonFormatter.java @@ -72,6 +72,7 @@ import google.registry.rdap.RdapObjectClasses.Vcard; import google.registry.rdap.RdapObjectClasses.VcardArray; import google.registry.request.RequestServerName; import google.registry.util.Clock; +import jakarta.inject.Inject; import jakarta.persistence.Entity; import java.net.Inet4Address; import java.net.Inet6Address; @@ -84,7 +85,6 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Stream; import javax.annotation.Nullable; -import javax.inject.Inject; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/rdap/RdapMetrics.java b/core/src/main/java/google/registry/rdap/RdapMetrics.java index 8228f76d0..86ebf26f6 100644 --- a/core/src/main/java/google/registry/rdap/RdapMetrics.java +++ b/core/src/main/java/google/registry/rdap/RdapMetrics.java @@ -25,8 +25,8 @@ import com.google.monitoring.metrics.LabelDescriptor; import com.google.monitoring.metrics.MetricRegistryImpl; import google.registry.rdap.RdapSearchResults.IncompletenessWarningType; import google.registry.request.Action; +import jakarta.inject.Inject; import java.util.Optional; -import javax.inject.Inject; /** RDAP Instrumentation. */ public class RdapMetrics { diff --git a/core/src/main/java/google/registry/rdap/RdapNameserverAction.java b/core/src/main/java/google/registry/rdap/RdapNameserverAction.java index 9f6dc2ef5..882563e4b 100644 --- a/core/src/main/java/google/registry/rdap/RdapNameserverAction.java +++ b/core/src/main/java/google/registry/rdap/RdapNameserverAction.java @@ -30,8 +30,8 @@ import google.registry.request.Action.GaeService; import google.registry.request.HttpException.BadRequestException; import google.registry.request.HttpException.NotFoundException; import google.registry.request.auth.Auth; +import jakarta.inject.Inject; import java.util.Optional; -import javax.inject.Inject; /** RDAP (new WHOIS) action for nameserver requests. */ @Action( diff --git a/core/src/main/java/google/registry/rdap/RdapNameserverSearchAction.java b/core/src/main/java/google/registry/rdap/RdapNameserverSearchAction.java index d3d507e42..adffbc36e 100644 --- a/core/src/main/java/google/registry/rdap/RdapNameserverSearchAction.java +++ b/core/src/main/java/google/registry/rdap/RdapNameserverSearchAction.java @@ -40,11 +40,11 @@ import google.registry.request.HttpException.NotFoundException; import google.registry.request.HttpException.UnprocessableEntityException; import google.registry.request.Parameter; import google.registry.request.auth.Auth; +import jakarta.inject.Inject; import java.net.InetAddress; import java.util.ArrayList; import java.util.List; import java.util.Optional; -import javax.inject.Inject; /** * RDAP (new WHOIS) action for nameserver search requests. diff --git a/core/src/main/java/google/registry/rdap/RdapSearchActionBase.java b/core/src/main/java/google/registry/rdap/RdapSearchActionBase.java index c6f89b35f..8b4d65b0b 100644 --- a/core/src/main/java/google/registry/rdap/RdapSearchActionBase.java +++ b/core/src/main/java/google/registry/rdap/RdapSearchActionBase.java @@ -32,6 +32,7 @@ import google.registry.request.HttpException.UnprocessableEntityException; import google.registry.request.Parameter; import google.registry.request.ParameterMap; import google.registry.request.RequestUrl; +import jakarta.inject.Inject; import jakarta.persistence.criteria.CriteriaBuilder; import java.io.UnsupportedEncodingException; import java.net.URI; @@ -42,7 +43,6 @@ import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Optional; -import javax.inject.Inject; /** * Base RDAP (new WHOIS) action for domain, nameserver and entity search requests. diff --git a/core/src/main/java/google/registry/rdap/UpdateRegistrarRdapBaseUrlsAction.java b/core/src/main/java/google/registry/rdap/UpdateRegistrarRdapBaseUrlsAction.java index b3960bae0..45fb25798 100644 --- a/core/src/main/java/google/registry/rdap/UpdateRegistrarRdapBaseUrlsAction.java +++ b/core/src/main/java/google/registry/rdap/UpdateRegistrarRdapBaseUrlsAction.java @@ -32,12 +32,12 @@ import google.registry.request.UrlConnectionService; import google.registry.request.UrlConnectionUtils; import google.registry.request.auth.Auth; import google.registry.util.UrlConnectionException; +import jakarta.inject.Inject; import java.io.IOException; import java.io.StringReader; import java.net.HttpURLConnection; import java.net.URL; import java.security.GeneralSecurityException; -import javax.inject.Inject; import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVParser; import org.apache.commons.csv.CSVRecord; diff --git a/core/src/main/java/google/registry/rde/BrdaCopyAction.java b/core/src/main/java/google/registry/rde/BrdaCopyAction.java index 2590a6ee1..95d682eec 100644 --- a/core/src/main/java/google/registry/rde/BrdaCopyAction.java +++ b/core/src/main/java/google/registry/rde/BrdaCopyAction.java @@ -37,11 +37,11 @@ import google.registry.request.HttpException.NoContentException; import google.registry.request.Parameter; import google.registry.request.RequestParameters; import google.registry.request.auth.Auth; +import jakarta.inject.Inject; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.Optional; -import javax.inject.Inject; import org.bouncycastle.openpgp.PGPKeyPair; import org.bouncycastle.openpgp.PGPPrivateKey; import org.bouncycastle.openpgp.PGPPublicKey; diff --git a/core/src/main/java/google/registry/rde/EscrowTaskRunner.java b/core/src/main/java/google/registry/rde/EscrowTaskRunner.java index 5bbf8b0d5..7a1ae5e0d 100644 --- a/core/src/main/java/google/registry/rde/EscrowTaskRunner.java +++ b/core/src/main/java/google/registry/rde/EscrowTaskRunner.java @@ -24,8 +24,8 @@ import google.registry.request.HttpException.NoContentException; import google.registry.request.HttpException.ServiceUnavailableException; import google.registry.request.lock.LockHandler; import google.registry.util.Clock; +import jakarta.inject.Inject; import java.util.concurrent.Callable; -import javax.inject.Inject; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/core/src/main/java/google/registry/rde/JSchSshSession.java b/core/src/main/java/google/registry/rde/JSchSshSession.java index 8011a76c0..d05b6f86e 100644 --- a/core/src/main/java/google/registry/rde/JSchSshSession.java +++ b/core/src/main/java/google/registry/rde/JSchSshSession.java @@ -22,9 +22,9 @@ import com.jcraft.jsch.JSchException; import com.jcraft.jsch.Session; import com.jcraft.jsch.SftpException; import google.registry.config.RegistryConfig.Config; +import jakarta.inject.Inject; import java.io.Closeable; import java.net.URI; -import javax.inject.Inject; import org.joda.time.Duration; /** diff --git a/core/src/main/java/google/registry/rde/LoggingSftpProgressMonitor.java b/core/src/main/java/google/registry/rde/LoggingSftpProgressMonitor.java index 6bc72b7b4..baba9476b 100644 --- a/core/src/main/java/google/registry/rde/LoggingSftpProgressMonitor.java +++ b/core/src/main/java/google/registry/rde/LoggingSftpProgressMonitor.java @@ -19,7 +19,7 @@ import com.google.common.flogger.FluentLogger; import com.jcraft.jsch.ChannelSftp; import com.jcraft.jsch.SftpProgressMonitor; import google.registry.util.Clock; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/core/src/main/java/google/registry/rde/PendingDepositChecker.java b/core/src/main/java/google/registry/rde/PendingDepositChecker.java index 406bc4746..7e4a762c0 100644 --- a/core/src/main/java/google/registry/rde/PendingDepositChecker.java +++ b/core/src/main/java/google/registry/rde/PendingDepositChecker.java @@ -27,8 +27,8 @@ import google.registry.model.tld.Tld; import google.registry.model.tld.Tld.TldType; import google.registry.model.tld.Tlds; import google.registry.util.Clock; +import jakarta.inject.Inject; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/core/src/main/java/google/registry/rde/RdeCounter.java b/core/src/main/java/google/registry/rde/RdeCounter.java index 676e805a7..0a2a54cee 100644 --- a/core/src/main/java/google/registry/rde/RdeCounter.java +++ b/core/src/main/java/google/registry/rde/RdeCounter.java @@ -22,11 +22,11 @@ import google.registry.xjc.rdeheader.XjcRdeHeader; import google.registry.xjc.rdeheader.XjcRdeHeaderCount; import google.registry.xjc.rdeheader.XjcRdeHeaderElement; import google.registry.xjc.rdereport.XjcRdeReport; +import jakarta.inject.Inject; import java.util.EnumMap; import java.util.EnumSet; import java.util.concurrent.atomic.AtomicLong; import javax.annotation.concurrent.NotThreadSafe; -import javax.inject.Inject; import org.joda.time.DateTime; /** Utility class for generating a single {@link XjcRdeHeader} while marshalling a deposit. */ diff --git a/core/src/main/java/google/registry/rde/RdeReportAction.java b/core/src/main/java/google/registry/rde/RdeReportAction.java index 11707c844..313a3a63e 100644 --- a/core/src/main/java/google/registry/rde/RdeReportAction.java +++ b/core/src/main/java/google/registry/rde/RdeReportAction.java @@ -42,10 +42,10 @@ import google.registry.request.Parameter; import google.registry.request.RequestParameters; import google.registry.request.Response; import google.registry.request.auth.Auth; +import jakarta.inject.Inject; import java.io.IOException; import java.io.InputStream; import java.util.Optional; -import javax.inject.Inject; import org.bouncycastle.openpgp.PGPPrivateKey; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/core/src/main/java/google/registry/rde/RdeReporter.java b/core/src/main/java/google/registry/rde/RdeReporter.java index 7b9e0141a..229a2415e 100644 --- a/core/src/main/java/google/registry/rde/RdeReporter.java +++ b/core/src/main/java/google/registry/rde/RdeReporter.java @@ -36,13 +36,13 @@ import google.registry.xjc.iirdea.XjcIirdeaResult; import google.registry.xjc.rdeheader.XjcRdeHeader; import google.registry.xjc.rdereport.XjcRdeReportReport; import google.registry.xml.XmlException; +import jakarta.inject.Inject; import java.io.ByteArrayInputStream; import java.io.IOException; import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; import java.security.GeneralSecurityException; -import javax.inject.Inject; /** * Class that uploads a decrypted XML deposit report to ICANN's webserver. diff --git a/core/src/main/java/google/registry/rde/RdeStagingAction.java b/core/src/main/java/google/registry/rde/RdeStagingAction.java index f446b6565..5d4938def 100644 --- a/core/src/main/java/google/registry/rde/RdeStagingAction.java +++ b/core/src/main/java/google/registry/rde/RdeStagingAction.java @@ -59,9 +59,9 @@ import google.registry.request.auth.Auth; import google.registry.util.Clock; import google.registry.util.RegistryEnvironment; import google.registry.xml.ValidationMode; +import jakarta.inject.Inject; import java.io.IOException; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/core/src/main/java/google/registry/rde/RdeUploadAction.java b/core/src/main/java/google/registry/rde/RdeUploadAction.java index 3b175edf4..361094d96 100644 --- a/core/src/main/java/google/registry/rde/RdeUploadAction.java +++ b/core/src/main/java/google/registry/rde/RdeUploadAction.java @@ -59,6 +59,7 @@ import google.registry.request.auth.Auth; import google.registry.util.Clock; import google.registry.util.Retrier; import google.registry.util.TeeOutputStream; +import jakarta.inject.Inject; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -66,7 +67,6 @@ import java.io.InputStream; import java.io.OutputStream; import java.net.URI; import java.util.Optional; -import javax.inject.Inject; import org.bouncycastle.openpgp.PGPKeyPair; import org.bouncycastle.openpgp.PGPPrivateKey; import org.bouncycastle.openpgp.PGPPublicKey; diff --git a/core/src/main/java/google/registry/reporting/billing/BillingEmailUtils.java b/core/src/main/java/google/registry/reporting/billing/BillingEmailUtils.java index 7ad41f3cc..5ac37e06c 100644 --- a/core/src/main/java/google/registry/reporting/billing/BillingEmailUtils.java +++ b/core/src/main/java/google/registry/reporting/billing/BillingEmailUtils.java @@ -26,9 +26,9 @@ import google.registry.gcs.GcsUtils; import google.registry.groups.GmailClient; import google.registry.reporting.billing.BillingModule.InvoiceDirectoryPrefix; import google.registry.util.EmailMessage; +import jakarta.inject.Inject; import jakarta.mail.internet.InternetAddress; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.YearMonth; /** Utility functions for sending emails involving monthly invoices. */ diff --git a/core/src/main/java/google/registry/reporting/billing/BillingModule.java b/core/src/main/java/google/registry/reporting/billing/BillingModule.java index 6d3e0408d..b8ed8d15a 100644 --- a/core/src/main/java/google/registry/reporting/billing/BillingModule.java +++ b/core/src/main/java/google/registry/reporting/billing/BillingModule.java @@ -21,10 +21,10 @@ import dagger.Module; import dagger.Provides; import google.registry.config.RegistryConfig.Config; import google.registry.request.Parameter; +import jakarta.inject.Qualifier; import jakarta.servlet.http.HttpServletRequest; import java.lang.annotation.Documented; import java.lang.annotation.Retention; -import javax.inject.Qualifier; import org.joda.time.YearMonth; /** Module for dependencies required by monthly billing actions. */ diff --git a/core/src/main/java/google/registry/reporting/billing/CopyDetailReportsAction.java b/core/src/main/java/google/registry/reporting/billing/CopyDetailReportsAction.java index 7af9befd9..71ef70db9 100644 --- a/core/src/main/java/google/registry/reporting/billing/CopyDetailReportsAction.java +++ b/core/src/main/java/google/registry/reporting/billing/CopyDetailReportsAction.java @@ -37,11 +37,11 @@ import google.registry.request.Response; import google.registry.request.auth.Auth; import google.registry.storage.drive.DriveConnection; import google.registry.util.Retrier; +import jakarta.inject.Inject; import java.io.IOException; import java.io.InputStream; import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; /** Copy all registrar detail reports in a given bucket's subdirectory from GCS to Drive. */ @Action( diff --git a/core/src/main/java/google/registry/reporting/billing/GenerateInvoicesAction.java b/core/src/main/java/google/registry/reporting/billing/GenerateInvoicesAction.java index bb379a432..d4facdf68 100644 --- a/core/src/main/java/google/registry/reporting/billing/GenerateInvoicesAction.java +++ b/core/src/main/java/google/registry/reporting/billing/GenerateInvoicesAction.java @@ -38,8 +38,8 @@ import google.registry.request.Response; import google.registry.request.auth.Auth; import google.registry.util.Clock; import google.registry.util.RegistryEnvironment; +import jakarta.inject.Inject; import java.io.IOException; -import javax.inject.Inject; import org.joda.time.Duration; import org.joda.time.YearMonth; diff --git a/core/src/main/java/google/registry/reporting/billing/PublishInvoicesAction.java b/core/src/main/java/google/registry/reporting/billing/PublishInvoicesAction.java index b473117fe..ae0571d90 100644 --- a/core/src/main/java/google/registry/reporting/billing/PublishInvoicesAction.java +++ b/core/src/main/java/google/registry/reporting/billing/PublishInvoicesAction.java @@ -34,8 +34,8 @@ import google.registry.request.Action.GaeService; import google.registry.request.Parameter; import google.registry.request.Response; import google.registry.request.auth.Auth; +import jakarta.inject.Inject; import java.io.IOException; -import javax.inject.Inject; import org.joda.time.YearMonth; /** diff --git a/core/src/main/java/google/registry/reporting/icann/ActivityReportingQueryBuilder.java b/core/src/main/java/google/registry/reporting/icann/ActivityReportingQueryBuilder.java index dd37e8c5b..990cdff49 100644 --- a/core/src/main/java/google/registry/reporting/icann/ActivityReportingQueryBuilder.java +++ b/core/src/main/java/google/registry/reporting/icann/ActivityReportingQueryBuilder.java @@ -21,8 +21,8 @@ import static google.registry.reporting.icann.QueryBuilderUtils.getTableName; import com.google.common.collect.ImmutableMap; import google.registry.config.RegistryConfig.Config; import google.registry.util.SqlTemplate; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.joda.time.LocalDate; import org.joda.time.YearMonth; import org.joda.time.format.DateTimeFormat; diff --git a/core/src/main/java/google/registry/reporting/icann/DnsCountQueryCoordinator.java b/core/src/main/java/google/registry/reporting/icann/DnsCountQueryCoordinator.java index 0d4f5df9e..3255d58de 100644 --- a/core/src/main/java/google/registry/reporting/icann/DnsCountQueryCoordinator.java +++ b/core/src/main/java/google/registry/reporting/icann/DnsCountQueryCoordinator.java @@ -23,8 +23,8 @@ import dagger.Module; import dagger.Provides; import google.registry.bigquery.BigqueryConnection; import google.registry.config.RegistryConfig.Config; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.joda.time.YearMonth; /** diff --git a/core/src/main/java/google/registry/reporting/icann/IcannHttpReporter.java b/core/src/main/java/google/registry/reporting/icann/IcannHttpReporter.java index 9cbcb2cc1..f0aca098a 100644 --- a/core/src/main/java/google/registry/reporting/icann/IcannHttpReporter.java +++ b/core/src/main/java/google/registry/reporting/icann/IcannHttpReporter.java @@ -32,6 +32,7 @@ import google.registry.xjc.XjcXmlTransformer; import google.registry.xjc.iirdea.XjcIirdeaResponseElement; import google.registry.xjc.iirdea.XjcIirdeaResult; import google.registry.xml.XmlException; +import jakarta.inject.Inject; import java.io.ByteArrayInputStream; import java.io.IOException; import java.net.HttpURLConnection; @@ -40,7 +41,6 @@ import java.net.URL; import java.nio.charset.StandardCharsets; import java.security.GeneralSecurityException; import java.util.List; -import javax.inject.Inject; import org.joda.time.YearMonth; import org.joda.time.format.DateTimeFormat; diff --git a/core/src/main/java/google/registry/reporting/icann/IcannReportingModule.java b/core/src/main/java/google/registry/reporting/icann/IcannReportingModule.java index 3c79303e0..c02844234 100644 --- a/core/src/main/java/google/registry/reporting/icann/IcannReportingModule.java +++ b/core/src/main/java/google/registry/reporting/icann/IcannReportingModule.java @@ -26,9 +26,9 @@ import dagger.Provides; import google.registry.bigquery.BigqueryConnection; import google.registry.request.HttpException.BadRequestException; import google.registry.request.Parameter; +import jakarta.inject.Named; import jakarta.servlet.http.HttpServletRequest; import java.util.Optional; -import javax.inject.Named; import org.joda.time.Duration; /** Module for dependencies required by ICANN monthly transactions/activity reporting. */ diff --git a/core/src/main/java/google/registry/reporting/icann/IcannReportingStager.java b/core/src/main/java/google/registry/reporting/icann/IcannReportingStager.java index 39c375f61..de69ecfc1 100644 --- a/core/src/main/java/google/registry/reporting/icann/IcannReportingStager.java +++ b/core/src/main/java/google/registry/reporting/icann/IcannReportingStager.java @@ -36,6 +36,7 @@ import google.registry.bigquery.BigqueryUtils.TableType; import google.registry.config.RegistryConfig.Config; import google.registry.gcs.GcsUtils; import google.registry.reporting.icann.IcannReportingModule.ReportType; +import jakarta.inject.Inject; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; @@ -46,7 +47,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; -import javax.inject.Inject; import org.joda.time.YearMonth; import org.joda.time.format.DateTimeFormat; diff --git a/core/src/main/java/google/registry/reporting/icann/IcannReportingStagingAction.java b/core/src/main/java/google/registry/reporting/icann/IcannReportingStagingAction.java index 08617556e..9484a9025 100644 --- a/core/src/main/java/google/registry/reporting/icann/IcannReportingStagingAction.java +++ b/core/src/main/java/google/registry/reporting/icann/IcannReportingStagingAction.java @@ -40,9 +40,9 @@ import google.registry.request.Response; import google.registry.request.auth.Auth; import google.registry.util.EmailMessage; import google.registry.util.Retrier; +import jakarta.inject.Inject; import jakarta.mail.internet.InternetAddress; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.Duration; import org.joda.time.YearMonth; import org.joda.time.format.DateTimeFormat; diff --git a/core/src/main/java/google/registry/reporting/icann/IcannReportingUploadAction.java b/core/src/main/java/google/registry/reporting/icann/IcannReportingUploadAction.java index 885680311..c7524093f 100644 --- a/core/src/main/java/google/registry/reporting/icann/IcannReportingUploadAction.java +++ b/core/src/main/java/google/registry/reporting/icann/IcannReportingUploadAction.java @@ -43,13 +43,13 @@ import google.registry.request.lock.LockHandler; import google.registry.util.Clock; import google.registry.util.EmailMessage; import google.registry.util.Retrier; +import jakarta.inject.Inject; import jakarta.mail.internet.InternetAddress; import java.io.IOException; import java.io.InputStream; import java.util.Map; import java.util.regex.Pattern; import java.util.stream.Collectors; -import javax.inject.Inject; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/core/src/main/java/google/registry/reporting/icann/TransactionsReportingQueryBuilder.java b/core/src/main/java/google/registry/reporting/icann/TransactionsReportingQueryBuilder.java index b34c4fe32..e0626b10f 100644 --- a/core/src/main/java/google/registry/reporting/icann/TransactionsReportingQueryBuilder.java +++ b/core/src/main/java/google/registry/reporting/icann/TransactionsReportingQueryBuilder.java @@ -21,8 +21,8 @@ import static google.registry.reporting.icann.QueryBuilderUtils.getTableName; import com.google.common.collect.ImmutableMap; import google.registry.config.RegistryConfig.Config; import google.registry.util.SqlTemplate; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.joda.time.DateTime; import org.joda.time.LocalTime; import org.joda.time.YearMonth; diff --git a/core/src/main/java/google/registry/reporting/spec11/GenerateSpec11ReportAction.java b/core/src/main/java/google/registry/reporting/spec11/GenerateSpec11ReportAction.java index ece7ea2b8..b45057713 100644 --- a/core/src/main/java/google/registry/reporting/spec11/GenerateSpec11ReportAction.java +++ b/core/src/main/java/google/registry/reporting/spec11/GenerateSpec11ReportAction.java @@ -38,8 +38,8 @@ import google.registry.request.Response; import google.registry.request.auth.Auth; import google.registry.util.Clock; import google.registry.util.RegistryEnvironment; +import jakarta.inject.Inject; import java.io.IOException; -import javax.inject.Inject; import org.joda.time.Duration; import org.joda.time.LocalDate; diff --git a/core/src/main/java/google/registry/reporting/spec11/PublishSpec11ReportAction.java b/core/src/main/java/google/registry/reporting/spec11/PublishSpec11ReportAction.java index e3205edb8..bb4267871 100644 --- a/core/src/main/java/google/registry/reporting/spec11/PublishSpec11ReportAction.java +++ b/core/src/main/java/google/registry/reporting/spec11/PublishSpec11ReportAction.java @@ -42,10 +42,10 @@ import google.registry.request.Action.GaeService; import google.registry.request.Parameter; import google.registry.request.Response; import google.registry.request.auth.Auth; +import jakarta.inject.Inject; import java.io.IOException; import java.util.Optional; import java.util.Set; -import javax.inject.Inject; import org.joda.time.LocalDate; import org.json.JSONException; diff --git a/core/src/main/java/google/registry/reporting/spec11/Spec11EmailUtils.java b/core/src/main/java/google/registry/reporting/spec11/Spec11EmailUtils.java index 872f2a318..2df917c21 100644 --- a/core/src/main/java/google/registry/reporting/spec11/Spec11EmailUtils.java +++ b/core/src/main/java/google/registry/reporting/spec11/Spec11EmailUtils.java @@ -38,11 +38,11 @@ import google.registry.model.registrar.RegistrarPoc; import google.registry.reporting.spec11.soy.Spec11EmailSoyInfo; import google.registry.util.EmailMessage; import google.registry.util.Sleeper; +import jakarta.inject.Inject; import jakarta.mail.MessagingException; import jakarta.mail.internet.InternetAddress; import java.util.List; import java.util.Map; -import javax.inject.Inject; import org.joda.time.Duration; import org.joda.time.LocalDate; diff --git a/core/src/main/java/google/registry/reporting/spec11/Spec11Module.java b/core/src/main/java/google/registry/reporting/spec11/Spec11Module.java index 4fee57004..f1ca3f7c5 100644 --- a/core/src/main/java/google/registry/reporting/spec11/Spec11Module.java +++ b/core/src/main/java/google/registry/reporting/spec11/Spec11Module.java @@ -19,9 +19,9 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import dagger.Module; import dagger.Provides; import google.registry.beam.spec11.Spec11Pipeline; +import jakarta.inject.Qualifier; import java.lang.annotation.Documented; import java.lang.annotation.Retention; -import javax.inject.Qualifier; import org.joda.time.LocalDate; /** Module for dependencies required by Spec11 reporting. */ diff --git a/core/src/main/java/google/registry/reporting/spec11/Spec11RegistrarThreatMatchesParser.java b/core/src/main/java/google/registry/reporting/spec11/Spec11RegistrarThreatMatchesParser.java index f2854d127..2947c08d9 100644 --- a/core/src/main/java/google/registry/reporting/spec11/Spec11RegistrarThreatMatchesParser.java +++ b/core/src/main/java/google/registry/reporting/spec11/Spec11RegistrarThreatMatchesParser.java @@ -27,11 +27,11 @@ import google.registry.beam.spec11.Spec11Pipeline; import google.registry.beam.spec11.ThreatMatch; import google.registry.config.RegistryConfig.Config; import google.registry.gcs.GcsUtils; +import jakarta.inject.Inject; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.LocalDate; import org.json.JSONArray; import org.json.JSONException; diff --git a/core/src/main/java/google/registry/request/Header.java b/core/src/main/java/google/registry/request/Header.java index 5b59f6542..8a1878f04 100644 --- a/core/src/main/java/google/registry/request/Header.java +++ b/core/src/main/java/google/registry/request/Header.java @@ -14,8 +14,8 @@ package google.registry.request; +import jakarta.inject.Qualifier; import java.lang.annotation.Documented; -import javax.inject.Qualifier; /** Dagger qualifier for HTTP headers. */ @Qualifier diff --git a/core/src/main/java/google/registry/request/JsonActionRunner.java b/core/src/main/java/google/registry/request/JsonActionRunner.java index 05c7ac22d..f614734f5 100644 --- a/core/src/main/java/google/registry/request/JsonActionRunner.java +++ b/core/src/main/java/google/registry/request/JsonActionRunner.java @@ -16,8 +16,8 @@ package google.registry.request; import static com.google.common.base.Verify.verifyNotNull; +import jakarta.inject.Inject; import java.util.Map; -import javax.inject.Inject; /** Runner for actions that read and write JSON objects. */ public final class JsonActionRunner { diff --git a/core/src/main/java/google/registry/request/JsonPayload.java b/core/src/main/java/google/registry/request/JsonPayload.java index 3eb25ee97..4cbc76743 100644 --- a/core/src/main/java/google/registry/request/JsonPayload.java +++ b/core/src/main/java/google/registry/request/JsonPayload.java @@ -14,8 +14,8 @@ package google.registry.request; +import jakarta.inject.Qualifier; import java.lang.annotation.Documented; -import javax.inject.Qualifier; /** * Dagger qualifier for the HTTP request payload as parsed JSON. diff --git a/core/src/main/java/google/registry/request/JsonResponse.java b/core/src/main/java/google/registry/request/JsonResponse.java index 516e2dbc3..78809a359 100644 --- a/core/src/main/java/google/registry/request/JsonResponse.java +++ b/core/src/main/java/google/registry/request/JsonResponse.java @@ -20,8 +20,8 @@ import static com.google.common.net.HttpHeaders.X_CONTENT_TYPE_OPTIONS; import static com.google.common.net.MediaType.JSON_UTF_8; import static org.json.simple.JSONValue.toJSONString; +import jakarta.inject.Inject; import java.util.Map; -import javax.inject.Inject; import org.joda.time.DateTime; /** JSON response object. */ diff --git a/core/src/main/java/google/registry/request/Modules.java b/core/src/main/java/google/registry/request/Modules.java index 5dabb8600..9ff211886 100644 --- a/core/src/main/java/google/registry/request/Modules.java +++ b/core/src/main/java/google/registry/request/Modules.java @@ -20,8 +20,8 @@ import com.google.api.client.json.JsonFactory; import com.google.api.client.json.gson.GsonFactory; import dagger.Module; import dagger.Provides; +import jakarta.inject.Singleton; import java.net.HttpURLConnection; -import javax.inject.Singleton; import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLContext; diff --git a/core/src/main/java/google/registry/request/OptionalJsonPayload.java b/core/src/main/java/google/registry/request/OptionalJsonPayload.java index 86e3b6d90..292880d65 100644 --- a/core/src/main/java/google/registry/request/OptionalJsonPayload.java +++ b/core/src/main/java/google/registry/request/OptionalJsonPayload.java @@ -14,8 +14,8 @@ package google.registry.request; +import jakarta.inject.Qualifier; import java.lang.annotation.Documented; -import javax.inject.Qualifier; /** * Dagger qualifier for the HTTP request payload as parsed JSON wrapped in Optional. Can be used for diff --git a/core/src/main/java/google/registry/request/Parameter.java b/core/src/main/java/google/registry/request/Parameter.java index 43282c702..bd132b27e 100644 --- a/core/src/main/java/google/registry/request/Parameter.java +++ b/core/src/main/java/google/registry/request/Parameter.java @@ -14,8 +14,8 @@ package google.registry.request; +import jakarta.inject.Qualifier; import java.lang.annotation.Documented; -import javax.inject.Qualifier; /** Dagger qualifier for HTTP parameters. */ @Qualifier diff --git a/core/src/main/java/google/registry/request/ParameterMap.java b/core/src/main/java/google/registry/request/ParameterMap.java index cd36c8e00..d49b5f0fa 100644 --- a/core/src/main/java/google/registry/request/ParameterMap.java +++ b/core/src/main/java/google/registry/request/ParameterMap.java @@ -14,8 +14,8 @@ package google.registry.request; +import jakarta.inject.Qualifier; import java.lang.annotation.Documented; -import javax.inject.Qualifier; /** Dagger qualifier for {@link com.google.common.collect.ImmutableListMultimap} of HTTP params. */ @Qualifier diff --git a/core/src/main/java/google/registry/request/Payload.java b/core/src/main/java/google/registry/request/Payload.java index e6412d122..6b50bf10f 100644 --- a/core/src/main/java/google/registry/request/Payload.java +++ b/core/src/main/java/google/registry/request/Payload.java @@ -14,8 +14,8 @@ package google.registry.request; +import jakarta.inject.Qualifier; import java.lang.annotation.Documented; -import javax.inject.Qualifier; /** * Dagger qualifier for the HTTP request payload. diff --git a/core/src/main/java/google/registry/request/RequestHandler.java b/core/src/main/java/google/registry/request/RequestHandler.java index 12dc64e68..7273fd0e3 100644 --- a/core/src/main/java/google/registry/request/RequestHandler.java +++ b/core/src/main/java/google/registry/request/RequestHandler.java @@ -30,13 +30,13 @@ import google.registry.util.NonFinalForTesting; import google.registry.util.RegistryEnvironment; import google.registry.util.SystemClock; import google.registry.util.TypeUtils.TypeInstantiator; +import jakarta.inject.Provider; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Objects; import java.util.Optional; import javax.annotation.Nullable; -import javax.inject.Provider; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/core/src/main/java/google/registry/request/RequestMethod.java b/core/src/main/java/google/registry/request/RequestMethod.java index 715bdcc7c..958cff135 100644 --- a/core/src/main/java/google/registry/request/RequestMethod.java +++ b/core/src/main/java/google/registry/request/RequestMethod.java @@ -14,8 +14,8 @@ package google.registry.request; +import jakarta.inject.Qualifier; import java.lang.annotation.Documented; -import javax.inject.Qualifier; /** * Dagger qualifier for the HTTP request method. diff --git a/core/src/main/java/google/registry/request/RequestModule.java b/core/src/main/java/google/registry/request/RequestModule.java index 3e0105e74..eb843bfb1 100644 --- a/core/src/main/java/google/registry/request/RequestModule.java +++ b/core/src/main/java/google/registry/request/RequestModule.java @@ -229,7 +229,7 @@ public final class RequestModule { * *

This performs a shallow copy of the {@code Map} data structure from the * servlets API, each time this is provided. This is almost certainly less expensive than the - * thread synchronization expense of {@link javax.inject.Singleton @Singleton}. + * thread synchronization expense of {@link jakarta.inject.Singleton @Singleton}. * *

Note: If a parameter is specified without a value, e.g. {@code /foo?lol} then an * empty string value is assumed, since Guava's multimap doesn't permit {@code null} mappings. diff --git a/core/src/main/java/google/registry/request/RequestPath.java b/core/src/main/java/google/registry/request/RequestPath.java index a7a6fb6e8..5d9598160 100644 --- a/core/src/main/java/google/registry/request/RequestPath.java +++ b/core/src/main/java/google/registry/request/RequestPath.java @@ -14,8 +14,8 @@ package google.registry.request; +import jakarta.inject.Qualifier; import java.lang.annotation.Documented; -import javax.inject.Qualifier; /** * Dagger qualifier for the HTTP request path. diff --git a/core/src/main/java/google/registry/request/RequestScope.java b/core/src/main/java/google/registry/request/RequestScope.java index 9c4bc86ac..a174ee5fa 100644 --- a/core/src/main/java/google/registry/request/RequestScope.java +++ b/core/src/main/java/google/registry/request/RequestScope.java @@ -14,12 +14,12 @@ package google.registry.request; +import jakarta.inject.Scope; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Scope; /** Dagger annotation for request-scoped components that depend on a global component. */ @Scope diff --git a/core/src/main/java/google/registry/request/RequestServerName.java b/core/src/main/java/google/registry/request/RequestServerName.java index c1fd6d637..dc2af36cd 100644 --- a/core/src/main/java/google/registry/request/RequestServerName.java +++ b/core/src/main/java/google/registry/request/RequestServerName.java @@ -14,10 +14,10 @@ package google.registry.request; +import jakarta.inject.Qualifier; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import javax.inject.Qualifier; /** * Dagger qualifier for the server name of the HTTP request. diff --git a/core/src/main/java/google/registry/request/RequestUrl.java b/core/src/main/java/google/registry/request/RequestUrl.java index dcb69695f..1203e8c27 100644 --- a/core/src/main/java/google/registry/request/RequestUrl.java +++ b/core/src/main/java/google/registry/request/RequestUrl.java @@ -16,9 +16,9 @@ package google.registry.request; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import jakarta.inject.Qualifier; import java.lang.annotation.Documented; import java.lang.annotation.Retention; -import javax.inject.Qualifier; /** * Dagger qualifier for the HTTP request URL. diff --git a/core/src/main/java/google/registry/request/ResponseImpl.java b/core/src/main/java/google/registry/request/ResponseImpl.java index d82a196d9..97807f050 100644 --- a/core/src/main/java/google/registry/request/ResponseImpl.java +++ b/core/src/main/java/google/registry/request/ResponseImpl.java @@ -15,11 +15,11 @@ package google.registry.request; import com.google.common.net.MediaType; +import jakarta.inject.Inject; import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; -import javax.inject.Inject; import org.joda.time.DateTime; /** HTTP response object. */ diff --git a/core/src/main/java/google/registry/request/auth/AuthModule.java b/core/src/main/java/google/registry/request/auth/AuthModule.java index c457c05b6..149e74876 100644 --- a/core/src/main/java/google/registry/request/auth/AuthModule.java +++ b/core/src/main/java/google/registry/request/auth/AuthModule.java @@ -37,14 +37,14 @@ import google.registry.request.auth.OidcTokenAuthenticationMechanism.TokenExtrac import google.registry.request.auth.OidcTokenAuthenticationMechanism.TokenVerifier; import google.registry.util.GoogleCredentialsBundle; import google.registry.util.RegistryEnvironment; +import jakarta.inject.Named; +import jakarta.inject.Provider; +import jakarta.inject.Qualifier; +import jakarta.inject.Singleton; import java.io.IOException; import java.time.Duration; import java.util.function.Supplier; import javax.annotation.Nullable; -import javax.inject.Named; -import javax.inject.Provider; -import javax.inject.Qualifier; -import javax.inject.Singleton; /** Dagger module for authentication routines. */ @Module diff --git a/core/src/main/java/google/registry/request/auth/AuthenticatedRegistrarAccessor.java b/core/src/main/java/google/registry/request/auth/AuthenticatedRegistrarAccessor.java index d228fae98..e686aa05e 100644 --- a/core/src/main/java/google/registry/request/auth/AuthenticatedRegistrarAccessor.java +++ b/core/src/main/java/google/registry/request/auth/AuthenticatedRegistrarAccessor.java @@ -28,9 +28,9 @@ import google.registry.groups.GroupsConnection; import google.registry.model.console.User; import google.registry.model.registrar.Registrar; import google.registry.model.registrar.RegistrarBase.State; +import jakarta.inject.Inject; import java.util.Optional; import javax.annotation.concurrent.Immutable; -import javax.inject.Inject; /** * Allows access only to {@link Registrar}s the current user has access to. diff --git a/core/src/main/java/google/registry/request/auth/OidcTokenAuthenticationMechanism.java b/core/src/main/java/google/registry/request/auth/OidcTokenAuthenticationMechanism.java index 5b91a9a0e..d6c05dabe 100644 --- a/core/src/main/java/google/registry/request/auth/OidcTokenAuthenticationMechanism.java +++ b/core/src/main/java/google/registry/request/auth/OidcTokenAuthenticationMechanism.java @@ -30,10 +30,10 @@ import google.registry.request.auth.AuthModule.IapOidc; import google.registry.request.auth.AuthModule.RegularOidc; import google.registry.request.auth.AuthSettings.AuthLevel; import google.registry.util.RegistryEnvironment; +import jakarta.inject.Inject; import jakarta.servlet.http.HttpServletRequest; import java.util.Optional; import javax.annotation.Nullable; -import javax.inject.Inject; /** * An authentication mechanism that verifies the OIDC token. diff --git a/core/src/main/java/google/registry/request/auth/RequestAuthenticator.java b/core/src/main/java/google/registry/request/auth/RequestAuthenticator.java index d2879d34d..f1ab01710 100644 --- a/core/src/main/java/google/registry/request/auth/RequestAuthenticator.java +++ b/core/src/main/java/google/registry/request/auth/RequestAuthenticator.java @@ -22,9 +22,9 @@ import static google.registry.request.auth.AuthSettings.UserPolicy.ADMIN; import com.google.common.collect.ImmutableList; import com.google.common.flogger.FluentLogger; +import jakarta.inject.Inject; import jakarta.servlet.http.HttpServletRequest; import java.util.Optional; -import javax.inject.Inject; /** Top-level authentication/authorization class; calls authentication mechanisms as needed. */ public class RequestAuthenticator { diff --git a/core/src/main/java/google/registry/request/lock/LockHandlerImpl.java b/core/src/main/java/google/registry/request/lock/LockHandlerImpl.java index 0609d9b91..18c92aa3f 100644 --- a/core/src/main/java/google/registry/request/lock/LockHandlerImpl.java +++ b/core/src/main/java/google/registry/request/lock/LockHandlerImpl.java @@ -26,6 +26,7 @@ import com.google.common.util.concurrent.UncheckedExecutionException; import google.registry.model.server.Lock; import google.registry.util.Clock; import google.registry.util.TimeLimiter; +import jakarta.inject.Inject; import java.util.HashSet; import java.util.Optional; import java.util.Set; @@ -34,7 +35,6 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import javax.annotation.Nullable; -import javax.inject.Inject; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/core/src/main/java/google/registry/security/XsrfTokenManager.java b/core/src/main/java/google/registry/security/XsrfTokenManager.java index af446b8f6..2538d583e 100644 --- a/core/src/main/java/google/registry/security/XsrfTokenManager.java +++ b/core/src/main/java/google/registry/security/XsrfTokenManager.java @@ -25,8 +25,8 @@ import com.google.common.flogger.FluentLogger; import com.google.common.hash.Hashing; import google.registry.model.server.ServerSecret; import google.registry.util.Clock; +import jakarta.inject.Inject; import java.util.List; -import javax.inject.Inject; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/core/src/main/java/google/registry/storage/drive/DriveConnection.java b/core/src/main/java/google/registry/storage/drive/DriveConnection.java index c7f914963..c7bf6ed9b 100644 --- a/core/src/main/java/google/registry/storage/drive/DriveConnection.java +++ b/core/src/main/java/google/registry/storage/drive/DriveConnection.java @@ -24,10 +24,10 @@ import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.common.flogger.FluentLogger; import com.google.common.net.MediaType; +import jakarta.inject.Inject; import java.io.IOException; import java.util.List; import javax.annotation.Nullable; -import javax.inject.Inject; /** Class encapsulating parameters and state for accessing the Drive API. */ public class DriveConnection { diff --git a/core/src/main/java/google/registry/tmch/LordnRequestInitializer.java b/core/src/main/java/google/registry/tmch/LordnRequestInitializer.java index 44aaecb24..f8d0c6935 100644 --- a/core/src/main/java/google/registry/tmch/LordnRequestInitializer.java +++ b/core/src/main/java/google/registry/tmch/LordnRequestInitializer.java @@ -20,9 +20,9 @@ import com.google.common.flogger.FluentLogger; import google.registry.keyring.api.KeyModule.Key; import google.registry.model.tld.Tld; import google.registry.request.UrlConnectionUtils; +import jakarta.inject.Inject; import java.net.HttpURLConnection; import java.util.Optional; -import javax.inject.Inject; /** Helper class for setting the authorization header on a MarksDB LORDN request. */ final class LordnRequestInitializer { diff --git a/core/src/main/java/google/registry/tmch/Marksdb.java b/core/src/main/java/google/registry/tmch/Marksdb.java index 501cb7918..fe2f25533 100644 --- a/core/src/main/java/google/registry/tmch/Marksdb.java +++ b/core/src/main/java/google/registry/tmch/Marksdb.java @@ -28,6 +28,7 @@ import google.registry.config.RegistryConfig.Config; import google.registry.keyring.api.KeyModule.Key; import google.registry.request.UrlConnectionService; import google.registry.util.UrlConnectionException; +import jakarta.inject.Inject; import java.io.ByteArrayInputStream; import java.io.IOException; import java.net.HttpURLConnection; @@ -38,7 +39,6 @@ import java.security.SignatureException; import java.util.Arrays; import java.util.Optional; import javax.annotation.Tainted; -import javax.inject.Inject; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPObjectFactory; diff --git a/core/src/main/java/google/registry/tmch/NordnUploadAction.java b/core/src/main/java/google/registry/tmch/NordnUploadAction.java index 20eeaaf8d..cfb462ca6 100644 --- a/core/src/main/java/google/registry/tmch/NordnUploadAction.java +++ b/core/src/main/java/google/registry/tmch/NordnUploadAction.java @@ -47,6 +47,7 @@ import google.registry.tmch.LordnTaskUtils.LordnPhase; import google.registry.util.Clock; import google.registry.util.Retrier; import google.registry.util.UrlConnectionException; +import jakarta.inject.Inject; import java.io.IOException; import java.net.HttpURLConnection; import java.net.URL; @@ -55,7 +56,6 @@ import java.security.SecureRandom; import java.util.List; import java.util.Optional; import java.util.Random; -import javax.inject.Inject; import org.joda.time.Duration; /** diff --git a/core/src/main/java/google/registry/tmch/NordnVerifyAction.java b/core/src/main/java/google/registry/tmch/NordnVerifyAction.java index e2265e0a4..e60bcd80e 100644 --- a/core/src/main/java/google/registry/tmch/NordnVerifyAction.java +++ b/core/src/main/java/google/registry/tmch/NordnVerifyAction.java @@ -31,12 +31,12 @@ import google.registry.request.Response; import google.registry.request.UrlConnectionService; import google.registry.request.auth.Auth; import google.registry.util.UrlConnectionException; +import jakarta.inject.Inject; import java.io.IOException; import java.net.HttpURLConnection; import java.net.URL; import java.security.GeneralSecurityException; import java.util.Map.Entry; -import javax.inject.Inject; /** * NORDN CSV uploading system, verify operation. diff --git a/core/src/main/java/google/registry/tmch/TmchCertificateAuthority.java b/core/src/main/java/google/registry/tmch/TmchCertificateAuthority.java index 3d95ab1c6..eb0c666c2 100644 --- a/core/src/main/java/google/registry/tmch/TmchCertificateAuthority.java +++ b/core/src/main/java/google/registry/tmch/TmchCertificateAuthority.java @@ -29,6 +29,7 @@ import google.registry.model.CacheUtils; import google.registry.model.tmch.TmchCrl; import google.registry.util.Clock; import google.registry.util.X509Utils; +import jakarta.inject.Inject; import java.security.GeneralSecurityException; import java.security.cert.CertificateParsingException; import java.security.cert.X509CRL; @@ -36,7 +37,6 @@ import java.security.cert.X509Certificate; import java.util.Optional; import javax.annotation.concurrent.Immutable; import javax.annotation.concurrent.ThreadSafe; -import javax.inject.Inject; /** * Helper methods for accessing ICANN's TMCH root certificate and revocation list. diff --git a/core/src/main/java/google/registry/tmch/TmchCrlAction.java b/core/src/main/java/google/registry/tmch/TmchCrlAction.java index af2cd5b18..751d610fb 100644 --- a/core/src/main/java/google/registry/tmch/TmchCrlAction.java +++ b/core/src/main/java/google/registry/tmch/TmchCrlAction.java @@ -21,11 +21,11 @@ import google.registry.config.RegistryConfig.Config; import google.registry.request.Action; import google.registry.request.Action.GaeService; import google.registry.request.auth.Auth; +import jakarta.inject.Inject; import java.io.IOException; import java.net.URL; import java.security.GeneralSecurityException; import java.util.Optional; -import javax.inject.Inject; /** Action to download the latest ICANN TMCH CRL from MarksDB. */ @Action( diff --git a/core/src/main/java/google/registry/tmch/TmchDnlAction.java b/core/src/main/java/google/registry/tmch/TmchDnlAction.java index 1a8e0e038..c2c80d5b5 100644 --- a/core/src/main/java/google/registry/tmch/TmchDnlAction.java +++ b/core/src/main/java/google/registry/tmch/TmchDnlAction.java @@ -24,10 +24,10 @@ import google.registry.model.tmch.ClaimsListDao; import google.registry.request.Action; import google.registry.request.Action.GaeService; import google.registry.request.auth.Auth; +import jakarta.inject.Inject; import java.io.IOException; import java.security.GeneralSecurityException; import java.util.Optional; -import javax.inject.Inject; import org.bouncycastle.openpgp.PGPException; /** Action to download the latest domain name list (aka claims list) from MarksDB. */ diff --git a/core/src/main/java/google/registry/tmch/TmchSmdrlAction.java b/core/src/main/java/google/registry/tmch/TmchSmdrlAction.java index 4ecdd2ce3..2376bd041 100644 --- a/core/src/main/java/google/registry/tmch/TmchSmdrlAction.java +++ b/core/src/main/java/google/registry/tmch/TmchSmdrlAction.java @@ -23,10 +23,10 @@ import google.registry.model.smd.SignedMarkRevocationList; import google.registry.request.Action; import google.registry.request.Action.GaeService; import google.registry.request.auth.Auth; +import jakarta.inject.Inject; import java.io.IOException; import java.security.GeneralSecurityException; import java.util.Optional; -import javax.inject.Inject; import org.bouncycastle.openpgp.PGPException; /** Action to download the latest signed mark revocation list from MarksDB. */ diff --git a/core/src/main/java/google/registry/tmch/TmchXmlSignature.java b/core/src/main/java/google/registry/tmch/TmchXmlSignature.java index da3b0eabb..56a27db59 100644 --- a/core/src/main/java/google/registry/tmch/TmchXmlSignature.java +++ b/core/src/main/java/google/registry/tmch/TmchXmlSignature.java @@ -22,6 +22,7 @@ import static google.registry.xml.XmlTransformer.loadXmlSchemas; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; +import jakarta.inject.Inject; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; @@ -33,7 +34,6 @@ import java.security.cert.X509Certificate; import java.util.List; import javax.annotation.Nullable; import javax.annotation.concurrent.ThreadSafe; -import javax.inject.Inject; import javax.xml.crypto.AlgorithmMethod; import javax.xml.crypto.KeySelector; import javax.xml.crypto.KeySelectorException; diff --git a/core/src/main/java/google/registry/tools/AckPollMessagesCommand.java b/core/src/main/java/google/registry/tools/AckPollMessagesCommand.java index 3683628a1..bb6362f47 100644 --- a/core/src/main/java/google/registry/tools/AckPollMessagesCommand.java +++ b/core/src/main/java/google/registry/tools/AckPollMessagesCommand.java @@ -29,7 +29,7 @@ import google.registry.model.poll.PollMessage.Autorenew; import google.registry.model.poll.PollMessage.OneTime; import google.registry.persistence.transaction.QueryComposer; import google.registry.util.Clock; -import javax.inject.Inject; +import jakarta.inject.Inject; /** * Command to acknowledge one-time poll messages for a registrar. diff --git a/core/src/main/java/google/registry/tools/AuthModule.java b/core/src/main/java/google/registry/tools/AuthModule.java index be957689e..c385d0c48 100644 --- a/core/src/main/java/google/registry/tools/AuthModule.java +++ b/core/src/main/java/google/registry/tools/AuthModule.java @@ -39,6 +39,8 @@ import google.registry.config.CredentialModule.LocalCredential; import google.registry.config.CredentialModule.LocalCredentialJson; import google.registry.config.RegistryConfig.Config; import google.registry.util.GoogleCredentialsBundle; +import jakarta.inject.Qualifier; +import jakarta.inject.Singleton; import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; @@ -49,8 +51,6 @@ import java.lang.annotation.RetentionPolicy; import java.nio.file.Files; import java.nio.file.Paths; import javax.annotation.Nullable; -import javax.inject.Qualifier; -import javax.inject.Singleton; /** Module providing the dependency graph for authorization credentials. */ @Module diff --git a/core/src/main/java/google/registry/tools/BigqueryCommand.java b/core/src/main/java/google/registry/tools/BigqueryCommand.java index c52eec9e4..61063746d 100644 --- a/core/src/main/java/google/registry/tools/BigqueryCommand.java +++ b/core/src/main/java/google/registry/tools/BigqueryCommand.java @@ -16,8 +16,8 @@ package google.registry.tools; import com.beust.jcommander.ParametersDelegate; import google.registry.bigquery.BigqueryConnection; -import javax.inject.Inject; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Provider; /** A {@link Command} that uses the bigquery client API. */ abstract class BigqueryCommand implements Command { diff --git a/core/src/main/java/google/registry/tools/CheckDomainClaimsCommand.java b/core/src/main/java/google/registry/tools/CheckDomainClaimsCommand.java index 5ec82b756..c1b08d974 100644 --- a/core/src/main/java/google/registry/tools/CheckDomainClaimsCommand.java +++ b/core/src/main/java/google/registry/tools/CheckDomainClaimsCommand.java @@ -20,9 +20,9 @@ import com.google.common.collect.Multimap; import com.google.template.soy.data.SoyMapData; import google.registry.config.RegistryConfig.Config; import google.registry.tools.soy.DomainCheckClaimsSoyInfo; +import jakarta.inject.Inject; import java.util.Collection; import java.util.List; -import javax.inject.Inject; /** A command to execute a domain check claims epp command. */ @Parameters(separators = " =", commandDescription = "Check claims on domain(s)") diff --git a/core/src/main/java/google/registry/tools/CheckDomainCommand.java b/core/src/main/java/google/registry/tools/CheckDomainCommand.java index 64ba8e3b8..76d5f0606 100644 --- a/core/src/main/java/google/registry/tools/CheckDomainCommand.java +++ b/core/src/main/java/google/registry/tools/CheckDomainCommand.java @@ -22,9 +22,9 @@ import com.google.common.collect.Multimap; import com.google.template.soy.data.SoyMapData; import google.registry.config.RegistryConfig.Config; import google.registry.tools.soy.DomainCheckSoyInfo; +import jakarta.inject.Inject; import java.util.Collection; import java.util.List; -import javax.inject.Inject; /** A command to execute a domain check EPP command (including cost of a 1 year create). */ @Parameters(separators = " =", commandDescription = "Check domain availability") diff --git a/core/src/main/java/google/registry/tools/ConfigureTldCommand.java b/core/src/main/java/google/registry/tools/ConfigureTldCommand.java index de4964bd5..27a66202d 100644 --- a/core/src/main/java/google/registry/tools/ConfigureTldCommand.java +++ b/core/src/main/java/google/registry/tools/ConfigureTldCommand.java @@ -34,6 +34,8 @@ import google.registry.model.tld.label.PremiumListDao; import google.registry.tools.params.PathParameter; import google.registry.util.Clock; import google.registry.util.Idn; +import jakarta.inject.Inject; +import jakarta.inject.Named; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.nio.file.Files; @@ -44,8 +46,6 @@ import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.inject.Named; import org.joda.money.CurrencyUnit; import org.joda.money.Money; import org.joda.time.DateTime; diff --git a/core/src/main/java/google/registry/tools/CountDomainsCommand.java b/core/src/main/java/google/registry/tools/CountDomainsCommand.java index 880449c70..448281b11 100644 --- a/core/src/main/java/google/registry/tools/CountDomainsCommand.java +++ b/core/src/main/java/google/registry/tools/CountDomainsCommand.java @@ -22,8 +22,8 @@ import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import google.registry.model.domain.Domain; import google.registry.util.Clock; +import jakarta.inject.Inject; import java.util.List; -import javax.inject.Inject; import org.joda.time.DateTime; /** Command to show the count of active domains on a given TLD. */ diff --git a/core/src/main/java/google/registry/tools/CreateAnchorTenantCommand.java b/core/src/main/java/google/registry/tools/CreateAnchorTenantCommand.java index 72ae9ba86..4e392cb16 100644 --- a/core/src/main/java/google/registry/tools/CreateAnchorTenantCommand.java +++ b/core/src/main/java/google/registry/tools/CreateAnchorTenantCommand.java @@ -27,8 +27,8 @@ import com.google.common.net.InternetDomainName; import com.google.template.soy.data.SoyMapData; import google.registry.tools.soy.CreateAnchorTenantSoyInfo; import google.registry.util.StringGenerator; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.joda.money.Money; import org.joda.time.DateTime; diff --git a/core/src/main/java/google/registry/tools/CreateCdnsTld.java b/core/src/main/java/google/registry/tools/CreateCdnsTld.java index 99ca73d12..a3aff7db3 100644 --- a/core/src/main/java/google/registry/tools/CreateCdnsTld.java +++ b/core/src/main/java/google/registry/tools/CreateCdnsTld.java @@ -22,10 +22,10 @@ import com.google.api.services.dns.Dns; import com.google.api.services.dns.model.ManagedZone; import com.google.api.services.dns.model.ManagedZoneDnsSecConfig; import google.registry.config.RegistryConfig.Config; +import jakarta.inject.Inject; import java.io.IOException; import java.util.stream.Collectors; import javax.annotation.Nullable; -import javax.inject.Inject; @Parameters(separators = " =", commandDescription = "Create a Managed Zone for a TLD in Cloud DNS.") final class CreateCdnsTld extends ConfirmingCommand { diff --git a/core/src/main/java/google/registry/tools/CreateContactCommand.java b/core/src/main/java/google/registry/tools/CreateContactCommand.java index 347ed6185..7df5ffb0d 100644 --- a/core/src/main/java/google/registry/tools/CreateContactCommand.java +++ b/core/src/main/java/google/registry/tools/CreateContactCommand.java @@ -23,9 +23,9 @@ import com.google.template.soy.data.SoyMapData; import google.registry.tools.params.PhoneNumberParameter; import google.registry.tools.soy.ContactCreateSoyInfo; import google.registry.util.StringGenerator; +import jakarta.inject.Inject; +import jakarta.inject.Named; import java.util.List; -import javax.inject.Inject; -import javax.inject.Named; /** A command to create a new contact via EPP. */ @Parameters(separators = " =", commandDescription = "Create a new contact via EPP.") diff --git a/core/src/main/java/google/registry/tools/CreateDomainCommand.java b/core/src/main/java/google/registry/tools/CreateDomainCommand.java index 48f8a7032..2c896c38b 100644 --- a/core/src/main/java/google/registry/tools/CreateDomainCommand.java +++ b/core/src/main/java/google/registry/tools/CreateDomainCommand.java @@ -26,8 +26,8 @@ import com.google.template.soy.data.SoyMapData; import google.registry.model.pricing.PremiumPricingEngine.DomainPrices; import google.registry.tools.soy.DomainCreateSoyInfo; import google.registry.util.StringGenerator; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.joda.money.Money; import org.joda.time.DateTime; diff --git a/core/src/main/java/google/registry/tools/CreateOrUpdateRegistrarCommand.java b/core/src/main/java/google/registry/tools/CreateOrUpdateRegistrarCommand.java index 719678632..5451c9103 100644 --- a/core/src/main/java/google/registry/tools/CreateOrUpdateRegistrarCommand.java +++ b/core/src/main/java/google/registry/tools/CreateOrUpdateRegistrarCommand.java @@ -38,6 +38,7 @@ import google.registry.tools.params.OptionalStringParameter; import google.registry.tools.params.PathParameter.InputFile; import google.registry.tools.params.StringListParameter; import google.registry.util.CidrAddressBlock; +import jakarta.inject.Inject; import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; @@ -48,7 +49,6 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; import javax.annotation.Nullable; -import javax.inject.Inject; import org.joda.money.CurrencyUnit; import org.joda.time.DateTime; diff --git a/core/src/main/java/google/registry/tools/CreateUserCommand.java b/core/src/main/java/google/registry/tools/CreateUserCommand.java index 8a5aeb3d3..9caa725e9 100644 --- a/core/src/main/java/google/registry/tools/CreateUserCommand.java +++ b/core/src/main/java/google/registry/tools/CreateUserCommand.java @@ -22,9 +22,9 @@ import com.beust.jcommander.Parameters; import google.registry.config.RegistryConfig.Config; import google.registry.model.console.User; import google.registry.persistence.VKey; +import jakarta.inject.Inject; import java.util.Optional; import javax.annotation.Nullable; -import javax.inject.Inject; /** Command to create a new User. */ @Parameters(separators = " =", commandDescription = "Update a user account") diff --git a/core/src/main/java/google/registry/tools/CurlCommand.java b/core/src/main/java/google/registry/tools/CurlCommand.java index 9c2f40398..0fd0741d1 100644 --- a/core/src/main/java/google/registry/tools/CurlCommand.java +++ b/core/src/main/java/google/registry/tools/CurlCommand.java @@ -31,8 +31,8 @@ import google.registry.config.RegistryConfig.Config; import google.registry.request.Action.GaeService; import google.registry.request.Action.GkeService; import google.registry.request.Action.Service; +import jakarta.inject.Inject; import java.util.List; -import javax.inject.Inject; @Parameters(separators = " =", commandDescription = "Send an HTTP command to the nomulus server.") class CurlCommand implements CommandWithConnection { diff --git a/core/src/main/java/google/registry/tools/DeleteUserCommand.java b/core/src/main/java/google/registry/tools/DeleteUserCommand.java index f6b6aa2f1..05387d7cb 100644 --- a/core/src/main/java/google/registry/tools/DeleteUserCommand.java +++ b/core/src/main/java/google/registry/tools/DeleteUserCommand.java @@ -23,9 +23,9 @@ import com.beust.jcommander.Parameters; import google.registry.config.RegistryConfig.Config; import google.registry.model.console.User; import google.registry.persistence.VKey; +import jakarta.inject.Inject; import java.util.Optional; import javax.annotation.Nullable; -import javax.inject.Inject; /** Deletes a {@link User}. */ @Parameters(separators = " =", commandDescription = "Delete a user account") diff --git a/core/src/main/java/google/registry/tools/DomainLockUtils.java b/core/src/main/java/google/registry/tools/DomainLockUtils.java index 2f2d9e8e7..c79f2ad9d 100644 --- a/core/src/main/java/google/registry/tools/DomainLockUtils.java +++ b/core/src/main/java/google/registry/tools/DomainLockUtils.java @@ -36,10 +36,10 @@ import google.registry.model.tld.RegistryLockDao; import google.registry.model.tld.Tld; import google.registry.request.Action; import google.registry.util.StringGenerator; +import jakarta.inject.Inject; +import jakarta.inject.Named; import java.util.Optional; import javax.annotation.Nullable; -import javax.inject.Inject; -import javax.inject.Named; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/core/src/main/java/google/registry/tools/EncryptEscrowDepositCommand.java b/core/src/main/java/google/registry/tools/EncryptEscrowDepositCommand.java index 6eacbeeb2..a8daea35d 100644 --- a/core/src/main/java/google/registry/tools/EncryptEscrowDepositCommand.java +++ b/core/src/main/java/google/registry/tools/EncryptEscrowDepositCommand.java @@ -20,9 +20,9 @@ import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import google.registry.model.rde.RdeMode; import google.registry.tools.params.PathParameter; +import jakarta.inject.Inject; import java.nio.file.Path; import java.nio.file.Paths; -import javax.inject.Inject; /** Command to encrypt an escrow deposit. */ @Parameters(separators = " =", commandDescription = "Encrypt an escrow deposit") diff --git a/core/src/main/java/google/registry/tools/EnqueuePollMessageCommand.java b/core/src/main/java/google/registry/tools/EnqueuePollMessageCommand.java index 9af829039..341cb3a4a 100644 --- a/core/src/main/java/google/registry/tools/EnqueuePollMessageCommand.java +++ b/core/src/main/java/google/registry/tools/EnqueuePollMessageCommand.java @@ -31,9 +31,9 @@ import google.registry.model.poll.PollMessage; import google.registry.model.registrar.Registrar; import google.registry.model.reporting.HistoryEntry; import google.registry.util.DomainNameUtils; +import jakarta.inject.Inject; import java.util.List; import java.util.Optional; -import javax.inject.Inject; /** * Tool to enqueue a poll message for a registrar. diff --git a/core/src/main/java/google/registry/tools/EscrowDepositEncryptor.java b/core/src/main/java/google/registry/tools/EscrowDepositEncryptor.java index e2131fa7f..332fec2f1 100644 --- a/core/src/main/java/google/registry/tools/EscrowDepositEncryptor.java +++ b/core/src/main/java/google/registry/tools/EscrowDepositEncryptor.java @@ -23,14 +23,14 @@ import google.registry.model.rde.RdeNamingUtils; import google.registry.rde.RdeUtils; import google.registry.rde.RydeEncoder; import google.registry.xml.XmlException; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.nio.file.Files; import java.nio.file.Path; -import javax.inject.Inject; -import javax.inject.Provider; import org.bouncycastle.bcpg.ArmoredOutputStream; import org.bouncycastle.openpgp.PGPKeyPair; import org.bouncycastle.openpgp.PGPPublicKey; diff --git a/core/src/main/java/google/registry/tools/GenerateAllocationTokensCommand.java b/core/src/main/java/google/registry/tools/GenerateAllocationTokensCommand.java index 1b226e149..d0c4e673a 100644 --- a/core/src/main/java/google/registry/tools/GenerateAllocationTokensCommand.java +++ b/core/src/main/java/google/registry/tools/GenerateAllocationTokensCommand.java @@ -53,6 +53,8 @@ import google.registry.util.CollectionUtils; import google.registry.util.DomainNameUtils; import google.registry.util.NonFinalForTesting; import google.registry.util.StringGenerator; +import jakarta.inject.Inject; +import jakarta.inject.Named; import java.io.File; import java.io.IOException; import java.util.ArrayDeque; @@ -62,8 +64,6 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Named; import org.joda.money.Money; import org.joda.time.DateTime; diff --git a/core/src/main/java/google/registry/tools/GenerateDnsReportCommand.java b/core/src/main/java/google/registry/tools/GenerateDnsReportCommand.java index efb1bc3ed..f4aad1d54 100644 --- a/core/src/main/java/google/registry/tools/GenerateDnsReportCommand.java +++ b/core/src/main/java/google/registry/tools/GenerateDnsReportCommand.java @@ -30,13 +30,13 @@ import google.registry.model.host.Host; import google.registry.persistence.transaction.QueryComposer.Comparator; import google.registry.tools.params.PathParameter; import google.registry.util.Clock; +import jakarta.inject.Inject; import java.net.InetAddress; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.List; import java.util.Map; -import javax.inject.Inject; import org.joda.time.DateTime; import org.json.simple.JSONValue; diff --git a/core/src/main/java/google/registry/tools/GenerateEscrowDepositCommand.java b/core/src/main/java/google/registry/tools/GenerateEscrowDepositCommand.java index 60013764c..c44f0f36c 100644 --- a/core/src/main/java/google/registry/tools/GenerateEscrowDepositCommand.java +++ b/core/src/main/java/google/registry/tools/GenerateEscrowDepositCommand.java @@ -32,9 +32,9 @@ import com.google.common.collect.ImmutableMultimap; import google.registry.batch.CloudTasksUtils; import google.registry.model.rde.RdeMode; import google.registry.rde.RdeStagingAction; +import jakarta.inject.Inject; import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/tools/GenerateLordnCommand.java b/core/src/main/java/google/registry/tools/GenerateLordnCommand.java index f1f992d4a..712d864b8 100644 --- a/core/src/main/java/google/registry/tools/GenerateLordnCommand.java +++ b/core/src/main/java/google/registry/tools/GenerateLordnCommand.java @@ -25,10 +25,10 @@ import google.registry.model.domain.Domain; import google.registry.tmch.LordnTaskUtils; import google.registry.tools.params.PathParameter; import google.registry.util.Clock; +import jakarta.inject.Inject; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import javax.inject.Inject; import org.joda.time.DateTime; /** Command to generate a LORDN CSV file for an entire TLD. */ diff --git a/core/src/main/java/google/registry/tools/GetEppResourceCommand.java b/core/src/main/java/google/registry/tools/GetEppResourceCommand.java index 700b7ab6a..69b546cc1 100644 --- a/core/src/main/java/google/registry/tools/GetEppResourceCommand.java +++ b/core/src/main/java/google/registry/tools/GetEppResourceCommand.java @@ -20,8 +20,8 @@ import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import google.registry.model.EppResource; import google.registry.util.Clock; +import jakarta.inject.Inject; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.DateTime; /** Abstract command to print one or more resources to stdout. */ diff --git a/core/src/main/java/google/registry/tools/GetFeatureFlagCommand.java b/core/src/main/java/google/registry/tools/GetFeatureFlagCommand.java index d4c360ead..3afef63ef 100644 --- a/core/src/main/java/google/registry/tools/GetFeatureFlagCommand.java +++ b/core/src/main/java/google/registry/tools/GetFeatureFlagCommand.java @@ -22,10 +22,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; import google.registry.model.common.FeatureFlag; import google.registry.model.common.FeatureFlag.FeatureFlagNotFoundException; import google.registry.model.common.FeatureFlag.FeatureName; +import jakarta.inject.Inject; import java.io.PrintStream; import java.util.List; import java.util.Optional; -import javax.inject.Inject; /** Command to show a {@link FeatureFlag}. */ @Parameters(separators = " =", commandDescription = "Show FeatureFlag record(s)") diff --git a/core/src/main/java/google/registry/tools/GetKeyringSecretCommand.java b/core/src/main/java/google/registry/tools/GetKeyringSecretCommand.java index 8d081b517..53837a3b1 100644 --- a/core/src/main/java/google/registry/tools/GetKeyringSecretCommand.java +++ b/core/src/main/java/google/registry/tools/GetKeyringSecretCommand.java @@ -20,11 +20,11 @@ import google.registry.keyring.api.KeySerializer; import google.registry.keyring.api.Keyring; import google.registry.tools.params.KeyringKeyName; import google.registry.tools.params.PathParameter; +import jakarta.inject.Inject; import java.io.FileOutputStream; import java.io.OutputStream; import java.nio.file.Path; import java.security.Security; -import javax.inject.Inject; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.openpgp.PGPKeyPair; diff --git a/core/src/main/java/google/registry/tools/GetSqlCredentialCommand.java b/core/src/main/java/google/registry/tools/GetSqlCredentialCommand.java index da8a082c1..62543420f 100644 --- a/core/src/main/java/google/registry/tools/GetSqlCredentialCommand.java +++ b/core/src/main/java/google/registry/tools/GetSqlCredentialCommand.java @@ -24,10 +24,10 @@ import google.registry.privileges.secretmanager.SqlCredentialStore; import google.registry.privileges.secretmanager.SqlUser; import google.registry.privileges.secretmanager.SqlUser.RobotUser; import google.registry.tools.params.PathParameter; +import jakarta.inject.Inject; import java.io.FileOutputStream; import java.nio.charset.StandardCharsets; import java.nio.file.Path; -import javax.inject.Inject; /** * Command to get a Cloud SQL credential in the Secret Manager. diff --git a/core/src/main/java/google/registry/tools/GetTldCommand.java b/core/src/main/java/google/registry/tools/GetTldCommand.java index b255c8b5a..e096f58e5 100644 --- a/core/src/main/java/google/registry/tools/GetTldCommand.java +++ b/core/src/main/java/google/registry/tools/GetTldCommand.java @@ -22,10 +22,10 @@ import com.beust.jcommander.Parameters; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import google.registry.model.tld.Tld; +import jakarta.inject.Inject; import java.io.PrintStream; import java.io.UnsupportedEncodingException; import java.util.List; -import javax.inject.Inject; /** Command to show a TLD record. */ @Parameters(separators = " =", commandDescription = "Show TLD record(s)") diff --git a/core/src/main/java/google/registry/tools/GhostrydeCommand.java b/core/src/main/java/google/registry/tools/GhostrydeCommand.java index 985155209..bd652a58a 100644 --- a/core/src/main/java/google/registry/tools/GhostrydeCommand.java +++ b/core/src/main/java/google/registry/tools/GhostrydeCommand.java @@ -24,14 +24,14 @@ import com.google.common.io.Files; import google.registry.keyring.api.KeyModule.Key; import google.registry.rde.Ghostryde; import google.registry.tools.params.PathParameter; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.nio.file.Path; import java.nio.file.Paths; import javax.annotation.Nullable; -import javax.inject.Inject; -import javax.inject.Provider; import org.bouncycastle.openpgp.PGPPrivateKey; import org.bouncycastle.openpgp.PGPPublicKey; diff --git a/core/src/main/java/google/registry/tools/IamClient.java b/core/src/main/java/google/registry/tools/IamClient.java index 1cdb6c6c4..e83232899 100644 --- a/core/src/main/java/google/registry/tools/IamClient.java +++ b/core/src/main/java/google/registry/tools/IamClient.java @@ -23,11 +23,11 @@ import com.google.common.base.Ascii; import google.registry.config.CredentialModule.ApplicationDefaultCredential; import google.registry.config.RegistryConfig.Config; import google.registry.util.GoogleCredentialsBundle; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import java.io.IOException; import java.util.ArrayList; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; @Singleton public class IamClient { diff --git a/core/src/main/java/google/registry/tools/ListFeatureFlagsCommand.java b/core/src/main/java/google/registry/tools/ListFeatureFlagsCommand.java index 7b33ca1b2..f950841ce 100644 --- a/core/src/main/java/google/registry/tools/ListFeatureFlagsCommand.java +++ b/core/src/main/java/google/registry/tools/ListFeatureFlagsCommand.java @@ -20,8 +20,8 @@ import com.beust.jcommander.Parameters; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import google.registry.model.common.FeatureFlag; +import jakarta.inject.Inject; import java.io.PrintStream; -import javax.inject.Inject; /** Command to list all {@link google.registry.model.common.FeatureFlag} objects. */ @Parameters(separators = " =", commandDescription = "List all feature flags.") diff --git a/core/src/main/java/google/registry/tools/LockOrUnlockDomainCommand.java b/core/src/main/java/google/registry/tools/LockOrUnlockDomainCommand.java index 67c6ebf23..0a777a2f1 100644 --- a/core/src/main/java/google/registry/tools/LockOrUnlockDomainCommand.java +++ b/core/src/main/java/google/registry/tools/LockOrUnlockDomainCommand.java @@ -28,8 +28,8 @@ import com.google.common.collect.ImmutableSet; import com.google.common.flogger.FluentLogger; import google.registry.config.RegistryConfig.Config; import google.registry.model.eppcommon.StatusValue; +import jakarta.inject.Inject; import java.util.List; -import javax.inject.Inject; /** Shared base class for commands to registry lock or unlock a domain via EPP. */ public abstract class LockOrUnlockDomainCommand extends ConfirmingCommand { diff --git a/core/src/main/java/google/registry/tools/LoginCommand.java b/core/src/main/java/google/registry/tools/LoginCommand.java index b63460762..66e92998c 100644 --- a/core/src/main/java/google/registry/tools/LoginCommand.java +++ b/core/src/main/java/google/registry/tools/LoginCommand.java @@ -19,8 +19,8 @@ import com.beust.jcommander.Parameters; import com.google.api.client.extensions.java6.auth.oauth2.AuthorizationCodeInstalledApp; import com.google.api.client.extensions.jetty.auth.oauth2.LocalServerReceiver; import com.google.api.client.googleapis.auth.oauth2.GoogleAuthorizationCodeFlow; +import jakarta.inject.Inject; import java.net.InetAddress; -import javax.inject.Inject; /** Authorizes the nomulus tool for OAuth 2.0 access to remote resources. */ @Parameters(commandDescription = "Create local OAuth credentials") @@ -53,21 +53,21 @@ final class LoginCommand implements Command { int remotePort = forwardingServerReceiver.getRemotePort(); System.out.printf( """ - Please first run the following command in a separate terminal on your local\ - host: + Please first run the following command in a separate terminal on your local\ + host: - ssh -L %s:localhost:%s %s + ssh -L %s:localhost:%s %s - """, + """, port, remotePort, remoteHost); System.out.printf( """ - Please then open the following URL in your local browser and follow the\ - instructions: + Please then open the following URL in your local browser and follow the\ + instructions: - %s + %s - """, + """, url); }); } else { diff --git a/core/src/main/java/google/registry/tools/LogoutCommand.java b/core/src/main/java/google/registry/tools/LogoutCommand.java index dc0b1417c..4e3ba8af0 100644 --- a/core/src/main/java/google/registry/tools/LogoutCommand.java +++ b/core/src/main/java/google/registry/tools/LogoutCommand.java @@ -18,8 +18,8 @@ import com.beust.jcommander.Parameters; import com.google.api.client.auth.oauth2.StoredCredential; import com.google.api.client.util.store.AbstractDataStoreFactory; import com.google.common.flogger.FluentLogger; +import jakarta.inject.Inject; import java.io.IOException; -import javax.inject.Inject; /** Logout (invalidates OAuth credentials). */ @Parameters(commandDescription = "Remove local OAuth credentials") diff --git a/core/src/main/java/google/registry/tools/PendingEscrowCommand.java b/core/src/main/java/google/registry/tools/PendingEscrowCommand.java index d3263b9a6..74a0f260f 100644 --- a/core/src/main/java/google/registry/tools/PendingEscrowCommand.java +++ b/core/src/main/java/google/registry/tools/PendingEscrowCommand.java @@ -21,7 +21,7 @@ import com.google.common.collect.ComparisonChain; import com.google.common.collect.Ordering; import google.registry.rde.PendingDeposit; import google.registry.rde.PendingDepositChecker; -import javax.inject.Inject; +import jakarta.inject.Inject; /** Command to show what escrow deposits are pending generation on the server. */ @Parameters(separators = " =", commandDescription = "List pending RDE/BRDA deposits.") diff --git a/core/src/main/java/google/registry/tools/RegistryToolComponent.java b/core/src/main/java/google/registry/tools/RegistryToolComponent.java index 79b847194..fd4b6ddbf 100644 --- a/core/src/main/java/google/registry/tools/RegistryToolComponent.java +++ b/core/src/main/java/google/registry/tools/RegistryToolComponent.java @@ -40,8 +40,8 @@ import google.registry.request.Modules.UrlConnectionServiceModule; import google.registry.tools.AuthModule.LocalCredentialModule; import google.registry.util.UtilsModule; import google.registry.whois.NonCachingWhoisModule; +import jakarta.inject.Singleton; import javax.annotation.Nullable; -import javax.inject.Singleton; /** * Dagger component for Registry Tool. diff --git a/core/src/main/java/google/registry/tools/RenewDomainCommand.java b/core/src/main/java/google/registry/tools/RenewDomainCommand.java index 7db608dfc..ca612e9d9 100644 --- a/core/src/main/java/google/registry/tools/RenewDomainCommand.java +++ b/core/src/main/java/google/registry/tools/RenewDomainCommand.java @@ -28,9 +28,9 @@ import com.google.template.soy.data.SoyMapData; import google.registry.model.domain.Domain; import google.registry.tools.soy.DomainRenewSoyInfo; import google.registry.util.Clock; +import jakarta.inject.Inject; import java.util.List; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; diff --git a/core/src/main/java/google/registry/tools/SaveSqlCredentialCommand.java b/core/src/main/java/google/registry/tools/SaveSqlCredentialCommand.java index 81c3279ca..fa94e5bd9 100644 --- a/core/src/main/java/google/registry/tools/SaveSqlCredentialCommand.java +++ b/core/src/main/java/google/registry/tools/SaveSqlCredentialCommand.java @@ -21,10 +21,10 @@ import google.registry.privileges.secretmanager.SqlCredentialStore; import google.registry.privileges.secretmanager.SqlUser; import google.registry.privileges.secretmanager.SqlUser.RobotUser; import google.registry.tools.params.PathParameter; +import jakarta.inject.Inject; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import javax.inject.Inject; /** * Command to create or update a Cloud SQL credential in the Secret Manager. diff --git a/core/src/main/java/google/registry/tools/SendEscrowReportToIcannCommand.java b/core/src/main/java/google/registry/tools/SendEscrowReportToIcannCommand.java index 35b6ff255..eff849c51 100644 --- a/core/src/main/java/google/registry/tools/SendEscrowReportToIcannCommand.java +++ b/core/src/main/java/google/registry/tools/SendEscrowReportToIcannCommand.java @@ -19,10 +19,10 @@ import com.beust.jcommander.Parameters; import dagger.Lazy; import google.registry.rde.RdeReporter; import google.registry.tools.params.PathParameter; +import jakarta.inject.Inject; import java.nio.file.Files; import java.nio.file.Path; import java.util.List; -import javax.inject.Inject; /** Command to send ICANN notification that an escrow deposit was uploaded. */ @Parameters(separators = " =", commandDescription = "Send an ICANN report of an uploaded deposit.") diff --git a/core/src/main/java/google/registry/tools/ServiceConnection.java b/core/src/main/java/google/registry/tools/ServiceConnection.java index aa25933bf..428b0692e 100644 --- a/core/src/main/java/google/registry/tools/ServiceConnection.java +++ b/core/src/main/java/google/registry/tools/ServiceConnection.java @@ -40,12 +40,12 @@ import google.registry.config.RegistryConfig.Config; import google.registry.request.Action.GaeService; import google.registry.request.Action.GkeService; import google.registry.request.Action.Service; +import jakarta.inject.Inject; import java.io.IOException; import java.io.InputStreamReader; import java.net.URL; import java.util.Map; import javax.annotation.Nullable; -import javax.inject.Inject; import org.json.simple.JSONValue; /** diff --git a/core/src/main/java/google/registry/tools/SetupOteCommand.java b/core/src/main/java/google/registry/tools/SetupOteCommand.java index a4a3f2504..e4bbf9c70 100644 --- a/core/src/main/java/google/registry/tools/SetupOteCommand.java +++ b/core/src/main/java/google/registry/tools/SetupOteCommand.java @@ -29,11 +29,11 @@ import google.registry.tools.params.PathParameter; import google.registry.util.Clock; import google.registry.util.RegistryEnvironment; import google.registry.util.StringGenerator; +import jakarta.inject.Inject; +import jakarta.inject.Named; import java.nio.file.Path; import java.util.List; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Named; /** Composite command to set up OT&E TLDs and accounts. */ @Parameters(separators = " =", commandDescription = "Set up OT&E TLDs and registrars") @@ -127,8 +127,8 @@ final class SetupOteCommand extends ConfirmingCommand { """ - WARNING: Running against %s environment. Are \ - you sure you didn't mean to run this against sandbox (e.g. "-e SANDBOX")?""", +WARNING: Running against %s environment. Are \ +you sure you didn't mean to run this against sandbox (e.g. "-e SANDBOX")?""", RegistryEnvironment.get())); } diff --git a/core/src/main/java/google/registry/tools/UniformRapidSuspensionCommand.java b/core/src/main/java/google/registry/tools/UniformRapidSuspensionCommand.java index 7ae3f52dd..5ec3e782c 100644 --- a/core/src/main/java/google/registry/tools/UniformRapidSuspensionCommand.java +++ b/core/src/main/java/google/registry/tools/UniformRapidSuspensionCommand.java @@ -39,13 +39,13 @@ import google.registry.tools.params.NameserversParameter; import google.registry.tools.soy.DomainRenewSoyInfo; import google.registry.tools.soy.UniformRapidSuspensionSoyInfo; import google.registry.util.Clock; +import jakarta.inject.Inject; import jakarta.xml.bind.annotation.adapters.HexBinaryAdapter; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Optional; import java.util.Set; -import javax.inject.Inject; import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormat; diff --git a/core/src/main/java/google/registry/tools/UnrenewDomainCommand.java b/core/src/main/java/google/registry/tools/UnrenewDomainCommand.java index eddd2882f..1719c9a2b 100644 --- a/core/src/main/java/google/registry/tools/UnrenewDomainCommand.java +++ b/core/src/main/java/google/registry/tools/UnrenewDomainCommand.java @@ -42,10 +42,10 @@ import google.registry.model.poll.PollMessage; import google.registry.model.reporting.HistoryEntry.Type; import google.registry.util.Clock; import google.registry.util.NonFinalForTesting; +import jakarta.inject.Inject; import java.io.UnsupportedEncodingException; import java.util.List; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/tools/UpdateDomainCommand.java b/core/src/main/java/google/registry/tools/UpdateDomainCommand.java index 9351d6aee..f1cc0a361 100644 --- a/core/src/main/java/google/registry/tools/UpdateDomainCommand.java +++ b/core/src/main/java/google/registry/tools/UpdateDomainCommand.java @@ -38,6 +38,7 @@ import google.registry.model.eppcommon.StatusValue; import google.registry.tools.params.NameserversParameter; import google.registry.tools.soy.DomainUpdateSoyInfo; import google.registry.util.Clock; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -45,7 +46,6 @@ import java.util.Optional; import java.util.Set; import java.util.TreeSet; import javax.annotation.Nullable; -import javax.inject.Inject; import org.joda.time.DateTime; /** A command to update a new domain via EPP. */ diff --git a/core/src/main/java/google/registry/tools/UpdateKeyringSecretCommand.java b/core/src/main/java/google/registry/tools/UpdateKeyringSecretCommand.java index 1677a6a85..07ffc2a96 100644 --- a/core/src/main/java/google/registry/tools/UpdateKeyringSecretCommand.java +++ b/core/src/main/java/google/registry/tools/UpdateKeyringSecretCommand.java @@ -23,9 +23,9 @@ import com.beust.jcommander.Parameters; import google.registry.keyring.secretmanager.SecretManagerKeyringUpdater; import google.registry.tools.params.KeyringKeyName; import google.registry.tools.params.PathParameter; +import jakarta.inject.Inject; import java.nio.file.Files; import java.nio.file.Path; -import javax.inject.Inject; /** * Command to set and update ASCII-armored secret from the active {@code Keyring} implementation. diff --git a/core/src/main/java/google/registry/tools/ValidateEscrowDepositCommand.java b/core/src/main/java/google/registry/tools/ValidateEscrowDepositCommand.java index b016c3d99..d19c52f91 100644 --- a/core/src/main/java/google/registry/tools/ValidateEscrowDepositCommand.java +++ b/core/src/main/java/google/registry/tools/ValidateEscrowDepositCommand.java @@ -34,6 +34,7 @@ import google.registry.xjc.rdedomain.XjcRdeDomain; import google.registry.xjc.rdehost.XjcRdeHost; import google.registry.xjc.rderegistrar.XjcRdeRegistrar; import google.registry.xml.XmlException; +import jakarta.inject.Inject; import jakarta.xml.bind.JAXBElement; import java.io.InputStream; import java.nio.file.Files; @@ -46,7 +47,6 @@ import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; import javax.annotation.Nullable; -import javax.inject.Inject; /** Command to view and schema validate an XML RDE escrow deposit. */ @Parameters(separators = " =", commandDescription = "View/validate an XML escrow deposit.") diff --git a/core/src/main/java/google/registry/tools/ValidateLoginCredentialsCommand.java b/core/src/main/java/google/registry/tools/ValidateLoginCredentialsCommand.java index a52351eef..fefc760d1 100644 --- a/core/src/main/java/google/registry/tools/ValidateLoginCredentialsCommand.java +++ b/core/src/main/java/google/registry/tools/ValidateLoginCredentialsCommand.java @@ -29,10 +29,10 @@ import google.registry.flows.certs.CertificateChecker; import google.registry.model.registrar.Registrar; import google.registry.tools.params.PathParameter; import google.registry.util.Clock; +import jakarta.inject.Inject; import java.nio.file.Path; import java.util.Optional; import javax.annotation.Nullable; -import javax.inject.Inject; /** A command to test registrar login credentials. */ @Parameters(separators = " =", commandDescription = "Test registrar login credentials") diff --git a/core/src/main/java/google/registry/tools/WhoisQueryCommand.java b/core/src/main/java/google/registry/tools/WhoisQueryCommand.java index 05e7a1ae0..5b501a0ee 100644 --- a/core/src/main/java/google/registry/tools/WhoisQueryCommand.java +++ b/core/src/main/java/google/registry/tools/WhoisQueryCommand.java @@ -18,8 +18,8 @@ import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import com.google.common.base.Joiner; import google.registry.whois.Whois; +import jakarta.inject.Inject; import java.util.List; -import javax.inject.Inject; /** Command to execute a WHOIS query. */ @Parameters(separators = " =", commandDescription = "Manually perform a WHOIS query") diff --git a/core/src/main/java/google/registry/tools/server/CreateGroupsAction.java b/core/src/main/java/google/registry/tools/server/CreateGroupsAction.java index ac2485290..865e7fc2d 100644 --- a/core/src/main/java/google/registry/tools/server/CreateGroupsAction.java +++ b/core/src/main/java/google/registry/tools/server/CreateGroupsAction.java @@ -33,11 +33,11 @@ import google.registry.request.Parameter; import google.registry.request.Response; import google.registry.request.auth.Auth; import google.registry.util.Concurrent; +import jakarta.inject.Inject; import java.io.PrintWriter; import java.io.StringWriter; import java.util.List; import java.util.Optional; -import javax.inject.Inject; /** Action that creates Google Groups for a registrar's mailing lists. */ @Action( diff --git a/core/src/main/java/google/registry/tools/server/GenerateZoneFilesAction.java b/core/src/main/java/google/registry/tools/server/GenerateZoneFilesAction.java index 28c96f9b9..d82f311a0 100644 --- a/core/src/main/java/google/registry/tools/server/GenerateZoneFilesAction.java +++ b/core/src/main/java/google/registry/tools/server/GenerateZoneFilesAction.java @@ -38,6 +38,7 @@ import google.registry.request.HttpException.BadRequestException; import google.registry.request.JsonActionRunner; import google.registry.request.auth.Auth; import google.registry.util.Clock; +import jakarta.inject.Inject; import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; @@ -47,7 +48,6 @@ import java.net.Inet4Address; import java.net.InetAddress; import java.util.List; import java.util.Map; -import javax.inject.Inject; import org.hibernate.CacheMode; import org.hibernate.ScrollMode; import org.hibernate.ScrollableResults; diff --git a/core/src/main/java/google/registry/tools/server/ListDomainsAction.java b/core/src/main/java/google/registry/tools/server/ListDomainsAction.java index bed2e3a6d..e69c5b5d4 100644 --- a/core/src/main/java/google/registry/tools/server/ListDomainsAction.java +++ b/core/src/main/java/google/registry/tools/server/ListDomainsAction.java @@ -33,7 +33,7 @@ import google.registry.request.Parameter; import google.registry.request.auth.Auth; import google.registry.util.Clock; import google.registry.util.NonFinalForTesting; -import javax.inject.Inject; +import jakarta.inject.Inject; /** An action that lists domains, for use by the {@code nomulus list_domains} command. */ @Action( diff --git a/core/src/main/java/google/registry/tools/server/ListHostsAction.java b/core/src/main/java/google/registry/tools/server/ListHostsAction.java index cf3995c44..90679223c 100644 --- a/core/src/main/java/google/registry/tools/server/ListHostsAction.java +++ b/core/src/main/java/google/registry/tools/server/ListHostsAction.java @@ -28,7 +28,7 @@ import google.registry.request.Action; import google.registry.request.Action.GaeService; import google.registry.request.auth.Auth; import google.registry.util.Clock; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.joda.time.DateTime; /** An action that lists hosts, for use by the {@code nomulus list_hosts} command. */ diff --git a/core/src/main/java/google/registry/tools/server/ListObjectsAction.java b/core/src/main/java/google/registry/tools/server/ListObjectsAction.java index 3f2217e69..16ff6bdd8 100644 --- a/core/src/main/java/google/registry/tools/server/ListObjectsAction.java +++ b/core/src/main/java/google/registry/tools/server/ListObjectsAction.java @@ -34,6 +34,7 @@ import com.google.common.flogger.FluentLogger; import google.registry.model.ImmutableObject; import google.registry.request.JsonResponse; import google.registry.request.Parameter; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -43,7 +44,6 @@ import java.util.Optional; import java.util.Set; import java.util.function.Function; import java.util.stream.Stream; -import javax.inject.Inject; /** * Abstract base class for actions that list ImmutableObjects. diff --git a/core/src/main/java/google/registry/tools/server/ListPremiumListsAction.java b/core/src/main/java/google/registry/tools/server/ListPremiumListsAction.java index e981c715e..6e049f83f 100644 --- a/core/src/main/java/google/registry/tools/server/ListPremiumListsAction.java +++ b/core/src/main/java/google/registry/tools/server/ListPremiumListsAction.java @@ -25,9 +25,9 @@ import google.registry.model.tld.label.PremiumListDao; import google.registry.request.Action; import google.registry.request.Action.GaeService; import google.registry.request.auth.Auth; +import jakarta.inject.Inject; import java.util.Comparator; import java.util.Optional; -import javax.inject.Inject; /** * An action that lists premium lists, for use by the {@code nomulus list_premium_lists} command. diff --git a/core/src/main/java/google/registry/tools/server/ListRegistrarsAction.java b/core/src/main/java/google/registry/tools/server/ListRegistrarsAction.java index 4dbc1744c..cc65a927e 100644 --- a/core/src/main/java/google/registry/tools/server/ListRegistrarsAction.java +++ b/core/src/main/java/google/registry/tools/server/ListRegistrarsAction.java @@ -24,7 +24,7 @@ import google.registry.model.registrar.Registrar; import google.registry.request.Action; import google.registry.request.Action.GaeService; import google.registry.request.auth.Auth; -import javax.inject.Inject; +import jakarta.inject.Inject; /** An action that lists registrars, for use by the {@code nomulus list_registrars} command. */ @Action( diff --git a/core/src/main/java/google/registry/tools/server/ListReservedListsAction.java b/core/src/main/java/google/registry/tools/server/ListReservedListsAction.java index 630610256..47e776463 100644 --- a/core/src/main/java/google/registry/tools/server/ListReservedListsAction.java +++ b/core/src/main/java/google/registry/tools/server/ListReservedListsAction.java @@ -25,9 +25,9 @@ import google.registry.model.tld.label.ReservedListDao; import google.registry.request.Action; import google.registry.request.Action.GaeService; import google.registry.request.auth.Auth; +import jakarta.inject.Inject; import java.util.Comparator; import java.util.Optional; -import javax.inject.Inject; /** A that lists reserved lists, for use by the {@code nomulus list_reserved_lists} command. */ @Action( diff --git a/core/src/main/java/google/registry/tools/server/ListTldsAction.java b/core/src/main/java/google/registry/tools/server/ListTldsAction.java index 078945c72..d57018e6d 100644 --- a/core/src/main/java/google/registry/tools/server/ListTldsAction.java +++ b/core/src/main/java/google/registry/tools/server/ListTldsAction.java @@ -27,7 +27,7 @@ import google.registry.request.Action; import google.registry.request.Action.GaeService; import google.registry.request.auth.Auth; import google.registry.util.Clock; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.joda.time.DateTime; /** An action that lists top-level domains, for use by the {@code nomulus list_tlds} command. */ diff --git a/core/src/main/java/google/registry/tools/server/RefreshDnsForAllDomainsAction.java b/core/src/main/java/google/registry/tools/server/RefreshDnsForAllDomainsAction.java index 1e658bf6c..4d7bcfe85 100644 --- a/core/src/main/java/google/registry/tools/server/RefreshDnsForAllDomainsAction.java +++ b/core/src/main/java/google/registry/tools/server/RefreshDnsForAllDomainsAction.java @@ -33,11 +33,11 @@ import google.registry.request.Action.GaeService; import google.registry.request.Parameter; import google.registry.request.Response; import google.registry.request.auth.Auth; +import jakarta.inject.Inject; import jakarta.persistence.TypedQuery; import java.util.Optional; import java.util.Random; import javax.annotation.Nullable; -import javax.inject.Inject; import org.apache.arrow.util.VisibleForTesting; import org.apache.http.HttpStatus; import org.joda.time.DateTime; diff --git a/core/src/main/java/google/registry/tools/server/UpdateUserGroupAction.java b/core/src/main/java/google/registry/tools/server/UpdateUserGroupAction.java index 181ba71a5..ef0a4bb2f 100644 --- a/core/src/main/java/google/registry/tools/server/UpdateUserGroupAction.java +++ b/core/src/main/java/google/registry/tools/server/UpdateUserGroupAction.java @@ -24,7 +24,7 @@ import google.registry.request.Action.GaeService; import google.registry.request.Parameter; import google.registry.request.Response; import google.registry.request.auth.Auth; -import javax.inject.Inject; +import jakarta.inject.Inject; /** Action that adds or deletes a console user to/from the group that has IAP permissions. */ @Action( diff --git a/core/src/main/java/google/registry/tools/server/VerifyOteAction.java b/core/src/main/java/google/registry/tools/server/VerifyOteAction.java index 3827ac255..e39ac3c0c 100644 --- a/core/src/main/java/google/registry/tools/server/VerifyOteAction.java +++ b/core/src/main/java/google/registry/tools/server/VerifyOteAction.java @@ -25,10 +25,10 @@ import google.registry.request.Action.GaeService; import google.registry.request.JsonActionRunner; import google.registry.request.JsonActionRunner.JsonAction; import google.registry.request.auth.Auth; +import jakarta.inject.Inject; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import javax.inject.Inject; /** * A servlet that verifies a registrar's OTE status. Note that this is eventually consistent, so diff --git a/core/src/main/java/google/registry/ui/server/SendEmailUtils.java b/core/src/main/java/google/registry/ui/server/SendEmailUtils.java index 69142c5d5..8effcfdad 100644 --- a/core/src/main/java/google/registry/ui/server/SendEmailUtils.java +++ b/core/src/main/java/google/registry/ui/server/SendEmailUtils.java @@ -22,12 +22,12 @@ import com.google.common.flogger.FluentLogger; import google.registry.config.RegistryConfig.Config; import google.registry.groups.GmailClient; import google.registry.util.EmailMessage; +import jakarta.inject.Inject; import jakarta.mail.internet.AddressException; import jakarta.mail.internet.InternetAddress; import java.util.Objects; import java.util.Optional; import java.util.stream.Stream; -import javax.inject.Inject; /** * Utility class for sending emails from the app. diff --git a/core/src/main/java/google/registry/ui/server/console/ConsoleApiAction.java b/core/src/main/java/google/registry/ui/server/console/ConsoleApiAction.java index 306d22e5e..f2ff52459 100644 --- a/core/src/main/java/google/registry/ui/server/console/ConsoleApiAction.java +++ b/core/src/main/java/google/registry/ui/server/console/ConsoleApiAction.java @@ -46,6 +46,7 @@ import google.registry.request.HttpException; import google.registry.security.XsrfTokenManager; import google.registry.util.DiffUtils; import google.registry.util.RegistryEnvironment; +import jakarta.inject.Inject; import jakarta.servlet.http.Cookie; import java.util.Arrays; import java.util.LinkedHashMap; @@ -53,7 +54,6 @@ import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.stream.Stream; -import javax.inject.Inject; /** Base class for handling Console API requests */ public abstract class ConsoleApiAction implements Runnable { diff --git a/core/src/main/java/google/registry/ui/server/console/ConsoleDomainGetAction.java b/core/src/main/java/google/registry/ui/server/console/ConsoleDomainGetAction.java index 216a4f512..79cfcbd52 100644 --- a/core/src/main/java/google/registry/ui/server/console/ConsoleDomainGetAction.java +++ b/core/src/main/java/google/registry/ui/server/console/ConsoleDomainGetAction.java @@ -27,8 +27,8 @@ import google.registry.request.Action.GaeService; import google.registry.request.Action.GkeService; import google.registry.request.Parameter; import google.registry.request.auth.Auth; +import jakarta.inject.Inject; import java.util.Optional; -import javax.inject.Inject; /** Returns a JSON representation of a domain to the registrar console. */ @Action( diff --git a/core/src/main/java/google/registry/ui/server/console/ConsoleDomainListAction.java b/core/src/main/java/google/registry/ui/server/console/ConsoleDomainListAction.java index 3250f9ae2..987e2ddf2 100644 --- a/core/src/main/java/google/registry/ui/server/console/ConsoleDomainListAction.java +++ b/core/src/main/java/google/registry/ui/server/console/ConsoleDomainListAction.java @@ -30,10 +30,10 @@ import google.registry.request.Action.GaeService; import google.registry.request.Action.GkeService; import google.registry.request.Parameter; import google.registry.request.auth.Auth; +import jakarta.inject.Inject; import jakarta.persistence.TypedQuery; import java.util.List; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.DateTime; /** Returns a (paginated) list of domains for a particular registrar. */ diff --git a/core/src/main/java/google/registry/ui/server/console/ConsoleDumDownloadAction.java b/core/src/main/java/google/registry/ui/server/console/ConsoleDumDownloadAction.java index 45eaaa81b..50586f3a3 100644 --- a/core/src/main/java/google/registry/ui/server/console/ConsoleDumDownloadAction.java +++ b/core/src/main/java/google/registry/ui/server/console/ConsoleDumDownloadAction.java @@ -31,10 +31,10 @@ import google.registry.request.Action.GkeService; import google.registry.request.Parameter; import google.registry.request.auth.Auth; import google.registry.util.Clock; +import jakarta.inject.Inject; import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; -import javax.inject.Inject; import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVPrinter; import org.joda.time.DateTime; diff --git a/core/src/main/java/google/registry/ui/server/console/ConsoleEppPasswordAction.java b/core/src/main/java/google/registry/ui/server/console/ConsoleEppPasswordAction.java index 08b96359e..790f3e0c3 100644 --- a/core/src/main/java/google/registry/ui/server/console/ConsoleEppPasswordAction.java +++ b/core/src/main/java/google/registry/ui/server/console/ConsoleEppPasswordAction.java @@ -39,8 +39,8 @@ import google.registry.request.auth.Auth; import google.registry.request.auth.AuthenticatedRegistrarAccessor; import google.registry.request.auth.AuthenticatedRegistrarAccessor.RegistrarAccessDeniedException; import google.registry.util.DiffUtils; +import jakarta.inject.Inject; import java.util.Optional; -import javax.inject.Inject; @Action( service = GaeService.DEFAULT, diff --git a/core/src/main/java/google/registry/ui/server/console/ConsoleOteAction.java b/core/src/main/java/google/registry/ui/server/console/ConsoleOteAction.java index 3edfe50d6..ca1a2735b 100644 --- a/core/src/main/java/google/registry/ui/server/console/ConsoleOteAction.java +++ b/core/src/main/java/google/registry/ui/server/console/ConsoleOteAction.java @@ -43,10 +43,10 @@ import google.registry.request.auth.Auth; import google.registry.tools.IamClient; import google.registry.util.RegistryEnvironment; import google.registry.util.StringGenerator; +import jakarta.inject.Inject; +import jakarta.inject.Named; import java.util.Map; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Named; @Action( service = Action.GaeService.DEFAULT, diff --git a/core/src/main/java/google/registry/ui/server/console/ConsoleRegistryLockAction.java b/core/src/main/java/google/registry/ui/server/console/ConsoleRegistryLockAction.java index 256f88899..c2d59af6d 100644 --- a/core/src/main/java/google/registry/ui/server/console/ConsoleRegistryLockAction.java +++ b/core/src/main/java/google/registry/ui/server/console/ConsoleRegistryLockAction.java @@ -40,11 +40,11 @@ import google.registry.request.Response; import google.registry.request.auth.Auth; import google.registry.tools.DomainLockUtils; import google.registry.util.EmailMessage; +import jakarta.inject.Inject; import jakarta.mail.internet.AddressException; import jakarta.mail.internet.InternetAddress; import java.util.Optional; import javax.annotation.Nullable; -import javax.inject.Inject; import org.joda.time.Duration; /** diff --git a/core/src/main/java/google/registry/ui/server/console/ConsoleRegistryLockVerifyAction.java b/core/src/main/java/google/registry/ui/server/console/ConsoleRegistryLockVerifyAction.java index 1d0c4b855..8f32f6098 100644 --- a/core/src/main/java/google/registry/ui/server/console/ConsoleRegistryLockVerifyAction.java +++ b/core/src/main/java/google/registry/ui/server/console/ConsoleRegistryLockVerifyAction.java @@ -26,8 +26,8 @@ import google.registry.request.Action.GkeService; import google.registry.request.Parameter; import google.registry.request.auth.Auth; import google.registry.tools.DomainLockUtils; +import jakarta.inject.Inject; import jakarta.servlet.http.HttpServletResponse; -import javax.inject.Inject; /** Handler for verifying registry lock requests, a form of 2FA. */ @Action( diff --git a/core/src/main/java/google/registry/ui/server/console/ConsoleUpdateRegistrarAction.java b/core/src/main/java/google/registry/ui/server/console/ConsoleUpdateRegistrarAction.java index 228837117..7082ddd36 100644 --- a/core/src/main/java/google/registry/ui/server/console/ConsoleUpdateRegistrarAction.java +++ b/core/src/main/java/google/registry/ui/server/console/ConsoleUpdateRegistrarAction.java @@ -35,9 +35,9 @@ import google.registry.request.Parameter; import google.registry.request.auth.Auth; import google.registry.util.DomainNameUtils; import google.registry.util.RegistryEnvironment; +import jakarta.inject.Inject; import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; @Action( service = GaeService.DEFAULT, diff --git a/core/src/main/java/google/registry/ui/server/console/ConsoleUserDataAction.java b/core/src/main/java/google/registry/ui/server/console/ConsoleUserDataAction.java index f9b703e73..deb891fa9 100644 --- a/core/src/main/java/google/registry/ui/server/console/ConsoleUserDataAction.java +++ b/core/src/main/java/google/registry/ui/server/console/ConsoleUserDataAction.java @@ -25,8 +25,8 @@ import google.registry.request.Action.GaeService; import google.registry.request.Action.GkeService; import google.registry.request.auth.Auth; import google.registry.security.XsrfTokenManager; +import jakarta.inject.Inject; import jakarta.servlet.http.Cookie; -import javax.inject.Inject; import org.json.JSONObject; @Action( diff --git a/core/src/main/java/google/registry/ui/server/console/ConsoleUsersAction.java b/core/src/main/java/google/registry/ui/server/console/ConsoleUsersAction.java index edf33b198..093834868 100644 --- a/core/src/main/java/google/registry/ui/server/console/ConsoleUsersAction.java +++ b/core/src/main/java/google/registry/ui/server/console/ConsoleUsersAction.java @@ -48,6 +48,8 @@ import google.registry.request.auth.Auth; import google.registry.tools.IamClient; import google.registry.util.DiffUtils; import google.registry.util.StringGenerator; +import jakarta.inject.Inject; +import jakarta.inject.Named; import java.io.IOException; import java.util.List; import java.util.Map; @@ -55,8 +57,6 @@ import java.util.Objects; import java.util.Optional; import java.util.stream.Collectors; import javax.annotation.Nullable; -import javax.inject.Inject; -import javax.inject.Named; @Action( service = Action.GaeService.DEFAULT, diff --git a/core/src/main/java/google/registry/ui/server/console/RegistrarsAction.java b/core/src/main/java/google/registry/ui/server/console/RegistrarsAction.java index c6b331779..96aeb0e4b 100644 --- a/core/src/main/java/google/registry/ui/server/console/RegistrarsAction.java +++ b/core/src/main/java/google/registry/ui/server/console/RegistrarsAction.java @@ -40,11 +40,11 @@ import google.registry.request.Action.GkeService; import google.registry.request.Parameter; import google.registry.request.auth.Auth; import google.registry.util.StringGenerator; +import jakarta.inject.Inject; +import jakarta.inject.Named; import java.util.List; import java.util.Map; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Named; @Action( service = GaeService.DEFAULT, diff --git a/core/src/main/java/google/registry/ui/server/console/domains/ConsoleBulkDomainAction.java b/core/src/main/java/google/registry/ui/server/console/domains/ConsoleBulkDomainAction.java index 2b755888d..64b4e97f9 100644 --- a/core/src/main/java/google/registry/ui/server/console/domains/ConsoleBulkDomainAction.java +++ b/core/src/main/java/google/registry/ui/server/console/domains/ConsoleBulkDomainAction.java @@ -35,9 +35,9 @@ import google.registry.request.Parameter; import google.registry.request.auth.Auth; import google.registry.ui.server.console.ConsoleApiAction; import google.registry.ui.server.console.ConsoleApiParams; +import jakarta.inject.Inject; import java.util.List; import java.util.Optional; -import javax.inject.Inject; /** * Console endpoint to perform the same action to a list of domains. diff --git a/core/src/main/java/google/registry/ui/server/console/settings/ContactAction.java b/core/src/main/java/google/registry/ui/server/console/settings/ContactAction.java index 69652ceb6..1bc1ec8e3 100644 --- a/core/src/main/java/google/registry/ui/server/console/settings/ContactAction.java +++ b/core/src/main/java/google/registry/ui/server/console/settings/ContactAction.java @@ -43,12 +43,12 @@ import google.registry.ui.forms.FormException; import google.registry.ui.server.RegistrarFormFields; import google.registry.ui.server.console.ConsoleApiAction; import google.registry.ui.server.console.ConsoleApiParams; +import jakarta.inject.Inject; import java.util.Collections; import java.util.HashSet; import java.util.Objects; import java.util.Optional; import java.util.Set; -import javax.inject.Inject; @Action( service = GaeService.DEFAULT, diff --git a/core/src/main/java/google/registry/ui/server/console/settings/SecurityAction.java b/core/src/main/java/google/registry/ui/server/console/settings/SecurityAction.java index 511701e9c..d4603e0f4 100644 --- a/core/src/main/java/google/registry/ui/server/console/settings/SecurityAction.java +++ b/core/src/main/java/google/registry/ui/server/console/settings/SecurityAction.java @@ -38,8 +38,8 @@ import google.registry.request.auth.AuthenticatedRegistrarAccessor; import google.registry.request.auth.AuthenticatedRegistrarAccessor.RegistrarAccessDeniedException; import google.registry.ui.server.console.ConsoleApiAction; import google.registry.ui.server.console.ConsoleApiParams; +import jakarta.inject.Inject; import java.util.Optional; -import javax.inject.Inject; @Action( service = GaeService.DEFAULT, diff --git a/core/src/main/java/google/registry/ui/server/console/settings/WhoisRegistrarFieldsAction.java b/core/src/main/java/google/registry/ui/server/console/settings/WhoisRegistrarFieldsAction.java index c9f0b65b2..7c90427d8 100644 --- a/core/src/main/java/google/registry/ui/server/console/settings/WhoisRegistrarFieldsAction.java +++ b/core/src/main/java/google/registry/ui/server/console/settings/WhoisRegistrarFieldsAction.java @@ -35,9 +35,9 @@ import google.registry.request.auth.AuthenticatedRegistrarAccessor; import google.registry.request.auth.AuthenticatedRegistrarAccessor.RegistrarAccessDeniedException; import google.registry.ui.server.console.ConsoleApiAction; import google.registry.ui.server.console.ConsoleApiParams; +import jakarta.inject.Inject; import java.util.Objects; import java.util.Optional; -import javax.inject.Inject; /** * Console action for editing fields on a registrar that are visible in WHOIS/RDAP. diff --git a/core/src/main/java/google/registry/whois/Whois.java b/core/src/main/java/google/registry/whois/Whois.java index 894f9542a..80b900eca 100644 --- a/core/src/main/java/google/registry/whois/Whois.java +++ b/core/src/main/java/google/registry/whois/Whois.java @@ -16,9 +16,9 @@ package google.registry.whois; import google.registry.config.RegistryConfig.Config; import google.registry.util.Clock; +import jakarta.inject.Inject; import java.io.IOException; import java.io.StringReader; -import javax.inject.Inject; import org.joda.time.DateTime; /** High-level WHOIS API for other packages. */ diff --git a/core/src/main/java/google/registry/whois/WhoisAction.java b/core/src/main/java/google/registry/whois/WhoisAction.java index 0128cdb07..cd3ef194e 100644 --- a/core/src/main/java/google/registry/whois/WhoisAction.java +++ b/core/src/main/java/google/registry/whois/WhoisAction.java @@ -30,8 +30,8 @@ import google.registry.util.Retrier; import google.registry.whois.WhoisException.UncheckedWhoisException; import google.registry.whois.WhoisMetrics.WhoisMetric; import google.registry.whois.WhoisResponse.WhoisResponseResults; +import jakarta.inject.Inject; import java.io.Reader; -import javax.inject.Inject; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/whois/WhoisHttpAction.java b/core/src/main/java/google/registry/whois/WhoisHttpAction.java index 8d2536609..038f99061 100644 --- a/core/src/main/java/google/registry/whois/WhoisHttpAction.java +++ b/core/src/main/java/google/registry/whois/WhoisHttpAction.java @@ -39,10 +39,10 @@ import google.registry.request.auth.Auth; import google.registry.util.Clock; import google.registry.whois.WhoisMetrics.WhoisMetric; import google.registry.whois.WhoisResponse.WhoisResponseResults; +import jakarta.inject.Inject; import java.io.StringReader; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; -import javax.inject.Inject; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/core/src/main/java/google/registry/whois/WhoisMetrics.java b/core/src/main/java/google/registry/whois/WhoisMetrics.java index c3b06a2f5..b8e0a8bfb 100644 --- a/core/src/main/java/google/registry/whois/WhoisMetrics.java +++ b/core/src/main/java/google/registry/whois/WhoisMetrics.java @@ -24,8 +24,8 @@ import com.google.monitoring.metrics.IncrementableMetric; import com.google.monitoring.metrics.LabelDescriptor; import com.google.monitoring.metrics.MetricRegistryImpl; import google.registry.util.Clock; +import jakarta.inject.Inject; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.DateTime; /** diff --git a/core/src/main/java/google/registry/whois/WhoisReader.java b/core/src/main/java/google/registry/whois/WhoisReader.java index 5ab3f7ee7..48280ed02 100644 --- a/core/src/main/java/google/registry/whois/WhoisReader.java +++ b/core/src/main/java/google/registry/whois/WhoisReader.java @@ -26,12 +26,12 @@ import com.google.common.io.CharStreams; import com.google.common.net.InetAddresses; import com.google.common.net.InternetDomainName; import google.registry.config.RegistryConfig.Config; +import jakarta.inject.Inject; import java.io.IOException; import java.io.Reader; import java.util.ArrayList; import java.util.List; import java.util.Optional; -import javax.inject.Inject; import org.joda.time.DateTime; /** diff --git a/core/src/test/java/google/registry/dns/DnsTestComponent.java b/core/src/test/java/google/registry/dns/DnsTestComponent.java index b0e1baada..73022d109 100644 --- a/core/src/test/java/google/registry/dns/DnsTestComponent.java +++ b/core/src/test/java/google/registry/dns/DnsTestComponent.java @@ -21,7 +21,7 @@ import google.registry.dns.writer.VoidDnsWriterModule; import google.registry.request.RequestModule; import google.registry.testing.CloudTasksHelper.CloudTasksHelperModule; import google.registry.util.UtilsModule; -import javax.inject.Singleton; +import jakarta.inject.Singleton; @Singleton @Component( diff --git a/core/src/test/java/google/registry/flows/EppTestComponent.java b/core/src/test/java/google/registry/flows/EppTestComponent.java index f6ddf3788..f9ad83d80 100644 --- a/core/src/test/java/google/registry/flows/EppTestComponent.java +++ b/core/src/test/java/google/registry/flows/EppTestComponent.java @@ -37,7 +37,7 @@ import google.registry.tmch.TmchCertificateAuthority; import google.registry.tmch.TmchXmlSignature; import google.registry.util.Clock; import google.registry.util.Sleeper; -import javax.inject.Singleton; +import jakarta.inject.Singleton; /** Dagger component for running EPP tests. */ @Singleton diff --git a/core/src/test/java/google/registry/persistence/PersistenceModuleTest.java b/core/src/test/java/google/registry/persistence/PersistenceModuleTest.java index 04f7ab513..bf9eb9f4b 100644 --- a/core/src/test/java/google/registry/persistence/PersistenceModuleTest.java +++ b/core/src/test/java/google/registry/persistence/PersistenceModuleTest.java @@ -23,11 +23,11 @@ import google.registry.config.RegistryConfig.ConfigModule; import google.registry.persistence.PersistenceModule.TransactionIsolationLevel; import google.registry.privileges.secretmanager.SecretManagerModule; import google.registry.util.UtilsModule; +import jakarta.inject.Provider; +import jakarta.inject.Singleton; import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; import java.util.Optional; -import javax.inject.Provider; -import javax.inject.Singleton; import org.hibernate.cfg.Environment; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/core/src/test/java/google/registry/privileges/secretmanager/FakeSecretManagerClient.java b/core/src/test/java/google/registry/privileges/secretmanager/FakeSecretManagerClient.java index 947d90ef7..772ae3b63 100644 --- a/core/src/test/java/google/registry/privileges/secretmanager/FakeSecretManagerClient.java +++ b/core/src/test/java/google/registry/privileges/secretmanager/FakeSecretManagerClient.java @@ -19,10 +19,10 @@ import static com.google.common.base.Preconditions.checkNotNull; import com.google.cloud.secretmanager.v1.SecretVersion.State; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.HashMap; import java.util.Optional; -import javax.inject.Inject; /** Implements {@link SecretManagerClient} for tests. */ public class FakeSecretManagerClient implements SecretManagerClient { diff --git a/core/src/test/java/google/registry/request/auth/OidcTokenAuthenticationMechanismTest.java b/core/src/test/java/google/registry/request/auth/OidcTokenAuthenticationMechanismTest.java index a8f671e46..597e4bd5d 100644 --- a/core/src/test/java/google/registry/request/auth/OidcTokenAuthenticationMechanismTest.java +++ b/core/src/test/java/google/registry/request/auth/OidcTokenAuthenticationMechanismTest.java @@ -42,8 +42,8 @@ import google.registry.request.auth.AuthSettings.AuthLevel; import google.registry.request.auth.OidcTokenAuthenticationMechanism.IapOidcAuthenticationMechanism; import google.registry.request.auth.OidcTokenAuthenticationMechanism.RegularOidcAuthenticationMechanism; import google.registry.util.GoogleCredentialsBundle; +import jakarta.inject.Singleton; import jakarta.servlet.http.HttpServletRequest; -import javax.inject.Singleton; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/core/src/test/java/google/registry/testing/CloudTasksHelper.java b/core/src/test/java/google/registry/testing/CloudTasksHelper.java index 66736fdbc..0559dbc7b 100644 --- a/core/src/test/java/google/registry/testing/CloudTasksHelper.java +++ b/core/src/test/java/google/registry/testing/CloudTasksHelper.java @@ -48,6 +48,7 @@ import google.registry.batch.CloudTasksUtils; import google.registry.model.ImmutableObject; import google.registry.util.GoogleCredentialsBundle; import google.registry.util.Retrier; +import jakarta.inject.Singleton; import java.io.Serializable; import java.net.URI; import java.net.URISyntaxException; @@ -68,7 +69,6 @@ import java.util.function.Predicate; import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.annotation.Nonnull; -import javax.inject.Singleton; import org.joda.time.DateTime; /** diff --git a/core/src/test/java/google/registry/testing/DeterministicStringGenerator.java b/core/src/test/java/google/registry/testing/DeterministicStringGenerator.java index 3043949ab..89d1337ca 100644 --- a/core/src/test/java/google/registry/testing/DeterministicStringGenerator.java +++ b/core/src/test/java/google/registry/testing/DeterministicStringGenerator.java @@ -20,8 +20,8 @@ import static com.google.common.collect.Lists.charactersOf; import com.google.common.collect.Iterators; import google.registry.util.RandomStringGenerator; import google.registry.util.StringGenerator; +import jakarta.inject.Named; import java.util.Iterator; -import javax.inject.Named; /** * A string generator that produces strings using sequential characters in its alphabet. This is diff --git a/core/src/test/java/google/registry/whois/WhoisTestComponent.java b/core/src/test/java/google/registry/whois/WhoisTestComponent.java index 1665aa2f7..02d7c199f 100644 --- a/core/src/test/java/google/registry/whois/WhoisTestComponent.java +++ b/core/src/test/java/google/registry/whois/WhoisTestComponent.java @@ -18,7 +18,7 @@ import dagger.Component; import google.registry.config.RegistryConfig.ConfigModule; import google.registry.request.RequestModule; import google.registry.util.UtilsModule; -import javax.inject.Singleton; +import jakarta.inject.Singleton; @Singleton @Component( diff --git a/db/gradle.lockfile b/db/gradle.lockfile index e818a3bda..40f90abee 100644 --- a/db/gradle.lockfile +++ b/db/gradle.lockfile @@ -75,7 +75,7 @@ io.grpc:grpc-api:1.69.0=deploy_jar,runtimeClasspath,testRuntimeClasspath io.grpc:grpc-context:1.69.0=deploy_jar,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-api:0.31.1=deploy_jar,runtimeClasspath,testRuntimeClasspath io.opencensus:opencensus-contrib-http-util:0.31.1=deploy_jar,runtimeClasspath,testRuntimeClasspath -jakarta.inject:jakarta.inject-api:1.0.5=testCompileClasspath,testRuntimeClasspath +jakarta.inject:jakarta.inject-api:2.0.1=testCompileClasspath,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor joda-time:joda-time:2.13.1=testCompileClasspath,testRuntimeClasspath junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath diff --git a/dependencies.gradle b/dependencies.gradle index f38e066eb..5a62905c9 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -53,17 +53,6 @@ ext { // OkHttp 5.0 is in alpha. 'com.squareup.okhttp3:okhttp:[4.10.0, 5.0.0)!!', - // Dagger doesn't support the Jakarta namespace yet. Pre-2.0 Jakarta - // Inject still use the old javax namespace. - // TODO: Remove the cap when https://github.com/google/dagger/issues/2058 - // is released. - 'jakarta.inject:jakarta.inject-api:[1,2.0.0)!!', - - // Version 2.51.1 is the last working version before dagger fully supports - // jakarta annotations. See comments on jakarta.inject below. - 'com.google.dagger:dagger-compiler:[2.33,2.51.2)!!', - 'com.google.dagger:dagger:[2.33,2.51.2)!!', - // This packages has a broken versioning scheme. There are v1beta3-* and // v1b4-* packages that are way older than v1b3-rev2024MMDD-* that need to // be excluded. @@ -117,6 +106,8 @@ ext { 'com.google.cloud:google-cloud-tasks:[1.33.2,)', 'com.google.code.findbugs:jsr305:[3.0.2,)', 'com.google.code.gson:gson:[2.8.6,)', + 'com.google.dagger:dagger-compiler:[2.55,)', + 'com.google.dagger:dagger:[2.55,)', 'com.google.errorprone:error_prone_annotations:[2.7.1,)', 'com.google.flogger:flogger-system-backend:[0.7.4,)', 'com.google.flogger:flogger:[0.7.4,)', @@ -147,6 +138,7 @@ ext { 'io.github.classgraph:classgraph:[4.8.102,)', 'io.github.java-diff-utils:java-diff-utils:[4.9,)', 'io.netty:netty-tcnative-boringssl-static:[2.0.36.Final,)', + 'jakarta.inject:jakarta.inject-api:[2.0.0,)', 'jakarta.mail:jakarta.mail-api:[2.1.3,)', 'jakarta.persistence:jakarta.persistence-api:[3.2.0,)', 'jakarta.servlet:jakarta.servlet-api:[6.0,)', diff --git a/jetty/gradle.lockfile b/jetty/gradle.lockfile index fee7f3c08..105039bb7 100644 --- a/jetty/gradle.lockfile +++ b/jetty/gradle.lockfile @@ -127,7 +127,7 @@ com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.30.3=deploy_jar,runtim com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testRuntimeClasspath com.google.code.gson:gson:2.12.1=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.common.html.types:types:1.0.8=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.dagger:dagger:2.51.1=deploy_jar,runtimeClasspath,testRuntimeClasspath +com.google.dagger:dagger:2.55=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotation:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.36.0=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -275,7 +275,7 @@ io.perfmark:perfmark-api:0.27.0=deploy_jar,runtimeClasspath,testRuntimeClasspath io.smallrye:jandex:3.1.2=deploy_jar,runtimeClasspath,testRuntimeClasspath jakarta-regexp:jakarta-regexp:1.4=deploy_jar,runtimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.3=deploy_jar,runtimeClasspath,testRuntimeClasspath -jakarta.inject:jakarta.inject-api:1.0.5=deploy_jar,runtimeClasspath,testRuntimeClasspath +jakarta.inject:jakarta.inject-api:2.0.1=deploy_jar,runtimeClasspath,testRuntimeClasspath jakarta.mail:jakarta.mail-api:2.1.3=deploy_jar,runtimeClasspath,testRuntimeClasspath jakarta.persistence:jakarta.persistence-api:3.2.0=deploy_jar,runtimeClasspath,testRuntimeClasspath jakarta.servlet:jakarta.servlet-api:6.1.0=deploy_jar,runtimeClasspath,testRuntimeClasspath diff --git a/networking/gradle.lockfile b/networking/gradle.lockfile index 6b186ee9f..7ca35d552 100644 --- a/networking/gradle.lockfile +++ b/networking/gradle.lockfile @@ -31,10 +31,10 @@ com.google.auto:auto-common:1.2.1=annotationProcessor,errorprone,testAnnotationP com.google.cloud:google-cloud-tasks:2.59.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.12.1=deploy_jar,runtimeClasspath,testRuntimeClasspath -com.google.dagger:dagger-compiler:2.51.1=annotationProcessor,testAnnotationProcessor -com.google.dagger:dagger-spi:2.51.1=annotationProcessor,testAnnotationProcessor -com.google.dagger:dagger:2.51.1=annotationProcessor,compileClasspath,deploy_jar,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.google.devtools.ksp:symbol-processing-api:1.9.20-1.0.14=annotationProcessor,testAnnotationProcessor +com.google.dagger:dagger-compiler:2.55=annotationProcessor,testAnnotationProcessor +com.google.dagger:dagger-spi:2.55=annotationProcessor,testAnnotationProcessor +com.google.dagger:dagger:2.55=annotationProcessor,compileClasspath,deploy_jar,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.devtools.ksp:symbol-processing-api:2.0.21-1.0.28=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotation:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.36.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -109,7 +109,7 @@ io.opencensus:opencensus-api:0.31.1=deploy_jar,runtimeClasspath,testRuntimeClass io.opencensus:opencensus-contrib-http-util:0.31.1=deploy_jar,runtimeClasspath,testRuntimeClasspath io.perfmark:perfmark-api:0.27.0=deploy_jar,runtimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.3=deploy_jar,runtimeClasspath,testRuntimeClasspath -jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.inject:jakarta.inject-api:2.0.1=annotationProcessor,compileClasspath,deploy_jar,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath jakarta.mail:jakarta.mail-api:2.1.3=deploy_jar,runtimeClasspath,testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=deploy_jar,runtimeClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -147,12 +147,12 @@ org.jacoco:org.jacoco.core:0.8.12=jacocoAnt org.jacoco:org.jacoco.report:0.8.12=jacocoAnt org.javassist:javassist:3.28.0-GA=checkstyle org.jetbrains.kotlin:kotlin-reflect:1.6.10=annotationProcessor,testAnnotationProcessor -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0=annotationProcessor,testAnnotationProcessor -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0=annotationProcessor,testAnnotationProcessor -org.jetbrains.kotlin:kotlin-stdlib:1.9.20=annotationProcessor,testAnnotationProcessor +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0=annotationProcessor,testAnnotationProcessor +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0=annotationProcessor,testAnnotationProcessor +org.jetbrains.kotlin:kotlin-stdlib:2.0.21=annotationProcessor,testAnnotationProcessor org.jetbrains:annotations:13.0=annotationProcessor,testAnnotationProcessor org.jetbrains:annotations:17.0.0=testCompileClasspath,testRuntimeClasspath -org.jspecify:jspecify:1.0.0=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,deploy_jar,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.12.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.12.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.12.1=testCompileClasspath,testRuntimeClasspath diff --git a/networking/src/main/java/google/registry/networking/handler/SslClientInitializer.java b/networking/src/main/java/google/registry/networking/handler/SslClientInitializer.java index 6c4bfc809..157fd0d28 100644 --- a/networking/src/main/java/google/registry/networking/handler/SslClientInitializer.java +++ b/networking/src/main/java/google/registry/networking/handler/SslClientInitializer.java @@ -27,11 +27,11 @@ import io.netty.channel.socket.nio.NioSocketChannel; import io.netty.handler.ssl.SslContextBuilder; import io.netty.handler.ssl.SslHandler; import io.netty.handler.ssl.SslProvider; +import jakarta.inject.Singleton; import java.security.PrivateKey; import java.security.cert.X509Certificate; import java.util.function.Function; import java.util.function.Supplier; -import javax.inject.Singleton; import javax.net.ssl.SSLEngine; import javax.net.ssl.SSLParameters; diff --git a/networking/src/main/java/google/registry/networking/module/CertificateSupplierModule.java b/networking/src/main/java/google/registry/networking/module/CertificateSupplierModule.java index 3b1371bcd..d0b24f1eb 100644 --- a/networking/src/main/java/google/registry/networking/module/CertificateSupplierModule.java +++ b/networking/src/main/java/google/registry/networking/module/CertificateSupplierModule.java @@ -26,6 +26,10 @@ import dagger.Lazy; import dagger.Module; import dagger.Provides; import google.registry.util.SelfSignedCaCertificate; +import jakarta.inject.Named; +import jakarta.inject.Provider; +import jakarta.inject.Qualifier; +import jakarta.inject.Singleton; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStreamReader; @@ -36,10 +40,6 @@ import java.security.cert.X509Certificate; import java.time.Duration; import java.util.function.Function; import java.util.function.Supplier; -import javax.inject.Named; -import javax.inject.Provider; -import javax.inject.Qualifier; -import javax.inject.Singleton; import org.bouncycastle.asn1.pkcs.PrivateKeyInfo; import org.bouncycastle.cert.X509CertificateHolder; import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter; diff --git a/networking/src/test/java/google/registry/networking/module/CertificateSupplierModuleTest.java b/networking/src/test/java/google/registry/networking/module/CertificateSupplierModuleTest.java index 9ccac224b..70ffbfe3e 100644 --- a/networking/src/test/java/google/registry/networking/module/CertificateSupplierModuleTest.java +++ b/networking/src/test/java/google/registry/networking/module/CertificateSupplierModuleTest.java @@ -27,6 +27,8 @@ import dagger.Module; import dagger.Provides; import google.registry.networking.module.CertificateSupplierModule.Mode; import google.registry.util.SelfSignedCaCertificate; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import java.io.ByteArrayOutputStream; import java.io.OutputStreamWriter; import java.security.KeyPair; @@ -35,8 +37,6 @@ import java.security.cert.Certificate; import java.security.cert.X509Certificate; import java.time.Duration; import java.util.function.Supplier; -import javax.inject.Named; -import javax.inject.Singleton; import org.bouncycastle.openssl.jcajce.JcaPEMWriter; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/prober/gradle.lockfile b/prober/gradle.lockfile index 3ac30a5f2..742faf013 100644 --- a/prober/gradle.lockfile +++ b/prober/gradle.lockfile @@ -31,10 +31,10 @@ com.google.auto:auto-common:1.2.1=annotationProcessor,errorprone,testAnnotationP com.google.cloud:google-cloud-tasks:2.59.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.12.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.dagger:dagger-compiler:2.51.1=annotationProcessor,testAnnotationProcessor -com.google.dagger:dagger-spi:2.51.1=annotationProcessor,testAnnotationProcessor -com.google.dagger:dagger:2.51.1=annotationProcessor,compileClasspath,deploy_jar,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.google.devtools.ksp:symbol-processing-api:1.9.20-1.0.14=annotationProcessor,testAnnotationProcessor +com.google.dagger:dagger-compiler:2.55=annotationProcessor,testAnnotationProcessor +com.google.dagger:dagger-spi:2.55=annotationProcessor,testAnnotationProcessor +com.google.dagger:dagger:2.55=annotationProcessor,compileClasspath,deploy_jar,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.devtools.ksp:symbol-processing-api:2.0.21-1.0.28=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotation:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.36.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -112,7 +112,7 @@ io.opencensus:opencensus-api:0.31.1=deploy_jar,runtimeClasspath,testRuntimeClass io.opencensus:opencensus-contrib-http-util:0.31.1=deploy_jar,runtimeClasspath,testRuntimeClasspath io.perfmark:perfmark-api:0.27.0=deploy_jar,runtimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.3=deploy_jar,runtimeClasspath,testRuntimeClasspath -jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.inject:jakarta.inject-api:2.0.1=annotationProcessor,compileClasspath,deploy_jar,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath jakarta.mail:jakarta.mail-api:2.1.3=deploy_jar,runtimeClasspath,testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=deploy_jar,runtimeClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=deploy_jar,runtimeClasspath,testRuntimeClasspath @@ -152,12 +152,12 @@ org.jacoco:org.jacoco.core:0.8.12=jacocoAnt org.jacoco:org.jacoco.report:0.8.12=jacocoAnt org.javassist:javassist:3.28.0-GA=checkstyle org.jetbrains.kotlin:kotlin-reflect:1.6.10=annotationProcessor,testAnnotationProcessor -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0=annotationProcessor,testAnnotationProcessor -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0=annotationProcessor,testAnnotationProcessor -org.jetbrains.kotlin:kotlin-stdlib:1.9.20=annotationProcessor,testAnnotationProcessor +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0=annotationProcessor,testAnnotationProcessor +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0=annotationProcessor,testAnnotationProcessor +org.jetbrains.kotlin:kotlin-stdlib:2.0.21=annotationProcessor,testAnnotationProcessor org.jetbrains:annotations:13.0=annotationProcessor,testAnnotationProcessor org.jetbrains:annotations:17.0.0=testCompileClasspath,testRuntimeClasspath -org.jspecify:jspecify:1.0.0=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,deploy_jar,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.12.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.12.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.12.1=testCompileClasspath,testRuntimeClasspath diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/ProberModule.java b/prober/src/main/java/google/registry/monitoring/blackbox/ProberModule.java index e284030b0..77b61a90a 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/ProberModule.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/ProberModule.java @@ -31,8 +31,8 @@ import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.nio.NioSocketChannel; import io.netty.handler.ssl.OpenSsl; import io.netty.handler.ssl.SslProvider; +import jakarta.inject.Singleton; import java.util.Set; -import javax.inject.Singleton; import org.joda.time.Duration; /** diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/connection/ProbingAction.java b/prober/src/main/java/google/registry/monitoring/blackbox/connection/ProbingAction.java index 207c309b4..ef7be4583 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/connection/ProbingAction.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/connection/ProbingAction.java @@ -35,13 +35,13 @@ import io.netty.channel.local.LocalAddress; import io.netty.util.AttributeKey; import io.netty.util.HashedWheelTimer; import io.netty.util.Timer; +import jakarta.inject.Provider; import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.SocketAddress; import java.net.UnknownHostException; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; -import javax.inject.Provider; import org.joda.time.Duration; /** @@ -203,11 +203,11 @@ public abstract class ProbingAction implements Callable { public final String toString() { return String.format( """ - ProbingAction with delay: %d - outboundMessage: %s - protocol: %s - host: %s - """, + ProbingAction with delay: %d + outboundMessage: %s + protocol: %s + host: %s + """, delay().getStandardSeconds(), outboundMessage(), protocol(), host()); } diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/connection/Protocol.java b/prober/src/main/java/google/registry/monitoring/blackbox/connection/Protocol.java index 50865aeb6..12d6f973b 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/connection/Protocol.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/connection/Protocol.java @@ -18,7 +18,7 @@ import com.google.auto.value.AutoValue; import com.google.common.collect.ImmutableList; import io.netty.channel.ChannelHandler; import io.netty.util.AttributeKey; -import javax.inject.Provider; +import jakarta.inject.Provider; /** {@link AutoValue} class that stores all unchanged variables necessary for type of connection. */ @AutoValue diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/handler/EppActionHandler.java b/prober/src/main/java/google/registry/monitoring/blackbox/handler/EppActionHandler.java index 55d125460..a730133b5 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/handler/EppActionHandler.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/handler/EppActionHandler.java @@ -19,7 +19,7 @@ import google.registry.monitoring.blackbox.exception.UndeterminedStateException; import google.registry.monitoring.blackbox.message.EppResponseMessage; import google.registry.monitoring.blackbox.message.InboundMessageType; import io.netty.channel.ChannelHandlerContext; -import javax.inject.Inject; +import jakarta.inject.Inject; /** * Subclass of {@link ActionHandler} that deals with the Epp Sequence diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/handler/EppMessageHandler.java b/prober/src/main/java/google/registry/monitoring/blackbox/handler/EppMessageHandler.java index 628edd3f5..4058ee79d 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/handler/EppMessageHandler.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/handler/EppMessageHandler.java @@ -23,8 +23,8 @@ import io.netty.channel.ChannelDuplexHandler; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelPromise; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; /** * {@link io.netty.channel.ChannelHandler} that converts inbound {@link ByteBuf} to custom type diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/handler/WebWhoisActionHandler.java b/prober/src/main/java/google/registry/monitoring/blackbox/handler/WebWhoisActionHandler.java index 8566b0a2a..8851bcfdd 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/handler/WebWhoisActionHandler.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/handler/WebWhoisActionHandler.java @@ -30,11 +30,11 @@ import io.netty.bootstrap.Bootstrap; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.http.HttpResponseStatus; +import jakarta.inject.Inject; import java.net.MalformedURLException; import java.net.URI; import java.net.URISyntaxException; import java.net.URL; -import javax.inject.Inject; import org.joda.time.Duration; /** diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/handler/WebWhoisMessageHandler.java b/prober/src/main/java/google/registry/monitoring/blackbox/handler/WebWhoisMessageHandler.java index 473a8a88a..be03214c3 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/handler/WebWhoisMessageHandler.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/handler/WebWhoisMessageHandler.java @@ -21,7 +21,7 @@ import io.netty.channel.ChannelDuplexHandler; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelPromise; import io.netty.handler.codec.http.FullHttpResponse; -import javax.inject.Inject; +import jakarta.inject.Inject; /** * {@link io.netty.channel.ChannelHandler} that converts inbound {@link FullHttpResponse} to custom diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/message/HttpRequestMessage.java b/prober/src/main/java/google/registry/monitoring/blackbox/message/HttpRequestMessage.java index ee011bb7d..809d2ad3e 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/message/HttpRequestMessage.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/message/HttpRequestMessage.java @@ -19,8 +19,8 @@ import io.netty.handler.codec.http.DefaultFullHttpRequest; import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpMethod; import io.netty.handler.codec.http.HttpVersion; +import jakarta.inject.Inject; import java.util.Arrays; -import javax.inject.Inject; /** * {@link OutboundMessageType} subtype that acts identically to {@link DefaultFullHttpRequest}. diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/metric/MetricsCollector.java b/prober/src/main/java/google/registry/monitoring/blackbox/metric/MetricsCollector.java index 1ebe9fbaa..2809e33e9 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/metric/MetricsCollector.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/metric/MetricsCollector.java @@ -21,8 +21,8 @@ import com.google.monitoring.metrics.IncrementableMetric; import com.google.monitoring.metrics.LabelDescriptor; import com.google.monitoring.metrics.MetricRegistryImpl; import google.registry.util.NonFinalForTesting; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; /** Metrics collection instrumentation. */ @Singleton diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/module/CertificateModule.java b/prober/src/main/java/google/registry/monitoring/blackbox/module/CertificateModule.java index 05b6597b5..2335c63f9 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/module/CertificateModule.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/module/CertificateModule.java @@ -21,6 +21,9 @@ import static google.registry.util.ResourceUtils.readResourceUtf8; import com.google.common.collect.ImmutableList; import dagger.Module; import dagger.Provides; +import jakarta.inject.Provider; +import jakarta.inject.Qualifier; +import jakarta.inject.Singleton; import java.io.IOException; import java.io.InputStream; import java.security.GeneralSecurityException; @@ -29,9 +32,6 @@ import java.security.PrivateKey; import java.security.cert.X509Certificate; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; -import javax.inject.Provider; -import javax.inject.Qualifier; -import javax.inject.Singleton; import org.joda.time.Duration; /** diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/module/EppModule.java b/prober/src/main/java/google/registry/monitoring/blackbox/module/EppModule.java index ddba19339..933c283ae 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/module/EppModule.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/module/EppModule.java @@ -46,13 +46,13 @@ import io.netty.channel.socket.nio.NioSocketChannel; import io.netty.handler.codec.LengthFieldBasedFrameDecoder; import io.netty.handler.codec.LengthFieldPrepender; import io.netty.handler.ssl.SslProvider; +import jakarta.inject.Named; +import jakarta.inject.Provider; +import jakarta.inject.Qualifier; +import jakarta.inject.Singleton; import java.security.PrivateKey; import java.security.cert.X509Certificate; import java.util.function.Supplier; -import javax.inject.Named; -import javax.inject.Provider; -import javax.inject.Qualifier; -import javax.inject.Singleton; import org.joda.time.Duration; /** diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/module/WebWhoisModule.java b/prober/src/main/java/google/registry/monitoring/blackbox/module/WebWhoisModule.java index 11f963abf..a27d97d3a 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/module/WebWhoisModule.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/module/WebWhoisModule.java @@ -40,9 +40,9 @@ import io.netty.channel.socket.nio.NioSocketChannel; import io.netty.handler.codec.http.HttpClientCodec; import io.netty.handler.codec.http.HttpObjectAggregator; import io.netty.handler.ssl.SslProvider; -import javax.inject.Provider; -import javax.inject.Qualifier; -import javax.inject.Singleton; +import jakarta.inject.Provider; +import jakarta.inject.Qualifier; +import jakarta.inject.Singleton; import org.joda.time.Duration; /** diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/token/EppToken.java b/prober/src/main/java/google/registry/monitoring/blackbox/token/EppToken.java index 114725449..45f57d501 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/token/EppToken.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/token/EppToken.java @@ -19,9 +19,9 @@ import google.registry.monitoring.blackbox.exception.UndeterminedStateException; import google.registry.monitoring.blackbox.message.EppRequestMessage; import google.registry.monitoring.blackbox.message.OutboundMessageType; import io.netty.channel.Channel; +import jakarta.inject.Inject; +import jakarta.inject.Named; import java.util.concurrent.atomic.AtomicInteger; -import javax.inject.Inject; -import javax.inject.Named; /** {@link Token} subtype that deals performs specified actions for the EPP sequence. */ public abstract class EppToken extends Token { diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/token/WebWhoisToken.java b/prober/src/main/java/google/registry/monitoring/blackbox/token/WebWhoisToken.java index e8617ea6d..700148eb4 100644 --- a/prober/src/main/java/google/registry/monitoring/blackbox/token/WebWhoisToken.java +++ b/prober/src/main/java/google/registry/monitoring/blackbox/token/WebWhoisToken.java @@ -23,7 +23,7 @@ import com.google.common.collect.PeekingIterator; import google.registry.monitoring.blackbox.exception.UndeterminedStateException; import google.registry.monitoring.blackbox.message.OutboundMessageType; import google.registry.monitoring.blackbox.module.WebWhoisModule.WebWhoisProtocol; -import javax.inject.Inject; +import jakarta.inject.Inject; /** * {@link Token} subtype designed for WebWhois sequence. diff --git a/prober/src/test/java/google/registry/monitoring/blackbox/handler/WebWhoisActionHandlerTest.java b/prober/src/test/java/google/registry/monitoring/blackbox/handler/WebWhoisActionHandlerTest.java index 1944d42a7..294194273 100644 --- a/prober/src/test/java/google/registry/monitoring/blackbox/handler/WebWhoisActionHandlerTest.java +++ b/prober/src/test/java/google/registry/monitoring/blackbox/handler/WebWhoisActionHandlerTest.java @@ -37,7 +37,7 @@ import io.netty.channel.local.LocalChannel; import io.netty.channel.nio.NioEventLoopGroup; import io.netty.handler.codec.http.FullHttpResponse; import io.netty.handler.codec.http.HttpResponseStatus; -import javax.inject.Provider; +import jakarta.inject.Provider; import org.junit.jupiter.api.Test; /** diff --git a/proxy/gradle.lockfile b/proxy/gradle.lockfile index 97ffa1bca..f03c99e8f 100644 --- a/proxy/gradle.lockfile +++ b/proxy/gradle.lockfile @@ -65,10 +65,10 @@ com.google.cloud:google-cloud-tasks:2.29.0=deploy_jar,runtimeClasspath,testRunti com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.11.0=deploy_jar,runtimeClasspath,testRuntimeClasspath com.google.code.gson:gson:2.12.1=compileClasspath,testCompileClasspath -com.google.dagger:dagger-compiler:2.51.1=annotationProcessor,testAnnotationProcessor -com.google.dagger:dagger-spi:2.51.1=annotationProcessor,testAnnotationProcessor -com.google.dagger:dagger:2.51.1=annotationProcessor,compileClasspath,deploy_jar,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.google.devtools.ksp:symbol-processing-api:1.9.20-1.0.14=annotationProcessor,testAnnotationProcessor +com.google.dagger:dagger-compiler:2.55=annotationProcessor,testAnnotationProcessor +com.google.dagger:dagger-spi:2.55=annotationProcessor,testAnnotationProcessor +com.google.dagger:dagger:2.55=annotationProcessor,compileClasspath,deploy_jar,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.devtools.ksp:symbol-processing-api:2.0.21-1.0.28=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotation:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.36.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -178,7 +178,7 @@ io.opentelemetry:opentelemetry-sdk-trace:1.47.0=compileClasspath,testCompileClas io.opentelemetry:opentelemetry-sdk:1.47.0=compileClasspath,testCompileClasspath io.perfmark:perfmark-api:0.26.0=deploy_jar,runtimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.3=deploy_jar,runtimeClasspath,testRuntimeClasspath -jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.inject:jakarta.inject-api:2.0.1=annotationProcessor,compileClasspath,deploy_jar,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath jakarta.mail:jakarta.mail-api:2.1.3=deploy_jar,runtimeClasspath,testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=deploy_jar,runtimeClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -219,12 +219,12 @@ org.jacoco:org.jacoco.report:0.8.12=jacocoAnt org.javassist:javassist:3.28.0-GA=checkstyle org.jcommander:jcommander:2.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-reflect:1.6.10=annotationProcessor,testAnnotationProcessor -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0=annotationProcessor,testAnnotationProcessor -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0=annotationProcessor,testAnnotationProcessor -org.jetbrains.kotlin:kotlin-stdlib:1.9.20=annotationProcessor,testAnnotationProcessor +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0=annotationProcessor,testAnnotationProcessor +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0=annotationProcessor,testAnnotationProcessor +org.jetbrains.kotlin:kotlin-stdlib:2.0.21=annotationProcessor,testAnnotationProcessor org.jetbrains:annotations:13.0=annotationProcessor,testAnnotationProcessor org.jetbrains:annotations:17.0.0=testCompileClasspath,testRuntimeClasspath -org.jspecify:jspecify:1.0.0=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,deploy_jar,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.12.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.12.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.12.1=testCompileClasspath,testRuntimeClasspath diff --git a/proxy/src/main/java/google/registry/proxy/EppProtocolModule.java b/proxy/src/main/java/google/registry/proxy/EppProtocolModule.java index 908cbd0f4..f3aa45752 100644 --- a/proxy/src/main/java/google/registry/proxy/EppProtocolModule.java +++ b/proxy/src/main/java/google/registry/proxy/EppProtocolModule.java @@ -40,16 +40,16 @@ import io.netty.handler.codec.LengthFieldBasedFrameDecoder; import io.netty.handler.codec.LengthFieldPrepender; import io.netty.handler.ssl.SslProvider; import io.netty.handler.timeout.ReadTimeoutHandler; +import jakarta.inject.Named; +import jakarta.inject.Provider; +import jakarta.inject.Qualifier; +import jakarta.inject.Singleton; import java.io.IOException; import java.security.PrivateKey; import java.security.cert.X509Certificate; import java.util.concurrent.ExecutorService; import java.util.concurrent.ScheduledExecutorService; import java.util.function.Supplier; -import javax.inject.Named; -import javax.inject.Provider; -import javax.inject.Qualifier; -import javax.inject.Singleton; /** A module that provides the {@link FrontendProtocol} used for epp protocol. */ @Module diff --git a/proxy/src/main/java/google/registry/proxy/HealthCheckProtocolModule.java b/proxy/src/main/java/google/registry/proxy/HealthCheckProtocolModule.java index b40da6f1b..6fcd50ed9 100644 --- a/proxy/src/main/java/google/registry/proxy/HealthCheckProtocolModule.java +++ b/proxy/src/main/java/google/registry/proxy/HealthCheckProtocolModule.java @@ -22,9 +22,9 @@ import google.registry.proxy.Protocol.FrontendProtocol; import google.registry.proxy.handler.HealthCheckHandler; import io.netty.channel.ChannelHandler; import io.netty.handler.codec.FixedLengthFrameDecoder; -import javax.inject.Provider; -import javax.inject.Qualifier; -import javax.inject.Singleton; +import jakarta.inject.Provider; +import jakarta.inject.Qualifier; +import jakarta.inject.Singleton; /** * Module that provides a {@link FrontendProtocol} used for GCP load balancer health checking. diff --git a/proxy/src/main/java/google/registry/proxy/HttpsRelayProtocolModule.java b/proxy/src/main/java/google/registry/proxy/HttpsRelayProtocolModule.java index 109268112..0f37b88df 100644 --- a/proxy/src/main/java/google/registry/proxy/HttpsRelayProtocolModule.java +++ b/proxy/src/main/java/google/registry/proxy/HttpsRelayProtocolModule.java @@ -29,10 +29,10 @@ import io.netty.handler.codec.http.HttpClientCodec; import io.netty.handler.codec.http.HttpObjectAggregator; import io.netty.handler.logging.LoggingHandler; import io.netty.handler.ssl.SslProvider; +import jakarta.inject.Provider; +import jakarta.inject.Qualifier; import java.security.cert.X509Certificate; import javax.annotation.Nullable; -import javax.inject.Provider; -import javax.inject.Qualifier; /** * Module that provides a {@link BackendProtocol.Builder} for HTTP(S) protocol. diff --git a/proxy/src/main/java/google/registry/proxy/MetricsModule.java b/proxy/src/main/java/google/registry/proxy/MetricsModule.java index 2db7d9a06..47f8369d9 100644 --- a/proxy/src/main/java/google/registry/proxy/MetricsModule.java +++ b/proxy/src/main/java/google/registry/proxy/MetricsModule.java @@ -28,7 +28,7 @@ import dagger.Provides; import google.registry.proxy.ProxyConfig.Environment; import google.registry.util.GoogleCredentialsBundle; import google.registry.util.MetricParameters; -import javax.inject.Singleton; +import jakarta.inject.Singleton; /** Module that provides necessary bindings to instantiate a {@link MetricReporter} */ @Module diff --git a/proxy/src/main/java/google/registry/proxy/Protocol.java b/proxy/src/main/java/google/registry/proxy/Protocol.java index 1770a0e08..921e152fa 100644 --- a/proxy/src/main/java/google/registry/proxy/Protocol.java +++ b/proxy/src/main/java/google/registry/proxy/Protocol.java @@ -22,8 +22,8 @@ import io.netty.channel.ChannelHandler; import io.netty.channel.socket.nio.NioSocketChannel; import io.netty.util.Attribute; import io.netty.util.AttributeKey; +import jakarta.inject.Provider; import javax.annotation.Nullable; -import javax.inject.Provider; /** Value class that encapsulates parameters of a specific connection. */ public interface Protocol { diff --git a/proxy/src/main/java/google/registry/proxy/ProxyModule.java b/proxy/src/main/java/google/registry/proxy/ProxyModule.java index 011257473..3556a4128 100644 --- a/proxy/src/main/java/google/registry/proxy/ProxyModule.java +++ b/proxy/src/main/java/google/registry/proxy/ProxyModule.java @@ -54,6 +54,8 @@ import io.netty.handler.logging.LogLevel; import io.netty.handler.logging.LoggingHandler; import io.netty.handler.ssl.OpenSsl; import io.netty.handler.ssl.SslProvider; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import java.io.IOException; import java.time.Duration; import java.util.Arrays; @@ -68,8 +70,6 @@ import java.util.function.Supplier; import java.util.logging.ConsoleHandler; import java.util.logging.Handler; import java.util.logging.Level; -import javax.inject.Named; -import javax.inject.Singleton; /** * A module that provides the port-to-protocol map and other configs that are used to bootstrap the diff --git a/proxy/src/main/java/google/registry/proxy/ProxyServer.java b/proxy/src/main/java/google/registry/proxy/ProxyServer.java index 18d6a90b3..13bfb72bc 100644 --- a/proxy/src/main/java/google/registry/proxy/ProxyServer.java +++ b/proxy/src/main/java/google/registry/proxy/ProxyServer.java @@ -43,11 +43,11 @@ import io.netty.util.ReferenceCountUtil; import io.netty.util.concurrent.Future; import io.netty.util.internal.logging.InternalLoggerFactory; import io.netty.util.internal.logging.JdkLoggerFactory; +import jakarta.inject.Provider; import java.util.ArrayDeque; import java.util.HashMap; import java.util.Queue; import java.util.concurrent.TimeoutException; -import javax.inject.Provider; /** * A multi-protocol proxy server that listens for protocols in {@link diff --git a/proxy/src/main/java/google/registry/proxy/WebWhoisProtocolsModule.java b/proxy/src/main/java/google/registry/proxy/WebWhoisProtocolsModule.java index 0ee0bb417..ff0825a30 100644 --- a/proxy/src/main/java/google/registry/proxy/WebWhoisProtocolsModule.java +++ b/proxy/src/main/java/google/registry/proxy/WebWhoisProtocolsModule.java @@ -26,12 +26,12 @@ import io.netty.channel.socket.nio.NioSocketChannel; import io.netty.handler.codec.http.HttpServerCodec; import io.netty.handler.codec.http.HttpServerExpectContinueHandler; import io.netty.handler.ssl.SslProvider; +import jakarta.inject.Provider; +import jakarta.inject.Qualifier; +import jakarta.inject.Singleton; import java.security.PrivateKey; import java.security.cert.X509Certificate; import java.util.function.Supplier; -import javax.inject.Provider; -import javax.inject.Qualifier; -import javax.inject.Singleton; /** A module that provides the {@link FrontendProtocol}s to redirect HTTP(S) web WHOIS requests. */ @Module diff --git a/proxy/src/main/java/google/registry/proxy/WhoisProtocolModule.java b/proxy/src/main/java/google/registry/proxy/WhoisProtocolModule.java index e5d9d7ee9..57ec08981 100644 --- a/proxy/src/main/java/google/registry/proxy/WhoisProtocolModule.java +++ b/proxy/src/main/java/google/registry/proxy/WhoisProtocolModule.java @@ -34,13 +34,13 @@ import google.registry.util.Clock; import io.netty.channel.ChannelHandler; import io.netty.handler.codec.LineBasedFrameDecoder; import io.netty.handler.timeout.ReadTimeoutHandler; +import jakarta.inject.Named; +import jakarta.inject.Provider; +import jakarta.inject.Qualifier; +import jakarta.inject.Singleton; import java.util.concurrent.ExecutorService; import java.util.concurrent.ScheduledExecutorService; import java.util.function.Supplier; -import javax.inject.Named; -import javax.inject.Provider; -import javax.inject.Qualifier; -import javax.inject.Singleton; /** A module that provides the {@link FrontendProtocol} used for whois protocol. */ @Module diff --git a/proxy/src/main/java/google/registry/proxy/handler/BackendMetricsHandler.java b/proxy/src/main/java/google/registry/proxy/handler/BackendMetricsHandler.java index e19bdf83f..e83c37383 100644 --- a/proxy/src/main/java/google/registry/proxy/handler/BackendMetricsHandler.java +++ b/proxy/src/main/java/google/registry/proxy/handler/BackendMetricsHandler.java @@ -31,10 +31,10 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelPromise; import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.FullHttpResponse; +import jakarta.inject.Inject; import java.util.ArrayDeque; import java.util.Optional; import java.util.Queue; -import javax.inject.Inject; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/proxy/src/main/java/google/registry/proxy/handler/FrontendMetricsHandler.java b/proxy/src/main/java/google/registry/proxy/handler/FrontendMetricsHandler.java index 0fd84c024..8d86e3e51 100644 --- a/proxy/src/main/java/google/registry/proxy/handler/FrontendMetricsHandler.java +++ b/proxy/src/main/java/google/registry/proxy/handler/FrontendMetricsHandler.java @@ -24,10 +24,10 @@ import io.netty.channel.ChannelDuplexHandler; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelPromise; +import jakarta.inject.Inject; import java.util.ArrayDeque; import java.util.Optional; import java.util.Queue; -import javax.inject.Inject; import org.joda.time.DateTime; import org.joda.time.Duration; diff --git a/proxy/src/main/java/google/registry/proxy/handler/ProxyProtocolHandler.java b/proxy/src/main/java/google/registry/proxy/handler/ProxyProtocolHandler.java index 557eea9f6..44d42c3af 100644 --- a/proxy/src/main/java/google/registry/proxy/handler/ProxyProtocolHandler.java +++ b/proxy/src/main/java/google/registry/proxy/handler/ProxyProtocolHandler.java @@ -22,10 +22,10 @@ import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.ByteToMessageDecoder; import io.netty.util.AttributeKey; +import jakarta.inject.Inject; import java.net.InetSocketAddress; import java.net.SocketAddress; import java.util.List; -import javax.inject.Inject; /** * Handler that processes possible existence of a PROXY protocol v1 header. diff --git a/proxy/src/main/java/google/registry/proxy/handler/QuotaHandler.java b/proxy/src/main/java/google/registry/proxy/handler/QuotaHandler.java index 79002a1d3..0c1047de7 100644 --- a/proxy/src/main/java/google/registry/proxy/handler/QuotaHandler.java +++ b/proxy/src/main/java/google/registry/proxy/handler/QuotaHandler.java @@ -28,8 +28,8 @@ import google.registry.proxy.quota.QuotaManager.QuotaRequest; import google.registry.proxy.quota.QuotaManager.QuotaResponse; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; +import jakarta.inject.Inject; import java.util.concurrent.Future; -import javax.inject.Inject; /** * Handler that checks quota fulfillment and terminates connection if necessary. diff --git a/proxy/src/main/java/google/registry/proxy/handler/RelayHandler.java b/proxy/src/main/java/google/registry/proxy/handler/RelayHandler.java index bd9c3fed3..8eea83b7a 100644 --- a/proxy/src/main/java/google/registry/proxy/handler/RelayHandler.java +++ b/proxy/src/main/java/google/registry/proxy/handler/RelayHandler.java @@ -28,9 +28,9 @@ import io.netty.util.Attribute; import io.netty.util.AttributeKey; import io.netty.util.ReferenceCountUtil; import io.netty.util.ReferenceCounted; +import jakarta.inject.Inject; import java.util.Deque; import java.util.Queue; -import javax.inject.Inject; /** * Receives inbound massage of type {@code I}, and writes it to the {@code relayChannel} stored in diff --git a/proxy/src/main/java/google/registry/proxy/metric/BackendMetrics.java b/proxy/src/main/java/google/registry/proxy/metric/BackendMetrics.java index 3653d2c3f..ee7603d6e 100644 --- a/proxy/src/main/java/google/registry/proxy/metric/BackendMetrics.java +++ b/proxy/src/main/java/google/registry/proxy/metric/BackendMetrics.java @@ -21,8 +21,8 @@ import com.google.monitoring.metrics.LabelDescriptor; import com.google.monitoring.metrics.MetricRegistryImpl; import google.registry.util.NonFinalForTesting; import io.netty.handler.codec.http.FullHttpResponse; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.joda.time.Duration; /** Backend metrics instrumentation. */ diff --git a/proxy/src/main/java/google/registry/proxy/metric/FrontendMetrics.java b/proxy/src/main/java/google/registry/proxy/metric/FrontendMetrics.java index 2a2f9aa7e..8a4decb58 100644 --- a/proxy/src/main/java/google/registry/proxy/metric/FrontendMetrics.java +++ b/proxy/src/main/java/google/registry/proxy/metric/FrontendMetrics.java @@ -25,11 +25,11 @@ import io.netty.channel.Channel; import io.netty.channel.group.ChannelGroup; import io.netty.channel.group.DefaultChannelGroup; import io.netty.util.concurrent.GlobalEventExecutor; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import javax.inject.Inject; -import javax.inject.Singleton; import org.joda.time.Duration; /** Frontend metrics instrumentation. */ diff --git a/proxy/src/test/java/google/registry/proxy/ProtocolModuleTest.java b/proxy/src/test/java/google/registry/proxy/ProtocolModuleTest.java index ddfc6e93b..9227c5df2 100644 --- a/proxy/src/test/java/google/registry/proxy/ProtocolModuleTest.java +++ b/proxy/src/test/java/google/registry/proxy/ProtocolModuleTest.java @@ -52,6 +52,9 @@ import io.netty.channel.embedded.EmbeddedChannel; import io.netty.handler.logging.LoggingHandler; import io.netty.handler.ssl.SslProvider; import io.netty.handler.timeout.ReadTimeoutHandler; +import jakarta.inject.Named; +import jakarta.inject.Provider; +import jakarta.inject.Singleton; import java.time.Duration; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -59,9 +62,6 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; -import javax.inject.Named; -import javax.inject.Provider; -import javax.inject.Singleton; import org.junit.jupiter.api.BeforeEach; /** diff --git a/services/backend/gradle.lockfile b/services/backend/gradle.lockfile index fc3a66d1f..bb843232f 100644 --- a/services/backend/gradle.lockfile +++ b/services/backend/gradle.lockfile @@ -134,7 +134,7 @@ com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.30.3=compileClasspath, com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.12.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.common.html.types:types:1.0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.dagger:dagger:2.51.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.dagger:dagger:2.55=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.escapevelocity:escapevelocity:1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.flatbuffers:flatbuffers-java:23.5.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -277,7 +277,7 @@ io.perfmark:perfmark-api:0.27.0=runtimeClasspath,testRuntimeClasspath io.smallrye:jandex:3.1.2=runtimeClasspath,testRuntimeClasspath jakarta-regexp:jakarta-regexp:1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.mail:jakarta.mail-api:2.1.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.persistence:jakarta.persistence-api:3.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.servlet:jakarta.servlet-api:6.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/services/bsa/gradle.lockfile b/services/bsa/gradle.lockfile index fc3a66d1f..bb843232f 100644 --- a/services/bsa/gradle.lockfile +++ b/services/bsa/gradle.lockfile @@ -134,7 +134,7 @@ com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.30.3=compileClasspath, com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.12.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.common.html.types:types:1.0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.dagger:dagger:2.51.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.dagger:dagger:2.55=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.escapevelocity:escapevelocity:1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.flatbuffers:flatbuffers-java:23.5.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -277,7 +277,7 @@ io.perfmark:perfmark-api:0.27.0=runtimeClasspath,testRuntimeClasspath io.smallrye:jandex:3.1.2=runtimeClasspath,testRuntimeClasspath jakarta-regexp:jakarta-regexp:1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.mail:jakarta.mail-api:2.1.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.persistence:jakarta.persistence-api:3.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.servlet:jakarta.servlet-api:6.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/services/default/gradle.lockfile b/services/default/gradle.lockfile index fc3a66d1f..bb843232f 100644 --- a/services/default/gradle.lockfile +++ b/services/default/gradle.lockfile @@ -134,7 +134,7 @@ com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.30.3=compileClasspath, com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.12.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.common.html.types:types:1.0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.dagger:dagger:2.51.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.dagger:dagger:2.55=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.escapevelocity:escapevelocity:1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.flatbuffers:flatbuffers-java:23.5.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -277,7 +277,7 @@ io.perfmark:perfmark-api:0.27.0=runtimeClasspath,testRuntimeClasspath io.smallrye:jandex:3.1.2=runtimeClasspath,testRuntimeClasspath jakarta-regexp:jakarta-regexp:1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.mail:jakarta.mail-api:2.1.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.persistence:jakarta.persistence-api:3.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.servlet:jakarta.servlet-api:6.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/services/pubapi/gradle.lockfile b/services/pubapi/gradle.lockfile index fc3a66d1f..bb843232f 100644 --- a/services/pubapi/gradle.lockfile +++ b/services/pubapi/gradle.lockfile @@ -134,7 +134,7 @@ com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.30.3=compileClasspath, com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.12.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.common.html.types:types:1.0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.dagger:dagger:2.51.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.dagger:dagger:2.55=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.escapevelocity:escapevelocity:1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.flatbuffers:flatbuffers-java:23.5.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -277,7 +277,7 @@ io.perfmark:perfmark-api:0.27.0=runtimeClasspath,testRuntimeClasspath io.smallrye:jandex:3.1.2=runtimeClasspath,testRuntimeClasspath jakarta-regexp:jakarta-regexp:1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.mail:jakarta.mail-api:2.1.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.persistence:jakarta.persistence-api:3.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.servlet:jakarta.servlet-api:6.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/services/tools/gradle.lockfile b/services/tools/gradle.lockfile index fc3a66d1f..bb843232f 100644 --- a/services/tools/gradle.lockfile +++ b/services/tools/gradle.lockfile @@ -134,7 +134,7 @@ com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.30.3=compileClasspath, com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.12.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.common.html.types:types:1.0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.dagger:dagger:2.51.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.dagger:dagger:2.55=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.escapevelocity:escapevelocity:1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.flatbuffers:flatbuffers-java:23.5.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -277,7 +277,7 @@ io.perfmark:perfmark-api:0.27.0=runtimeClasspath,testRuntimeClasspath io.smallrye:jandex:3.1.2=runtimeClasspath,testRuntimeClasspath jakarta-regexp:jakarta-regexp:1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.mail:jakarta.mail-api:2.1.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.persistence:jakarta.persistence-api:3.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.servlet:jakarta.servlet-api:6.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/util/gradle.lockfile b/util/gradle.lockfile index e118a9261..73472cff1 100644 --- a/util/gradle.lockfile +++ b/util/gradle.lockfile @@ -31,10 +31,10 @@ com.google.auto:auto-common:1.2.1=annotationProcessor,errorprone,testAnnotationP com.google.cloud:google-cloud-tasks:2.59.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.12.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.dagger:dagger-compiler:2.51.1=annotationProcessor,testAnnotationProcessor -com.google.dagger:dagger-spi:2.51.1=annotationProcessor,testAnnotationProcessor -com.google.dagger:dagger:2.51.1=annotationProcessor,compileClasspath,deploy_jar,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.google.devtools.ksp:symbol-processing-api:1.9.20-1.0.14=annotationProcessor,testAnnotationProcessor +com.google.dagger:dagger-compiler:2.55=annotationProcessor,testAnnotationProcessor +com.google.dagger:dagger-spi:2.55=annotationProcessor,testAnnotationProcessor +com.google.dagger:dagger:2.55=annotationProcessor,compileClasspath,deploy_jar,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.devtools.ksp:symbol-processing-api:2.0.21-1.0.28=annotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotation:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.23.0=annotationProcessor,errorprone,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.36.0=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -100,7 +100,7 @@ io.opencensus:opencensus-api:0.31.1=compileClasspath,deploy_jar,runtimeClasspath io.opencensus:opencensus-contrib-http-util:0.31.1=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.perfmark:perfmark-api:0.27.0=deploy_jar,runtimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.3=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -jakarta.inject:jakarta.inject-api:1.0.5=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.inject:jakarta.inject-api:2.0.1=annotationProcessor,compileClasspath,deploy_jar,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath jakarta.mail:jakarta.mail-api:2.1.3=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath,deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -138,12 +138,12 @@ org.jacoco:org.jacoco.core:0.8.12=jacocoAnt org.jacoco:org.jacoco.report:0.8.12=jacocoAnt org.javassist:javassist:3.28.0-GA=checkstyle org.jetbrains.kotlin:kotlin-reflect:1.6.10=annotationProcessor,testAnnotationProcessor -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0=annotationProcessor,testAnnotationProcessor -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0=annotationProcessor,testAnnotationProcessor -org.jetbrains.kotlin:kotlin-stdlib:1.9.20=annotationProcessor,testAnnotationProcessor +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0=annotationProcessor,testAnnotationProcessor +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0=annotationProcessor,testAnnotationProcessor +org.jetbrains.kotlin:kotlin-stdlib:2.0.21=annotationProcessor,testAnnotationProcessor org.jetbrains:annotations:13.0=annotationProcessor,testAnnotationProcessor org.jetbrains:annotations:17.0.0=testCompileClasspath,testRuntimeClasspath -org.jspecify:jspecify:1.0.0=deploy_jar,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=annotationProcessor,compileClasspath,deploy_jar,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.12.1=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.12.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-commons:1.12.1=testCompileClasspath,testRuntimeClasspath diff --git a/util/src/main/java/google/registry/util/MetricParameters.java b/util/src/main/java/google/registry/util/MetricParameters.java index dbb43771d..29d727f75 100644 --- a/util/src/main/java/google/registry/util/MetricParameters.java +++ b/util/src/main/java/google/registry/util/MetricParameters.java @@ -20,6 +20,7 @@ import com.google.api.services.monitoring.v3.model.MonitoredResource; import com.google.common.collect.ImmutableMap; import com.google.common.flogger.FluentLogger; import com.google.common.io.CharStreams; +import jakarta.inject.Inject; import java.io.IOException; import java.io.InputStreamReader; import java.net.HttpURLConnection; @@ -28,7 +29,6 @@ import java.net.URI; import java.net.URISyntaxException; import java.util.Map; import java.util.function.Function; -import javax.inject.Inject; /** * Utility class to obtain labels for monitored resource of type {@code gke_container}. diff --git a/util/src/main/java/google/registry/util/Retrier.java b/util/src/main/java/google/registry/util/Retrier.java index 1a32458d1..c63d6744c 100644 --- a/util/src/main/java/google/registry/util/Retrier.java +++ b/util/src/main/java/google/registry/util/Retrier.java @@ -21,12 +21,12 @@ import static google.registry.util.PredicateUtils.supertypeOf; import com.google.common.collect.ImmutableSet; import com.google.common.flogger.FluentLogger; +import jakarta.inject.Inject; +import jakarta.inject.Named; import java.io.Serializable; import java.util.Set; import java.util.concurrent.Callable; import java.util.function.Predicate; -import javax.inject.Inject; -import javax.inject.Named; import org.joda.time.Duration; /** Wrapper that does retry with exponential backoff. */ diff --git a/util/src/main/java/google/registry/util/UtilsModule.java b/util/src/main/java/google/registry/util/UtilsModule.java index 5f0e6d3f6..40861cb31 100644 --- a/util/src/main/java/google/registry/util/UtilsModule.java +++ b/util/src/main/java/google/registry/util/UtilsModule.java @@ -17,12 +17,12 @@ package google.registry.util; import dagger.Binds; import dagger.Module; import dagger.Provides; +import jakarta.inject.Named; +import jakarta.inject.Singleton; import java.security.NoSuchAlgorithmException; import java.security.ProviderException; import java.security.SecureRandom; import java.util.Random; -import javax.inject.Named; -import javax.inject.Singleton; /** Dagger module to provide instances of various utils classes. */ @Module