From d7c6fe05d7c3e86510e76c1f094c9437c0bf89da Mon Sep 17 00:00:00 2001 From: Kevin Brightwell Date: Thu, 3 Aug 2023 16:53:33 -0400 Subject: [PATCH] feat: [Guice 6] Migrate to use `jakarta.inject.*` for injection annotations (#2890) * [Guice 6] Migrate to use `com.guice.inject.*` for injection annotations Part of #2863. This replaces usages to enable migration to [Guice 7+](https://github.com/google/guice/wiki/Guice700). This is the first (only?) step to allow projects using Guice 6.0.0 or Guice 7.0.0 to use misk-inject. By using `jakarta.inject` instead of `javax.inject`, injections work in both 6+ and 7+ versions. The new project, `:misk-inject-guice7-test` sets up a test project with the classpath forced to Guice 7+. This acts as a guard project for basic usages. As needed, we can add more content. * remove BindingAnnotation, oops * Fix dependencies and apiDump * fix bad refactors --- buildSrc/src/main/kotlin/Dependencies.kt | 3 + detekt.yaml | 18 ++++ .../AnnotatePublicApisWithJvmOverloads.kt | 2 +- .../AnnotatePublicApisWithJvmOverloadsTest.kt | 12 ++- misk-action-scopes/build.gradle.kts | 2 +- .../src/main/kotlin/misk/scope/ActionScope.kt | 4 +- .../misk/scope/ActionScopedProviderModule.kt | 2 +- .../kotlin/misk/scope/RealActionScoped.kt | 2 +- .../misk/scope/ActionScopePropagationTest.kt | 2 +- .../kotlin/misk/scope/ActionScopedTest.kt | 2 +- .../scope/TestActionScopedProviderModule.kt | 2 +- .../ActionScopedExecutorServiceTest.kt | 4 +- misk-admin/api/misk-admin.api | 2 +- misk-admin/build.gradle.kts | 2 +- .../web/dashboard/AdminDashboardModule.kt | 2 +- .../kotlin/misk/web/dashboard/DashboardTab.kt | 4 +- .../web/dashboard/MiskWebTabIndexAction.kt | 4 +- .../web/metadata/DashboardMetadataAction.kt | 4 +- .../web/metadata/ServiceMetadataAction.kt | 4 +- .../metadata/config/ConfigMetadataAction.kt | 4 +- .../database/DatabaseQueryMetadataAction.kt | 4 +- .../web/metadata/jvm/JvmMetadataAction.kt | 4 +- .../webaction/WebActionMetadataAction.kt | 4 +- .../misk/web/v2/DashboardHotwireTabAction.kt | 4 +- .../misk/web/v2/DashboardIFrameTabAction.kt | 4 +- .../misk/web/v2/DashboardIndexAction.kt | 4 +- .../kotlin/misk/web/v2/DashboardPageLayout.kt | 2 +- .../misk/web/actions/TestWebActionModule.kt | 2 +- .../metadata/DashboardMetadataActionTest.kt | 2 +- .../web/metadata/MetadataTestingModule.kt | 2 +- .../web/metadata/ServiceMetadataActionTest.kt | 2 +- .../config/ConfigMetadataActionTest.kt | 2 +- .../metadata/config/JvmMetadataActionTest.kt | 2 +- .../webaction/WebActionMetadataActionTest.kt | 2 +- .../misk/web/v2/DashboardPageLayoutTest.kt | 4 +- misk-aws-dynamodb-testing/build.gradle.kts | 2 +- .../dynamodb/testing/DockerDynamoDbModule.kt | 4 +- .../testing/InProcessDynamoDbModule.kt | 4 +- .../misk/aws/dynamodb/testing/TestDynamoDb.kt | 4 +- misk-aws-dynamodb/build.gradle.kts | 4 +- .../misk/dynamodb/DynamoDbHealthCheck.kt | 4 +- .../misk/dynamodb/RealDynamoDbModule.kt | 4 +- .../dynamodb/testing/AbstractDynamoDbTest.kt | 2 +- .../dynamodb/testing/DockerDynamoDbModule.kt | 4 +- .../testing/InProcessDynamoDbModule.kt | 4 +- .../misk/aws/dynamodb/testing/TestDynamoDb.kt | 4 +- misk-aws/build.gradle.kts | 2 +- .../jobqueue/sqs/AwsSqsJobHandlerModule.kt | 4 +- .../misk/jobqueue/sqs/AwsSqsJobQueueModule.kt | 4 +- .../sqs/AwsSqsQueueAttributeImporter.kt | 2 +- .../jobqueue/sqs/DeadLetterQueueProvider.kt | 4 +- .../misk/jobqueue/sqs/ForSqsHandling.kt | 2 +- .../misk/jobqueue/sqs/ForSqsReceiving.kt | 2 +- .../kotlin/misk/jobqueue/sqs/QueueResolver.kt | 4 +- .../misk/jobqueue/sqs/SqsConsumerAllocator.kt | 4 +- .../misk/jobqueue/sqs/SqsJobConsumer.kt | 6 +- .../kotlin/misk/jobqueue/sqs/SqsJobQueue.kt | 4 +- .../kotlin/misk/jobqueue/sqs/SqsMetrics.kt | 4 +- .../jobqueue/sqs/SqsTransactionalJobQueue.kt | 4 +- .../src/main/kotlin/misk/s3/RealS3Module.kt | 2 +- .../sqs/AwsSqsQueueAttributeImporterTest.kt | 2 +- .../jobqueue/sqs/SqsConsumerAllocatorTest.kt | 2 +- .../jobqueue/sqs/SqsJobQueueServiceTest.kt | 4 +- .../misk/jobqueue/sqs/SqsJobQueueTest.kt | 2 +- .../kotlin/misk/jobqueue/sqs/SqsJobTest.kt | 2 +- misk-aws2-dynamodb-testing/build.gradle.kts | 2 +- .../dynamodb/testing/DockerDynamoDbModule.kt | 4 +- .../testing/InProcessDynamoDbModule.kt | 4 +- .../aws2/dynamodb/testing/TestDynamoDb.kt | 4 +- misk-aws2-dynamodb/build.gradle.kts | 4 +- .../misk/aws2/dynamodb/DynamoDbHealthCheck.kt | 4 +- .../misk/aws2/dynamodb/RealDynamoDbModule.kt | 4 +- .../dynamodb/testing/AbstractDynamoDbTest.kt | 2 +- .../dynamodb/testing/DockerDynamoDbModule.kt | 4 +- .../testing/InProcessDynamoDbModule.kt | 4 +- .../aws2/dynamodb/testing/TestDynamoDb.kt | 4 +- misk-clustering/build.gradle.kts | 2 +- .../kotlin/misk/clustering/DefaultCluster.kt | 2 +- .../misk/clustering/fake/FakeCluster.kt | 4 +- .../clustering/fake/lease/FakeLeaseManager.kt | 4 +- .../kubernetes/KubernetesClusterProvider.kt | 4 +- .../kubernetes/KubernetesClusterWatcher.kt | 4 +- .../misk/clustering/fake/FakeClusterTest.kt | 2 +- .../kubernetes/KubernetesClusterTest.kt | 2 +- misk-config/build.gradle.kts | 2 +- .../src/main/kotlin/misk/config/AppName.kt | 2 +- .../kotlin/misk/resources/ResourceLoader.kt | 4 +- .../misk/resources/ResourceLoaderModule.kt | 4 +- .../test/kotlin/misk/config/MiskConfigTest.kt | 2 +- .../kotlin/misk/config/SecretConfigTest.kt | 2 +- .../misk/resources/FakeFileLoaderTest.kt | 2 +- .../misk/resources/ResourceLoaderTest.kt | 2 +- misk-core/build.gradle.kts | 2 +- .../src/main/kotlin/misk/random/Random.kt | 4 +- .../main/kotlin/misk/sampling/RateLimiter.kt | 2 +- .../src/main/kotlin/misk/sampling/Sampler.kt | 4 +- .../misk/security/ssl/CertStoreConfig.kt | 2 +- .../misk/security/ssl/SslContextFactory.kt | 2 +- .../kotlin/misk/security/ssl/SslLoader.kt | 2 +- .../misk/security/ssl/TrustStoreConfig.kt | 2 +- .../kotlin/misk/tokens/FakeTokenGenerator.kt | 4 +- .../kotlin/misk/tokens/RealTokenGenerator.kt | 4 +- .../test/kotlin/misk/logging/LoggingTest.kt | 2 +- .../kotlin/misk/logging/SampledLoggerTest.kt | 2 +- misk-cron/build.gradle.kts | 2 +- .../src/main/kotlin/misk/cron/CronManager.kt | 4 +- .../src/main/kotlin/misk/cron/CronModule.kt | 4 +- .../src/main/kotlin/misk/cron/CronService.kt | 4 +- .../src/main/kotlin/misk/cron/CronTask.kt | 4 +- .../test/kotlin/misk/cron/CronModuleTest.kt | 4 +- .../src/test/kotlin/misk/cron/CronTest.kt | 4 +- .../kotlin/misk/cron/CronTestingModule.kt | 2 +- misk-crypto/build.gradle.kts | 2 +- .../main/kotlin/misk/crypto/CryptoModule.kt | 2 +- .../kotlin/misk/crypto/ExternalDataKeys.kt | 2 +- .../kotlin/misk/crypto/ExternalKeyResolver.kt | 2 +- .../src/main/kotlin/misk/crypto/KeyManager.kt | 4 +- .../src/main/kotlin/misk/crypto/KeyReader.kt | 2 +- .../kotlin/misk/crypto/KmsClientModule.kt | 4 +- .../main/kotlin/misk/crypto/ServiceKeys.kt | 2 +- .../misk/crypto/internal/KeyProviders.kt | 2 +- .../pgp/internal/PgpDecrypterProvider.kt | 2 +- .../pgp/internal/PgpEncrypterProvider.kt | 2 +- .../src/test/kotlin/misk.crypto/PgpKeyTest.kt | 2 +- misk-events-testing/build.gradle.kts | 3 +- .../kotlin/misk/events/FakeEventProcessor.kt | 4 +- .../misk/events/FakeEventProcessorTest.kt | 4 +- misk-exceptions-dynamodb/build.gradle.kts | 2 +- .../ClientExecutionTimeoutExceptionMapper.kt | 2 +- .../TransactionCanceledExceptionMapper.kt | 2 +- .../dynamodb/DynamoDbExceptionMapperTest.kt | 2 +- misk-feature-testing/build.gradle.kts | 2 +- .../misk/feature/testing/FakeFeatureFlags.kt | 4 +- .../feature/testing/FakeFeatureFlagsModule.kt | 2 +- misk-feature/build.gradle.kts | 4 +- .../testing/FakeFeatureFlagsJavaTest.java | 2 +- .../testing/FakeFeatureFlagsModuleTest.kt | 2 +- .../feature/testing/FakeFeatureFlagsTest.kt | 2 +- .../misk/feature/testing/FakeFeatureFlags.kt | 4 +- .../feature/testing/FakeFeatureFlagsModule.kt | 2 +- misk-gcp-testing/build.gradle.kts | 2 +- .../gcp/datastore/FakeDatastoreModule.kt | 4 +- .../gcp/spanner/GoogleSpannerEmulator.kt | 4 +- .../cloud/gcp/storage/FakeStorageModule.kt | 2 +- .../cloud/gcp/storage/LocalStorageRpcTest.kt | 2 +- misk-gcp/build.gradle.kts | 4 +- .../misk/cloud/gcp/GoogleCloudModule.kt | 4 +- .../security/keys/GcpKeyManagementModule.kt | 2 +- .../cloud/gcp/security/keys/GcpKeyService.kt | 2 +- .../cloud/gcp/spanner/GoogleSpannerModule.kt | 4 +- .../gcp/spanner/GoogleSpannerEmulatorTest.kt | 2 +- .../gcp/spanner/GoogleSpannerModuleTest.kt | 2 +- .../gcp/datastore/FakeDatastoreModule.kt | 4 +- .../gcp/spanner/GoogleSpannerEmulator.kt | 4 +- .../cloud/gcp/storage/FakeStorageModule.kt | 2 +- .../cloud/gcp/storage/LocalStorageRpcTest.kt | 2 +- misk-grpc-reflect/build.gradle.kts | 2 +- .../misk/grpc/reflect/GrpcReflectModule.kt | 2 +- .../misk/grpc/reflect/ServerReflectionApi.kt | 2 +- .../misk/grpc/GrpcReflectNoProtoFoundTest.kt | 6 +- .../test/kotlin/misk/grpc/GrpcReflectTest.kt | 6 +- .../misk/grpc/GrpcReflectTestingModule.kt | 4 +- misk-grpc-tests/build.gradle.kts | 2 +- .../grpc/miskclient/MiskGrpcClientModule.kt | 2 +- .../grpc/miskclient/RouteGuideCallCounter.kt | 4 +- .../grpc/miskserver/GetFeatureGrpcAction.kt | 2 +- .../grpc/miskserver/RouteChatGrpcAction.kt | 4 +- .../miskserver/RouteGuideMiskServiceModule.kt | 2 +- .../grpc/protocclient/GrpcChannelFactory.kt | 4 +- .../protocclient/ProtocGrpcClientModule.kt | 4 +- .../grpc/protocserver/ProtocGrpcService.kt | 4 +- .../protocserver/RouteGuideProtocService.kt | 4 +- .../RouteGuideProtocServiceModule.kt | 2 +- .../misk/grpc/MiskClientMiskServerTest.kt | 4 +- .../misk/grpc/MiskClientProtocServerTest.kt | 4 +- .../misk/grpc/ProtocClientMiskServerTest.kt | 4 +- .../misk/grpc/ProtocClientProtocServerTest.kt | 4 +- misk-hibernate/build.gradle.kts | 2 +- .../misk/hibernate/AggregateListener.kt | 2 +- .../misk/hibernate/HibernateEventListener.kt | 2 +- .../hibernate/HibernateExceptionMappers.kt | 2 +- .../misk/hibernate/HibernateHealthCheck.kt | 2 +- .../misk/hibernate/HibernateInjectorAccess.kt | 4 +- .../kotlin/misk/hibernate/HibernateModule.kt | 13 ++- .../misk/hibernate/ReflectionQueryFactory.kt | 4 +- .../misk/hibernate/SchemaValidatorService.kt | 2 +- .../misk/hibernate/SessionFactoryService.kt | 2 +- .../misk/hibernate/TimestampListener.kt | 4 +- .../actions/DatabaseQueryMetadataProvider.kt | 4 +- .../HibernateDatabaseQueryDynamicAction.kt | 4 +- .../HibernateDatabaseQueryMetadataFactory.kt | 4 +- .../HibernateDatabaseQueryStaticAction.kt | 4 +- .../hibernate/migrate/BulkShardMigrator.kt | 4 +- .../misk/hibernate/BoxedStringColumnTest.kt | 4 +- .../misk/hibernate/ByteStringColumnTest.kt | 4 +- .../kotlin/misk/hibernate/ChildEntityTest.kt | 2 +- .../misk/hibernate/EventListenersTest.kt | 2 +- .../misk/hibernate/ExternalColumnTest.kt | 4 +- .../misk/hibernate/FakeEventListener.kt | 4 +- .../kotlin/misk/hibernate/HealthCheckTest.kt | 4 +- .../hibernate/HibernateEntityModuleTest.kt | 6 +- .../kotlin/misk/hibernate/JsonColumnTest.kt | 4 +- .../src/test/kotlin/misk/hibernate/Movies.kt | 2 +- .../misk/hibernate/MySqlScaleSafetyTest.kt | 2 +- .../misk/hibernate/PrimitiveColumnsTest.kt | 4 +- .../kotlin/misk/hibernate/ProtoColumnTest.kt | 4 +- .../misk/hibernate/RawHibernateApiTest.kt | 2 +- .../misk/hibernate/ReaderTransacterTest.kt | 2 +- .../hibernate/ReflectionQueryFactoryTest.kt | 2 +- .../ReflectionQueryFactoryValidationTest.kt | 2 +- .../hibernate/SchemaValidatorSuccessTest.kt | 2 +- .../misk/hibernate/SchemaValidatorTest.kt | 8 +- .../kotlin/misk/hibernate/SecretColumnTest.kt | 4 +- .../misk/hibernate/TimestampListenerTest.kt | 2 +- .../kotlin/misk/hibernate/TransacterTest.kt | 2 +- .../misk/hibernate/TransformedColumnTest.kt | 4 +- .../misk/hibernate/VitessScaleSafetyTest.kt | 2 +- .../hibernate/VitessSchemaValidatorTest.kt | 4 +- ...HibernateDatabaseQueryDynamicActionTest.kt | 2 +- .../HibernateDatabaseQueryStaticActionTest.kt | 2 +- .../HibernateDatabaseQueryTestingModule.kt | 2 +- .../actions/RealActionRequestExecuter.kt | 2 +- .../migrate/BulkShardMigratorTest.kt | 4 +- .../hibernate/pagination/RealPagerTest.kt | 2 +- .../kotlin/misk/jdbc/HikariMetricsTest.kt | 2 +- misk-inject/build.gradle.kts | 1 + misk-inject/misk-inject-guice7-test/README.md | 5 + .../api/misk-inject-guice7-test.api | 0 .../misk-inject-guice7-test/build.gradle.kts | 23 +++++ .../inject/guice7/Guice7IntegrationTest.kt | 92 +++++++++++++++++++ .../misk/inject/guice7/Guice7TestClass.kt | 29 ++++++ .../misk/inject/guice7/Guice7TestInterface.kt | 5 + .../src/main/kotlin/misk/inject/Guice.kt | 8 +- .../misk/inject/KInstallOnceModuleTest.kt | 2 +- .../test/kotlin/misk/inject/MapBinderTest.kt | 4 +- .../kotlin/misk/inject/MultiBinderTest.kt | 2 +- misk-jdbc-testing/api/misk-jdbc-testing.api | 8 +- misk-jdbc-testing/build.gradle.kts | 4 +- .../kotlin/misk/jdbc/JdbcTestingModule.kt | 2 +- .../misk/jdbc/MySqlScaleSafetyChecks.kt | 2 +- .../misk/jdbc/MySqlTestDatabasePoolBackend.kt | 4 +- .../kotlin/misk/jdbc/TruncateTablesService.kt | 2 +- .../misk/vitess/VitessScaleSafetyChecks.kt | 2 +- misk-jdbc/api/misk-jdbc.api | 10 +- misk-jdbc/build.gradle.kts | 6 +- .../kotlin/misk/jdbc/DataSourceService.kt | 4 +- .../src/main/kotlin/misk/jdbc/JdbcModule.kt | 10 +- .../kotlin/misk/jdbc/PingDatabaseService.kt | 4 +- .../kotlin/misk/jdbc/SchemaMigratorService.kt | 2 +- .../kotlin/misk/jdbc/RealTransacterTest.kt | 2 +- .../misk/jdbc/SchemaMigratorServiceTest.kt | 2 +- .../kotlin/misk/jdbc/SchemaMigratorTest.kt | 2 +- .../kotlin/misk/jdbc/TestDatabasePoolTest.kt | 4 +- .../misk/jdbc/TruncateTablesServiceTest.kt | 4 +- .../misk/jdbc/VitessSchemaMigratorTest.kt | 4 +- .../kotlin/misk/jdbc/JdbcTestingModule.kt | 2 +- .../misk/jdbc/MySqlScaleSafetyChecks.kt | 2 +- .../misk/jdbc/MySqlTestDatabasePoolBackend.kt | 4 +- .../kotlin/misk/jdbc/TruncateTablesService.kt | 2 +- .../misk/vitess/VitessScaleSafetyChecks.kt | 2 +- .../api/misk-jobqueue-testing.api | 2 +- misk-jobqueue-testing/build.gradle.kts | 2 +- .../misk/jobqueue/DevelopmentJobProcessor.kt | 6 +- .../jobqueue/DevelopmentJobProcessorModule.kt | 2 +- .../main/kotlin/misk/jobqueue/FakeJobQueue.kt | 6 +- .../misk/jobqueue/ForDevelopmentHandling.kt | 2 +- misk-jobqueue/api/misk-jobqueue.api | 2 +- misk-jobqueue/build.gradle.kts | 4 +- .../misk/jobqueue/DevelopmentJobQueueTest.kt | 2 +- .../kotlin/misk/jobqueue/FakeJobQueueTest.kt | 4 +- .../misk/jobqueue/DevelopmentJobProcessor.kt | 6 +- .../jobqueue/DevelopmentJobProcessorModule.kt | 2 +- .../kotlin/misk/jobqueue/FakeJobQueue.kt | 6 +- .../misk/jobqueue/ForDevelopmentHandling.kt | 2 +- misk-jooq/api/misk-jooq.api | 2 +- misk-jooq/build.gradle.kts | 4 +- .../main/kotlin/misk/jooq/JooqHealthCheck.kt | 2 +- .../src/main/kotlin/misk/jooq/JooqModule.kt | 4 +- .../kotlin/misk/jooq/JooqTransacterTest.kt | 2 +- .../jooq/config/ClientJooqTestingModule.kt | 2 +- misk-launchdarkly-core/build.gradle.kts | 2 +- .../launchdarkly/LaunchDarklyDynamicConfig.kt | 2 +- .../launchdarkly/LaunchDarklyFeatureFlags.kt | 4 +- misk-launchdarkly/build.gradle.kts | 2 +- .../LaunchDarklyFeatureFlagsModule.kt | 4 +- misk-lease/build.gradle.kts | 2 +- .../main/kotlin/misk/lease/LeaseService.kt | 4 +- misk-metrics-testing/build.gradle.kts | 2 +- .../main/kotlin/misk/metrics/FakeMetrics.kt | 4 +- .../kotlin/misk/metrics/v2/FakeMetrics.kt | 4 +- misk-metrics/build.gradle.kts | 3 +- .../kotlin/misk/metrics/FakeMetricsTest.kt | 2 +- .../kotlin/misk/metrics/v2/FakeMetricsTest.kt | 2 +- .../kotlin/misk/metrics/FakeMetrics.kt | 4 +- .../kotlin/misk/metrics/v2/FakeMetrics.kt | 4 +- misk-policy-testing/build.gradle.kts | 2 +- .../kotlin/misk/policy/opa/FakeOpaModule.kt | 2 +- .../misk/policy/opa/FakeOpaPolicyEngine.kt | 4 +- misk-policy/build.gradle.kts | 4 +- .../main/kotlin/misk/policy/opa/OpaModule.kt | 6 +- .../misk/policy/opa/RealOpaPolicyEngine.kt | 4 +- .../policy/opa/FakeOpaPolicyEngineTest.kt | 2 +- .../policy/opa/RealOpaPolicyEngineTest.kt | 6 +- .../kotlin/misk/policy/opa/FakeOpaModule.kt | 2 +- .../misk/policy/opa/FakeOpaPolicyEngine.kt | 4 +- misk-prometheus/build.gradle.kts | 2 +- .../backends/prometheus/PrometheusConfig.kt | 2 +- .../prometheus/PrometheusHttpService.kt | 4 +- .../backends/prometheus/PrometheusMetrics.kt | 4 +- .../PrometheusMetricsClientModule.kt | 4 +- .../PrometheusMetricsServiceModule.kt | 2 +- .../prometheus/v2/PrometheusMetrics.kt | 4 +- .../prometheus/PrometheusHistogramRegistry.kt | 2 +- misk-redis-testing/build.gradle.kts | 2 +- .../kotlin/misk/redis/testing/FakeRedis.kt | 2 +- .../misk/redis/testing/RedisTestModule.kt | 2 +- misk-redis/build.gradle.kts | 3 +- .../src/main/kotlin/misk/redis/FakeRedis.kt | 2 +- .../src/main/kotlin/misk/redis/RedisModule.kt | 2 +- .../main/kotlin/misk/redis/RedisService.kt | 6 +- .../main/kotlin/misk/redis/RedisTestModule.kt | 2 +- .../test/kotlin/misk/redis/FakeRedisTest.kt | 2 +- .../test/kotlin/misk/redis/RealRedisTest.kt | 2 +- .../misk/redis/RedisAuthPasswordEnvTest.kt | 2 +- .../misk/redis/RedisClientMetricsTest.kt | 2 +- .../kotlin/misk/redis/testing/FakeRedis.kt | 2 +- .../misk/redis/testing/RedisTestModule.kt | 2 +- misk-service/build.gradle.kts | 3 +- .../main/kotlin/misk/CoordinatedService.kt | 2 +- .../src/main/kotlin/misk/ReadyService.kt | 4 +- .../main/kotlin/misk/ServiceGraphBuilder.kt | 2 +- .../main/kotlin/misk/ServiceManagerModule.kt | 4 +- .../kotlin/misk/ServiceManagerModuleTest.kt | 14 ++- misk-slack/build.gradle.kts | 2 +- .../main/kotlin/misk/slack/RealSlackClient.kt | 2 +- .../src/main/kotlin/misk/slack/SlackClient.kt | 2 +- .../src/main/kotlin/misk/slack/SlackModule.kt | 4 +- .../misk/slack/webapi/RealSlackClient.kt | 2 +- .../interceptors/SlackClientInterceptor.kt | 4 +- .../SlackSignedRequestsInterceptor.kt | 4 +- .../test/kotlin/misk/slack/SlackClientTest.kt | 2 +- .../misk/slack/webapi/MockSlackServer.kt | 4 +- .../misk/slack/webapi/PingSlackActionTest.kt | 4 +- .../misk/slack/webapi/RealSlackClientTest.kt | 2 +- misk-testing/build.gradle.kts | 2 +- .../FakeScheduledExecutorService.kt | 4 +- .../kotlin/misk/concurrent/FakeSleeper.kt | 4 +- .../main/kotlin/misk/concurrent/FakeTicker.kt | 4 +- .../kotlin/misk/logging/LogCollectorModule.kt | 2 +- .../kotlin/misk/logging/RealLogCollector.kt | 4 +- .../src/main/kotlin/misk/random/FakeRandom.kt | 4 +- .../main/kotlin/misk/services/FakeService.kt | 4 +- .../misk/testing/ConcurrentMockTracer.kt | 4 +- .../kotlin/misk/testing/LogLevelExtension.kt | 2 +- .../kotlin/misk/testing/MiskTestExtension.kt | 4 +- .../kotlin/misk/testing/TemporaryFolder.kt | 4 +- .../src/main/kotlin/misk/time/FakeClock.kt | 4 +- .../src/main/kotlin/misk/web/WebTestClient.kt | 2 +- .../kotlin/misk/logging/LogCollectorTest.kt | 2 +- .../misk/testing/LogLevelExtensionTest.kt | 2 +- .../kotlin/misk/testing/NestedTestsTest.kt | 4 +- .../fieldbind/BindFieldUsingFakeTest.kt | 2 +- .../fieldbind/BindFieldUsingMockTest.kt | 2 +- .../fieldbind/BindFieldsUsingProviderTest.kt | 4 +- .../kotlin/misk/testing/fieldbind/Services.kt | 2 +- .../misk/web/MiskCallerExtensionTest.kt | 2 +- .../test/kotlin/misk/web/WebTestClientTest.kt | 2 +- misk-warmup/build.gradle.kts | 2 +- .../main/kotlin/misk/warmup/WarmupRunner.kt | 6 +- .../src/test/kotlin/misk/warmup/WarmupTest.kt | 4 +- misk/api/misk.api | 6 +- misk/build.gradle.kts | 3 +- misk/src/main/kotlin/misk/MiskCommand.kt | 2 +- misk/src/main/kotlin/misk/MiskDefault.kt | 2 +- .../misk/client/ClientInvocationHandler.kt | 2 +- .../misk/client/ClientLoggingInterceptor.kt | 4 +- .../misk/client/ClientMetricsInterceptor.kt | 4 +- .../kotlin/misk/client/GrpcClientModule.kt | 2 +- .../kotlin/misk/client/GrpcClientProvider.kt | 4 +- .../kotlin/misk/client/HttpClientFactory.kt | 6 +- .../kotlin/misk/client/HttpClientModule.kt | 2 +- .../client/OkHttpClientCommonConfigurator.kt | 2 +- .../kotlin/misk/client/PeerClientFactory.kt | 2 +- .../misk/client/TypedHttpClientModule.kt | 2 +- .../misk/concurrent/ExecutorServiceModule.kt | 2 +- .../concurrent/RealExecutorServiceFactory.kt | 2 +- .../main/kotlin/misk/environment/EnvVars.kt | 4 +- .../kotlin/misk/grpc/GrpcFeatureBinding.kt | 4 +- .../main/kotlin/misk/monitoring/JvmMetrics.kt | 4 +- .../kotlin/misk/moshi/MoshiJsonAdapter.kt | 2 +- .../src/main/kotlin/misk/moshi/MoshiModule.kt | 2 +- .../misk/moshi/wire/WireMessageAdapter.kt | 2 +- .../main/kotlin/misk/perf/ForPauseDetector.kt | 2 +- .../main/kotlin/misk/perf/PauseDetector.kt | 4 +- .../misk/security/authz/AccessInterceptor.kt | 2 +- .../security/authz/FakeCallerAuthenticator.kt | 4 +- .../csp/ContentSecurityPolicyInterceptor.kt | 2 +- .../misk/security/ssl/CertificatesModule.kt | 2 +- .../security/ssl/ClientCertAnnotations.kt | 2 +- .../kotlin/misk/tasks/RepeatedTaskQueue.kt | 4 +- .../misk/time/ForceUtcTimeZoneService.kt | 4 +- misk/src/main/kotlin/misk/web/BoundAction.kt | 2 +- .../src/main/kotlin/misk/web/MiskWebModule.kt | 4 +- .../main/kotlin/misk/web/WebActionBinding.kt | 2 +- .../misk/web/actions/InternalErrorAction.kt | 4 +- .../misk/web/actions/LivenessCheckAction.kt | 6 +- .../kotlin/misk/web/actions/NotFoundAction.kt | 6 +- .../misk/web/actions/ReadinessCheckAction.kt | 6 +- .../kotlin/misk/web/actions/StatusAction.kt | 6 +- .../misk/web/actions/WebActionFactory.kt | 4 +- .../ConcurrencyLimitsModule.kt | 4 +- .../misk/web/exceptions/EofExceptionMapper.kt | 2 +- .../ExceptionHandlingInterceptor.kt | 2 +- .../web/exceptions/ExceptionMapperResolver.kt | 4 +- .../web/exceptions/GrpcExceptionMapper.kt | 2 +- .../misk/web/exceptions/IOExceptionMapper.kt | 2 +- .../exceptions/RequestBodyExceptionMapper.kt | 2 +- .../exceptions/WebActionExceptionMapper.kt | 2 +- .../extractors/RequestBodyFeatureBinding.kt | 4 +- .../extractors/ResponseBodyFeatureBinding.kt | 4 +- .../misk/web/formatter/ClassNameFormatter.kt | 2 +- .../web/interceptors/BeforeContentEncoding.kt | 2 +- .../ConcurrencyLimitsInterceptor.kt | 4 +- .../web/interceptors/ForContentEncoding.kt | 2 +- .../GunzipRequestBodyInterceptor.kt | 4 +- .../InternalErrorInterceptorFactory.kt | 4 +- .../misk/web/interceptors/LogRateLimiter.kt | 4 +- .../web/interceptors/MetricsInterceptor.kt | 4 +- .../interceptors/RebalancingInterceptor.kt | 4 +- .../RequestBodyLoggingInterceptor.kt | 4 +- .../RequestLogContextInterceptor.kt | 4 +- .../interceptors/RequestLoggingInterceptor.kt | 4 +- .../ResponseBodyMarshallerFactory.kt | 4 +- .../web/interceptors/TracingInterceptor.kt | 2 +- .../WideOpenDevelopmentInterceptor.kt | 2 +- .../misk/web/jetty/ConnectionMetrics.kt | 4 +- .../jetty/JettyConnectionMetricsCollector.kt | 4 +- .../kotlin/misk/web/jetty/JettyService.kt | 4 +- .../jetty/JettyThreadPoolMetricsCollector.kt | 4 +- .../misk/web/jetty/ThreadPoolMetrics.kt | 4 +- .../misk/web/jetty/ThreadPoolQueueMetrics.kt | 4 +- .../misk/web/jetty/WebActionsServlet.kt | 4 +- misk/src/main/kotlin/misk/web/marshal/Json.kt | 4 +- .../misk/web/marshal/MultipartUnmarshaller.kt | 4 +- .../main/kotlin/misk/web/marshal/PlainText.kt | 4 +- .../main/kotlin/misk/web/marshal/Protobuf.kt | 4 +- .../RequestHttpMethodLogContextProvider.kt | 2 +- .../mdc/RequestProtocolLogContextProvider.kt | 2 +- .../RequestRemoteAddressLogContextProvider.kt | 2 +- .../web/mdc/RequestURILogContextProvider.kt | 2 +- .../webaction/WebActionMetadataList.kt | 6 +- .../kotlin/misk/web/proxy/WebProxyAction.kt | 4 +- .../misk/web/resources/ResourceEntryFinder.kt | 2 +- .../web/resources/StaticResourceAction.kt | 4 +- .../extractors/JavaPathParamDispatchTest.java | 2 +- .../test/kotlin/misk/MiskApplicationTest.kt | 2 +- misk/src/test/kotlin/misk/MiskCallerTest.kt | 4 +- .../client/ClientLoggingInterceptorTest.kt | 4 +- .../client/ClientMetricsInterceptorTest.kt | 4 +- .../kotlin/misk/client/ConnectionReuseTest.kt | 6 +- .../misk/client/GrpcClientProviderTest.kt | 4 +- .../kotlin/misk/client/HttpClientEnvoyTest.kt | 4 +- .../client/HttpClientEventListenerTest.kt | 4 +- .../misk/client/HttpClientProviderTest.kt | 4 +- .../misk/client/MockWebServerService.kt | 2 +- ...ropagatingScopeActionInInterceptorsTest.kt | 2 +- .../misk/client/ProtoMessageHttpClientTest.kt | 4 +- misk/src/test/kotlin/misk/client/TestDino.kt | 4 +- .../client/TypedHttpClientInterceptorTest.kt | 2 +- .../kotlin/misk/client/TypedHttpClientTest.kt | 4 +- .../misk/client/TypedPeerHttpClientTest.kt | 4 +- .../concurrent/ExecutorServiceModuleTest.kt | 4 +- .../kotlin/misk/grpc/GrpcConnectivityTest.kt | 4 +- .../misk/grpc/Http2ClientTestingModule.kt | 2 +- .../misk/healthchecks/FakeHealthCheck.kt | 4 +- .../kotlin/misk/moshi/BuiltInAdaptersTest.kt | 2 +- .../misk/moshi/MoshiAdapterPrecedenceTest.kt | 2 +- .../test/kotlin/misk/moshi/MoshiModuleTest.kt | 2 +- .../misk/moshi/wire/WireMessageAdapterTest.kt | 2 +- .../kotlin/misk/perf/PauseDetectorTest.kt | 2 +- .../misk/tasks/RepeatedTaskQueueTest.kt | 6 +- .../testing/InjectingParameterResolverTest.kt | 4 +- .../test/kotlin/misk/time/FakeResourcePool.kt | 2 +- .../misk/tracing/ClientServerTraceTest.kt | 4 +- .../misk/web/AbstractRebalancingTest.kt | 4 +- .../misk/web/ActionScopedWebDispatchTest.kt | 4 +- .../misk/web/ContentBasedDispatchTest.kt | 2 +- .../test/kotlin/misk/web/CorsFilterTest.kt | 2 +- .../misk/web/DegradedHealthStressTest.kt | 2 +- .../misk/web/DeterministicRoutingTest.kt | 2 +- .../kotlin/misk/web/GracefulShutdownTest.kt | 4 +- misk/src/test/kotlin/misk/web/GzipTest.kt | 2 +- .../kotlin/misk/web/InvalidActionsTest.kt | 4 +- .../kotlin/misk/web/JettyHealthCheckTest.kt | 4 +- .../misk/web/JettyServiceMetricsTest.kt | 2 +- .../test/kotlin/misk/web/JettyShutdownTest.kt | 2 +- .../misk/web/JsonForProtoEndpointsTest.kt | 2 +- .../misk/web/SingleRequestThreadTest.kt | 4 +- .../test/kotlin/misk/web/WebDispatchTest.kt | 2 +- .../test/kotlin/misk/web/WebSocketsTest.kt | 4 +- .../misk/web/actions/AuthenticationTest.kt | 2 +- .../ContentSecurityPolicyHeadersTest.kt | 2 +- ...tActionsWorkWithAccessControlModuleTest.kt | 2 +- .../misk/web/actions/GrpcBindingActionTest.kt | 4 +- .../web/actions/LivenessCheckActionTest.kt | 2 +- .../misk/web/actions/NotFoundActionTest.kt | 2 +- .../web/actions/ReadinessCheckActionTest.kt | 2 +- .../web/actions/ResponseContentTypeTest.kt | 4 +- .../misk/web/actions/StatusActionTest.kt | 2 +- .../web/actions/SupportedHttpMethodsTest.kt | 2 +- .../misk/web/actions/TestWebActionModule.kt | 2 +- .../ConcurrencyLimitsStrategyTest.kt | 2 +- .../web/exceptions/ExceptionMapperTest.kt | 2 +- .../web/extractors/FormValueParameterTest.kt | 2 +- .../web/extractors/PathParamDispatchTest.kt | 2 +- .../web/extractors/QueryStringRequestTest.kt | 2 +- .../ConcurrencyLimitsInterceptorTest.kt | 4 +- .../web/interceptors/LogRateLimiterTest.kt | 2 +- .../interceptors/MetricsInterceptorTest.kt | 2 +- .../RequestLogContextInterceptorTest.kt | 2 +- .../RequestLoggingInterceptorTest.kt | 2 +- .../interceptors/TracingInterceptorTest.kt | 2 +- .../web/interceptors/UserInterceptorTest.kt | 2 +- .../misk/web/jetty/WebActionsServletTest.kt | 2 +- .../misk/web/marshal/JsonRequestTest.kt | 2 +- .../misk/web/marshal/JsonResponseTest.kt | 2 +- .../misk/web/marshal/MultipartRequestTest.kt | 2 +- .../misk/web/marshal/PlainTextRequestTest.kt | 2 +- .../misk/web/marshal/PlainTextResponseTest.kt | 2 +- .../web/marshal/UnspecifiedContentTypeTest.kt | 2 +- .../misk/web/proxy/WebProxyActionTest.kt | 4 +- .../web/resource/StaticResourceActionTest.kt | 4 +- .../misk/web/ssl/Http2ConnectivityTest.kt | 4 +- .../misk/web/ssl/JceksSslClientServerTest.kt | 4 +- .../misk/web/ssl/PemSslClientServerTest.kt | 4 +- .../misk/web/uds/UDSHttp2ConnectivityTest.kt | 4 +- samples/exemplar/build.gradle.kts | 2 +- .../squareup/exemplar/HelloJavaAction.java | 2 +- .../actions/DownloadAFileWebAction.kt | 4 +- .../exemplar/actions/EchoFormAction.kt | 4 +- .../exemplar/actions/HelloWebAction.kt | 4 +- .../exemplar/actions/HelloWebPostAction.kt | 4 +- .../exemplar/actions/HelloWebProtoAction.kt | 2 +- .../dashboard/ExemplarDashboardModule.kt | 2 +- .../dashboard/admin/AlphaIndexAction.kt | 4 +- .../frontend/EcommerceLandingPage.kt | 4 +- .../exemplar/dashboard/frontend/IndexPage.kt | 4 +- .../exemplar/dashboard/frontend/SimplePage.kt | 4 +- .../support/SupportBravoIndexAction.kt | 4 +- .../support/SupportDashboardIndexAction.kt | 4 +- .../exemplar/ExemplarCompilationTests.kt | 2 +- .../squareup/exemplar/HelloWebActionTest.kt | 2 +- samples/exemplarchat/build.gradle.kts | 2 +- .../chat/actions/ChatWebSocketAction.kt | 4 +- .../actions/ToggleManualHealthCheckAction.kt | 4 +- .../chat/healthchecks/ManualHealthCheck.kt | 2 +- .../squareup/chat/ChatWebSocketActionTest.kt | 2 +- settings.gradle.kts | 1 + 558 files changed, 1050 insertions(+), 851 deletions(-) create mode 100644 misk-inject/misk-inject-guice7-test/README.md create mode 100644 misk-inject/misk-inject-guice7-test/api/misk-inject-guice7-test.api create mode 100644 misk-inject/misk-inject-guice7-test/build.gradle.kts create mode 100644 misk-inject/misk-inject-guice7-test/src/test/kotlin/misk/inject/guice7/Guice7IntegrationTest.kt create mode 100644 misk-inject/misk-inject-guice7-test/src/test/kotlin/misk/inject/guice7/Guice7TestClass.kt create mode 100644 misk-inject/misk-inject-guice7-test/src/test/kotlin/misk/inject/guice7/Guice7TestInterface.kt diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index cb7a5cc2500..58fc2bfcb0e 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -59,6 +59,7 @@ object Dependencies { val guavaTestLib = "com.google.guava:guava-testlib" val guice = "com.google.inject:guice" val guiceBom = "com.google.inject:guice-bom:6.0.0" + val guice7Bom = "com.google.inject:guice-bom:7.0.0" val guiceTestLib = "com.google.inject.extensions:guice-testlib" val hibernateCore = "org.hibernate:hibernate-core:5.5.3.Final" val hikariCp = "com.zaxxer:HikariCP:4.0.3" @@ -77,6 +78,8 @@ object Dependencies { val jacksonJsr310 = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.2" val jacksonKotlin = "com.fasterxml.jackson.module:jackson-module-kotlin:2.14.2" val javaxAnnotation = "javax.annotation:javax.annotation-api:1.3.2" + val jakartaInject = "jakarta.inject:jakarta.inject-api:2.0.1" + @Deprecated("Use jakartaInject", replaceWith = ReplaceWith("jakartaInject")) val javaxInject = "javax.inject:javax.inject:1" val javaxPersistenceApi = "javax.persistence:javax.persistence-api:2.2" val jedis = "redis.clients:jedis:4.1.1" diff --git a/detekt.yaml b/detekt.yaml index b68fd34be70..d71a422329d 100644 --- a/detekt.yaml +++ b/detekt.yaml @@ -21,6 +21,24 @@ complexity: LongParameterList: active: false +style: + ForbiddenImport: + active: true + imports: + - value: 'javax.inject.Inject' + reason: 'To be Guice 7+ compliant, use `jakarta.inject.Inject`' + - value: 'javax.inject.Named' + reason: 'To be Guice 7+ compliant, use `jakarta.inject.Named`' + - value: 'javax.inject.Qualifier' + reason: 'To be Guice 7+ compliant, use `jakarta.inject.Qualifier`' + - value: 'javax.inject.Singleton' + reason: 'To be Guice 7+ compliant, use `jakarta.inject.Singleton`' + - value: 'javax.inject.Provider' + reason: 'To be Guice 7+ compliant, use `com.google.inject.Provider`' + # Until moved to Guice 7, jakarta.inject.Provider causes issues with type overloads in Guice 6 + - value: 'jakarta.inject.Provider' + reason: 'To be Guice 6 compliant, use `com.google.inject.Provider`' + detektive: active: true AnnotatePublicApisWithJvmOverloads: diff --git a/detektive/src/main/kotlin/cash/detektive/javacompat/AnnotatePublicApisWithJvmOverloads.kt b/detektive/src/main/kotlin/cash/detektive/javacompat/AnnotatePublicApisWithJvmOverloads.kt index b00532990d6..863ff94ac8d 100644 --- a/detektive/src/main/kotlin/cash/detektive/javacompat/AnnotatePublicApisWithJvmOverloads.kt +++ b/detektive/src/main/kotlin/cash/detektive/javacompat/AnnotatePublicApisWithJvmOverloads.kt @@ -74,7 +74,7 @@ class AnnotatePublicApisWithJvmOverloads(config: Config) : Rule(config) { if (!element.valueParameters.any { it.hasDefaultValue() }) return false // Is not annotated with @Inject - if (element.hasAnyAnnotation("javax.inject.Inject", "com.google.inject.Inject")) return false + if (element.hasAnyAnnotation("javax.inject.Inject", "jakarta.inject.Inject", "com.google.inject.Inject")) return false // Is public val callableMemberDescriptor = descriptor as? CallableMemberDescriptor diff --git a/detektive/src/test/kotlin/cash/detektive/javacompat/AnnotatePublicApisWithJvmOverloadsTest.kt b/detektive/src/test/kotlin/cash/detektive/javacompat/AnnotatePublicApisWithJvmOverloadsTest.kt index 4137ef932df..ed19c322c85 100644 --- a/detektive/src/test/kotlin/cash/detektive/javacompat/AnnotatePublicApisWithJvmOverloadsTest.kt +++ b/detektive/src/test/kotlin/cash/detektive/javacompat/AnnotatePublicApisWithJvmOverloadsTest.kt @@ -129,7 +129,15 @@ internal class AnnotatePublicApisWithJvmOverloadsTest(private val env: KotlinCor NoErrorTestCase( description = "Public constructor annotated with javax Inject", code = """ - import javax.inject.Inject + import jakarta.inject.Inject + + class Subject @Inject constructor(x: String = "", y: Int) {} + """ + ), + NoErrorTestCase( + description = "Public constructor annotated with jakarta Inject", + code = """ + import jakarta.inject.Inject class Subject @Inject constructor(x: String = "", y: Int) {} """ @@ -137,7 +145,7 @@ internal class AnnotatePublicApisWithJvmOverloadsTest(private val env: KotlinCor NoErrorTestCase( description = "Public constructor annotated with guice Inject", code = """ - import com.google.inject.Inject + import jakarta.inject.Inject class Subject @Inject constructor(x: String = "", y: Int) {} """ diff --git a/misk-action-scopes/build.gradle.kts b/misk-action-scopes/build.gradle.kts index 255529a66f7..781f7258077 100644 --- a/misk-action-scopes/build.gradle.kts +++ b/misk-action-scopes/build.gradle.kts @@ -11,7 +11,7 @@ plugins { dependencies { api(Dependencies.guava) api(Dependencies.guice) - api(Dependencies.javaxInject) + api(Dependencies.jakartaInject) api(project(":misk-inject")) implementation(Dependencies.kotlinReflect) implementation(Dependencies.kotlinStdLibJdk8) diff --git a/misk-action-scopes/src/main/kotlin/misk/scope/ActionScope.kt b/misk-action-scopes/src/main/kotlin/misk/scope/ActionScope.kt index d700399b3e7..a838d01a29d 100644 --- a/misk-action-scopes/src/main/kotlin/misk/scope/ActionScope.kt +++ b/misk-action-scopes/src/main/kotlin/misk/scope/ActionScope.kt @@ -5,8 +5,8 @@ import com.google.inject.Provider import kotlinx.coroutines.asContextElement import java.util.UUID import java.util.concurrent.Callable -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import kotlin.coroutines.CoroutineContext import kotlin.reflect.KFunction import kotlin.reflect.KParameter diff --git a/misk-action-scopes/src/main/kotlin/misk/scope/ActionScopedProviderModule.kt b/misk-action-scopes/src/main/kotlin/misk/scope/ActionScopedProviderModule.kt index c9da593a3b2..2ac49898075 100644 --- a/misk-action-scopes/src/main/kotlin/misk/scope/ActionScopedProviderModule.kt +++ b/misk-action-scopes/src/main/kotlin/misk/scope/ActionScopedProviderModule.kt @@ -12,7 +12,7 @@ import misk.inject.parameterizedType import misk.inject.toKey import misk.inject.typeLiteral import java.lang.reflect.Type -import javax.inject.Inject +import jakarta.inject.Inject import kotlin.reflect.KClass import kotlin.reflect.jvm.javaMethod diff --git a/misk-action-scopes/src/main/kotlin/misk/scope/RealActionScoped.kt b/misk-action-scopes/src/main/kotlin/misk/scope/RealActionScoped.kt index aaded7ea94d..c254697ed04 100644 --- a/misk-action-scopes/src/main/kotlin/misk/scope/RealActionScoped.kt +++ b/misk-action-scopes/src/main/kotlin/misk/scope/RealActionScoped.kt @@ -1,7 +1,7 @@ package misk.scope import com.google.inject.Key -import javax.inject.Inject +import jakarta.inject.Inject internal class RealActionScoped @Inject internal constructor( val key: Key, diff --git a/misk-action-scopes/src/test/kotlin/misk/scope/ActionScopePropagationTest.kt b/misk-action-scopes/src/test/kotlin/misk/scope/ActionScopePropagationTest.kt index 6424710e3fa..03536548556 100644 --- a/misk-action-scopes/src/test/kotlin/misk/scope/ActionScopePropagationTest.kt +++ b/misk-action-scopes/src/test/kotlin/misk/scope/ActionScopePropagationTest.kt @@ -10,7 +10,7 @@ import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import java.util.concurrent.Callable import java.util.concurrent.Executors -import javax.inject.Inject +import jakarta.inject.Inject import kotlin.reflect.KFunction internal class ActionScopePropagationTest { diff --git a/misk-action-scopes/src/test/kotlin/misk/scope/ActionScopedTest.kt b/misk-action-scopes/src/test/kotlin/misk/scope/ActionScopedTest.kt index 9bdb5483d82..e1446f5b3b7 100644 --- a/misk-action-scopes/src/test/kotlin/misk/scope/ActionScopedTest.kt +++ b/misk-action-scopes/src/test/kotlin/misk/scope/ActionScopedTest.kt @@ -14,7 +14,7 @@ import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import java.util.Optional -import javax.inject.Inject +import jakarta.inject.Inject import kotlin.test.assertFailsWith internal class ActionScopedTest { diff --git a/misk-action-scopes/src/test/kotlin/misk/scope/TestActionScopedProviderModule.kt b/misk-action-scopes/src/test/kotlin/misk/scope/TestActionScopedProviderModule.kt index aac14541981..6623cd5625c 100644 --- a/misk-action-scopes/src/test/kotlin/misk/scope/TestActionScopedProviderModule.kt +++ b/misk-action-scopes/src/test/kotlin/misk/scope/TestActionScopedProviderModule.kt @@ -4,7 +4,7 @@ import com.google.inject.TypeLiteral import com.google.inject.name.Named import com.google.inject.name.Names import java.util.Optional -import javax.inject.Inject +import jakarta.inject.Inject internal class TestActionScopedProviderModule : ActionScopedProviderModule() { override fun configureProviders() { diff --git a/misk-action-scopes/src/test/kotlin/misk/scope/executor/ActionScopedExecutorServiceTest.kt b/misk-action-scopes/src/test/kotlin/misk/scope/executor/ActionScopedExecutorServiceTest.kt index 99c1947cefa..0082193a10c 100644 --- a/misk-action-scopes/src/test/kotlin/misk/scope/executor/ActionScopedExecutorServiceTest.kt +++ b/misk-action-scopes/src/test/kotlin/misk/scope/executor/ActionScopedExecutorServiceTest.kt @@ -15,8 +15,8 @@ import org.junit.jupiter.api.Test import java.util.concurrent.Callable import java.util.concurrent.ExecutorService import java.util.concurrent.Executors -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import kotlin.test.assertFailsWith internal class ActionScopedExecutorServiceTest { diff --git a/misk-admin/api/misk-admin.api b/misk-admin/api/misk-admin.api index c34f8098fdd..5e1446bd53a 100644 --- a/misk-admin/api/misk-admin.api +++ b/misk-admin/api/misk-admin.api @@ -339,7 +339,7 @@ public final class misk/web/dashboard/DashboardTabLoaderEntry { public fun toString ()Ljava/lang/String; } -public final class misk/web/dashboard/DashboardTabProvider : misk/web/dashboard/ValidWebEntry, javax/inject/Provider { +public final class misk/web/dashboard/DashboardTabProvider : misk/web/dashboard/ValidWebEntry, com/google/inject/Provider { public field accessAnnotationEntries Ljava/util/List; public fun (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;Lkotlin/reflect/KClass;)V public fun (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;Lkotlin/reflect/KClass;Lkotlin/reflect/KClass;)V diff --git a/misk-admin/build.gradle.kts b/misk-admin/build.gradle.kts index 8bfb241c4c4..a24fdc3228d 100644 --- a/misk-admin/build.gradle.kts +++ b/misk-admin/build.gradle.kts @@ -11,7 +11,7 @@ plugins { dependencies { api(Dependencies.guice) - api(Dependencies.javaxInject) + api(Dependencies.jakartaInject) api(Dependencies.kotlinxHtml) api(Dependencies.moshi) api(Dependencies.okio) diff --git a/misk-admin/src/main/kotlin/misk/web/dashboard/AdminDashboardModule.kt b/misk-admin/src/main/kotlin/misk/web/dashboard/AdminDashboardModule.kt index 55def0d9744..60ec9a681b8 100644 --- a/misk-admin/src/main/kotlin/misk/web/dashboard/AdminDashboardModule.kt +++ b/misk-admin/src/main/kotlin/misk/web/dashboard/AdminDashboardModule.kt @@ -4,7 +4,7 @@ import misk.inject.KAbstractModule import misk.security.authz.AccessAnnotationEntry import misk.web.v2.BaseDashboardV2Module import misk.web.metadata.config.ConfigMetadataAction -import javax.inject.Qualifier +import jakarta.inject.Qualifier /** * Installs default Admin Dashboard that runs at multibound DashboardHomeUrl diff --git a/misk-admin/src/main/kotlin/misk/web/dashboard/DashboardTab.kt b/misk-admin/src/main/kotlin/misk/web/dashboard/DashboardTab.kt index 5d4797bed03..3cd62536aee 100644 --- a/misk-admin/src/main/kotlin/misk/web/dashboard/DashboardTab.kt +++ b/misk-admin/src/main/kotlin/misk/web/dashboard/DashboardTab.kt @@ -2,8 +2,8 @@ package misk.web.dashboard import misk.security.authz.AccessAnnotationEntry import misk.web.dashboard.ValidWebEntry.Companion.slugify -import javax.inject.Inject -import javax.inject.Provider +import jakarta.inject.Inject +import com.google.inject.Provider import kotlin.reflect.KClass /** diff --git a/misk-admin/src/main/kotlin/misk/web/dashboard/MiskWebTabIndexAction.kt b/misk-admin/src/main/kotlin/misk/web/dashboard/MiskWebTabIndexAction.kt index 1ecf886c0c3..c8a870c29ba 100644 --- a/misk-admin/src/main/kotlin/misk/web/dashboard/MiskWebTabIndexAction.kt +++ b/misk-admin/src/main/kotlin/misk/web/dashboard/MiskWebTabIndexAction.kt @@ -15,8 +15,8 @@ import misk.web.PathParam import misk.web.ResponseContentType import misk.web.actions.WebAction import misk.web.mediatype.MediaTypes -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * Kotlin backed tab loader, equivalent to /_tab/slug/index.html diff --git a/misk-admin/src/main/kotlin/misk/web/metadata/DashboardMetadataAction.kt b/misk-admin/src/main/kotlin/misk/web/metadata/DashboardMetadataAction.kt index 6f2ac725ef3..b7c0853ce0e 100644 --- a/misk-admin/src/main/kotlin/misk/web/metadata/DashboardMetadataAction.kt +++ b/misk-admin/src/main/kotlin/misk/web/metadata/DashboardMetadataAction.kt @@ -16,8 +16,8 @@ import misk.web.dashboard.DashboardTheme import misk.web.dashboard.MiskWebTheme import misk.web.mediatype.MediaTypes import misk.web.metadata.DashboardMetadataAction.DashboardTabMetadata.Companion.toMetadata -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * Serve metadata related to a Misk-Web Dashboard diff --git a/misk-admin/src/main/kotlin/misk/web/metadata/ServiceMetadataAction.kt b/misk-admin/src/main/kotlin/misk/web/metadata/ServiceMetadataAction.kt index c7d45bd31b3..aefb41b16a3 100644 --- a/misk-admin/src/main/kotlin/misk/web/metadata/ServiceMetadataAction.kt +++ b/misk-admin/src/main/kotlin/misk/web/metadata/ServiceMetadataAction.kt @@ -8,8 +8,8 @@ import misk.web.ResponseContentType import misk.web.actions.WebAction import misk.web.mediatype.MediaTypes import wisp.deployment.Deployment -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * Service Metadata used for front end dashboards including App Name and Misk.Deployment name diff --git a/misk-admin/src/main/kotlin/misk/web/metadata/config/ConfigMetadataAction.kt b/misk-admin/src/main/kotlin/misk/web/metadata/config/ConfigMetadataAction.kt index 852a5c008bb..8cd0ba9b3b5 100644 --- a/misk-admin/src/main/kotlin/misk/web/metadata/config/ConfigMetadataAction.kt +++ b/misk-admin/src/main/kotlin/misk/web/metadata/config/ConfigMetadataAction.kt @@ -1,6 +1,6 @@ package misk.web.metadata.config -import com.google.inject.Inject +import jakarta.inject.Inject import misk.config.AppName import misk.config.MiskConfig import misk.resources.ResourceLoader @@ -13,7 +13,7 @@ import misk.web.mediatype.MediaTypes import misk.web.metadata.jvm.JvmMetadataAction import wisp.config.Config import wisp.deployment.Deployment -import javax.inject.Singleton +import jakarta.inject.Singleton @Singleton class ConfigMetadataAction @Inject constructor( diff --git a/misk-admin/src/main/kotlin/misk/web/metadata/database/DatabaseQueryMetadataAction.kt b/misk-admin/src/main/kotlin/misk/web/metadata/database/DatabaseQueryMetadataAction.kt index 28157b47bfd..bde2494447d 100644 --- a/misk-admin/src/main/kotlin/misk/web/metadata/database/DatabaseQueryMetadataAction.kt +++ b/misk-admin/src/main/kotlin/misk/web/metadata/database/DatabaseQueryMetadataAction.kt @@ -6,8 +6,8 @@ import misk.web.ResponseContentType import misk.web.actions.WebAction import misk.web.dashboard.AdminDashboardAccess import misk.web.mediatype.MediaTypes -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** Display available queries and their types */ @Singleton diff --git a/misk-admin/src/main/kotlin/misk/web/metadata/jvm/JvmMetadataAction.kt b/misk-admin/src/main/kotlin/misk/web/metadata/jvm/JvmMetadataAction.kt index f62f7c37a21..f55fdf089f4 100644 --- a/misk-admin/src/main/kotlin/misk/web/metadata/jvm/JvmMetadataAction.kt +++ b/misk-admin/src/main/kotlin/misk/web/metadata/jvm/JvmMetadataAction.kt @@ -10,8 +10,8 @@ import misk.web.actions.WebAction import misk.web.dashboard.AdminDashboardAccess import misk.web.mediatype.MediaTypes import java.lang.management.RuntimeMXBean -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * Conveys information about the current JVM diff --git a/misk-admin/src/main/kotlin/misk/web/metadata/webaction/WebActionMetadataAction.kt b/misk-admin/src/main/kotlin/misk/web/metadata/webaction/WebActionMetadataAction.kt index 32ac8abf7bf..3eedb5e50dc 100644 --- a/misk-admin/src/main/kotlin/misk/web/metadata/webaction/WebActionMetadataAction.kt +++ b/misk-admin/src/main/kotlin/misk/web/metadata/webaction/WebActionMetadataAction.kt @@ -6,8 +6,8 @@ import misk.web.ResponseContentType import misk.web.actions.WebAction import misk.web.dashboard.AdminDashboardAccess import misk.web.mediatype.MediaTypes -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton class WebActionMetadataAction @Inject constructor( diff --git a/misk-admin/src/main/kotlin/misk/web/v2/DashboardHotwireTabAction.kt b/misk-admin/src/main/kotlin/misk/web/v2/DashboardHotwireTabAction.kt index 09130747db3..a5639f6c849 100644 --- a/misk-admin/src/main/kotlin/misk/web/v2/DashboardHotwireTabAction.kt +++ b/misk-admin/src/main/kotlin/misk/web/v2/DashboardHotwireTabAction.kt @@ -12,8 +12,8 @@ import misk.web.dashboard.AdminDashboardAccess import misk.web.dashboard.DashboardTabLoader import misk.web.dashboard.DashboardTabLoaderEntry import misk.web.mediatype.MediaTypes -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * Builds dashboard UI and loads Hotwire tab. diff --git a/misk-admin/src/main/kotlin/misk/web/v2/DashboardIFrameTabAction.kt b/misk-admin/src/main/kotlin/misk/web/v2/DashboardIFrameTabAction.kt index bfdddba0656..cab56bbc6fc 100644 --- a/misk-admin/src/main/kotlin/misk/web/v2/DashboardIFrameTabAction.kt +++ b/misk-admin/src/main/kotlin/misk/web/v2/DashboardIFrameTabAction.kt @@ -12,8 +12,8 @@ import misk.web.dashboard.AdminDashboardAccess import misk.web.dashboard.DashboardTabLoader import misk.web.dashboard.DashboardTabLoaderEntry import misk.web.mediatype.MediaTypes -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * Builds dashboard UI and loads IFrame tab. diff --git a/misk-admin/src/main/kotlin/misk/web/v2/DashboardIndexAction.kt b/misk-admin/src/main/kotlin/misk/web/v2/DashboardIndexAction.kt index d3c04bb4fc3..96bee557784 100644 --- a/misk-admin/src/main/kotlin/misk/web/v2/DashboardIndexAction.kt +++ b/misk-admin/src/main/kotlin/misk/web/v2/DashboardIndexAction.kt @@ -11,8 +11,8 @@ import misk.web.ResponseContentType import misk.web.actions.WebAction import misk.web.dashboard.AdminDashboardAccess import misk.web.mediatype.MediaTypes -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import kotlin.reflect.KClass /** diff --git a/misk-admin/src/main/kotlin/misk/web/v2/DashboardPageLayout.kt b/misk-admin/src/main/kotlin/misk/web/v2/DashboardPageLayout.kt index 1401a4ef90a..ed1c88c1e89 100644 --- a/misk-admin/src/main/kotlin/misk/web/v2/DashboardPageLayout.kt +++ b/misk-admin/src/main/kotlin/misk/web/v2/DashboardPageLayout.kt @@ -14,7 +14,7 @@ import misk.web.dashboard.DashboardNavbarItem import misk.web.dashboard.DashboardTab import misk.web.v2.DashboardIndexAction.Companion.titlecase import wisp.deployment.Deployment -import javax.inject.Inject +import jakarta.inject.Inject /** * Builds dashboard UI for index homepage. diff --git a/misk-admin/src/test/kotlin/misk/web/actions/TestWebActionModule.kt b/misk-admin/src/test/kotlin/misk/web/actions/TestWebActionModule.kt index f2479549399..e3b97252762 100644 --- a/misk-admin/src/test/kotlin/misk/web/actions/TestWebActionModule.kt +++ b/misk-admin/src/test/kotlin/misk/web/actions/TestWebActionModule.kt @@ -22,7 +22,7 @@ import misk.web.WebActionModule import misk.web.WebServerTestingModule import misk.web.mediatype.MediaTypes import misk.web.toResponseBody -import javax.inject.Inject +import jakarta.inject.Inject // Common module for web action-related tests to use to use that bind up some sample web actions class TestWebActionModule : KAbstractModule() { diff --git a/misk-admin/src/test/kotlin/misk/web/metadata/DashboardMetadataActionTest.kt b/misk-admin/src/test/kotlin/misk/web/metadata/DashboardMetadataActionTest.kt index 78311103539..90dfffc61d9 100644 --- a/misk-admin/src/test/kotlin/misk/web/metadata/DashboardMetadataActionTest.kt +++ b/misk-admin/src/test/kotlin/misk/web/metadata/DashboardMetadataActionTest.kt @@ -15,7 +15,7 @@ import misk.web.jetty.JettyService import okhttp3.OkHttpClient import okhttp3.Request import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject import kotlin.test.assertEquals import kotlin.test.assertNotNull import kotlin.test.assertNull diff --git a/misk-admin/src/test/kotlin/misk/web/metadata/MetadataTestingModule.kt b/misk-admin/src/test/kotlin/misk/web/metadata/MetadataTestingModule.kt index 7cf1aa58999..5fa59a12a32 100644 --- a/misk-admin/src/test/kotlin/misk/web/metadata/MetadataTestingModule.kt +++ b/misk-admin/src/test/kotlin/misk/web/metadata/MetadataTestingModule.kt @@ -12,7 +12,7 @@ import misk.web.dashboard.DashboardTabProvider import misk.web.dashboard.DashboardTheme import misk.web.dashboard.MiskWebTheme import wisp.config.Config -import javax.inject.Qualifier +import jakarta.inject.Qualifier // Common test module used to be able to test admin dashboard WebActions class MetadataTestingModule : KAbstractModule() { diff --git a/misk-admin/src/test/kotlin/misk/web/metadata/ServiceMetadataActionTest.kt b/misk-admin/src/test/kotlin/misk/web/metadata/ServiceMetadataActionTest.kt index c4e06c2eae5..f1190dffe6f 100644 --- a/misk-admin/src/test/kotlin/misk/web/metadata/ServiceMetadataActionTest.kt +++ b/misk-admin/src/test/kotlin/misk/web/metadata/ServiceMetadataActionTest.kt @@ -12,7 +12,7 @@ import okhttp3.OkHttpClient import okhttp3.Request import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) class ServiceMetadataActionTest { diff --git a/misk-admin/src/test/kotlin/misk/web/metadata/config/ConfigMetadataActionTest.kt b/misk-admin/src/test/kotlin/misk/web/metadata/config/ConfigMetadataActionTest.kt index 5ba0e395b5c..e2dd638782c 100644 --- a/misk-admin/src/test/kotlin/misk/web/metadata/config/ConfigMetadataActionTest.kt +++ b/misk-admin/src/test/kotlin/misk/web/metadata/config/ConfigMetadataActionTest.kt @@ -12,7 +12,7 @@ import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import wisp.config.Config import wisp.deployment.TESTING -import javax.inject.Inject +import jakarta.inject.Inject import kotlin.test.assertEquals @MiskTest(startService = true) diff --git a/misk-admin/src/test/kotlin/misk/web/metadata/config/JvmMetadataActionTest.kt b/misk-admin/src/test/kotlin/misk/web/metadata/config/JvmMetadataActionTest.kt index f9952e043b8..e7892cefe98 100644 --- a/misk-admin/src/test/kotlin/misk/web/metadata/config/JvmMetadataActionTest.kt +++ b/misk-admin/src/test/kotlin/misk/web/metadata/config/JvmMetadataActionTest.kt @@ -11,7 +11,7 @@ import misk.web.metadata.jvm.JvmMetadataAction.JvmRuntimeResponse import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import java.lang.management.RuntimeMXBean -import javax.inject.Inject +import jakarta.inject.Inject import javax.management.ObjectName @MiskTest(startService = false) diff --git a/misk-admin/src/test/kotlin/misk/web/metadata/webaction/WebActionMetadataActionTest.kt b/misk-admin/src/test/kotlin/misk/web/metadata/webaction/WebActionMetadataActionTest.kt index 3073a8688b6..1234db9b4d4 100644 --- a/misk-admin/src/test/kotlin/misk/web/metadata/webaction/WebActionMetadataActionTest.kt +++ b/misk-admin/src/test/kotlin/misk/web/metadata/webaction/WebActionMetadataActionTest.kt @@ -11,7 +11,7 @@ import misk.web.mediatype.MediaTypes import misk.web.metadata.MetadataTestingModule import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) class WebActionMetadataActionTest { diff --git a/misk-admin/src/test/kotlin/misk/web/v2/DashboardPageLayoutTest.kt b/misk-admin/src/test/kotlin/misk/web/v2/DashboardPageLayoutTest.kt index ba41a472ef3..b47968667e3 100644 --- a/misk-admin/src/test/kotlin/misk/web/v2/DashboardPageLayoutTest.kt +++ b/misk-admin/src/test/kotlin/misk/web/v2/DashboardPageLayoutTest.kt @@ -9,8 +9,8 @@ import misk.web.HttpCall import misk.web.actions.WebAction import misk.web.metadata.MetadataTestingModule import org.junit.jupiter.api.Test -import javax.inject.Inject -import javax.inject.Provider +import jakarta.inject.Inject +import com.google.inject.Provider import kotlin.test.assertEquals import kotlin.test.assertFailsWith diff --git a/misk-aws-dynamodb-testing/build.gradle.kts b/misk-aws-dynamodb-testing/build.gradle.kts index 3f64230455c..074ef64c451 100644 --- a/misk-aws-dynamodb-testing/build.gradle.kts +++ b/misk-aws-dynamodb-testing/build.gradle.kts @@ -12,7 +12,7 @@ dependencies { api(Dependencies.awsDynamodb) api(Dependencies.guava) api(Dependencies.guice) - api(Dependencies.javaxInject) + api(Dependencies.jakartaInject) api(Dependencies.tempestTestingInternal) api(project(":misk-aws-dynamodb")) api(project(":misk-inject")) diff --git a/misk-aws-dynamodb-testing/src/main/kotlin/misk/aws/dynamodb/testing/DockerDynamoDbModule.kt b/misk-aws-dynamodb-testing/src/main/kotlin/misk/aws/dynamodb/testing/DockerDynamoDbModule.kt index b7f3580e624..ccecdfcfac7 100644 --- a/misk-aws-dynamodb-testing/src/main/kotlin/misk/aws/dynamodb/testing/DockerDynamoDbModule.kt +++ b/misk-aws-dynamodb-testing/src/main/kotlin/misk/aws/dynamodb/testing/DockerDynamoDbModule.kt @@ -7,8 +7,8 @@ import com.amazonaws.services.dynamodbv2.AmazonDynamoDB import com.amazonaws.services.dynamodbv2.AmazonDynamoDBStreams import com.google.common.util.concurrent.AbstractService import com.google.inject.Provides -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import kotlin.reflect.KClass import misk.ServiceModule import misk.dynamodb.DynamoDbHealthCheck diff --git a/misk-aws-dynamodb-testing/src/main/kotlin/misk/aws/dynamodb/testing/InProcessDynamoDbModule.kt b/misk-aws-dynamodb-testing/src/main/kotlin/misk/aws/dynamodb/testing/InProcessDynamoDbModule.kt index 979c8eb02a7..618a7dc4a22 100644 --- a/misk-aws-dynamodb-testing/src/main/kotlin/misk/aws/dynamodb/testing/InProcessDynamoDbModule.kt +++ b/misk-aws-dynamodb-testing/src/main/kotlin/misk/aws/dynamodb/testing/InProcessDynamoDbModule.kt @@ -7,8 +7,8 @@ import com.amazonaws.services.dynamodbv2.AmazonDynamoDB import com.amazonaws.services.dynamodbv2.AmazonDynamoDBStreams import com.google.common.util.concurrent.AbstractService import com.google.inject.Provides -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import kotlin.reflect.KClass import misk.ServiceModule import misk.dynamodb.DynamoDbHealthCheck diff --git a/misk-aws-dynamodb-testing/src/main/kotlin/misk/aws/dynamodb/testing/TestDynamoDb.kt b/misk-aws-dynamodb-testing/src/main/kotlin/misk/aws/dynamodb/testing/TestDynamoDb.kt index a1e46156fae..d13c85ba34a 100644 --- a/misk-aws-dynamodb-testing/src/main/kotlin/misk/aws/dynamodb/testing/TestDynamoDb.kt +++ b/misk-aws-dynamodb-testing/src/main/kotlin/misk/aws/dynamodb/testing/TestDynamoDb.kt @@ -2,8 +2,8 @@ package misk.aws.dynamodb.testing import app.cash.tempest.testing.internal.TestDynamoDbService import com.google.common.util.concurrent.Service -import com.google.inject.Inject -import com.google.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * Thin wrapper to make `TestDynamoDbService`, which is not a @Singleton, compatible with `ServiceModule`. diff --git a/misk-aws-dynamodb/build.gradle.kts b/misk-aws-dynamodb/build.gradle.kts index e675c0f65e8..0be365ebe87 100644 --- a/misk-aws-dynamodb/build.gradle.kts +++ b/misk-aws-dynamodb/build.gradle.kts @@ -14,7 +14,7 @@ dependencies { api(Dependencies.awsJavaSdkCore) api(Dependencies.guava) api(Dependencies.guice) - api(Dependencies.javaxInject) + api(Dependencies.jakartaInject) api(Dependencies.kotlinLogging) api(project(":misk-aws")) api(project(":misk-core")) @@ -26,7 +26,7 @@ dependencies { testFixturesApi(Dependencies.awsDynamodb) testFixturesApi(Dependencies.guice) - testFixturesApi(Dependencies.javaxInject) + testFixturesApi(Dependencies.jakartaInject) testFixturesApi(Dependencies.tempestTestingInternal) testFixturesApi(project(":misk-aws-dynamodb")) testFixturesApi(project(":misk-inject")) diff --git a/misk-aws-dynamodb/src/main/kotlin/misk/dynamodb/DynamoDbHealthCheck.kt b/misk-aws-dynamodb/src/main/kotlin/misk/dynamodb/DynamoDbHealthCheck.kt index f54349a1084..d2e98737e5d 100644 --- a/misk-aws-dynamodb/src/main/kotlin/misk/dynamodb/DynamoDbHealthCheck.kt +++ b/misk-aws-dynamodb/src/main/kotlin/misk/dynamodb/DynamoDbHealthCheck.kt @@ -1,8 +1,8 @@ package misk.dynamodb import com.amazonaws.services.dynamodbv2.AmazonDynamoDB -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import misk.healthchecks.HealthCheck import misk.healthchecks.HealthStatus import wisp.logging.getLogger diff --git a/misk-aws-dynamodb/src/main/kotlin/misk/dynamodb/RealDynamoDbModule.kt b/misk-aws-dynamodb/src/main/kotlin/misk/dynamodb/RealDynamoDbModule.kt index 071a86c6897..4141c4cfc53 100644 --- a/misk-aws-dynamodb/src/main/kotlin/misk/dynamodb/RealDynamoDbModule.kt +++ b/misk-aws-dynamodb/src/main/kotlin/misk/dynamodb/RealDynamoDbModule.kt @@ -15,8 +15,8 @@ import misk.cloud.aws.AwsRegion import misk.exceptions.dynamodb.DynamoDbExceptionMapperModule import misk.healthchecks.HealthCheck import misk.inject.KAbstractModule -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import kotlin.reflect.KClass import kotlin.reflect.full.findAnnotation diff --git a/misk-aws-dynamodb/src/test/kotlin/misk/aws/dynamodb/testing/AbstractDynamoDbTest.kt b/misk-aws-dynamodb/src/test/kotlin/misk/aws/dynamodb/testing/AbstractDynamoDbTest.kt index 8931ef44cb0..91fd512f1fa 100644 --- a/misk-aws-dynamodb/src/test/kotlin/misk/aws/dynamodb/testing/AbstractDynamoDbTest.kt +++ b/misk-aws-dynamodb/src/test/kotlin/misk/aws/dynamodb/testing/AbstractDynamoDbTest.kt @@ -11,7 +11,7 @@ import misk.dynamodb.DynamoDbHealthCheck import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import java.time.LocalDate -import javax.inject.Inject +import jakarta.inject.Inject abstract class AbstractDynamoDbTest { @Inject lateinit var dynamoDbClient: AmazonDynamoDB diff --git a/misk-aws-dynamodb/src/testFixtures/kotlin/misk/aws/dynamodb/testing/DockerDynamoDbModule.kt b/misk-aws-dynamodb/src/testFixtures/kotlin/misk/aws/dynamodb/testing/DockerDynamoDbModule.kt index 5684deace1f..14f13525cd3 100644 --- a/misk-aws-dynamodb/src/testFixtures/kotlin/misk/aws/dynamodb/testing/DockerDynamoDbModule.kt +++ b/misk-aws-dynamodb/src/testFixtures/kotlin/misk/aws/dynamodb/testing/DockerDynamoDbModule.kt @@ -7,8 +7,8 @@ import com.amazonaws.services.dynamodbv2.AmazonDynamoDB import com.amazonaws.services.dynamodbv2.AmazonDynamoDBStreams import com.google.common.util.concurrent.AbstractService import com.google.inject.Provides -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import kotlin.reflect.KClass import misk.ServiceModule import misk.dynamodb.DynamoDbHealthCheck diff --git a/misk-aws-dynamodb/src/testFixtures/kotlin/misk/aws/dynamodb/testing/InProcessDynamoDbModule.kt b/misk-aws-dynamodb/src/testFixtures/kotlin/misk/aws/dynamodb/testing/InProcessDynamoDbModule.kt index a47f0a50f6c..d65829d02a1 100644 --- a/misk-aws-dynamodb/src/testFixtures/kotlin/misk/aws/dynamodb/testing/InProcessDynamoDbModule.kt +++ b/misk-aws-dynamodb/src/testFixtures/kotlin/misk/aws/dynamodb/testing/InProcessDynamoDbModule.kt @@ -7,8 +7,8 @@ import com.amazonaws.services.dynamodbv2.AmazonDynamoDB import com.amazonaws.services.dynamodbv2.AmazonDynamoDBStreams import com.google.common.util.concurrent.AbstractService import com.google.inject.Provides -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import kotlin.reflect.KClass import misk.ServiceModule import misk.dynamodb.DynamoDbHealthCheck diff --git a/misk-aws-dynamodb/src/testFixtures/kotlin/misk/aws/dynamodb/testing/TestDynamoDb.kt b/misk-aws-dynamodb/src/testFixtures/kotlin/misk/aws/dynamodb/testing/TestDynamoDb.kt index 4543f67bc6e..f5782bddb7e 100644 --- a/misk-aws-dynamodb/src/testFixtures/kotlin/misk/aws/dynamodb/testing/TestDynamoDb.kt +++ b/misk-aws-dynamodb/src/testFixtures/kotlin/misk/aws/dynamodb/testing/TestDynamoDb.kt @@ -2,8 +2,8 @@ package misk.aws.dynamodb.testing import app.cash.tempest.testing.internal.TestDynamoDbService import com.google.common.util.concurrent.Service -import com.google.inject.Inject -import com.google.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * Thin wrapper to make `TestDynamoDbService`, which is not a @Singleton, compatible with `ServiceModule`. diff --git a/misk-aws/build.gradle.kts b/misk-aws/build.gradle.kts index 72ef7c9ea83..d813b69b284 100644 --- a/misk-aws/build.gradle.kts +++ b/misk-aws/build.gradle.kts @@ -14,7 +14,7 @@ dependencies { api(Dependencies.awsSqs) api(Dependencies.guava) api(Dependencies.guice) - api(Dependencies.javaxInject) + api(Dependencies.jakartaInject) api(project(":wisp:wisp-aws-environment")) api(project(":wisp:wisp-config")) api(project(":wisp:wisp-lease")) diff --git a/misk-aws/src/main/kotlin/misk/jobqueue/sqs/AwsSqsJobHandlerModule.kt b/misk-aws/src/main/kotlin/misk/jobqueue/sqs/AwsSqsJobHandlerModule.kt index 0ed753415c0..38b933103c2 100644 --- a/misk-aws/src/main/kotlin/misk/jobqueue/sqs/AwsSqsJobHandlerModule.kt +++ b/misk-aws/src/main/kotlin/misk/jobqueue/sqs/AwsSqsJobHandlerModule.kt @@ -9,8 +9,8 @@ import misk.inject.KAbstractModule import misk.inject.toKey import misk.jobqueue.JobHandler import misk.jobqueue.QueueName -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import kotlin.reflect.KClass /** diff --git a/misk-aws/src/main/kotlin/misk/jobqueue/sqs/AwsSqsJobQueueModule.kt b/misk-aws/src/main/kotlin/misk/jobqueue/sqs/AwsSqsJobQueueModule.kt index 69106fb7ace..87d5660f5a6 100644 --- a/misk-aws/src/main/kotlin/misk/jobqueue/sqs/AwsSqsJobQueueModule.kt +++ b/misk-aws/src/main/kotlin/misk/jobqueue/sqs/AwsSqsJobQueueModule.kt @@ -10,7 +10,7 @@ import com.amazonaws.services.sqs.buffered.AmazonSQSBufferedAsyncClient import com.amazonaws.services.sqs.buffered.QueueBufferConfig import com.google.inject.Provider import com.google.inject.Provides -import com.google.inject.Singleton +import jakarta.inject.Singleton import misk.ReadyService import misk.ServiceModule import misk.cloud.aws.AwsRegion @@ -27,7 +27,7 @@ import misk.tasks.RepeatedTaskQueue import misk.tasks.RepeatedTaskQueueConfig import misk.tasks.RepeatedTaskQueueFactory import wisp.lease.LeaseManager -import javax.inject.Inject +import jakarta.inject.Inject /** [AwsSqsJobQueueModule] installs job queue support provided by SQS. */ open class AwsSqsJobQueueModule( diff --git a/misk-aws/src/main/kotlin/misk/jobqueue/sqs/AwsSqsQueueAttributeImporter.kt b/misk-aws/src/main/kotlin/misk/jobqueue/sqs/AwsSqsQueueAttributeImporter.kt index d38c9e255fa..b792271f575 100644 --- a/misk-aws/src/main/kotlin/misk/jobqueue/sqs/AwsSqsQueueAttributeImporter.kt +++ b/misk-aws/src/main/kotlin/misk/jobqueue/sqs/AwsSqsQueueAttributeImporter.kt @@ -9,7 +9,7 @@ import wisp.lease.LeaseManager import wisp.logging.getLogger import java.time.Duration import java.util.concurrent.atomic.AtomicBoolean -import javax.inject.Inject +import jakarta.inject.Inject internal class AwsSqsQueueAttributeImporter @Inject constructor( private val config: AwsSqsJobQueueConfig, diff --git a/misk-aws/src/main/kotlin/misk/jobqueue/sqs/DeadLetterQueueProvider.kt b/misk-aws/src/main/kotlin/misk/jobqueue/sqs/DeadLetterQueueProvider.kt index 8f92da44d6d..9ad2876e3a4 100644 --- a/misk-aws/src/main/kotlin/misk/jobqueue/sqs/DeadLetterQueueProvider.kt +++ b/misk-aws/src/main/kotlin/misk/jobqueue/sqs/DeadLetterQueueProvider.kt @@ -2,8 +2,8 @@ package misk.jobqueue.sqs import com.google.inject.ImplementedBy import misk.jobqueue.QueueName -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * Interface for a provider of dead-letter queue names. diff --git a/misk-aws/src/main/kotlin/misk/jobqueue/sqs/ForSqsHandling.kt b/misk-aws/src/main/kotlin/misk/jobqueue/sqs/ForSqsHandling.kt index c4e538cdd2a..1356db8a790 100644 --- a/misk-aws/src/main/kotlin/misk/jobqueue/sqs/ForSqsHandling.kt +++ b/misk-aws/src/main/kotlin/misk/jobqueue/sqs/ForSqsHandling.kt @@ -1,6 +1,6 @@ package misk.jobqueue.sqs -import javax.inject.Qualifier +import jakarta.inject.Qualifier @Qualifier @Target(AnnotationTarget.FIELD, AnnotationTarget.FUNCTION, AnnotationTarget.VALUE_PARAMETER) diff --git a/misk-aws/src/main/kotlin/misk/jobqueue/sqs/ForSqsReceiving.kt b/misk-aws/src/main/kotlin/misk/jobqueue/sqs/ForSqsReceiving.kt index 4bbfda832f0..40b7e084281 100644 --- a/misk-aws/src/main/kotlin/misk/jobqueue/sqs/ForSqsReceiving.kt +++ b/misk-aws/src/main/kotlin/misk/jobqueue/sqs/ForSqsReceiving.kt @@ -1,6 +1,6 @@ package misk.jobqueue.sqs -import javax.inject.Qualifier +import jakarta.inject.Qualifier @Qualifier internal annotation class ForSqsReceiving diff --git a/misk-aws/src/main/kotlin/misk/jobqueue/sqs/QueueResolver.kt b/misk-aws/src/main/kotlin/misk/jobqueue/sqs/QueueResolver.kt index f1821b20b50..ec47e9a3906 100644 --- a/misk-aws/src/main/kotlin/misk/jobqueue/sqs/QueueResolver.kt +++ b/misk-aws/src/main/kotlin/misk/jobqueue/sqs/QueueResolver.kt @@ -9,8 +9,8 @@ import misk.jobqueue.QueueName import wisp.logging.getLogger import java.io.File import java.util.concurrent.ConcurrentHashMap -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton internal class QueueResolver @Inject internal constructor( diff --git a/misk-aws/src/main/kotlin/misk/jobqueue/sqs/SqsConsumerAllocator.kt b/misk-aws/src/main/kotlin/misk/jobqueue/sqs/SqsConsumerAllocator.kt index ca358c7030b..789fb83433a 100644 --- a/misk-aws/src/main/kotlin/misk/jobqueue/sqs/SqsConsumerAllocator.kt +++ b/misk-aws/src/main/kotlin/misk/jobqueue/sqs/SqsConsumerAllocator.kt @@ -4,8 +4,8 @@ import com.google.common.annotations.VisibleForTesting import misk.feature.FeatureFlags import misk.jobqueue.QueueName import wisp.lease.LeaseManager -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * Uses a [LeaseManager] and [FeatureFlags] to calculate the number of sqs consumers a pods should diff --git a/misk-aws/src/main/kotlin/misk/jobqueue/sqs/SqsJobConsumer.kt b/misk-aws/src/main/kotlin/misk/jobqueue/sqs/SqsJobConsumer.kt index b4718cc64ed..84877711a50 100644 --- a/misk-aws/src/main/kotlin/misk/jobqueue/sqs/SqsJobConsumer.kt +++ b/misk-aws/src/main/kotlin/misk/jobqueue/sqs/SqsJobConsumer.kt @@ -27,9 +27,9 @@ import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.ExecutorService import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicBoolean -import javax.inject.Inject -import javax.inject.Provider -import javax.inject.Singleton +import jakarta.inject.Inject +import com.google.inject.Provider +import jakarta.inject.Singleton @Singleton internal class SqsJobConsumer @Inject internal constructor( diff --git a/misk-aws/src/main/kotlin/misk/jobqueue/sqs/SqsJobQueue.kt b/misk-aws/src/main/kotlin/misk/jobqueue/sqs/SqsJobQueue.kt index 8a7235d7e1e..6ad0d013488 100644 --- a/misk-aws/src/main/kotlin/misk/jobqueue/sqs/SqsJobQueue.kt +++ b/misk-aws/src/main/kotlin/misk/jobqueue/sqs/SqsJobQueue.kt @@ -15,8 +15,8 @@ import misk.moshi.adapter import misk.time.timed import wisp.tracing.traceWithSpan import java.time.Duration -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton internal class SqsJobQueue @Inject internal constructor( diff --git a/misk-aws/src/main/kotlin/misk/jobqueue/sqs/SqsMetrics.kt b/misk-aws/src/main/kotlin/misk/jobqueue/sqs/SqsMetrics.kt index df042fcacb5..47b84f6efb5 100644 --- a/misk-aws/src/main/kotlin/misk/jobqueue/sqs/SqsMetrics.kt +++ b/misk-aws/src/main/kotlin/misk/jobqueue/sqs/SqsMetrics.kt @@ -1,8 +1,8 @@ package misk.jobqueue.sqs import misk.metrics.Metrics -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * SQS Jobqueue metrics. diff --git a/misk-aws/src/main/kotlin/misk/jobqueue/sqs/SqsTransactionalJobQueue.kt b/misk-aws/src/main/kotlin/misk/jobqueue/sqs/SqsTransactionalJobQueue.kt index 5ad979c6773..90ad8a86cb5 100644 --- a/misk-aws/src/main/kotlin/misk/jobqueue/sqs/SqsTransactionalJobQueue.kt +++ b/misk-aws/src/main/kotlin/misk/jobqueue/sqs/SqsTransactionalJobQueue.kt @@ -7,8 +7,8 @@ import misk.jobqueue.QueueName import misk.jobqueue.TransactionalJobQueue import wisp.logging.getLogger import java.time.Duration -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton // Implements the TransactionalJobQueue interface by registering a post-commit hook that // forwards the message to SQS. It is not truly transactional, and is intended only for diff --git a/misk-aws/src/main/kotlin/misk/s3/RealS3Module.kt b/misk-aws/src/main/kotlin/misk/s3/RealS3Module.kt index 140529faeef..6954f251649 100644 --- a/misk-aws/src/main/kotlin/misk/s3/RealS3Module.kt +++ b/misk-aws/src/main/kotlin/misk/s3/RealS3Module.kt @@ -6,7 +6,7 @@ import com.amazonaws.services.s3.AmazonS3ClientBuilder import com.google.inject.Provides import misk.cloud.aws.AwsRegion import misk.inject.KAbstractModule -import javax.inject.Singleton +import jakarta.inject.Singleton open class RealS3Module : KAbstractModule() { override fun configure() { diff --git a/misk-aws/src/test/kotlin/misk/jobqueue/sqs/AwsSqsQueueAttributeImporterTest.kt b/misk-aws/src/test/kotlin/misk/jobqueue/sqs/AwsSqsQueueAttributeImporterTest.kt index b4b36b306a2..5333624fb35 100644 --- a/misk-aws/src/test/kotlin/misk/jobqueue/sqs/AwsSqsQueueAttributeImporterTest.kt +++ b/misk-aws/src/test/kotlin/misk/jobqueue/sqs/AwsSqsQueueAttributeImporterTest.kt @@ -11,7 +11,7 @@ import org.awaitility.Awaitility.await import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import java.util.concurrent.TimeUnit -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) internal class AwsSqsQueueAttributeImporterTest { diff --git a/misk-aws/src/test/kotlin/misk/jobqueue/sqs/SqsConsumerAllocatorTest.kt b/misk-aws/src/test/kotlin/misk/jobqueue/sqs/SqsConsumerAllocatorTest.kt index ae83a5d806c..2b139ac140f 100644 --- a/misk-aws/src/test/kotlin/misk/jobqueue/sqs/SqsConsumerAllocatorTest.kt +++ b/misk-aws/src/test/kotlin/misk/jobqueue/sqs/SqsConsumerAllocatorTest.kt @@ -16,7 +16,7 @@ import misk.testing.MiskTest import misk.testing.MiskTestModule import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject import kotlin.test.assertEquals @MiskTest(startService = false) diff --git a/misk-aws/src/test/kotlin/misk/jobqueue/sqs/SqsJobQueueServiceTest.kt b/misk-aws/src/test/kotlin/misk/jobqueue/sqs/SqsJobQueueServiceTest.kt index 292698ecefd..a49feb80de3 100644 --- a/misk-aws/src/test/kotlin/misk/jobqueue/sqs/SqsJobQueueServiceTest.kt +++ b/misk-aws/src/test/kotlin/misk/jobqueue/sqs/SqsJobQueueServiceTest.kt @@ -21,8 +21,8 @@ import org.junit.jupiter.api.Test import java.util.concurrent.CountDownLatch import java.util.concurrent.LinkedBlockingDeque import java.util.concurrent.TimeUnit -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** This is separate from [SqsJobQueueTest] because we don't want the services started automatically. */ @MiskTest diff --git a/misk-aws/src/test/kotlin/misk/jobqueue/sqs/SqsJobQueueTest.kt b/misk-aws/src/test/kotlin/misk/jobqueue/sqs/SqsJobQueueTest.kt index 671ec4d831d..7658427e232 100644 --- a/misk-aws/src/test/kotlin/misk/jobqueue/sqs/SqsJobQueueTest.kt +++ b/misk-aws/src/test/kotlin/misk/jobqueue/sqs/SqsJobQueueTest.kt @@ -29,7 +29,7 @@ import java.util.concurrent.CopyOnWriteArrayList import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicInteger -import javax.inject.Inject +import jakarta.inject.Inject import kotlin.test.assertFailsWith @MiskTest(startService = true) diff --git a/misk-aws/src/test/kotlin/misk/jobqueue/sqs/SqsJobTest.kt b/misk-aws/src/test/kotlin/misk/jobqueue/sqs/SqsJobTest.kt index cd905a14ff6..d96687502f3 100644 --- a/misk-aws/src/test/kotlin/misk/jobqueue/sqs/SqsJobTest.kt +++ b/misk-aws/src/test/kotlin/misk/jobqueue/sqs/SqsJobTest.kt @@ -13,7 +13,7 @@ import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import wisp.time.FakeClock -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) internal class SqsJobTest { diff --git a/misk-aws2-dynamodb-testing/build.gradle.kts b/misk-aws2-dynamodb-testing/build.gradle.kts index ca7b634b494..0e87152fe09 100644 --- a/misk-aws2-dynamodb-testing/build.gradle.kts +++ b/misk-aws2-dynamodb-testing/build.gradle.kts @@ -13,7 +13,7 @@ dependencies { api(Dependencies.aws2DynamodbEnhanced) api(Dependencies.guava) api(Dependencies.guice) - api(Dependencies.javaxInject) + api(Dependencies.jakartaInject) api(Dependencies.tempest2TestingInternal) api(project(":misk-aws2-dynamodb")) api(project(":misk-inject")) diff --git a/misk-aws2-dynamodb-testing/src/main/kotlin/misk/aws2/dynamodb/testing/DockerDynamoDbModule.kt b/misk-aws2-dynamodb-testing/src/main/kotlin/misk/aws2/dynamodb/testing/DockerDynamoDbModule.kt index 29677dfa70b..af0fba160a1 100644 --- a/misk-aws2-dynamodb-testing/src/main/kotlin/misk/aws2/dynamodb/testing/DockerDynamoDbModule.kt +++ b/misk-aws2-dynamodb-testing/src/main/kotlin/misk/aws2/dynamodb/testing/DockerDynamoDbModule.kt @@ -5,8 +5,8 @@ import app.cash.tempest2.testing.TestTable import app.cash.tempest2.testing.internal.TestDynamoDbService import com.google.common.util.concurrent.AbstractService import com.google.inject.Provides -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import misk.ServiceModule import misk.aws2.dynamodb.DynamoDbHealthCheck import misk.aws2.dynamodb.DynamoDbService diff --git a/misk-aws2-dynamodb-testing/src/main/kotlin/misk/aws2/dynamodb/testing/InProcessDynamoDbModule.kt b/misk-aws2-dynamodb-testing/src/main/kotlin/misk/aws2/dynamodb/testing/InProcessDynamoDbModule.kt index 96af56eaaf5..9a576dc1ec5 100644 --- a/misk-aws2-dynamodb-testing/src/main/kotlin/misk/aws2/dynamodb/testing/InProcessDynamoDbModule.kt +++ b/misk-aws2-dynamodb-testing/src/main/kotlin/misk/aws2/dynamodb/testing/InProcessDynamoDbModule.kt @@ -5,8 +5,8 @@ import app.cash.tempest2.testing.TestTable import app.cash.tempest2.testing.internal.TestDynamoDbService import com.google.common.util.concurrent.AbstractService import com.google.inject.Provides -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import misk.ServiceModule import misk.aws2.dynamodb.DynamoDbHealthCheck import misk.aws2.dynamodb.DynamoDbService diff --git a/misk-aws2-dynamodb-testing/src/main/kotlin/misk/aws2/dynamodb/testing/TestDynamoDb.kt b/misk-aws2-dynamodb-testing/src/main/kotlin/misk/aws2/dynamodb/testing/TestDynamoDb.kt index 64c9dda50ca..e81dce9644b 100644 --- a/misk-aws2-dynamodb-testing/src/main/kotlin/misk/aws2/dynamodb/testing/TestDynamoDb.kt +++ b/misk-aws2-dynamodb-testing/src/main/kotlin/misk/aws2/dynamodb/testing/TestDynamoDb.kt @@ -2,8 +2,8 @@ package misk.aws2.dynamodb.testing import app.cash.tempest2.testing.internal.TestDynamoDbService import com.google.common.util.concurrent.Service -import com.google.inject.Inject -import com.google.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * Thin wrapper to make `TestDynamoDbService`, which is not a @Singleton, compatible with `ServiceModule`. diff --git a/misk-aws2-dynamodb/build.gradle.kts b/misk-aws2-dynamodb/build.gradle.kts index 38442932630..a7dddb8a555 100644 --- a/misk-aws2-dynamodb/build.gradle.kts +++ b/misk-aws2-dynamodb/build.gradle.kts @@ -15,7 +15,7 @@ dependencies { api(Dependencies.awsSdkCore) api(Dependencies.guava) api(Dependencies.guice) - api(Dependencies.javaxInject) + api(Dependencies.jakartaInject) api(Dependencies.kotlinLogging) api(project(":misk-aws")) api(project(":misk-core")) @@ -29,7 +29,7 @@ dependencies { testFixturesApi(Dependencies.aws2Dynamodb) testFixturesApi(Dependencies.aws2DynamodbEnhanced) testFixturesApi(Dependencies.guice) - testFixturesApi(Dependencies.javaxInject) + testFixturesApi(Dependencies.jakartaInject) testFixturesApi(Dependencies.tempest2TestingInternal) testFixturesApi(project(":misk-aws2-dynamodb")) testFixturesApi(project(":misk-inject")) diff --git a/misk-aws2-dynamodb/src/main/kotlin/misk/aws2/dynamodb/DynamoDbHealthCheck.kt b/misk-aws2-dynamodb/src/main/kotlin/misk/aws2/dynamodb/DynamoDbHealthCheck.kt index 7b59a6d7aca..eaeacc06752 100644 --- a/misk-aws2-dynamodb/src/main/kotlin/misk/aws2/dynamodb/DynamoDbHealthCheck.kt +++ b/misk-aws2-dynamodb/src/main/kotlin/misk/aws2/dynamodb/DynamoDbHealthCheck.kt @@ -1,7 +1,7 @@ package misk.aws2.dynamodb -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import misk.healthchecks.HealthCheck import misk.healthchecks.HealthStatus import software.amazon.awssdk.services.dynamodb.DynamoDbClient diff --git a/misk-aws2-dynamodb/src/main/kotlin/misk/aws2/dynamodb/RealDynamoDbModule.kt b/misk-aws2-dynamodb/src/main/kotlin/misk/aws2/dynamodb/RealDynamoDbModule.kt index d9440340757..af042098a18 100644 --- a/misk-aws2-dynamodb/src/main/kotlin/misk/aws2/dynamodb/RealDynamoDbModule.kt +++ b/misk-aws2-dynamodb/src/main/kotlin/misk/aws2/dynamodb/RealDynamoDbModule.kt @@ -16,8 +16,8 @@ import software.amazon.awssdk.services.dynamodb.DynamoDbClientBuilder import software.amazon.awssdk.services.dynamodb.streams.DynamoDbStreamsClient import software.amazon.awssdk.services.dynamodb.streams.DynamoDbStreamsClientBuilder import java.net.URI -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * Install this module to have access to a DynamoDbClient. diff --git a/misk-aws2-dynamodb/src/test/kotlin/misk/aws2/dynamodb/testing/AbstractDynamoDbTest.kt b/misk-aws2-dynamodb/src/test/kotlin/misk/aws2/dynamodb/testing/AbstractDynamoDbTest.kt index 086356f3527..f01365ba1c9 100644 --- a/misk-aws2-dynamodb/src/test/kotlin/misk/aws2/dynamodb/testing/AbstractDynamoDbTest.kt +++ b/misk-aws2-dynamodb/src/test/kotlin/misk/aws2/dynamodb/testing/AbstractDynamoDbTest.kt @@ -11,7 +11,7 @@ import software.amazon.awssdk.enhanced.dynamodb.model.QueryConditional import software.amazon.awssdk.enhanced.dynamodb.model.QueryEnhancedRequest import software.amazon.awssdk.services.dynamodb.DynamoDbClient import java.time.LocalDate -import javax.inject.Inject +import jakarta.inject.Inject abstract class AbstractDynamoDbTest { @Inject lateinit var dynamoDbClient: DynamoDbClient diff --git a/misk-aws2-dynamodb/src/testFixtures/kotlin/misk/aws2/dynamodb/testing/DockerDynamoDbModule.kt b/misk-aws2-dynamodb/src/testFixtures/kotlin/misk/aws2/dynamodb/testing/DockerDynamoDbModule.kt index 3e82f0397d0..12dd8ac3b14 100644 --- a/misk-aws2-dynamodb/src/testFixtures/kotlin/misk/aws2/dynamodb/testing/DockerDynamoDbModule.kt +++ b/misk-aws2-dynamodb/src/testFixtures/kotlin/misk/aws2/dynamodb/testing/DockerDynamoDbModule.kt @@ -13,8 +13,8 @@ import misk.healthchecks.HealthCheck import misk.inject.KAbstractModule import software.amazon.awssdk.services.dynamodb.DynamoDbClient import software.amazon.awssdk.services.dynamodb.streams.DynamoDbStreamsClient -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * Spins up a docker container for testing. It clears the table content before each test starts. diff --git a/misk-aws2-dynamodb/src/testFixtures/kotlin/misk/aws2/dynamodb/testing/InProcessDynamoDbModule.kt b/misk-aws2-dynamodb/src/testFixtures/kotlin/misk/aws2/dynamodb/testing/InProcessDynamoDbModule.kt index 304fdd5504b..ce77d49818c 100644 --- a/misk-aws2-dynamodb/src/testFixtures/kotlin/misk/aws2/dynamodb/testing/InProcessDynamoDbModule.kt +++ b/misk-aws2-dynamodb/src/testFixtures/kotlin/misk/aws2/dynamodb/testing/InProcessDynamoDbModule.kt @@ -13,8 +13,8 @@ import misk.healthchecks.HealthCheck import misk.inject.KAbstractModule import software.amazon.awssdk.services.dynamodb.DynamoDbClient import software.amazon.awssdk.services.dynamodb.streams.DynamoDbStreamsClient -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * Executes a DynamoDB service in-process per test. It clears the table content before each test diff --git a/misk-aws2-dynamodb/src/testFixtures/kotlin/misk/aws2/dynamodb/testing/TestDynamoDb.kt b/misk-aws2-dynamodb/src/testFixtures/kotlin/misk/aws2/dynamodb/testing/TestDynamoDb.kt index e833e5c38eb..cfbeeb34c95 100644 --- a/misk-aws2-dynamodb/src/testFixtures/kotlin/misk/aws2/dynamodb/testing/TestDynamoDb.kt +++ b/misk-aws2-dynamodb/src/testFixtures/kotlin/misk/aws2/dynamodb/testing/TestDynamoDb.kt @@ -2,8 +2,8 @@ package misk.aws2.dynamodb.testing import app.cash.tempest2.testing.internal.TestDynamoDbService import com.google.common.util.concurrent.Service -import com.google.inject.Inject -import com.google.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * Thin wrapper to make `TestDynamoDbService`, which is not a @Singleton, compatible with `ServiceModule`. diff --git a/misk-clustering/build.gradle.kts b/misk-clustering/build.gradle.kts index 605ea5bb331..c576f3f9271 100644 --- a/misk-clustering/build.gradle.kts +++ b/misk-clustering/build.gradle.kts @@ -10,7 +10,7 @@ plugins { dependencies { api(Dependencies.guava) - api(Dependencies.javaxInject) + api(Dependencies.jakartaInject) api(Dependencies.kotlinLogging) api(project(":wisp:wisp-config")) api(project(":wisp:wisp-lease-testing")) diff --git a/misk-clustering/src/main/kotlin/misk/clustering/DefaultCluster.kt b/misk-clustering/src/main/kotlin/misk/clustering/DefaultCluster.kt index 180a56e2e83..307a3c78faa 100644 --- a/misk-clustering/src/main/kotlin/misk/clustering/DefaultCluster.kt +++ b/misk-clustering/src/main/kotlin/misk/clustering/DefaultCluster.kt @@ -5,7 +5,7 @@ import wisp.logging.getLogger import java.util.concurrent.LinkedBlockingQueue import java.util.concurrent.atomic.AtomicBoolean import java.util.concurrent.atomic.AtomicReference -import javax.inject.Singleton +import jakarta.inject.Singleton /** * A [DefaultCluster] is the default implementation of the [Cluster], which relies on an outside diff --git a/misk-clustering/src/main/kotlin/misk/clustering/fake/FakeCluster.kt b/misk-clustering/src/main/kotlin/misk/clustering/fake/FakeCluster.kt index f451ba63784..c28c8c38093 100644 --- a/misk-clustering/src/main/kotlin/misk/clustering/fake/FakeCluster.kt +++ b/misk-clustering/src/main/kotlin/misk/clustering/fake/FakeCluster.kt @@ -7,8 +7,8 @@ import misk.clustering.DefaultCluster import wisp.logging.getLogger import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * A [FakeCluster] is a [Cluster] that is a fake. It delegates entirely to [DefaultCluster], diff --git a/misk-clustering/src/main/kotlin/misk/clustering/fake/lease/FakeLeaseManager.kt b/misk-clustering/src/main/kotlin/misk/clustering/fake/lease/FakeLeaseManager.kt index d67c1fad975..6fdf26ce1f7 100644 --- a/misk-clustering/src/main/kotlin/misk/clustering/fake/lease/FakeLeaseManager.kt +++ b/misk-clustering/src/main/kotlin/misk/clustering/fake/lease/FakeLeaseManager.kt @@ -1,8 +1,8 @@ package misk.clustering.fake.lease import wisp.lease.FakeLeaseManager -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * A [FakeLeaseManager] provides explicit control over leases for the purposes of testing. By diff --git a/misk-clustering/src/main/kotlin/misk/clustering/kubernetes/KubernetesClusterProvider.kt b/misk-clustering/src/main/kotlin/misk/clustering/kubernetes/KubernetesClusterProvider.kt index 693554c26c8..ebf57af0429 100644 --- a/misk-clustering/src/main/kotlin/misk/clustering/kubernetes/KubernetesClusterProvider.kt +++ b/misk-clustering/src/main/kotlin/misk/clustering/kubernetes/KubernetesClusterProvider.kt @@ -2,8 +2,8 @@ package misk.clustering.kubernetes import misk.clustering.Cluster import misk.clustering.DefaultCluster -import javax.inject.Inject -import javax.inject.Provider +import jakarta.inject.Inject +import com.google.inject.Provider internal class KubernetesClusterProvider @Inject internal constructor( private val config: KubernetesConfig diff --git a/misk-clustering/src/main/kotlin/misk/clustering/kubernetes/KubernetesClusterWatcher.kt b/misk-clustering/src/main/kotlin/misk/clustering/kubernetes/KubernetesClusterWatcher.kt index a515b0be5f2..74e9fbfe57f 100644 --- a/misk-clustering/src/main/kotlin/misk/clustering/kubernetes/KubernetesClusterWatcher.kt +++ b/misk-clustering/src/main/kotlin/misk/clustering/kubernetes/KubernetesClusterWatcher.kt @@ -17,8 +17,8 @@ import wisp.logging.getLogger import java.time.Duration import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicBoolean -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import kotlin.concurrent.thread /** diff --git a/misk-clustering/src/test/kotlin/misk/clustering/fake/FakeClusterTest.kt b/misk-clustering/src/test/kotlin/misk/clustering/fake/FakeClusterTest.kt index 51f6663b2e1..2771a017efc 100644 --- a/misk-clustering/src/test/kotlin/misk/clustering/fake/FakeClusterTest.kt +++ b/misk-clustering/src/test/kotlin/misk/clustering/fake/FakeClusterTest.kt @@ -7,7 +7,7 @@ import misk.testing.MiskTest import misk.testing.MiskTestModule import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) internal class FakeClusterTest { diff --git a/misk-clustering/src/test/kotlin/misk/clustering/kubernetes/KubernetesClusterTest.kt b/misk-clustering/src/test/kotlin/misk/clustering/kubernetes/KubernetesClusterTest.kt index 4fc9795f963..4ff7b97201b 100644 --- a/misk-clustering/src/test/kotlin/misk/clustering/kubernetes/KubernetesClusterTest.kt +++ b/misk-clustering/src/test/kotlin/misk/clustering/kubernetes/KubernetesClusterTest.kt @@ -21,7 +21,7 @@ import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) internal class KubernetesClusterTest { diff --git a/misk-config/build.gradle.kts b/misk-config/build.gradle.kts index b4312ebd087..909482ebbe8 100644 --- a/misk-config/build.gradle.kts +++ b/misk-config/build.gradle.kts @@ -11,7 +11,7 @@ plugins { dependencies { api(Dependencies.jacksonAnotations) api(Dependencies.jacksonDatabind) - api(Dependencies.javaxInject) + api(Dependencies.jakartaInject) api(project(":wisp:wisp-config")) api(project(":wisp:wisp-deployment")) api(project(":wisp:wisp-resource-loader")) diff --git a/misk-config/src/main/kotlin/misk/config/AppName.kt b/misk-config/src/main/kotlin/misk/config/AppName.kt index 0a2b32a6f5f..9d21693b087 100644 --- a/misk-config/src/main/kotlin/misk/config/AppName.kt +++ b/misk-config/src/main/kotlin/misk/config/AppName.kt @@ -1,6 +1,6 @@ package misk.config -import javax.inject.Qualifier +import jakarta.inject.Qualifier @Qualifier @Target( diff --git a/misk-config/src/main/kotlin/misk/resources/ResourceLoader.kt b/misk-config/src/main/kotlin/misk/resources/ResourceLoader.kt index 25cadd068ab..33dec919845 100644 --- a/misk-config/src/main/kotlin/misk/resources/ResourceLoader.kt +++ b/misk-config/src/main/kotlin/misk/resources/ResourceLoader.kt @@ -5,8 +5,8 @@ import okio.ByteString import wisp.resources.ClasspathResourceLoaderBackend import wisp.resources.FilesystemLoaderBackend import java.nio.file.Path -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import wisp.resources.ResourceLoader as WispResourceLoader /** diff --git a/misk-config/src/main/kotlin/misk/resources/ResourceLoaderModule.kt b/misk-config/src/main/kotlin/misk/resources/ResourceLoaderModule.kt index f616346a143..652e3f963c2 100644 --- a/misk-config/src/main/kotlin/misk/resources/ResourceLoaderModule.kt +++ b/misk-config/src/main/kotlin/misk/resources/ResourceLoaderModule.kt @@ -8,8 +8,8 @@ import wisp.resources.ClasspathResourceLoaderBackend import wisp.resources.FakeFilesystemLoaderBackend import wisp.resources.FilesystemLoaderBackend import wisp.resources.MemoryResourceLoaderBackend -import javax.inject.Qualifier -import javax.inject.Singleton +import jakarta.inject.Qualifier +import jakarta.inject.Singleton import wisp.resources.ResourceLoader as WispResourceLoader class ResourceLoaderModule : KAbstractModule() { diff --git a/misk-config/src/test/kotlin/misk/config/MiskConfigTest.kt b/misk-config/src/test/kotlin/misk/config/MiskConfigTest.kt index 6a2e4adc560..fb2f719fbe7 100644 --- a/misk-config/src/test/kotlin/misk/config/MiskConfigTest.kt +++ b/misk-config/src/test/kotlin/misk/config/MiskConfigTest.kt @@ -18,7 +18,7 @@ import wisp.deployment.TESTING import wisp.logging.LogCollector import java.io.File import java.time.Duration -import javax.inject.Inject +import jakarta.inject.Inject import kotlin.test.assertFailsWith @MiskTest diff --git a/misk-config/src/test/kotlin/misk/config/SecretConfigTest.kt b/misk-config/src/test/kotlin/misk/config/SecretConfigTest.kt index 33084eb7a9d..56d26a93418 100644 --- a/misk-config/src/test/kotlin/misk/config/SecretConfigTest.kt +++ b/misk-config/src/test/kotlin/misk/config/SecretConfigTest.kt @@ -11,7 +11,7 @@ import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows import wisp.deployment.TESTING -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest class SecretConfigTest { diff --git a/misk-config/src/test/kotlin/misk/resources/FakeFileLoaderTest.kt b/misk-config/src/test/kotlin/misk/resources/FakeFileLoaderTest.kt index b92200faa16..c47bbedd8fe 100644 --- a/misk-config/src/test/kotlin/misk/resources/FakeFileLoaderTest.kt +++ b/misk-config/src/test/kotlin/misk/resources/FakeFileLoaderTest.kt @@ -6,7 +6,7 @@ import misk.testing.MiskTest import misk.testing.MiskTestModule import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = false) class FakeFileLoaderTest { diff --git a/misk-config/src/test/kotlin/misk/resources/ResourceLoaderTest.kt b/misk-config/src/test/kotlin/misk/resources/ResourceLoaderTest.kt index 8c6bca71f90..c2d9ed308d6 100644 --- a/misk-config/src/test/kotlin/misk/resources/ResourceLoaderTest.kt +++ b/misk-config/src/test/kotlin/misk/resources/ResourceLoaderTest.kt @@ -3,7 +3,7 @@ package misk.resources import com.google.inject.util.Modules import java.io.File import java.net.URLClassLoader -import javax.inject.Inject +import jakarta.inject.Inject import kotlin.test.assertFailsWith import misk.testing.MiskTest import misk.testing.MiskTestModule diff --git a/misk-core/build.gradle.kts b/misk-core/build.gradle.kts index a6950cbca65..d754e46830c 100644 --- a/misk-core/build.gradle.kts +++ b/misk-core/build.gradle.kts @@ -10,7 +10,7 @@ plugins { dependencies { api(Dependencies.guava) - api(Dependencies.javaxInject) + api(Dependencies.jakartaInject) api(Dependencies.kotlinLogging) api(Dependencies.kotlinRetry) api(Dependencies.okHttp) diff --git a/misk-core/src/main/kotlin/misk/random/Random.kt b/misk-core/src/main/kotlin/misk/random/Random.kt index 2d90667b288..4c0e42c03a3 100644 --- a/misk-core/src/main/kotlin/misk/random/Random.kt +++ b/misk-core/src/main/kotlin/misk/random/Random.kt @@ -1,7 +1,7 @@ package misk.random -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * Abstraction for Java's Random that allows for testing. diff --git a/misk-core/src/main/kotlin/misk/sampling/RateLimiter.kt b/misk-core/src/main/kotlin/misk/sampling/RateLimiter.kt index bbd51c35fb4..d581332e3bf 100644 --- a/misk-core/src/main/kotlin/misk/sampling/RateLimiter.kt +++ b/misk-core/src/main/kotlin/misk/sampling/RateLimiter.kt @@ -5,7 +5,7 @@ import misk.concurrent.Sleeper import java.time.Duration import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicLong -import javax.inject.Inject +import jakarta.inject.Inject /** * A deterministic testable rate limiter that uses two variables: diff --git a/misk-core/src/main/kotlin/misk/sampling/Sampler.kt b/misk-core/src/main/kotlin/misk/sampling/Sampler.kt index 9848781b83d..94e21994a28 100644 --- a/misk-core/src/main/kotlin/misk/sampling/Sampler.kt +++ b/misk-core/src/main/kotlin/misk/sampling/Sampler.kt @@ -4,8 +4,8 @@ import com.google.common.base.Ticker import misk.concurrent.Sleeper import java.util.concurrent.ThreadLocalRandom import java.util.concurrent.TimeUnit -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton interface Sampler { /** If an action should be taken based on the implementation's policy, returns true */ diff --git a/misk-core/src/main/kotlin/misk/security/ssl/CertStoreConfig.kt b/misk-core/src/main/kotlin/misk/security/ssl/CertStoreConfig.kt index 3fd691950a3..7243f64b5f8 100644 --- a/misk-core/src/main/kotlin/misk/security/ssl/CertStoreConfig.kt +++ b/misk-core/src/main/kotlin/misk/security/ssl/CertStoreConfig.kt @@ -2,7 +2,7 @@ package misk.security.ssl import misk.config.Redact import wisp.security.ssl.CertStoreConfig as WispCertStoreConfig -import javax.inject.Inject +import jakarta.inject.Inject data class CertStoreConfig @Inject constructor( val resource: String, diff --git a/misk-core/src/main/kotlin/misk/security/ssl/SslContextFactory.kt b/misk-core/src/main/kotlin/misk/security/ssl/SslContextFactory.kt index ee7e8c693c7..112c945a873 100644 --- a/misk-core/src/main/kotlin/misk/security/ssl/SslContextFactory.kt +++ b/misk-core/src/main/kotlin/misk/security/ssl/SslContextFactory.kt @@ -1,7 +1,7 @@ package misk.security.ssl import java.security.KeyStore -import javax.inject.Inject +import jakarta.inject.Inject import javax.net.ssl.SSLContext import javax.net.ssl.TrustManager import wisp.security.ssl.SslContextFactory as WispSslContextFactory diff --git a/misk-core/src/main/kotlin/misk/security/ssl/SslLoader.kt b/misk-core/src/main/kotlin/misk/security/ssl/SslLoader.kt index fdcc110167e..c2cc3331303 100644 --- a/misk-core/src/main/kotlin/misk/security/ssl/SslLoader.kt +++ b/misk-core/src/main/kotlin/misk/security/ssl/SslLoader.kt @@ -1,7 +1,7 @@ package misk.security.ssl import misk.resources.ResourceLoader -import javax.inject.Inject +import jakarta.inject.Inject import wisp.security.ssl.SslLoader as WispSslLoader /** Loads keys and certificates from the file system. */ diff --git a/misk-core/src/main/kotlin/misk/security/ssl/TrustStoreConfig.kt b/misk-core/src/main/kotlin/misk/security/ssl/TrustStoreConfig.kt index 79a1dde7990..0bca269b2ee 100644 --- a/misk-core/src/main/kotlin/misk/security/ssl/TrustStoreConfig.kt +++ b/misk-core/src/main/kotlin/misk/security/ssl/TrustStoreConfig.kt @@ -2,7 +2,7 @@ package misk.security.ssl import misk.config.Redact import misk.security.ssl.SslLoader.Companion.FORMAT_JCEKS -import javax.inject.Inject +import jakarta.inject.Inject import wisp.security.ssl.TrustStoreConfig as WispTrustStoreConfig data class TrustStoreConfig @Inject constructor( diff --git a/misk-core/src/main/kotlin/misk/tokens/FakeTokenGenerator.kt b/misk-core/src/main/kotlin/misk/tokens/FakeTokenGenerator.kt index d9273005220..dd65e47346a 100644 --- a/misk-core/src/main/kotlin/misk/tokens/FakeTokenGenerator.kt +++ b/misk-core/src/main/kotlin/misk/tokens/FakeTokenGenerator.kt @@ -1,7 +1,7 @@ package misk.tokens -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton class FakeTokenGenerator @Inject constructor() : TokenGenerator by wisp.token.FakeTokenGenerator() diff --git a/misk-core/src/main/kotlin/misk/tokens/RealTokenGenerator.kt b/misk-core/src/main/kotlin/misk/tokens/RealTokenGenerator.kt index b9d07a7f2f0..00269f75018 100644 --- a/misk-core/src/main/kotlin/misk/tokens/RealTokenGenerator.kt +++ b/misk-core/src/main/kotlin/misk/tokens/RealTokenGenerator.kt @@ -1,7 +1,7 @@ package misk.tokens -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton class RealTokenGenerator @Inject constructor() : TokenGenerator by wisp.token.RealTokenGenerator() diff --git a/misk-core/src/test/kotlin/misk/logging/LoggingTest.kt b/misk-core/src/test/kotlin/misk/logging/LoggingTest.kt index 2944e4972d7..91cae7957d3 100644 --- a/misk-core/src/test/kotlin/misk/logging/LoggingTest.kt +++ b/misk-core/src/test/kotlin/misk/logging/LoggingTest.kt @@ -16,7 +16,7 @@ import wisp.logging.error import wisp.logging.getLogger import wisp.logging.info import wisp.logging.warn -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) class LoggingTest { diff --git a/misk-core/src/test/kotlin/misk/logging/SampledLoggerTest.kt b/misk-core/src/test/kotlin/misk/logging/SampledLoggerTest.kt index 4e5f5761442..6c3479edf49 100644 --- a/misk-core/src/test/kotlin/misk/logging/SampledLoggerTest.kt +++ b/misk-core/src/test/kotlin/misk/logging/SampledLoggerTest.kt @@ -16,7 +16,7 @@ import wisp.logging.error import wisp.logging.getLogger import wisp.logging.info import wisp.logging.warn -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) class SampledLoggerTest { diff --git a/misk-cron/build.gradle.kts b/misk-cron/build.gradle.kts index f694d9280a4..0d3e66f2057 100644 --- a/misk-cron/build.gradle.kts +++ b/misk-cron/build.gradle.kts @@ -12,7 +12,7 @@ dependencies { api(Dependencies.cronUtils) api(Dependencies.guava) api(Dependencies.guice) - api(Dependencies.javaxInject) + api(Dependencies.jakartaInject) api(project(":misk")) api(project(":misk-inject")) implementation(Dependencies.kotlinLogging) diff --git a/misk-cron/src/main/kotlin/misk/cron/CronManager.kt b/misk-cron/src/main/kotlin/misk/cron/CronManager.kt index bc6be2a122f..71a12b94a93 100644 --- a/misk-cron/src/main/kotlin/misk/cron/CronManager.kt +++ b/misk-cron/src/main/kotlin/misk/cron/CronManager.kt @@ -11,8 +11,8 @@ import java.time.ZoneId import java.time.ZonedDateTime import java.util.concurrent.CompletableFuture import java.util.concurrent.ExecutorService -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton class CronManager @Inject constructor() { diff --git a/misk-cron/src/main/kotlin/misk/cron/CronModule.kt b/misk-cron/src/main/kotlin/misk/cron/CronModule.kt index 5086a95a838..1aaa7e15184 100644 --- a/misk-cron/src/main/kotlin/misk/cron/CronModule.kt +++ b/misk-cron/src/main/kotlin/misk/cron/CronModule.kt @@ -3,7 +3,7 @@ package misk.cron import com.google.common.util.concurrent.Service import com.google.inject.Key import com.google.inject.Provides -import com.google.inject.Singleton +import jakarta.inject.Singleton import misk.ReadyService import misk.ServiceModule import misk.concurrent.ExecutorServiceModule @@ -12,7 +12,7 @@ import misk.inject.toKey import misk.tasks.RepeatedTaskQueue import misk.tasks.RepeatedTaskQueueFactory import java.time.ZoneId -import javax.inject.Qualifier +import jakarta.inject.Qualifier class CronModule @JvmOverloads constructor( private val zoneId: ZoneId, diff --git a/misk-cron/src/main/kotlin/misk/cron/CronService.kt b/misk-cron/src/main/kotlin/misk/cron/CronService.kt index 01632fb4043..bc9bf64231e 100644 --- a/misk-cron/src/main/kotlin/misk/cron/CronService.kt +++ b/misk-cron/src/main/kotlin/misk/cron/CronService.kt @@ -3,8 +3,8 @@ package misk.cron import com.google.common.util.concurrent.AbstractIdleService import com.google.inject.Injector import wisp.logging.getLogger -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton internal class CronService @Inject constructor( diff --git a/misk-cron/src/main/kotlin/misk/cron/CronTask.kt b/misk-cron/src/main/kotlin/misk/cron/CronTask.kt index 1c16b7e91bb..72bd4d40d63 100644 --- a/misk-cron/src/main/kotlin/misk/cron/CronTask.kt +++ b/misk-cron/src/main/kotlin/misk/cron/CronTask.kt @@ -8,8 +8,8 @@ import wisp.lease.LeaseManager import wisp.logging.getLogger import java.time.Clock import java.time.Duration -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton internal class CronTask @Inject constructor() : AbstractIdleService() { diff --git a/misk-cron/src/test/kotlin/misk/cron/CronModuleTest.kt b/misk-cron/src/test/kotlin/misk/cron/CronModuleTest.kt index 493c7ce3512..2ac641bcb72 100644 --- a/misk-cron/src/test/kotlin/misk/cron/CronModuleTest.kt +++ b/misk-cron/src/test/kotlin/misk/cron/CronModuleTest.kt @@ -16,8 +16,8 @@ import wisp.logging.LogCollector import wisp.logging.getLogger import java.lang.Thread.sleep import java.time.ZoneId -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @MiskTest(startService = true) class CronModuleTest { diff --git a/misk-cron/src/test/kotlin/misk/cron/CronTest.kt b/misk-cron/src/test/kotlin/misk/cron/CronTest.kt index da4ab87e61c..2114ec55c27 100644 --- a/misk-cron/src/test/kotlin/misk/cron/CronTest.kt +++ b/misk-cron/src/test/kotlin/misk/cron/CronTest.kt @@ -15,8 +15,8 @@ import java.time.Clock import java.time.Duration import java.time.Instant import java.time.ZoneId -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @MiskTest(startService = true) class CronTest { diff --git a/misk-cron/src/test/kotlin/misk/cron/CronTestingModule.kt b/misk-cron/src/test/kotlin/misk/cron/CronTestingModule.kt index 5f271e85dde..8888b0c8acd 100644 --- a/misk-cron/src/test/kotlin/misk/cron/CronTestingModule.kt +++ b/misk-cron/src/test/kotlin/misk/cron/CronTestingModule.kt @@ -1,7 +1,7 @@ package misk.cron import com.google.inject.Provides -import com.google.inject.Singleton +import jakarta.inject.Singleton import misk.MiskTestingServiceModule import misk.ServiceModule import misk.clustering.fake.lease.FakeLeaseModule diff --git a/misk-crypto/build.gradle.kts b/misk-crypto/build.gradle.kts index 973a0fff7c6..173cef356e7 100644 --- a/misk-crypto/build.gradle.kts +++ b/misk-crypto/build.gradle.kts @@ -13,7 +13,7 @@ dependencies { api(Dependencies.awsJavaSdkCore) api(Dependencies.awsS3) api(Dependencies.guice) - api(Dependencies.javaxInject) + api(Dependencies.jakartaInject) api(Dependencies.tink) api(Dependencies.tinkAwskms) api(Dependencies.tinkGcpkms) diff --git a/misk-crypto/src/main/kotlin/misk/crypto/CryptoModule.kt b/misk-crypto/src/main/kotlin/misk/crypto/CryptoModule.kt index 4b72808a286..5995fc80dd7 100644 --- a/misk-crypto/src/main/kotlin/misk/crypto/CryptoModule.kt +++ b/misk-crypto/src/main/kotlin/misk/crypto/CryptoModule.kt @@ -16,7 +16,7 @@ import com.google.crypto.tink.hybrid.HybridConfig import com.google.crypto.tink.mac.MacConfig import com.google.crypto.tink.signature.SignatureConfig import com.google.crypto.tink.streamingaead.StreamingAeadConfig -import com.google.inject.Singleton +import jakarta.inject.Singleton import com.google.inject.TypeLiteral import com.google.inject.name.Names import misk.crypto.internal.AeadEnvelopeProvider diff --git a/misk-crypto/src/main/kotlin/misk/crypto/ExternalDataKeys.kt b/misk-crypto/src/main/kotlin/misk/crypto/ExternalDataKeys.kt index 56bf0b35f9d..388ca7298a2 100644 --- a/misk-crypto/src/main/kotlin/misk/crypto/ExternalDataKeys.kt +++ b/misk-crypto/src/main/kotlin/misk/crypto/ExternalDataKeys.kt @@ -1,6 +1,6 @@ package misk.crypto -import javax.inject.Qualifier +import jakarta.inject.Qualifier import kotlin.annotation.AnnotationRetention.RUNTIME /** diff --git a/misk-crypto/src/main/kotlin/misk/crypto/ExternalKeyResolver.kt b/misk-crypto/src/main/kotlin/misk/crypto/ExternalKeyResolver.kt index 8339b074232..cadb84c5044 100644 --- a/misk-crypto/src/main/kotlin/misk/crypto/ExternalKeyResolver.kt +++ b/misk-crypto/src/main/kotlin/misk/crypto/ExternalKeyResolver.kt @@ -1,6 +1,6 @@ package misk.crypto -import com.google.inject.Inject +import jakarta.inject.Inject import wisp.logging.getLogger /** diff --git a/misk-crypto/src/main/kotlin/misk/crypto/KeyManager.kt b/misk-crypto/src/main/kotlin/misk/crypto/KeyManager.kt index de01809cfec..ca8b5023915 100644 --- a/misk-crypto/src/main/kotlin/misk/crypto/KeyManager.kt +++ b/misk-crypto/src/main/kotlin/misk/crypto/KeyManager.kt @@ -9,14 +9,14 @@ import com.google.crypto.tink.PublicKeySign import com.google.crypto.tink.PublicKeyVerify import com.google.crypto.tink.StreamingAead import com.google.inject.ConfigurationException -import com.google.inject.Inject +import jakarta.inject.Inject import com.google.inject.Injector import com.google.inject.Key import com.google.inject.name.Names import misk.crypto.pgp.PgpDecrypter import misk.crypto.pgp.PgpEncrypter import java.security.GeneralSecurityException -import javax.inject.Singleton +import jakarta.inject.Singleton sealed class MappedKeyManager constructor( private val injector: Injector, diff --git a/misk-crypto/src/main/kotlin/misk/crypto/KeyReader.kt b/misk-crypto/src/main/kotlin/misk/crypto/KeyReader.kt index 9f87295e05b..bf39800df10 100644 --- a/misk-crypto/src/main/kotlin/misk/crypto/KeyReader.kt +++ b/misk-crypto/src/main/kotlin/misk/crypto/KeyReader.kt @@ -7,7 +7,7 @@ import com.google.crypto.tink.KmsClient import com.google.crypto.tink.aead.AeadKeyTemplates import com.google.crypto.tink.aead.KmsEnvelopeAead import com.google.crypto.tink.proto.KeyTemplate -import com.google.inject.Inject +import jakarta.inject.Inject import wisp.logging.getLogger import java.security.GeneralSecurityException diff --git a/misk-crypto/src/main/kotlin/misk/crypto/KmsClientModule.kt b/misk-crypto/src/main/kotlin/misk/crypto/KmsClientModule.kt index aef48691c82..e34c4f54320 100644 --- a/misk-crypto/src/main/kotlin/misk/crypto/KmsClientModule.kt +++ b/misk-crypto/src/main/kotlin/misk/crypto/KmsClientModule.kt @@ -4,9 +4,9 @@ import com.google.crypto.tink.KmsClient import com.google.crypto.tink.integration.awskms.AwsKmsClient import com.google.crypto.tink.integration.gcpkms.GcpKmsClient import com.google.inject.Provides -import com.google.inject.Singleton +import jakarta.inject.Singleton import misk.inject.KAbstractModule -import javax.inject.Qualifier +import jakarta.inject.Qualifier /** * AWS specific KMS client module. diff --git a/misk-crypto/src/main/kotlin/misk/crypto/ServiceKeys.kt b/misk-crypto/src/main/kotlin/misk/crypto/ServiceKeys.kt index 822ec3e9752..eecb3cd9a6b 100644 --- a/misk-crypto/src/main/kotlin/misk/crypto/ServiceKeys.kt +++ b/misk-crypto/src/main/kotlin/misk/crypto/ServiceKeys.kt @@ -1,6 +1,6 @@ package misk.crypto -import javax.inject.Qualifier +import jakarta.inject.Qualifier import kotlin.annotation.AnnotationRetention.RUNTIME /** diff --git a/misk-crypto/src/main/kotlin/misk/crypto/internal/KeyProviders.kt b/misk-crypto/src/main/kotlin/misk/crypto/internal/KeyProviders.kt index 4a3f4f6b223..d9955a86420 100644 --- a/misk-crypto/src/main/kotlin/misk/crypto/internal/KeyProviders.kt +++ b/misk-crypto/src/main/kotlin/misk/crypto/internal/KeyProviders.kt @@ -15,7 +15,7 @@ import com.google.crypto.tink.mac.MacFactory import com.google.crypto.tink.signature.PublicKeySignFactory import com.google.crypto.tink.signature.PublicKeyVerifyFactory import com.google.crypto.tink.streamingaead.StreamingAeadFactory -import com.google.inject.Inject +import jakarta.inject.Inject import com.google.inject.Provider import misk.crypto.AeadKeyManager import misk.crypto.DeterministicAeadKeyManager diff --git a/misk-crypto/src/main/kotlin/misk/crypto/pgp/internal/PgpDecrypterProvider.kt b/misk-crypto/src/main/kotlin/misk/crypto/pgp/internal/PgpDecrypterProvider.kt index 4ee67b8afdf..8045e799a1b 100644 --- a/misk-crypto/src/main/kotlin/misk/crypto/pgp/internal/PgpDecrypterProvider.kt +++ b/misk-crypto/src/main/kotlin/misk/crypto/pgp/internal/PgpDecrypterProvider.kt @@ -1,7 +1,7 @@ package misk.crypto.pgp.internal import com.google.crypto.tink.aead.KmsEnvelopeAead -import com.google.inject.Inject +import jakarta.inject.Inject import com.google.inject.Provider import com.squareup.moshi.Moshi import misk.crypto.KeyAlias diff --git a/misk-crypto/src/main/kotlin/misk/crypto/pgp/internal/PgpEncrypterProvider.kt b/misk-crypto/src/main/kotlin/misk/crypto/pgp/internal/PgpEncrypterProvider.kt index c75e873736a..9eb8934508a 100644 --- a/misk-crypto/src/main/kotlin/misk/crypto/pgp/internal/PgpEncrypterProvider.kt +++ b/misk-crypto/src/main/kotlin/misk/crypto/pgp/internal/PgpEncrypterProvider.kt @@ -11,7 +11,7 @@ import org.bouncycastle.openpgp.PGPPublicKeyRingCollection import org.bouncycastle.openpgp.PGPUtil import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator import java.io.BufferedInputStream -import javax.inject.Inject +import jakarta.inject.Inject class PgpEncrypterProvider( private val alias: KeyAlias diff --git a/misk-crypto/src/test/kotlin/misk.crypto/PgpKeyTest.kt b/misk-crypto/src/test/kotlin/misk.crypto/PgpKeyTest.kt index 0c7c29bd530..437636a3cf7 100644 --- a/misk-crypto/src/test/kotlin/misk.crypto/PgpKeyTest.kt +++ b/misk-crypto/src/test/kotlin/misk.crypto/PgpKeyTest.kt @@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows import wisp.deployment.TESTING import java.util.Base64 -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) class PgpKeyTest { diff --git a/misk-events-testing/build.gradle.kts b/misk-events-testing/build.gradle.kts index b0608144e64..2488b97d6a1 100644 --- a/misk-events-testing/build.gradle.kts +++ b/misk-events-testing/build.gradle.kts @@ -9,9 +9,10 @@ plugins { } dependencies { - api(Dependencies.javaxInject) + api(Dependencies.jakartaInject) api(project(":misk-events-core")) api(project(":misk-inject")) + implementation(Dependencies.guice) testImplementation(Dependencies.assertj) diff --git a/misk-events-testing/src/main/kotlin/misk/events/FakeEventProcessor.kt b/misk-events-testing/src/main/kotlin/misk/events/FakeEventProcessor.kt index 6641d48f6fe..52dd77f3c86 100644 --- a/misk-events-testing/src/main/kotlin/misk/events/FakeEventProcessor.kt +++ b/misk-events-testing/src/main/kotlin/misk/events/FakeEventProcessor.kt @@ -2,8 +2,8 @@ package misk.events import java.util.concurrent.BlockingDeque import java.util.concurrent.LinkedBlockingDeque -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * An in-memory events system for testing publishers and consumers. diff --git a/misk-events-testing/src/test/kotlin/misk/events/FakeEventProcessorTest.kt b/misk-events-testing/src/test/kotlin/misk/events/FakeEventProcessorTest.kt index 5b5b028d419..e911e1bb33c 100644 --- a/misk-events-testing/src/test/kotlin/misk/events/FakeEventProcessorTest.kt +++ b/misk-events-testing/src/test/kotlin/misk/events/FakeEventProcessorTest.kt @@ -8,8 +8,8 @@ import okio.ByteString.Companion.encodeUtf8 import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import java.time.Instant -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import kotlin.test.assertFailsWith @MiskTest diff --git a/misk-exceptions-dynamodb/build.gradle.kts b/misk-exceptions-dynamodb/build.gradle.kts index 81c7f1ff891..44606c0360d 100644 --- a/misk-exceptions-dynamodb/build.gradle.kts +++ b/misk-exceptions-dynamodb/build.gradle.kts @@ -11,7 +11,7 @@ plugins { dependencies { api(Dependencies.awsDynamodb) api(Dependencies.awsJavaSdkCore) - api(Dependencies.javaxInject) + api(Dependencies.jakartaInject) api(Dependencies.slf4jApi) api(project(":misk")) api(project(":misk-actions")) diff --git a/misk-exceptions-dynamodb/src/main/kotlin/misk/exceptions/dynamodb/ClientExecutionTimeoutExceptionMapper.kt b/misk-exceptions-dynamodb/src/main/kotlin/misk/exceptions/dynamodb/ClientExecutionTimeoutExceptionMapper.kt index 8ece2fec1f6..ae7cc42d2a6 100644 --- a/misk-exceptions-dynamodb/src/main/kotlin/misk/exceptions/dynamodb/ClientExecutionTimeoutExceptionMapper.kt +++ b/misk-exceptions-dynamodb/src/main/kotlin/misk/exceptions/dynamodb/ClientExecutionTimeoutExceptionMapper.kt @@ -9,7 +9,7 @@ import misk.web.toResponseBody import okhttp3.Headers import okhttp3.Headers.Companion.toHeaders import java.net.HttpURLConnection.HTTP_UNAVAILABLE -import javax.inject.Inject +import jakarta.inject.Inject /** Maps ClientExecutionTimeoutException to 503 responses because the exception is concurrency related */ class ClientExecutionTimeoutExceptionMapper @Inject constructor() : diff --git a/misk-exceptions-dynamodb/src/main/kotlin/misk/exceptions/dynamodb/TransactionCanceledExceptionMapper.kt b/misk-exceptions-dynamodb/src/main/kotlin/misk/exceptions/dynamodb/TransactionCanceledExceptionMapper.kt index 4654497867d..48f9951e50d 100644 --- a/misk-exceptions-dynamodb/src/main/kotlin/misk/exceptions/dynamodb/TransactionCanceledExceptionMapper.kt +++ b/misk-exceptions-dynamodb/src/main/kotlin/misk/exceptions/dynamodb/TransactionCanceledExceptionMapper.kt @@ -11,7 +11,7 @@ import okhttp3.Headers.Companion.toHeaders import org.slf4j.event.Level import java.net.HttpURLConnection.HTTP_INTERNAL_ERROR import java.net.HttpURLConnection.HTTP_UNAVAILABLE -import javax.inject.Inject +import jakarta.inject.Inject /** Maps certain TransactionCanceledExceptionMapper to 503 responses when the exception is concurrency related */ class TransactionCanceledExceptionMapper @Inject constructor() : diff --git a/misk-exceptions-dynamodb/src/test/kotlin/misk/exceptions/dynamodb/DynamoDbExceptionMapperTest.kt b/misk-exceptions-dynamodb/src/test/kotlin/misk/exceptions/dynamodb/DynamoDbExceptionMapperTest.kt index 90c2a3ecb6e..8be167adfa0 100644 --- a/misk-exceptions-dynamodb/src/test/kotlin/misk/exceptions/dynamodb/DynamoDbExceptionMapperTest.kt +++ b/misk-exceptions-dynamodb/src/test/kotlin/misk/exceptions/dynamodb/DynamoDbExceptionMapperTest.kt @@ -20,7 +20,7 @@ import org.assertj.core.api.Assertions import org.junit.jupiter.api.Test import java.net.HttpURLConnection.HTTP_INTERNAL_ERROR import java.net.HttpURLConnection.HTTP_UNAVAILABLE -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) class DynamoDbExceptionMapperTest { diff --git a/misk-feature-testing/build.gradle.kts b/misk-feature-testing/build.gradle.kts index 783d0b72cad..4d142a017d8 100644 --- a/misk-feature-testing/build.gradle.kts +++ b/misk-feature-testing/build.gradle.kts @@ -10,7 +10,7 @@ plugins { dependencies { api(Dependencies.guava) - api(Dependencies.javaxInject) + api(Dependencies.jakartaInject) api(project(":wisp:wisp-feature")) api(project(":wisp:wisp-feature-testing")) api(project(":misk-feature")) diff --git a/misk-feature-testing/src/main/kotlin/misk/feature/testing/FakeFeatureFlags.kt b/misk-feature-testing/src/main/kotlin/misk/feature/testing/FakeFeatureFlags.kt index 99da9cdeb6e..537b442b1d1 100644 --- a/misk-feature-testing/src/main/kotlin/misk/feature/testing/FakeFeatureFlags.kt +++ b/misk-feature-testing/src/main/kotlin/misk/feature/testing/FakeFeatureFlags.kt @@ -15,8 +15,8 @@ import wisp.feature.IntFeatureFlag import wisp.feature.JsonFeatureFlag import wisp.feature.StringFeatureFlag import java.util.concurrent.Executor -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * In-memory test implementation of [FeatureFlags] that allows flags to be overridden. diff --git a/misk-feature-testing/src/main/kotlin/misk/feature/testing/FakeFeatureFlagsModule.kt b/misk-feature-testing/src/main/kotlin/misk/feature/testing/FakeFeatureFlagsModule.kt index e81d7d837cb..2b77fbe3af5 100644 --- a/misk-feature-testing/src/main/kotlin/misk/feature/testing/FakeFeatureFlagsModule.kt +++ b/misk-feature-testing/src/main/kotlin/misk/feature/testing/FakeFeatureFlagsModule.kt @@ -13,7 +13,7 @@ import misk.inject.asSingleton import misk.inject.parameterizedType import misk.inject.toKey import misk.inject.typeLiteral -import javax.inject.Inject +import jakarta.inject.Inject import kotlin.reflect.KClass /** diff --git a/misk-feature/build.gradle.kts b/misk-feature/build.gradle.kts index 702f95df943..3423d29a9b3 100644 --- a/misk-feature/build.gradle.kts +++ b/misk-feature/build.gradle.kts @@ -14,7 +14,7 @@ dependencies { api(project(":wisp:wisp-feature")) implementation(Dependencies.kotlinStdLibJdk8) - testFixturesApi(Dependencies.javaxInject) + testFixturesApi(Dependencies.jakartaInject) testFixturesApi(project(":wisp:wisp-feature")) testFixturesApi(project(":wisp:wisp-feature-testing")) testFixturesApi(project(":misk-feature")) @@ -26,7 +26,7 @@ dependencies { testImplementation(Dependencies.assertj) testImplementation(Dependencies.guice) - testImplementation(Dependencies.javaxInject) + testImplementation(Dependencies.jakartaInject) testImplementation(Dependencies.junitApi) testImplementation(Dependencies.kotlinTest) testImplementation(Dependencies.moshi) diff --git a/misk-feature/src/test/java/misk/feature/testing/FakeFeatureFlagsJavaTest.java b/misk-feature/src/test/java/misk/feature/testing/FakeFeatureFlagsJavaTest.java index 59298c94e02..548133fd18f 100644 --- a/misk-feature/src/test/java/misk/feature/testing/FakeFeatureFlagsJavaTest.java +++ b/misk-feature/src/test/java/misk/feature/testing/FakeFeatureFlagsJavaTest.java @@ -1,7 +1,7 @@ package misk.feature.testing; import java.util.Map; -import javax.inject.Inject; +import jakarta.inject.Inject; import misk.inject.KAbstractModule; import misk.testing.MiskTest; import misk.testing.MiskTestModule; diff --git a/misk-feature/src/test/kotlin/misk/feature/testing/FakeFeatureFlagsModuleTest.kt b/misk-feature/src/test/kotlin/misk/feature/testing/FakeFeatureFlagsModuleTest.kt index 5488302afd0..f3705ac27cd 100644 --- a/misk-feature/src/test/kotlin/misk/feature/testing/FakeFeatureFlagsModuleTest.kt +++ b/misk-feature/src/test/kotlin/misk/feature/testing/FakeFeatureFlagsModuleTest.kt @@ -9,7 +9,7 @@ import misk.feature.testing.FakeFeatureFlagsTest.JsonFeature import misk.inject.KAbstractModule import misk.inject.keyOf import org.junit.jupiter.api.Test -import javax.inject.Qualifier +import jakarta.inject.Qualifier import kotlin.test.assertEquals class FakeFeatureFlagsModuleTest { diff --git a/misk-feature/src/test/kotlin/misk/feature/testing/FakeFeatureFlagsTest.kt b/misk-feature/src/test/kotlin/misk/feature/testing/FakeFeatureFlagsTest.kt index 909061c4877..c852cf4bdc7 100644 --- a/misk-feature/src/test/kotlin/misk/feature/testing/FakeFeatureFlagsTest.kt +++ b/misk-feature/src/test/kotlin/misk/feature/testing/FakeFeatureFlagsTest.kt @@ -11,7 +11,7 @@ import misk.feature.Attributes import misk.feature.Feature import misk.feature.getEnum import misk.feature.getJson -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest internal class FakeFeatureFlagsTest { diff --git a/misk-feature/src/testFixtures/kotlin/misk/feature/testing/FakeFeatureFlags.kt b/misk-feature/src/testFixtures/kotlin/misk/feature/testing/FakeFeatureFlags.kt index d04ff8b5235..3434f014559 100644 --- a/misk-feature/src/testFixtures/kotlin/misk/feature/testing/FakeFeatureFlags.kt +++ b/misk-feature/src/testFixtures/kotlin/misk/feature/testing/FakeFeatureFlags.kt @@ -15,8 +15,8 @@ import wisp.feature.IntFeatureFlag import wisp.feature.JsonFeatureFlag import wisp.feature.StringFeatureFlag import java.util.concurrent.Executor -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * In-memory test implementation of [FeatureFlags] that allows flags to be overridden. diff --git a/misk-feature/src/testFixtures/kotlin/misk/feature/testing/FakeFeatureFlagsModule.kt b/misk-feature/src/testFixtures/kotlin/misk/feature/testing/FakeFeatureFlagsModule.kt index d940371a50d..48fbb51b974 100644 --- a/misk-feature/src/testFixtures/kotlin/misk/feature/testing/FakeFeatureFlagsModule.kt +++ b/misk-feature/src/testFixtures/kotlin/misk/feature/testing/FakeFeatureFlagsModule.kt @@ -13,7 +13,7 @@ import misk.inject.asSingleton import misk.inject.parameterizedType import misk.inject.toKey import misk.inject.typeLiteral -import javax.inject.Inject +import jakarta.inject.Inject import kotlin.reflect.KClass /** diff --git a/misk-gcp-testing/build.gradle.kts b/misk-gcp-testing/build.gradle.kts index 89b4b3fad51..6c8208471a2 100644 --- a/misk-gcp-testing/build.gradle.kts +++ b/misk-gcp-testing/build.gradle.kts @@ -30,7 +30,7 @@ dependencies { api(Dependencies.googleHttpClient) api(Dependencies.guava) api(Dependencies.guice) - api(Dependencies.javaxInject) + api(Dependencies.jakartaInject) api(Dependencies.kotlinLogging) api(project(":misk-gcp")) api(project(":misk-inject")) diff --git a/misk-gcp-testing/src/main/kotlin/misk/cloud/gcp/datastore/FakeDatastoreModule.kt b/misk-gcp-testing/src/main/kotlin/misk/cloud/gcp/datastore/FakeDatastoreModule.kt index ab6b9375258..8ebdd8dcba9 100644 --- a/misk-gcp-testing/src/main/kotlin/misk/cloud/gcp/datastore/FakeDatastoreModule.kt +++ b/misk-gcp-testing/src/main/kotlin/misk/cloud/gcp/datastore/FakeDatastoreModule.kt @@ -4,10 +4,10 @@ import com.google.cloud.datastore.Datastore import com.google.cloud.datastore.testing.LocalDatastoreHelper import com.google.common.util.concurrent.AbstractIdleService import com.google.inject.Provides -import com.google.inject.Singleton +import jakarta.inject.Singleton import misk.ServiceModule import misk.inject.KAbstractModule -import javax.inject.Inject +import jakarta.inject.Inject /** Installs a version of the [Datastore] that works off an in-memory local store */ @Deprecated("Replace the dependency on misk-gcp-testing with testFixtures(misk-gcp)") diff --git a/misk-gcp-testing/src/main/kotlin/misk/cloud/gcp/spanner/GoogleSpannerEmulator.kt b/misk-gcp-testing/src/main/kotlin/misk/cloud/gcp/spanner/GoogleSpannerEmulator.kt index af9f7b6eaf9..68929c9721b 100644 --- a/misk-gcp-testing/src/main/kotlin/misk/cloud/gcp/spanner/GoogleSpannerEmulator.kt +++ b/misk-gcp-testing/src/main/kotlin/misk/cloud/gcp/spanner/GoogleSpannerEmulator.kt @@ -29,8 +29,8 @@ import wisp.containers.Composer import java.time.Duration import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicBoolean -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Deprecated("Replace the dependency on misk-gcp-testing with testFixtures(misk-gcp)") @Singleton diff --git a/misk-gcp-testing/src/main/kotlin/misk/cloud/gcp/storage/FakeStorageModule.kt b/misk-gcp-testing/src/main/kotlin/misk/cloud/gcp/storage/FakeStorageModule.kt index f1c5877ff71..271a868ec01 100644 --- a/misk-gcp-testing/src/main/kotlin/misk/cloud/gcp/storage/FakeStorageModule.kt +++ b/misk-gcp-testing/src/main/kotlin/misk/cloud/gcp/storage/FakeStorageModule.kt @@ -4,7 +4,7 @@ import com.google.cloud.NoCredentials import com.google.cloud.storage.Storage import com.google.cloud.storage.StorageOptions import com.google.inject.Provides -import com.google.inject.Singleton +import jakarta.inject.Singleton import misk.inject.KAbstractModule /** Installs an embeddable version of [Storage] that works in-memory */ diff --git a/misk-gcp-testing/src/main/kotlin/misk/cloud/gcp/storage/LocalStorageRpcTest.kt b/misk-gcp-testing/src/main/kotlin/misk/cloud/gcp/storage/LocalStorageRpcTest.kt index f61fbce7a61..4c35a5e7444 100644 --- a/misk-gcp-testing/src/main/kotlin/misk/cloud/gcp/storage/LocalStorageRpcTest.kt +++ b/misk-gcp-testing/src/main/kotlin/misk/cloud/gcp/storage/LocalStorageRpcTest.kt @@ -5,7 +5,7 @@ import misk.testing.MiskTestModule import misk.testing.TemporaryFolder import misk.testing.TemporaryFolderModule import wisp.moshi.defaultKotlinMoshi -import javax.inject.Inject +import jakarta.inject.Inject @Deprecated("Replace the dependency on misk-gcp-testing with testFixtures(misk-gcp)") @MiskTest(startService = false) diff --git a/misk-gcp/build.gradle.kts b/misk-gcp/build.gradle.kts index b939655b9bc..6d5022f4637 100644 --- a/misk-gcp/build.gradle.kts +++ b/misk-gcp/build.gradle.kts @@ -25,7 +25,7 @@ dependencies { api(Dependencies.googleAuthLibraryCredentials) api(Dependencies.guava) api(Dependencies.guice) - api(Dependencies.javaxInject) + api(Dependencies.jakartaInject) api(Dependencies.logbackClassic) api(Dependencies.moshi) api(Dependencies.okio) @@ -64,7 +64,7 @@ dependencies { testFixturesApi(Dependencies.googleApiServicesStorage) testFixturesApi(Dependencies.googleHttpClient) testFixturesApi(Dependencies.guice) - testFixturesApi(Dependencies.javaxInject) + testFixturesApi(Dependencies.jakartaInject) testFixturesApi(Dependencies.kotlinLogging) testFixturesApi(project(":misk-gcp")) testFixturesApi(project(":misk-inject")) diff --git a/misk-gcp/src/main/kotlin/misk/cloud/gcp/GoogleCloudModule.kt b/misk-gcp/src/main/kotlin/misk/cloud/gcp/GoogleCloudModule.kt index e51a58628a0..470b4ccf75f 100644 --- a/misk-gcp/src/main/kotlin/misk/cloud/gcp/GoogleCloudModule.kt +++ b/misk-gcp/src/main/kotlin/misk/cloud/gcp/GoogleCloudModule.kt @@ -10,7 +10,7 @@ import com.google.cloud.storage.Storage import com.google.cloud.storage.StorageOptions import com.google.common.util.concurrent.AbstractIdleService import com.google.inject.Provides -import com.google.inject.Singleton +import jakarta.inject.Singleton import misk.ReadyService import misk.ServiceModule import misk.cloud.gcp.datastore.DatastoreConfig @@ -20,7 +20,7 @@ import misk.inject.KAbstractModule import wisp.deployment.Deployment import wisp.logging.getLogger import java.nio.file.Paths -import javax.inject.Inject +import jakarta.inject.Inject /** Installs support for talking to real GCP services, either direct or via emulator */ class GoogleCloudModule( diff --git a/misk-gcp/src/main/kotlin/misk/cloud/gcp/security/keys/GcpKeyManagementModule.kt b/misk-gcp/src/main/kotlin/misk/cloud/gcp/security/keys/GcpKeyManagementModule.kt index 6dae9232e35..6153fce9f69 100644 --- a/misk-gcp/src/main/kotlin/misk/cloud/gcp/security/keys/GcpKeyManagementModule.kt +++ b/misk-gcp/src/main/kotlin/misk/cloud/gcp/security/keys/GcpKeyManagementModule.kt @@ -8,7 +8,7 @@ import misk.config.AppName import misk.inject.KAbstractModule import misk.inject.asSingleton import misk.security.keys.KeyService -import javax.inject.Singleton +import jakarta.inject.Singleton class GcpKeyManagementModule(private val config: GcpKmsConfig) : KAbstractModule() { override fun configure() { diff --git a/misk-gcp/src/main/kotlin/misk/cloud/gcp/security/keys/GcpKeyService.kt b/misk-gcp/src/main/kotlin/misk/cloud/gcp/security/keys/GcpKeyService.kt index 06d5bb018e9..90cf66d0180 100644 --- a/misk-gcp/src/main/kotlin/misk/cloud/gcp/security/keys/GcpKeyService.kt +++ b/misk-gcp/src/main/kotlin/misk/cloud/gcp/security/keys/GcpKeyService.kt @@ -7,7 +7,7 @@ import misk.security.keys.KeyService import okio.ByteString import okio.ByteString.Companion.toByteString import java.nio.ByteBuffer -import javax.inject.Inject +import jakarta.inject.Inject internal class GcpKeyService @Inject internal constructor( kms: CloudKMS, diff --git a/misk-gcp/src/main/kotlin/misk/cloud/gcp/spanner/GoogleSpannerModule.kt b/misk-gcp/src/main/kotlin/misk/cloud/gcp/spanner/GoogleSpannerModule.kt index bc2d7da2746..92ef29f1a71 100644 --- a/misk-gcp/src/main/kotlin/misk/cloud/gcp/spanner/GoogleSpannerModule.kt +++ b/misk-gcp/src/main/kotlin/misk/cloud/gcp/spanner/GoogleSpannerModule.kt @@ -7,12 +7,12 @@ import com.google.cloud.spanner.Spanner import com.google.cloud.spanner.SpannerOptions import com.google.common.util.concurrent.AbstractIdleService import com.google.inject.Provides -import com.google.inject.Singleton +import jakarta.inject.Singleton import misk.ReadyService import misk.ServiceModule import misk.inject.KAbstractModule import wisp.logging.getLogger -import javax.inject.Inject +import jakarta.inject.Inject /** * [GoogleSpannerModule] provides a Google Spanner client for your app. diff --git a/misk-gcp/src/test/kotlin/misk/cloud/gcp/spanner/GoogleSpannerEmulatorTest.kt b/misk-gcp/src/test/kotlin/misk/cloud/gcp/spanner/GoogleSpannerEmulatorTest.kt index 1004101a029..2a84f60f985 100644 --- a/misk-gcp/src/test/kotlin/misk/cloud/gcp/spanner/GoogleSpannerEmulatorTest.kt +++ b/misk-gcp/src/test/kotlin/misk/cloud/gcp/spanner/GoogleSpannerEmulatorTest.kt @@ -26,7 +26,7 @@ import org.junit.jupiter.api.assertDoesNotThrow import wisp.containers.ContainerUtil import wisp.deployment.TESTING import java.time.Duration -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest @Disabled("Flaky test") diff --git a/misk-gcp/src/test/kotlin/misk/cloud/gcp/spanner/GoogleSpannerModuleTest.kt b/misk-gcp/src/test/kotlin/misk/cloud/gcp/spanner/GoogleSpannerModuleTest.kt index efd842345c3..7aa5a73c221 100644 --- a/misk-gcp/src/test/kotlin/misk/cloud/gcp/spanner/GoogleSpannerModuleTest.kt +++ b/misk-gcp/src/test/kotlin/misk/cloud/gcp/spanner/GoogleSpannerModuleTest.kt @@ -13,7 +13,7 @@ import org.junit.jupiter.api.Order import org.junit.jupiter.api.Test import wisp.containers.ContainerUtil import wisp.deployment.TESTING -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) class GoogleSpannerModuleTest { diff --git a/misk-gcp/src/testFixtures/kotlin/misk/cloud/gcp/datastore/FakeDatastoreModule.kt b/misk-gcp/src/testFixtures/kotlin/misk/cloud/gcp/datastore/FakeDatastoreModule.kt index ff75b880762..0ac85db6d33 100644 --- a/misk-gcp/src/testFixtures/kotlin/misk/cloud/gcp/datastore/FakeDatastoreModule.kt +++ b/misk-gcp/src/testFixtures/kotlin/misk/cloud/gcp/datastore/FakeDatastoreModule.kt @@ -4,10 +4,10 @@ import com.google.cloud.datastore.Datastore import com.google.cloud.datastore.testing.LocalDatastoreHelper import com.google.common.util.concurrent.AbstractIdleService import com.google.inject.Provides -import com.google.inject.Singleton +import jakarta.inject.Singleton import misk.ServiceModule import misk.inject.KAbstractModule -import javax.inject.Inject +import jakarta.inject.Inject /** Installs a version of the [Datastore] that works off an in-memory local store */ class FakeDatastoreModule : KAbstractModule() { diff --git a/misk-gcp/src/testFixtures/kotlin/misk/cloud/gcp/spanner/GoogleSpannerEmulator.kt b/misk-gcp/src/testFixtures/kotlin/misk/cloud/gcp/spanner/GoogleSpannerEmulator.kt index bb58ea4b196..9d078dffadf 100644 --- a/misk-gcp/src/testFixtures/kotlin/misk/cloud/gcp/spanner/GoogleSpannerEmulator.kt +++ b/misk-gcp/src/testFixtures/kotlin/misk/cloud/gcp/spanner/GoogleSpannerEmulator.kt @@ -29,8 +29,8 @@ import wisp.containers.Composer import java.time.Duration import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicBoolean -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton class GoogleSpannerEmulator @Inject constructor( diff --git a/misk-gcp/src/testFixtures/kotlin/misk/cloud/gcp/storage/FakeStorageModule.kt b/misk-gcp/src/testFixtures/kotlin/misk/cloud/gcp/storage/FakeStorageModule.kt index 25cecec8cee..60671921f18 100644 --- a/misk-gcp/src/testFixtures/kotlin/misk/cloud/gcp/storage/FakeStorageModule.kt +++ b/misk-gcp/src/testFixtures/kotlin/misk/cloud/gcp/storage/FakeStorageModule.kt @@ -4,7 +4,7 @@ import com.google.cloud.NoCredentials import com.google.cloud.storage.Storage import com.google.cloud.storage.StorageOptions import com.google.inject.Provides -import com.google.inject.Singleton +import jakarta.inject.Singleton import misk.inject.KAbstractModule /** Installs an embeddable version of [Storage] that works in-memory */ diff --git a/misk-gcp/src/testFixtures/kotlin/misk/cloud/gcp/storage/LocalStorageRpcTest.kt b/misk-gcp/src/testFixtures/kotlin/misk/cloud/gcp/storage/LocalStorageRpcTest.kt index f2a45a75208..cee92f4d5ed 100644 --- a/misk-gcp/src/testFixtures/kotlin/misk/cloud/gcp/storage/LocalStorageRpcTest.kt +++ b/misk-gcp/src/testFixtures/kotlin/misk/cloud/gcp/storage/LocalStorageRpcTest.kt @@ -5,7 +5,7 @@ import misk.testing.MiskTestModule import misk.testing.TemporaryFolder import misk.testing.TemporaryFolderModule import wisp.moshi.defaultKotlinMoshi -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = false) internal class LocalStorageRpcTest : CustomStorageRpcTestCases() { diff --git a/misk-grpc-reflect/build.gradle.kts b/misk-grpc-reflect/build.gradle.kts index 0300afe693c..ca533355d05 100644 --- a/misk-grpc-reflect/build.gradle.kts +++ b/misk-grpc-reflect/build.gradle.kts @@ -25,7 +25,7 @@ wire { dependencies { api(Dependencies.guice) - api(Dependencies.javaxInject) + api(Dependencies.jakartaInject) api(Dependencies.wireReflector) api(project(":misk-actions")) api(project(":misk-inject")) diff --git a/misk-grpc-reflect/src/main/kotlin/misk/grpc/reflect/GrpcReflectModule.kt b/misk-grpc-reflect/src/main/kotlin/misk/grpc/reflect/GrpcReflectModule.kt index a30b515b593..be6bea43bfc 100644 --- a/misk-grpc-reflect/src/main/kotlin/misk/grpc/reflect/GrpcReflectModule.kt +++ b/misk-grpc-reflect/src/main/kotlin/misk/grpc/reflect/GrpcReflectModule.kt @@ -14,7 +14,7 @@ import misk.web.actions.WebActionEntry import okio.FileSystem import okio.Path.Companion.toPath import wisp.logging.getLogger -import javax.inject.Singleton +import jakarta.inject.Singleton import kotlin.reflect.KClass import kotlin.reflect.full.findAnnotation import kotlin.reflect.full.functions diff --git a/misk-grpc-reflect/src/main/kotlin/misk/grpc/reflect/ServerReflectionApi.kt b/misk-grpc-reflect/src/main/kotlin/misk/grpc/reflect/ServerReflectionApi.kt index 7967d4613b5..7b1eb3ba3bb 100644 --- a/misk-grpc-reflect/src/main/kotlin/misk/grpc/reflect/ServerReflectionApi.kt +++ b/misk-grpc-reflect/src/main/kotlin/misk/grpc/reflect/ServerReflectionApi.kt @@ -8,7 +8,7 @@ import grpc.reflection.v1alpha.ServerReflectionResponse import grpc.reflection.v1alpha.ServerReflectionServerReflectionInfoBlockingServer import misk.security.authz.Unauthenticated import misk.web.actions.WebAction -import javax.inject.Inject +import jakarta.inject.Inject // https://raw.githubusercontent.com/grpc/grpc/master/src/proto/grpc/reflection/v1alpha/reflection.proto class ServerReflectionApi @Inject constructor( diff --git a/misk-grpc-reflect/src/test/kotlin/misk/grpc/GrpcReflectNoProtoFoundTest.kt b/misk-grpc-reflect/src/test/kotlin/misk/grpc/GrpcReflectNoProtoFoundTest.kt index 9be4565b719..9d0276c7f5f 100644 --- a/misk-grpc-reflect/src/test/kotlin/misk/grpc/GrpcReflectNoProtoFoundTest.kt +++ b/misk-grpc-reflect/src/test/kotlin/misk/grpc/GrpcReflectNoProtoFoundTest.kt @@ -13,9 +13,9 @@ import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import routeguide.Feature import routeguide.Point -import javax.inject.Inject -import javax.inject.Provider -import javax.inject.Singleton +import jakarta.inject.Inject +import com.google.inject.Provider +import jakarta.inject.Singleton @MiskTest(startService = true) class GrpcReflectNoProtoFoundTest { diff --git a/misk-grpc-reflect/src/test/kotlin/misk/grpc/GrpcReflectTest.kt b/misk-grpc-reflect/src/test/kotlin/misk/grpc/GrpcReflectTest.kt index bfcccd81683..0358a12ac03 100644 --- a/misk-grpc-reflect/src/test/kotlin/misk/grpc/GrpcReflectTest.kt +++ b/misk-grpc-reflect/src/test/kotlin/misk/grpc/GrpcReflectTest.kt @@ -16,9 +16,9 @@ import org.junit.jupiter.api.Test import routeguide.Feature import routeguide.Point import routeguide.RouteGuideGetFeatureBlockingServer -import javax.inject.Inject -import javax.inject.Provider -import javax.inject.Singleton +import jakarta.inject.Inject +import com.google.inject.Provider +import jakarta.inject.Singleton @MiskTest(startService = true) class GrpcReflectTest { diff --git a/misk-grpc-reflect/src/test/kotlin/misk/grpc/GrpcReflectTestingModule.kt b/misk-grpc-reflect/src/test/kotlin/misk/grpc/GrpcReflectTestingModule.kt index a21b1b3fdee..044194dcf8c 100644 --- a/misk-grpc-reflect/src/test/kotlin/misk/grpc/GrpcReflectTestingModule.kt +++ b/misk-grpc-reflect/src/test/kotlin/misk/grpc/GrpcReflectTestingModule.kt @@ -16,8 +16,8 @@ import misk.security.ssl.TrustStoreConfig import misk.web.WebTestingModule import misk.web.jetty.JettyService import okhttp3.HttpUrl -import javax.inject.Named -import javax.inject.Singleton +import jakarta.inject.Named +import jakarta.inject.Singleton class GrpcReflectTestingModule : KAbstractModule() { val webConfig = WebTestingModule.TESTING_WEB_CONFIG.copy( diff --git a/misk-grpc-tests/build.gradle.kts b/misk-grpc-tests/build.gradle.kts index 9cfd469396c..793fcdf3133 100644 --- a/misk-grpc-tests/build.gradle.kts +++ b/misk-grpc-tests/build.gradle.kts @@ -67,7 +67,7 @@ dependencies { api(Dependencies.grpcStub) api(Dependencies.guava) api(Dependencies.guice) - api(Dependencies.javaxInject) + api(Dependencies.jakartaInject) api(Dependencies.okHttp) api(Dependencies.okio) api(Dependencies.protobufJava) diff --git a/misk-grpc-tests/src/main/kotlin/misk/grpc/miskclient/MiskGrpcClientModule.kt b/misk-grpc-tests/src/main/kotlin/misk/grpc/miskclient/MiskGrpcClientModule.kt index a82ffb6f09c..ba3f2bb1b7c 100644 --- a/misk-grpc-tests/src/main/kotlin/misk/grpc/miskclient/MiskGrpcClientModule.kt +++ b/misk-grpc-tests/src/main/kotlin/misk/grpc/miskclient/MiskGrpcClientModule.kt @@ -1,7 +1,7 @@ package misk.grpc.miskclient import com.google.inject.Provides -import javax.inject.Singleton +import jakarta.inject.Singleton import misk.MiskTestingServiceModule import misk.client.ClientNetworkInterceptor import misk.client.GrpcClientModule diff --git a/misk-grpc-tests/src/main/kotlin/misk/grpc/miskclient/RouteGuideCallCounter.kt b/misk-grpc-tests/src/main/kotlin/misk/grpc/miskclient/RouteGuideCallCounter.kt index 472b0814d88..381a35af18e 100644 --- a/misk-grpc-tests/src/main/kotlin/misk/grpc/miskclient/RouteGuideCallCounter.kt +++ b/misk-grpc-tests/src/main/kotlin/misk/grpc/miskclient/RouteGuideCallCounter.kt @@ -2,8 +2,8 @@ package misk.grpc.miskclient import java.util.Collections import java.util.concurrent.atomic.AtomicInteger -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import misk.client.ClientAction import misk.client.ClientNetworkChain import misk.client.ClientNetworkInterceptor diff --git a/misk-grpc-tests/src/main/kotlin/misk/grpc/miskserver/GetFeatureGrpcAction.kt b/misk-grpc-tests/src/main/kotlin/misk/grpc/miskserver/GetFeatureGrpcAction.kt index b0518e3ace2..3755fd9ab78 100644 --- a/misk-grpc-tests/src/main/kotlin/misk/grpc/miskserver/GetFeatureGrpcAction.kt +++ b/misk-grpc-tests/src/main/kotlin/misk/grpc/miskserver/GetFeatureGrpcAction.kt @@ -10,7 +10,7 @@ import routeguide.Point import routeguide.Rectangle import routeguide.RouteGuideGetFeatureBlockingServer import java.net.HttpURLConnection.HTTP_BAD_REQUEST -import javax.inject.Inject +import jakarta.inject.Inject class GetFeatureGrpcAction @Inject constructor() : WebAction, RouteGuideGetFeatureBlockingServer { @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) diff --git a/misk-grpc-tests/src/main/kotlin/misk/grpc/miskserver/RouteChatGrpcAction.kt b/misk-grpc-tests/src/main/kotlin/misk/grpc/miskserver/RouteChatGrpcAction.kt index 187d29567c1..6b89939a858 100644 --- a/misk-grpc-tests/src/main/kotlin/misk/grpc/miskserver/RouteChatGrpcAction.kt +++ b/misk-grpc-tests/src/main/kotlin/misk/grpc/miskserver/RouteChatGrpcAction.kt @@ -7,8 +7,8 @@ import misk.web.actions.WebAction import misk.web.interceptors.LogRequestResponse import routeguide.RouteGuideRouteChatBlockingServer import routeguide.RouteNote -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton class RouteChatGrpcAction @Inject constructor() : WebAction, RouteGuideRouteChatBlockingServer { diff --git a/misk-grpc-tests/src/main/kotlin/misk/grpc/miskserver/RouteGuideMiskServiceModule.kt b/misk-grpc-tests/src/main/kotlin/misk/grpc/miskserver/RouteGuideMiskServiceModule.kt index b87f282970b..d595e14a60d 100644 --- a/misk-grpc-tests/src/main/kotlin/misk/grpc/miskserver/RouteGuideMiskServiceModule.kt +++ b/misk-grpc-tests/src/main/kotlin/misk/grpc/miskserver/RouteGuideMiskServiceModule.kt @@ -8,7 +8,7 @@ import misk.metrics.FakeMetricsModule import misk.web.WebActionModule import misk.web.WebServerTestingModule import misk.web.jetty.JettyService -import javax.inject.Named +import jakarta.inject.Named /** A module that runs a Misk gRPC server: Wire protos and a Jetty backend. */ class RouteGuideMiskServiceModule : KAbstractModule() { diff --git a/misk-grpc-tests/src/main/kotlin/misk/grpc/protocclient/GrpcChannelFactory.kt b/misk-grpc-tests/src/main/kotlin/misk/grpc/protocclient/GrpcChannelFactory.kt index 4f7d4f6b55c..7895a252891 100644 --- a/misk-grpc-tests/src/main/kotlin/misk/grpc/protocclient/GrpcChannelFactory.kt +++ b/misk-grpc-tests/src/main/kotlin/misk/grpc/protocclient/GrpcChannelFactory.kt @@ -7,8 +7,8 @@ import io.netty.handler.ssl.SslContext import io.netty.handler.ssl.SslContextBuilder import misk.resources.ResourceLoader import java.net.SocketAddress -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton class GrpcChannelFactory @Inject constructor(val resourceLoader: ResourceLoader) { diff --git a/misk-grpc-tests/src/main/kotlin/misk/grpc/protocclient/ProtocGrpcClientModule.kt b/misk-grpc-tests/src/main/kotlin/misk/grpc/protocclient/ProtocGrpcClientModule.kt index 00388097d0b..52a589c5fdc 100644 --- a/misk-grpc-tests/src/main/kotlin/misk/grpc/protocclient/ProtocGrpcClientModule.kt +++ b/misk-grpc-tests/src/main/kotlin/misk/grpc/protocclient/ProtocGrpcClientModule.kt @@ -4,8 +4,8 @@ import com.google.inject.Provides import misk.inject.KAbstractModule import okhttp3.HttpUrl import java.net.InetSocketAddress -import javax.inject.Named -import javax.inject.Singleton +import jakarta.inject.Named +import jakarta.inject.Singleton class ProtocGrpcClientModule : KAbstractModule() { override fun configure() {} diff --git a/misk-grpc-tests/src/main/kotlin/misk/grpc/protocserver/ProtocGrpcService.kt b/misk-grpc-tests/src/main/kotlin/misk/grpc/protocserver/ProtocGrpcService.kt index f9f7b51553d..e11b5bbdde8 100644 --- a/misk-grpc-tests/src/main/kotlin/misk/grpc/protocserver/ProtocGrpcService.kt +++ b/misk-grpc-tests/src/main/kotlin/misk/grpc/protocserver/ProtocGrpcService.kt @@ -6,8 +6,8 @@ import io.grpc.Server import io.grpc.ServerBuilder import misk.resources.ResourceLoader import okhttp3.HttpUrl -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * Runs a standard gRPC server: generated protoc protos and a Netty backend. This isn't how Misk diff --git a/misk-grpc-tests/src/main/kotlin/misk/grpc/protocserver/RouteGuideProtocService.kt b/misk-grpc-tests/src/main/kotlin/misk/grpc/protocserver/RouteGuideProtocService.kt index d4e830d8312..ec1ecfdb4cf 100644 --- a/misk-grpc-tests/src/main/kotlin/misk/grpc/protocserver/RouteGuideProtocService.kt +++ b/misk-grpc-tests/src/main/kotlin/misk/grpc/protocserver/RouteGuideProtocService.kt @@ -5,8 +5,8 @@ import routeguide.RouteGuideGrpc.RouteGuideImplBase import routeguide.RouteGuideProto import routeguide.RouteGuideProto.Feature import routeguide.RouteGuideProto.Point -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton internal class RouteGuideProtocService @Inject constructor() : RouteGuideImplBase() { diff --git a/misk-grpc-tests/src/main/kotlin/misk/grpc/protocserver/RouteGuideProtocServiceModule.kt b/misk-grpc-tests/src/main/kotlin/misk/grpc/protocserver/RouteGuideProtocServiceModule.kt index d3710485594..33b2ac2a08a 100644 --- a/misk-grpc-tests/src/main/kotlin/misk/grpc/protocserver/RouteGuideProtocServiceModule.kt +++ b/misk-grpc-tests/src/main/kotlin/misk/grpc/protocserver/RouteGuideProtocServiceModule.kt @@ -4,7 +4,7 @@ import com.google.inject.Provides import io.grpc.BindableService import misk.ServiceModule import misk.inject.KAbstractModule -import javax.inject.Named +import jakarta.inject.Named /** A module that runs a standard gRPC server: generated protoc protos and a Netty backend. */ class RouteGuideProtocServiceModule : KAbstractModule() { diff --git a/misk-grpc-tests/src/test/kotlin/misk/grpc/MiskClientMiskServerTest.kt b/misk-grpc-tests/src/test/kotlin/misk/grpc/MiskClientMiskServerTest.kt index 8951b4e3c8e..ebce15e59f6 100644 --- a/misk-grpc-tests/src/test/kotlin/misk/grpc/MiskClientMiskServerTest.kt +++ b/misk-grpc-tests/src/test/kotlin/misk/grpc/MiskClientMiskServerTest.kt @@ -34,8 +34,8 @@ import routeguide.RouteGuideClient import routeguide.RouteNote import wisp.logging.LogCollector import java.net.HttpURLConnection.HTTP_BAD_REQUEST -import javax.inject.Inject -import javax.inject.Named +import jakarta.inject.Inject +import jakarta.inject.Named import kotlin.test.assertFailsWith @MiskTest(startService = true) diff --git a/misk-grpc-tests/src/test/kotlin/misk/grpc/MiskClientProtocServerTest.kt b/misk-grpc-tests/src/test/kotlin/misk/grpc/MiskClientProtocServerTest.kt index d9a78adcca5..23533be8dfc 100644 --- a/misk-grpc-tests/src/test/kotlin/misk/grpc/MiskClientProtocServerTest.kt +++ b/misk-grpc-tests/src/test/kotlin/misk/grpc/MiskClientProtocServerTest.kt @@ -2,8 +2,8 @@ package misk.grpc import com.google.inject.Guice import com.google.inject.util.Modules -import javax.inject.Inject -import javax.inject.Named +import jakarta.inject.Inject +import jakarta.inject.Named import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.runBlocking import misk.MiskTestingServiceModule diff --git a/misk-grpc-tests/src/test/kotlin/misk/grpc/ProtocClientMiskServerTest.kt b/misk-grpc-tests/src/test/kotlin/misk/grpc/ProtocClientMiskServerTest.kt index 08190a960c3..997775e2659 100644 --- a/misk-grpc-tests/src/test/kotlin/misk/grpc/ProtocClientMiskServerTest.kt +++ b/misk-grpc-tests/src/test/kotlin/misk/grpc/ProtocClientMiskServerTest.kt @@ -16,8 +16,8 @@ import routeguide.RouteGuideGrpc import routeguide.RouteGuideProto.Feature import routeguide.RouteGuideProto.Point import routeguide.RouteGuideProto.Rectangle -import javax.inject.Inject -import javax.inject.Provider +import jakarta.inject.Inject +import com.google.inject.Provider @MiskTest(startService = true) class ProtocClientMiskServerTest { diff --git a/misk-grpc-tests/src/test/kotlin/misk/grpc/ProtocClientProtocServerTest.kt b/misk-grpc-tests/src/test/kotlin/misk/grpc/ProtocClientProtocServerTest.kt index 3461c53ab88..65545a6738b 100644 --- a/misk-grpc-tests/src/test/kotlin/misk/grpc/ProtocClientProtocServerTest.kt +++ b/misk-grpc-tests/src/test/kotlin/misk/grpc/ProtocClientProtocServerTest.kt @@ -12,8 +12,8 @@ import org.junit.jupiter.api.Test import routeguide.RouteGuideGrpc import routeguide.RouteGuideProto.Feature import routeguide.RouteGuideProto.Point -import javax.inject.Inject -import javax.inject.Provider +import jakarta.inject.Inject +import com.google.inject.Provider @MiskTest(startService = true) class ProtocClientProtocServerTest { diff --git a/misk-hibernate/build.gradle.kts b/misk-hibernate/build.gradle.kts index 0f36a320a76..d62cd7f7dcd 100644 --- a/misk-hibernate/build.gradle.kts +++ b/misk-hibernate/build.gradle.kts @@ -28,7 +28,7 @@ dependencies { api(Dependencies.guava) api(Dependencies.guice) api(Dependencies.hibernateCore) - api(Dependencies.javaxInject) + api(Dependencies.jakartaInject) api(Dependencies.javaxPersistenceApi) api(project(":misk-inject")) api(project(":misk-jdbc")) diff --git a/misk-hibernate/src/main/kotlin/misk/hibernate/AggregateListener.kt b/misk-hibernate/src/main/kotlin/misk/hibernate/AggregateListener.kt index e199fdfe44e..ae060a948e1 100644 --- a/misk-hibernate/src/main/kotlin/misk/hibernate/AggregateListener.kt +++ b/misk-hibernate/src/main/kotlin/misk/hibernate/AggregateListener.kt @@ -27,7 +27,7 @@ import org.hibernate.jpa.event.spi.Callback import org.hibernate.jpa.event.spi.CallbackRegistry import org.hibernate.jpa.event.spi.CallbackRegistryConsumer import org.hibernate.persister.entity.EntityPersister -import javax.inject.Provider +import com.google.inject.Provider /** * This class delegates to other event listeners registered with Guice. This allows us to defer diff --git a/misk-hibernate/src/main/kotlin/misk/hibernate/HibernateEventListener.kt b/misk-hibernate/src/main/kotlin/misk/hibernate/HibernateEventListener.kt index c0a601273d0..792485642b7 100644 --- a/misk-hibernate/src/main/kotlin/misk/hibernate/HibernateEventListener.kt +++ b/misk-hibernate/src/main/kotlin/misk/hibernate/HibernateEventListener.kt @@ -1,7 +1,7 @@ package misk.hibernate import org.hibernate.event.spi.EventType -import javax.inject.Provider +import com.google.inject.Provider /** * Control how we register listeners. diff --git a/misk-hibernate/src/main/kotlin/misk/hibernate/HibernateExceptionMappers.kt b/misk-hibernate/src/main/kotlin/misk/hibernate/HibernateExceptionMappers.kt index 345f225818f..369057d0c07 100644 --- a/misk-hibernate/src/main/kotlin/misk/hibernate/HibernateExceptionMappers.kt +++ b/misk-hibernate/src/main/kotlin/misk/hibernate/HibernateExceptionMappers.kt @@ -11,7 +11,7 @@ import okhttp3.Headers.Companion.headersOf import org.hibernate.exception.ConstraintViolationException import org.hibernate.exception.GenericJDBCException import org.slf4j.event.Level -import javax.inject.Inject +import jakarta.inject.Inject import javax.persistence.OptimisticLockException internal class RetryTransactionExceptionMapper @Inject internal constructor() : diff --git a/misk-hibernate/src/main/kotlin/misk/hibernate/HibernateHealthCheck.kt b/misk-hibernate/src/main/kotlin/misk/hibernate/HibernateHealthCheck.kt index 3c5d799b88d..ad4120cb31b 100644 --- a/misk-hibernate/src/main/kotlin/misk/hibernate/HibernateHealthCheck.kt +++ b/misk-hibernate/src/main/kotlin/misk/hibernate/HibernateHealthCheck.kt @@ -8,7 +8,7 @@ import wisp.logging.getLogger import java.sql.Timestamp import java.time.Clock import java.time.Duration -import javax.inject.Provider +import com.google.inject.Provider import kotlin.reflect.KClass /** diff --git a/misk-hibernate/src/main/kotlin/misk/hibernate/HibernateInjectorAccess.kt b/misk-hibernate/src/main/kotlin/misk/hibernate/HibernateInjectorAccess.kt index 2b7297d0d57..78ae7fa9394 100644 --- a/misk-hibernate/src/main/kotlin/misk/hibernate/HibernateInjectorAccess.kt +++ b/misk-hibernate/src/main/kotlin/misk/hibernate/HibernateInjectorAccess.kt @@ -4,8 +4,8 @@ import com.google.inject.Injector import org.hibernate.boot.registry.StandardServiceInitiator import org.hibernate.service.ServiceRegistry import org.hibernate.service.spi.ServiceRegistryImplementor -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * Exposes the Misk injector to Hibernate extensions like UserTypes. Use it with the `injector` diff --git a/misk-hibernate/src/main/kotlin/misk/hibernate/HibernateModule.kt b/misk-hibernate/src/main/kotlin/misk/hibernate/HibernateModule.kt index e1cff14e893..eb0ea0d7b0a 100644 --- a/misk-hibernate/src/main/kotlin/misk/hibernate/HibernateModule.kt +++ b/misk-hibernate/src/main/kotlin/misk/hibernate/HibernateModule.kt @@ -26,8 +26,8 @@ import org.hibernate.SessionFactory import org.hibernate.event.spi.EventType import org.hibernate.exception.ConstraintViolationException import java.time.Clock -import javax.inject.Inject -import javax.inject.Provider +import jakarta.inject.Inject +import com.google.inject.Provider import javax.persistence.OptimisticLockException import javax.sql.DataSource import kotlin.reflect.KClass @@ -35,9 +35,12 @@ import kotlin.reflect.KClass /** * Binds database connectivity for a qualified data source. This binds the following public types: * - * * @Qualifier [misk.jdbc.DataSourceConfig] - * * @Qualifier [SessionFactory] - * * @Qualifier [Transacter] + * * @Qualifier +[misk.jdbc.DataSourceConfig] + * * @Qualifier +[SessionFactory] + * * @Qualifier +[Transacter] * * [Query.Factory] (with no qualifier) * * This also registers services to connect to the database ([SessionFactoryService]) and to verify diff --git a/misk-hibernate/src/main/kotlin/misk/hibernate/ReflectionQueryFactory.kt b/misk-hibernate/src/main/kotlin/misk/hibernate/ReflectionQueryFactory.kt index 9cd59123b22..f9a50a9e224 100644 --- a/misk-hibernate/src/main/kotlin/misk/hibernate/ReflectionQueryFactory.kt +++ b/misk-hibernate/src/main/kotlin/misk/hibernate/ReflectionQueryFactory.kt @@ -11,8 +11,8 @@ import java.lang.reflect.Method import java.lang.reflect.ParameterizedType import java.lang.reflect.Proxy import java.util.* -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import javax.persistence.criteria.CriteriaBuilder import javax.persistence.criteria.JoinType import javax.persistence.criteria.Path diff --git a/misk-hibernate/src/main/kotlin/misk/hibernate/SchemaValidatorService.kt b/misk-hibernate/src/main/kotlin/misk/hibernate/SchemaValidatorService.kt index 57a7ef9d947..5377ad5947e 100644 --- a/misk-hibernate/src/main/kotlin/misk/hibernate/SchemaValidatorService.kt +++ b/misk-hibernate/src/main/kotlin/misk/hibernate/SchemaValidatorService.kt @@ -5,7 +5,7 @@ import com.google.common.util.concurrent.Service import misk.healthchecks.HealthCheck import misk.healthchecks.HealthStatus import java.util.Collections -import javax.inject.Provider +import com.google.inject.Provider import kotlin.reflect.KClass internal class SchemaValidatorService internal constructor( diff --git a/misk-hibernate/src/main/kotlin/misk/hibernate/SessionFactoryService.kt b/misk-hibernate/src/main/kotlin/misk/hibernate/SessionFactoryService.kt index aeccedcc642..fcb7d3cd1dd 100644 --- a/misk-hibernate/src/main/kotlin/misk/hibernate/SessionFactoryService.kt +++ b/misk-hibernate/src/main/kotlin/misk/hibernate/SessionFactoryService.kt @@ -21,7 +21,7 @@ import org.hibernate.mapping.Value import org.hibernate.service.spi.SessionFactoryServiceRegistry import org.hibernate.usertype.UserType import wisp.logging.getLogger -import javax.inject.Provider +import com.google.inject.Provider import javax.persistence.Column import javax.persistence.Table import javax.sql.DataSource diff --git a/misk-hibernate/src/main/kotlin/misk/hibernate/TimestampListener.kt b/misk-hibernate/src/main/kotlin/misk/hibernate/TimestampListener.kt index f0cdc86a909..203062324ae 100644 --- a/misk-hibernate/src/main/kotlin/misk/hibernate/TimestampListener.kt +++ b/misk-hibernate/src/main/kotlin/misk/hibernate/TimestampListener.kt @@ -5,8 +5,8 @@ import org.hibernate.event.spi.PreInsertEventListener import org.hibernate.event.spi.PreUpdateEvent import org.hibernate.event.spi.PreUpdateEventListener import java.time.Clock -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton internal class TimestampListener @Inject constructor() : diff --git a/misk-hibernate/src/main/kotlin/misk/hibernate/actions/DatabaseQueryMetadataProvider.kt b/misk-hibernate/src/main/kotlin/misk/hibernate/actions/DatabaseQueryMetadataProvider.kt index 57d83f2e1fd..8cd9e3eb36c 100644 --- a/misk-hibernate/src/main/kotlin/misk/hibernate/actions/DatabaseQueryMetadataProvider.kt +++ b/misk-hibernate/src/main/kotlin/misk/hibernate/actions/DatabaseQueryMetadataProvider.kt @@ -4,8 +4,8 @@ import misk.hibernate.DbEntity import misk.hibernate.Query import misk.web.metadata.database.DatabaseQueryMetadata import misk.web.metadata.database.NoAdminDashboardDatabaseAccess -import javax.inject.Inject -import javax.inject.Provider +import jakarta.inject.Inject +import com.google.inject.Provider import kotlin.reflect.KClass internal class DatabaseQueryMetadataProvider>( diff --git a/misk-hibernate/src/main/kotlin/misk/hibernate/actions/HibernateDatabaseQueryDynamicAction.kt b/misk-hibernate/src/main/kotlin/misk/hibernate/actions/HibernateDatabaseQueryDynamicAction.kt index c9679c48cbc..9570690099e 100644 --- a/misk-hibernate/src/main/kotlin/misk/hibernate/actions/HibernateDatabaseQueryDynamicAction.kt +++ b/misk-hibernate/src/main/kotlin/misk/hibernate/actions/HibernateDatabaseQueryDynamicAction.kt @@ -23,8 +23,8 @@ import misk.web.dashboard.AdminDashboardAccess import misk.web.mediatype.MediaTypes import misk.web.metadata.database.DatabaseQueryMetadata import wisp.logging.getLogger -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import kotlin.reflect.KClass /** Runs query from Database Query dashboard tab against DB and returns results */ diff --git a/misk-hibernate/src/main/kotlin/misk/hibernate/actions/HibernateDatabaseQueryMetadataFactory.kt b/misk-hibernate/src/main/kotlin/misk/hibernate/actions/HibernateDatabaseQueryMetadataFactory.kt index f47370a551a..eec08f1f654 100644 --- a/misk-hibernate/src/main/kotlin/misk/hibernate/actions/HibernateDatabaseQueryMetadataFactory.kt +++ b/misk-hibernate/src/main/kotlin/misk/hibernate/actions/HibernateDatabaseQueryMetadataFactory.kt @@ -21,8 +21,8 @@ import misk.web.MiskWebFormBuilder.Field import misk.web.MiskWebFormBuilder.Type import misk.web.metadata.database.DatabaseQueryMetadata import misk.web.metadata.database.NoAdminDashboardDatabaseAccess -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import javax.persistence.Table import kotlin.reflect.KClass import kotlin.reflect.KFunction diff --git a/misk-hibernate/src/main/kotlin/misk/hibernate/actions/HibernateDatabaseQueryStaticAction.kt b/misk-hibernate/src/main/kotlin/misk/hibernate/actions/HibernateDatabaseQueryStaticAction.kt index cc0110a94ca..5e31ea60240 100644 --- a/misk-hibernate/src/main/kotlin/misk/hibernate/actions/HibernateDatabaseQueryStaticAction.kt +++ b/misk-hibernate/src/main/kotlin/misk/hibernate/actions/HibernateDatabaseQueryStaticAction.kt @@ -27,8 +27,8 @@ import misk.web.mediatype.MediaTypes import misk.web.metadata.database.DatabaseQueryMetadata import wisp.logging.getLogger import java.lang.reflect.ParameterizedType -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import kotlin.reflect.KClass /** Runs query from Database Query dashboard tab against DB and returns results */ diff --git a/misk-hibernate/src/main/kotlin/misk/hibernate/migrate/BulkShardMigrator.kt b/misk-hibernate/src/main/kotlin/misk/hibernate/migrate/BulkShardMigrator.kt index 4a1f5482cc0..c12268fb266 100644 --- a/misk-hibernate/src/main/kotlin/misk/hibernate/migrate/BulkShardMigrator.kt +++ b/misk-hibernate/src/main/kotlin/misk/hibernate/migrate/BulkShardMigrator.kt @@ -21,8 +21,8 @@ import java.sql.Connection import java.sql.PreparedStatement import java.sql.SQLException import java.util.stream.Collectors.joining -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import kotlin.reflect.KClass import kotlin.reflect.full.isSubclassOf diff --git a/misk-hibernate/src/test/kotlin/misk/hibernate/BoxedStringColumnTest.kt b/misk-hibernate/src/test/kotlin/misk/hibernate/BoxedStringColumnTest.kt index 61d87257d32..86292567e39 100644 --- a/misk-hibernate/src/test/kotlin/misk/hibernate/BoxedStringColumnTest.kt +++ b/misk-hibernate/src/test/kotlin/misk/hibernate/BoxedStringColumnTest.kt @@ -11,8 +11,8 @@ import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import wisp.config.Config import wisp.deployment.TESTING -import javax.inject.Inject -import javax.inject.Qualifier +import jakarta.inject.Inject +import jakarta.inject.Qualifier import javax.persistence.Column import javax.persistence.Entity import javax.persistence.GeneratedValue diff --git a/misk-hibernate/src/test/kotlin/misk/hibernate/ByteStringColumnTest.kt b/misk-hibernate/src/test/kotlin/misk/hibernate/ByteStringColumnTest.kt index c5fbd0b52b4..6a82ab9d37b 100644 --- a/misk-hibernate/src/test/kotlin/misk/hibernate/ByteStringColumnTest.kt +++ b/misk-hibernate/src/test/kotlin/misk/hibernate/ByteStringColumnTest.kt @@ -14,8 +14,8 @@ import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import wisp.config.Config import wisp.deployment.TESTING -import javax.inject.Inject -import javax.inject.Qualifier +import jakarta.inject.Inject +import jakarta.inject.Qualifier import javax.persistence.Column import javax.persistence.Entity import javax.persistence.GeneratedValue diff --git a/misk-hibernate/src/test/kotlin/misk/hibernate/ChildEntityTest.kt b/misk-hibernate/src/test/kotlin/misk/hibernate/ChildEntityTest.kt index 3b2fb505d92..4a5675d8b7c 100644 --- a/misk-hibernate/src/test/kotlin/misk/hibernate/ChildEntityTest.kt +++ b/misk-hibernate/src/test/kotlin/misk/hibernate/ChildEntityTest.kt @@ -7,7 +7,7 @@ import org.hibernate.TypeMismatchException import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows import java.time.LocalDate -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) class ChildEntityTest { diff --git a/misk-hibernate/src/test/kotlin/misk/hibernate/EventListenersTest.kt b/misk-hibernate/src/test/kotlin/misk/hibernate/EventListenersTest.kt index 09de6092ff4..4c9e72755a8 100644 --- a/misk-hibernate/src/test/kotlin/misk/hibernate/EventListenersTest.kt +++ b/misk-hibernate/src/test/kotlin/misk/hibernate/EventListenersTest.kt @@ -7,7 +7,7 @@ import org.assertj.core.api.Assertions.assertThat import org.hibernate.event.spi.EventType import org.junit.jupiter.api.Test import java.time.LocalDate -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) class EventListenersTest { diff --git a/misk-hibernate/src/test/kotlin/misk/hibernate/ExternalColumnTest.kt b/misk-hibernate/src/test/kotlin/misk/hibernate/ExternalColumnTest.kt index 606046edb78..e7f4612b3f9 100644 --- a/misk-hibernate/src/test/kotlin/misk/hibernate/ExternalColumnTest.kt +++ b/misk-hibernate/src/test/kotlin/misk/hibernate/ExternalColumnTest.kt @@ -11,8 +11,8 @@ import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import wisp.config.Config import wisp.deployment.TESTING -import javax.inject.Inject -import javax.inject.Qualifier +import jakarta.inject.Inject +import jakarta.inject.Qualifier import javax.persistence.Column import javax.persistence.Entity import javax.persistence.FetchType diff --git a/misk-hibernate/src/test/kotlin/misk/hibernate/FakeEventListener.kt b/misk-hibernate/src/test/kotlin/misk/hibernate/FakeEventListener.kt index c9187b28922..c6217709eab 100644 --- a/misk-hibernate/src/test/kotlin/misk/hibernate/FakeEventListener.kt +++ b/misk-hibernate/src/test/kotlin/misk/hibernate/FakeEventListener.kt @@ -8,8 +8,8 @@ import org.hibernate.event.spi.PreLoadEvent import org.hibernate.event.spi.PreLoadEventListener import org.hibernate.event.spi.PreUpdateEvent import org.hibernate.event.spi.PreUpdateEventListener -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton class FakeEventListener @Inject constructor() : diff --git a/misk-hibernate/src/test/kotlin/misk/hibernate/HealthCheckTest.kt b/misk-hibernate/src/test/kotlin/misk/hibernate/HealthCheckTest.kt index 525c153a42f..7e61ed433da 100644 --- a/misk-hibernate/src/test/kotlin/misk/hibernate/HealthCheckTest.kt +++ b/misk-hibernate/src/test/kotlin/misk/hibernate/HealthCheckTest.kt @@ -14,8 +14,8 @@ import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import wisp.time.FakeClock import java.time.Instant -import javax.inject.Inject -import javax.inject.Provider +import jakarta.inject.Inject +import com.google.inject.Provider @MiskTest(startService = true) class HealthCheckTest { diff --git a/misk-hibernate/src/test/kotlin/misk/hibernate/HibernateEntityModuleTest.kt b/misk-hibernate/src/test/kotlin/misk/hibernate/HibernateEntityModuleTest.kt index ecac05ff244..7bf36fe485c 100644 --- a/misk-hibernate/src/test/kotlin/misk/hibernate/HibernateEntityModuleTest.kt +++ b/misk-hibernate/src/test/kotlin/misk/hibernate/HibernateEntityModuleTest.kt @@ -4,7 +4,7 @@ import com.google.inject.Guice import misk.inject.getSetOf import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.inject.Qualifier +import jakarta.inject.Qualifier internal class HibernateEntityModuleTest { @Test fun multipleDataSources() { @@ -60,10 +60,10 @@ internal class HibernateEntityModuleTest { private fun Set.unwrap() = map { it.entity } @Qualifier - annotation class Dinosaurs +annotation class Dinosaurs @Qualifier - annotation class Shapes +annotation class Shapes abstract class Square : DbUnsharded abstract class Circle : DbEntity diff --git a/misk-hibernate/src/test/kotlin/misk/hibernate/JsonColumnTest.kt b/misk-hibernate/src/test/kotlin/misk/hibernate/JsonColumnTest.kt index e321d488bcb..8db42538994 100644 --- a/misk-hibernate/src/test/kotlin/misk/hibernate/JsonColumnTest.kt +++ b/misk-hibernate/src/test/kotlin/misk/hibernate/JsonColumnTest.kt @@ -11,8 +11,8 @@ import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import wisp.config.Config import wisp.deployment.TESTING -import javax.inject.Inject -import javax.inject.Qualifier +import jakarta.inject.Inject +import jakarta.inject.Qualifier import javax.persistence.Column import javax.persistence.Entity import javax.persistence.GeneratedValue diff --git a/misk-hibernate/src/test/kotlin/misk/hibernate/Movies.kt b/misk-hibernate/src/test/kotlin/misk/hibernate/Movies.kt index 5f69eba2ee0..21d7fd3c3eb 100644 --- a/misk-hibernate/src/test/kotlin/misk/hibernate/Movies.kt +++ b/misk-hibernate/src/test/kotlin/misk/hibernate/Movies.kt @@ -1,6 +1,6 @@ package misk.hibernate -import javax.inject.Qualifier +import jakarta.inject.Qualifier @Qualifier @Target(AnnotationTarget.FIELD, AnnotationTarget.FUNCTION) diff --git a/misk-hibernate/src/test/kotlin/misk/hibernate/MySqlScaleSafetyTest.kt b/misk-hibernate/src/test/kotlin/misk/hibernate/MySqlScaleSafetyTest.kt index 228b6bc3a5f..e848c9dd7b9 100644 --- a/misk-hibernate/src/test/kotlin/misk/hibernate/MySqlScaleSafetyTest.kt +++ b/misk-hibernate/src/test/kotlin/misk/hibernate/MySqlScaleSafetyTest.kt @@ -10,7 +10,7 @@ import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows import java.time.LocalDate -import javax.inject.Inject +import jakarta.inject.Inject /** * Verifies that we're constraining a few things that makes apps hard to scale out. diff --git a/misk-hibernate/src/test/kotlin/misk/hibernate/PrimitiveColumnsTest.kt b/misk-hibernate/src/test/kotlin/misk/hibernate/PrimitiveColumnsTest.kt index 44f61e88810..158ea295172 100644 --- a/misk-hibernate/src/test/kotlin/misk/hibernate/PrimitiveColumnsTest.kt +++ b/misk-hibernate/src/test/kotlin/misk/hibernate/PrimitiveColumnsTest.kt @@ -11,8 +11,8 @@ import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import wisp.config.Config import wisp.deployment.TESTING -import javax.inject.Inject -import javax.inject.Qualifier +import jakarta.inject.Inject +import jakarta.inject.Qualifier import javax.persistence.Column import javax.persistence.Entity import javax.persistence.GeneratedValue diff --git a/misk-hibernate/src/test/kotlin/misk/hibernate/ProtoColumnTest.kt b/misk-hibernate/src/test/kotlin/misk/hibernate/ProtoColumnTest.kt index 08ef181a38e..4a95ed73ee6 100644 --- a/misk-hibernate/src/test/kotlin/misk/hibernate/ProtoColumnTest.kt +++ b/misk-hibernate/src/test/kotlin/misk/hibernate/ProtoColumnTest.kt @@ -12,8 +12,8 @@ import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import wisp.config.Config import wisp.deployment.TESTING -import javax.inject.Inject -import javax.inject.Qualifier +import jakarta.inject.Inject +import jakarta.inject.Qualifier import javax.persistence.Column import javax.persistence.Entity import javax.persistence.GeneratedValue diff --git a/misk-hibernate/src/test/kotlin/misk/hibernate/RawHibernateApiTest.kt b/misk-hibernate/src/test/kotlin/misk/hibernate/RawHibernateApiTest.kt index 459fb3ce645..45c0d7bb65b 100644 --- a/misk-hibernate/src/test/kotlin/misk/hibernate/RawHibernateApiTest.kt +++ b/misk-hibernate/src/test/kotlin/misk/hibernate/RawHibernateApiTest.kt @@ -6,7 +6,7 @@ import org.assertj.core.api.Assertions.assertThat import org.hibernate.SessionFactory import org.junit.jupiter.api.Test import java.time.LocalDate -import javax.inject.Inject +import jakarta.inject.Inject /** Test that we can access Hibernate's SessionFactory directly. */ @MiskTest(startService = true) diff --git a/misk-hibernate/src/test/kotlin/misk/hibernate/ReaderTransacterTest.kt b/misk-hibernate/src/test/kotlin/misk/hibernate/ReaderTransacterTest.kt index 66ca5026101..9e7bcaabfcd 100644 --- a/misk-hibernate/src/test/kotlin/misk/hibernate/ReaderTransacterTest.kt +++ b/misk-hibernate/src/test/kotlin/misk/hibernate/ReaderTransacterTest.kt @@ -6,7 +6,7 @@ import misk.testing.MiskTestModule import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import java.time.LocalDate -import javax.inject.Inject +import jakarta.inject.Inject import kotlin.test.assertFailsWith @MiskTest(startService = true) diff --git a/misk-hibernate/src/test/kotlin/misk/hibernate/ReflectionQueryFactoryTest.kt b/misk-hibernate/src/test/kotlin/misk/hibernate/ReflectionQueryFactoryTest.kt index 2fd0cd6ffcb..fe279e0066c 100644 --- a/misk-hibernate/src/test/kotlin/misk/hibernate/ReflectionQueryFactoryTest.kt +++ b/misk-hibernate/src/test/kotlin/misk/hibernate/ReflectionQueryFactoryTest.kt @@ -14,7 +14,7 @@ import wisp.logging.LogCollector import wisp.time.FakeClock import java.time.Duration.ofSeconds import java.time.LocalDate -import javax.inject.Inject +import jakarta.inject.Inject import kotlin.test.assertFailsWith @MiskTest(startService = true) diff --git a/misk-hibernate/src/test/kotlin/misk/hibernate/ReflectionQueryFactoryValidationTest.kt b/misk-hibernate/src/test/kotlin/misk/hibernate/ReflectionQueryFactoryValidationTest.kt index c7b7b18083c..9951bdc2ae4 100644 --- a/misk-hibernate/src/test/kotlin/misk/hibernate/ReflectionQueryFactoryValidationTest.kt +++ b/misk-hibernate/src/test/kotlin/misk/hibernate/ReflectionQueryFactoryValidationTest.kt @@ -5,7 +5,7 @@ import misk.testing.MiskTest import misk.testing.MiskTestModule import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject import kotlin.test.assertFailsWith @MiskTest(startService = true) diff --git a/misk-hibernate/src/test/kotlin/misk/hibernate/SchemaValidatorSuccessTest.kt b/misk-hibernate/src/test/kotlin/misk/hibernate/SchemaValidatorSuccessTest.kt index e756cef6a9d..a88431e1436 100644 --- a/misk-hibernate/src/test/kotlin/misk/hibernate/SchemaValidatorSuccessTest.kt +++ b/misk-hibernate/src/test/kotlin/misk/hibernate/SchemaValidatorSuccessTest.kt @@ -6,7 +6,7 @@ import misk.testing.MiskTestModule import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) internal class SchemaValidatorSuccessTest { diff --git a/misk-hibernate/src/test/kotlin/misk/hibernate/SchemaValidatorTest.kt b/misk-hibernate/src/test/kotlin/misk/hibernate/SchemaValidatorTest.kt index 92b760af819..9f8828d8ebb 100644 --- a/misk-hibernate/src/test/kotlin/misk/hibernate/SchemaValidatorTest.kt +++ b/misk-hibernate/src/test/kotlin/misk/hibernate/SchemaValidatorTest.kt @@ -27,9 +27,9 @@ import org.junit.jupiter.api.assertThrows import wisp.config.Config import wisp.deployment.TESTING import java.time.Instant -import javax.inject.Inject -import javax.inject.Provider -import javax.inject.Qualifier +import jakarta.inject.Inject +import com.google.inject.Provider +import jakarta.inject.Qualifier import javax.persistence.Column import javax.persistence.Entity import javax.persistence.GeneratedValue @@ -239,7 +239,7 @@ internal class SchemaValidatorTest { data class RootConfig(val data_source: DataSourceConfig) : Config @Qualifier - @Target(AnnotationTarget.FIELD, AnnotationTarget.FUNCTION) +@Target(AnnotationTarget.FIELD, AnnotationTarget.FUNCTION) annotation class ValidationDb @Entity diff --git a/misk-hibernate/src/test/kotlin/misk/hibernate/SecretColumnTest.kt b/misk-hibernate/src/test/kotlin/misk/hibernate/SecretColumnTest.kt index baaa9bc56b1..206afc575e9 100644 --- a/misk-hibernate/src/test/kotlin/misk/hibernate/SecretColumnTest.kt +++ b/misk-hibernate/src/test/kotlin/misk/hibernate/SecretColumnTest.kt @@ -16,8 +16,8 @@ import wisp.config.Config import wisp.deployment.TESTING import java.util.Arrays import java.util.Objects -import javax.inject.Inject -import javax.inject.Qualifier +import jakarta.inject.Inject +import jakarta.inject.Qualifier import javax.persistence.Column import javax.persistence.Entity import javax.persistence.GeneratedValue diff --git a/misk-hibernate/src/test/kotlin/misk/hibernate/TimestampListenerTest.kt b/misk-hibernate/src/test/kotlin/misk/hibernate/TimestampListenerTest.kt index f3857f1331c..1976f900170 100644 --- a/misk-hibernate/src/test/kotlin/misk/hibernate/TimestampListenerTest.kt +++ b/misk-hibernate/src/test/kotlin/misk/hibernate/TimestampListenerTest.kt @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test import wisp.time.FakeClock import java.time.LocalDate import java.util.concurrent.TimeUnit -import javax.inject.Inject +import jakarta.inject.Inject abstract class TimestampListenerTest { @Inject @Movies lateinit var transacter: Transacter diff --git a/misk-hibernate/src/test/kotlin/misk/hibernate/TransacterTest.kt b/misk-hibernate/src/test/kotlin/misk/hibernate/TransacterTest.kt index 207143afe2a..2a2f8d1be70 100644 --- a/misk-hibernate/src/test/kotlin/misk/hibernate/TransacterTest.kt +++ b/misk-hibernate/src/test/kotlin/misk/hibernate/TransacterTest.kt @@ -16,7 +16,7 @@ import java.util.concurrent.Callable import java.util.concurrent.CountDownLatch import java.util.concurrent.Executors import java.util.concurrent.atomic.AtomicInteger -import javax.inject.Inject +import jakarta.inject.Inject import kotlin.test.assertFailsWith abstract class TransacterTest { diff --git a/misk-hibernate/src/test/kotlin/misk/hibernate/TransformedColumnTest.kt b/misk-hibernate/src/test/kotlin/misk/hibernate/TransformedColumnTest.kt index 18f5b4e8f34..152778cd133 100644 --- a/misk-hibernate/src/test/kotlin/misk/hibernate/TransformedColumnTest.kt +++ b/misk-hibernate/src/test/kotlin/misk/hibernate/TransformedColumnTest.kt @@ -14,8 +14,8 @@ import wisp.config.Config import wisp.deployment.TESTING import java.io.Serializable import java.util.Objects -import javax.inject.Inject -import javax.inject.Qualifier +import jakarta.inject.Inject +import jakarta.inject.Qualifier import javax.persistence.AttributeConverter import javax.persistence.Column import javax.persistence.Convert diff --git a/misk-hibernate/src/test/kotlin/misk/hibernate/VitessScaleSafetyTest.kt b/misk-hibernate/src/test/kotlin/misk/hibernate/VitessScaleSafetyTest.kt index e63afa3ded4..fd48a85e145 100644 --- a/misk-hibernate/src/test/kotlin/misk/hibernate/VitessScaleSafetyTest.kt +++ b/misk-hibernate/src/test/kotlin/misk/hibernate/VitessScaleSafetyTest.kt @@ -16,7 +16,7 @@ import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows import java.lang.reflect.UndeclaredThrowableException import java.time.LocalDate -import javax.inject.Inject +import jakarta.inject.Inject /** * Verifies that we're constraining a few things that makes apps hard to scale out. diff --git a/misk-hibernate/src/test/kotlin/misk/hibernate/VitessSchemaValidatorTest.kt b/misk-hibernate/src/test/kotlin/misk/hibernate/VitessSchemaValidatorTest.kt index b8c31f3937a..fb9b7abbd96 100644 --- a/misk-hibernate/src/test/kotlin/misk/hibernate/VitessSchemaValidatorTest.kt +++ b/misk-hibernate/src/test/kotlin/misk/hibernate/VitessSchemaValidatorTest.kt @@ -4,8 +4,8 @@ import misk.jdbc.DataSourceConfig import misk.testing.MiskTest import misk.testing.MiskTestModule import org.junit.jupiter.api.Test -import javax.inject.Inject -import javax.inject.Provider +import jakarta.inject.Inject +import com.google.inject.Provider @MiskTest(startService = true) class VitessSchemaValidatorTest { diff --git a/misk-hibernate/src/test/kotlin/misk/hibernate/actions/HibernateDatabaseQueryDynamicActionTest.kt b/misk-hibernate/src/test/kotlin/misk/hibernate/actions/HibernateDatabaseQueryDynamicActionTest.kt index 0874ceed3e3..843fd17bc5c 100644 --- a/misk-hibernate/src/test/kotlin/misk/hibernate/actions/HibernateDatabaseQueryDynamicActionTest.kt +++ b/misk-hibernate/src/test/kotlin/misk/hibernate/actions/HibernateDatabaseQueryDynamicActionTest.kt @@ -15,7 +15,7 @@ import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import java.time.LocalDate -import javax.inject.Inject +import jakarta.inject.Inject import javax.persistence.Transient import kotlin.reflect.full.declaredMemberProperties import kotlin.reflect.jvm.javaField diff --git a/misk-hibernate/src/test/kotlin/misk/hibernate/actions/HibernateDatabaseQueryStaticActionTest.kt b/misk-hibernate/src/test/kotlin/misk/hibernate/actions/HibernateDatabaseQueryStaticActionTest.kt index a8278b32b65..295a2afbbde 100644 --- a/misk-hibernate/src/test/kotlin/misk/hibernate/actions/HibernateDatabaseQueryStaticActionTest.kt +++ b/misk-hibernate/src/test/kotlin/misk/hibernate/actions/HibernateDatabaseQueryStaticActionTest.kt @@ -15,7 +15,7 @@ import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import java.time.LocalDate -import javax.inject.Inject +import jakarta.inject.Inject import javax.persistence.Transient import kotlin.reflect.full.declaredMemberProperties import kotlin.reflect.jvm.javaField diff --git a/misk-hibernate/src/test/kotlin/misk/hibernate/actions/HibernateDatabaseQueryTestingModule.kt b/misk-hibernate/src/test/kotlin/misk/hibernate/actions/HibernateDatabaseQueryTestingModule.kt index 42894006d2b..d94b6af0ccd 100644 --- a/misk-hibernate/src/test/kotlin/misk/hibernate/actions/HibernateDatabaseQueryTestingModule.kt +++ b/misk-hibernate/src/test/kotlin/misk/hibernate/actions/HibernateDatabaseQueryTestingModule.kt @@ -10,7 +10,7 @@ import misk.hibernate.OperatorsMovieQuery import misk.inject.KAbstractModule import misk.jdbc.DataSourceType import misk.security.authz.AccessAnnotationEntry -import javax.inject.Qualifier +import jakarta.inject.Qualifier class HibernateDatabaseQueryTestingModule : KAbstractModule() { override fun configure() { diff --git a/misk-hibernate/src/test/kotlin/misk/hibernate/actions/RealActionRequestExecuter.kt b/misk-hibernate/src/test/kotlin/misk/hibernate/actions/RealActionRequestExecuter.kt index ec8e3b983c2..79f3001980a 100644 --- a/misk-hibernate/src/test/kotlin/misk/hibernate/actions/RealActionRequestExecuter.kt +++ b/misk-hibernate/src/test/kotlin/misk/hibernate/actions/RealActionRequestExecuter.kt @@ -12,7 +12,7 @@ import okhttp3.MediaType.Companion.toMediaType import okhttp3.OkHttpClient import okhttp3.Request import okhttp3.RequestBody.Companion.toRequestBody -import javax.inject.Inject +import jakarta.inject.Inject import kotlin.reflect.KClass /** diff --git a/misk-hibernate/src/test/kotlin/misk/hibernate/migrate/BulkShardMigratorTest.kt b/misk-hibernate/src/test/kotlin/misk/hibernate/migrate/BulkShardMigratorTest.kt index 94ff7265c9c..7591cae8fbd 100644 --- a/misk-hibernate/src/test/kotlin/misk/hibernate/migrate/BulkShardMigratorTest.kt +++ b/misk-hibernate/src/test/kotlin/misk/hibernate/migrate/BulkShardMigratorTest.kt @@ -26,7 +26,7 @@ import org.assertj.core.api.ListAssert import org.hibernate.SessionFactory import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject abstract class BulkShardMigratorTest { @Inject @Movies lateinit var transacter: Transacter @@ -342,4 +342,4 @@ class BulkShardMigratorMySqlTest : BulkShardMigratorTest() { class BulkShardMigratorTidbTest : BulkShardMigratorTest() { @MiskTestModule val module = MoviesTestModule(type = DataSourceType.TIDB) -} \ No newline at end of file +} diff --git a/misk-hibernate/src/test/kotlin/misk/hibernate/pagination/RealPagerTest.kt b/misk-hibernate/src/test/kotlin/misk/hibernate/pagination/RealPagerTest.kt index 0395a8ea69d..37253560c0d 100644 --- a/misk-hibernate/src/test/kotlin/misk/hibernate/pagination/RealPagerTest.kt +++ b/misk-hibernate/src/test/kotlin/misk/hibernate/pagination/RealPagerTest.kt @@ -24,7 +24,7 @@ import wisp.logging.LogCollector import java.sql.Timestamp import java.time.Instant import java.time.LocalDate -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) class RealPagerTest { diff --git a/misk-hibernate/src/test/kotlin/misk/jdbc/HikariMetricsTest.kt b/misk-hibernate/src/test/kotlin/misk/jdbc/HikariMetricsTest.kt index 53022772802..a741d8ef4fb 100644 --- a/misk-hibernate/src/test/kotlin/misk/jdbc/HikariMetricsTest.kt +++ b/misk-hibernate/src/test/kotlin/misk/jdbc/HikariMetricsTest.kt @@ -8,7 +8,7 @@ import misk.testing.MiskTestModule import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import java.util.Collections -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) class HikariMetricsTest { diff --git a/misk-inject/build.gradle.kts b/misk-inject/build.gradle.kts index b69b1778ffb..1b52686a806 100644 --- a/misk-inject/build.gradle.kts +++ b/misk-inject/build.gradle.kts @@ -11,6 +11,7 @@ plugins { dependencies { api(Dependencies.guice) api(Dependencies.javaxInject) + implementation(Dependencies.jakartaInject) implementation(Dependencies.kotlinReflect) implementation(Dependencies.kotlinStdLibJdk8) diff --git a/misk-inject/misk-inject-guice7-test/README.md b/misk-inject/misk-inject-guice7-test/README.md new file mode 100644 index 00000000000..236d0dd5983 --- /dev/null +++ b/misk-inject/misk-inject-guice7-test/README.md @@ -0,0 +1,5 @@ +## misk-inject-guice7-test + +This project is a test project to ensure that `:misk-inject` maintains +compatibility with Guice 7+. It has no contents except tests that mimic a setup +using Guice 7+. \ No newline at end of file diff --git a/misk-inject/misk-inject-guice7-test/api/misk-inject-guice7-test.api b/misk-inject/misk-inject-guice7-test/api/misk-inject-guice7-test.api new file mode 100644 index 00000000000..e69de29bb2d diff --git a/misk-inject/misk-inject-guice7-test/build.gradle.kts b/misk-inject/misk-inject-guice7-test/build.gradle.kts new file mode 100644 index 00000000000..7edca1edf25 --- /dev/null +++ b/misk-inject/misk-inject-guice7-test/build.gradle.kts @@ -0,0 +1,23 @@ +plugins { + kotlin("jvm") + `java-library` +} + +dependencies { + testImplementation(Dependencies.assertj) + testImplementation(Dependencies.jakartaInject) + testImplementation(Dependencies.junitApi) + testImplementation(Dependencies.guava) + testImplementation(Dependencies.guice) { + version { + require("7.0.0") + } + } + testImplementation(Dependencies.guice7Bom) + testImplementation(Dependencies.okHttp) + testImplementation(project(":misk")) + testImplementation(project(":misk-actions")) + testImplementation(project(":misk-core")) + testImplementation(project(":misk-inject")) + testImplementation(project(":misk-testing")) +} diff --git a/misk-inject/misk-inject-guice7-test/src/test/kotlin/misk/inject/guice7/Guice7IntegrationTest.kt b/misk-inject/misk-inject-guice7-test/src/test/kotlin/misk/inject/guice7/Guice7IntegrationTest.kt new file mode 100644 index 00000000000..697a8b3beda --- /dev/null +++ b/misk-inject/misk-inject-guice7-test/src/test/kotlin/misk/inject/guice7/Guice7IntegrationTest.kt @@ -0,0 +1,92 @@ +package misk.inject.guice7 + +import com.google.common.util.concurrent.ServiceManager +import com.google.inject.Guice +import com.google.inject.Inject +import com.google.inject.Injector +import misk.MiskTestingServiceModule +import misk.inject.KInstallOnceModule +import misk.inject.getInstance +import misk.inject.keyOf +import misk.web.Post +import misk.web.RequestBody +import misk.web.RequestContentType +import misk.web.ResponseContentType +import misk.web.WebActionModule +import misk.web.WebServerTestingModule +import misk.web.WebTestClient +import misk.web.actions.WebAction +import misk.web.mediatype.MediaTypes +import org.assertj.core.api.Assertions.assertThat +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Test +import java.util.concurrent.TimeUnit + +internal class Guice7IntegrationTest { + private lateinit var injector: Injector + + @BeforeEach + fun setupInjector() { + injector = Guice.createInjector(Guice7TestModule) + } + + @Test + fun `basic injections work in guice 7`() { + val testInstanceProvider = injector.getProvider(keyOf()) + assertThat(testInstanceProvider.get()).isNotNull() + } + + @Test + fun `multibind injections work in guice 7`() { + val instance = injector.getInstance() + assertThat(instance.multiboundInstances).hasSize(2) + } + + @Test + fun `simple actions with guice 7`() { + val injector = Guice.createInjector( + WebServerTestingModule(), + MiskTestingServiceModule(), + WebActionModule.create(), + ) + + val serviceManager = injector.getInstance() + serviceManager.startAsync().awaitHealthy(30, TimeUnit.SECONDS) + + try { + val webTestClient = injector.getInstance() + val response = webTestClient.post( + path = "/count", + body = "[\"foo\",\"miskhype\",\"miskhype\"]", + ).response + assertThat(response.body?.string()?.toInt()).isEqualTo(2) + } finally { + serviceManager.stopAsync().awaitStopped(60, TimeUnit.SECONDS) + } + } +} + +private object Guice7TestModule : KInstallOnceModule() { + override fun configure() { + binder().requireAtInjectOnConstructors() + + bind().to() + bind() + bind() + + multibind().to() + multibind().to() + } +} + +private class WithMultibind @Inject constructor( + val multiboundInstances: List, +) + + +internal open class CountHypeAction @Inject constructor() : WebAction { + @Post("/count") + @RequestContentType(MediaTypes.APPLICATION_JSON) + @ResponseContentType(MediaTypes.APPLICATION_JSON) + fun postMiskHype(@RequestBody request: List): Int = request.count { it == "miskhype" } +} diff --git a/misk-inject/misk-inject-guice7-test/src/test/kotlin/misk/inject/guice7/Guice7TestClass.kt b/misk-inject/misk-inject-guice7-test/src/test/kotlin/misk/inject/guice7/Guice7TestClass.kt new file mode 100644 index 00000000000..4c3cfd98908 --- /dev/null +++ b/misk-inject/misk-inject-guice7-test/src/test/kotlin/misk/inject/guice7/Guice7TestClass.kt @@ -0,0 +1,29 @@ +package misk.inject.guice7 + +import com.google.inject.Inject +import com.google.inject.Provider +import jakarta.inject.Singleton +import org.assertj.core.api.Assertions.assertThat + +@Singleton +internal class Guice7TestClass @Inject constructor( + jakartaInjectJakartaProvider: jakarta.inject.Provider, + jakartaInjectGuiceProvider: Provider, + guiceInjectJakartaProvider: jakarta.inject.Provider, + guiceInjectGuiceProvider: Provider, +) : Guice7TestInterface { + init { + assertThat(jakartaInjectJakartaProvider.get()) + .isSameAs(jakartaInjectGuiceProvider.get()) + + assertThat(guiceInjectJakartaProvider.get()) + .isSameAs(guiceInjectGuiceProvider.get()) + } + + @Singleton + internal class JakartaConstructor @jakarta.inject.Inject constructor() : Guice7TestInterface.Multibind + + @jakarta.inject.Singleton + internal class GuiceConstructor @Inject constructor() + : Guice7TestInterface.Multibind +} diff --git a/misk-inject/misk-inject-guice7-test/src/test/kotlin/misk/inject/guice7/Guice7TestInterface.kt b/misk-inject/misk-inject-guice7-test/src/test/kotlin/misk/inject/guice7/Guice7TestInterface.kt new file mode 100644 index 00000000000..65dbcecc3f7 --- /dev/null +++ b/misk-inject/misk-inject-guice7-test/src/test/kotlin/misk/inject/guice7/Guice7TestInterface.kt @@ -0,0 +1,5 @@ +package misk.inject.guice7 + +internal interface Guice7TestInterface { + interface Multibind +} diff --git a/misk-inject/src/main/kotlin/misk/inject/Guice.kt b/misk-inject/src/main/kotlin/misk/inject/Guice.kt index 7d41aadcd73..de96a2d85da 100644 --- a/misk-inject/src/main/kotlin/misk/inject/Guice.kt +++ b/misk-inject/src/main/kotlin/misk/inject/Guice.kt @@ -8,9 +8,9 @@ import com.google.inject.util.Types import java.lang.reflect.ParameterizedType import java.lang.reflect.Type import java.lang.reflect.WildcardType -import javax.inject.Inject -import javax.inject.Provider -import javax.inject.Singleton +import jakarta.inject.Inject +import com.google.inject.Provider +import jakarta.inject.Singleton import kotlin.reflect.KClass import kotlin.reflect.KType import kotlin.reflect.jvm.javaType @@ -115,7 +115,7 @@ fun uninject(target: Any) { if (!f.type.isPrimitive) f.set(target, null) } if (f.isAnnotationPresent(com.google.inject.Inject::class.java)) { - throw AssertionError("prefer @javax.inject.Inject for " + target.javaClass) + throw AssertionError("prefer @jakarta.inject.Inject for " + target.javaClass) } } c = c.superclass diff --git a/misk-inject/src/test/kotlin/misk/inject/KInstallOnceModuleTest.kt b/misk-inject/src/test/kotlin/misk/inject/KInstallOnceModuleTest.kt index 1acb470e2ba..c42b1df7481 100644 --- a/misk-inject/src/test/kotlin/misk/inject/KInstallOnceModuleTest.kt +++ b/misk-inject/src/test/kotlin/misk/inject/KInstallOnceModuleTest.kt @@ -4,7 +4,7 @@ import misk.testing.MiskTest import misk.testing.MiskTestModule import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest class KInstallOnceModuleTest { diff --git a/misk-inject/src/test/kotlin/misk/inject/MapBinderTest.kt b/misk-inject/src/test/kotlin/misk/inject/MapBinderTest.kt index c927bd62c80..dbfaefba423 100644 --- a/misk-inject/src/test/kotlin/misk/inject/MapBinderTest.kt +++ b/misk-inject/src/test/kotlin/misk/inject/MapBinderTest.kt @@ -4,8 +4,8 @@ import misk.testing.MiskTest import misk.testing.MiskTestModule import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.inject.Inject -import javax.inject.Qualifier +import jakarta.inject.Inject +import jakarta.inject.Qualifier @MiskTest class MapBinderTest { diff --git a/misk-inject/src/test/kotlin/misk/inject/MultiBinderTest.kt b/misk-inject/src/test/kotlin/misk/inject/MultiBinderTest.kt index c12c628aeff..1d10a3c75cf 100644 --- a/misk-inject/src/test/kotlin/misk/inject/MultiBinderTest.kt +++ b/misk-inject/src/test/kotlin/misk/inject/MultiBinderTest.kt @@ -4,7 +4,7 @@ import misk.testing.MiskTest import misk.testing.MiskTestModule import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest class MultiBinderTest { diff --git a/misk-jdbc-testing/api/misk-jdbc-testing.api b/misk-jdbc-testing/api/misk-jdbc-testing.api index 33a9f2b4647..a228cd76ec0 100644 --- a/misk-jdbc-testing/api/misk-jdbc-testing.api +++ b/misk-jdbc-testing/api/misk-jdbc-testing.api @@ -89,10 +89,10 @@ public final class misk/jdbc/TestDatabasePoolKt { } public final class misk/jdbc/TruncateTablesService : com/google/common/util/concurrent/AbstractIdleService { - public fun (Lkotlin/reflect/KClass;Lmisk/jdbc/DataSourceService;Ljavax/inject/Provider;)V - public fun (Lkotlin/reflect/KClass;Lmisk/jdbc/DataSourceService;Ljavax/inject/Provider;Ljava/util/List;)V - public fun (Lkotlin/reflect/KClass;Lmisk/jdbc/DataSourceService;Ljavax/inject/Provider;Ljava/util/List;Ljava/util/List;)V - public synthetic fun (Lkotlin/reflect/KClass;Lmisk/jdbc/DataSourceService;Ljavax/inject/Provider;Ljava/util/List;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun (Lkotlin/reflect/KClass;Lmisk/jdbc/DataSourceService;Lcom/google/inject/Provider;)V + public fun (Lkotlin/reflect/KClass;Lmisk/jdbc/DataSourceService;Lcom/google/inject/Provider;Ljava/util/List;)V + public fun (Lkotlin/reflect/KClass;Lmisk/jdbc/DataSourceService;Lcom/google/inject/Provider;Ljava/util/List;Ljava/util/List;)V + public synthetic fun (Lkotlin/reflect/KClass;Lmisk/jdbc/DataSourceService;Lcom/google/inject/Provider;Ljava/util/List;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V } public final class misk/vitess/VitessScaleSafetyChecks : misk/jdbc/DataSourceDecorator { diff --git a/misk-jdbc-testing/build.gradle.kts b/misk-jdbc-testing/build.gradle.kts index d1b84fa9b35..b7a3cdc55ad 100644 --- a/misk-jdbc-testing/build.gradle.kts +++ b/misk-jdbc-testing/build.gradle.kts @@ -11,12 +11,12 @@ plugins { dependencies { api(Dependencies.datasourceProxy) api(Dependencies.guava) - api(Dependencies.javaxInject) + api(Dependencies.guice) + api(Dependencies.jakartaInject) api(Dependencies.moshi) api(Dependencies.okHttp) api(project(":misk-inject")) api(project(":misk-jdbc")) - implementation(Dependencies.guice) implementation(Dependencies.hikariCp) implementation(Dependencies.kotlinLogging) implementation(Dependencies.okio) diff --git a/misk-jdbc-testing/src/main/kotlin/misk/jdbc/JdbcTestingModule.kt b/misk-jdbc-testing/src/main/kotlin/misk/jdbc/JdbcTestingModule.kt index ba75ee31d89..61b420ef783 100644 --- a/misk-jdbc-testing/src/main/kotlin/misk/jdbc/JdbcTestingModule.kt +++ b/misk-jdbc-testing/src/main/kotlin/misk/jdbc/JdbcTestingModule.kt @@ -11,7 +11,7 @@ import misk.inject.toKey import misk.time.ForceUtcTimeZoneService import misk.vitess.VitessScaleSafetyChecks import okhttp3.OkHttpClient -import javax.inject.Provider +import com.google.inject.Provider import kotlin.reflect.KClass /** diff --git a/misk-jdbc-testing/src/main/kotlin/misk/jdbc/MySqlScaleSafetyChecks.kt b/misk-jdbc-testing/src/main/kotlin/misk/jdbc/MySqlScaleSafetyChecks.kt index 00765e9ea89..8c9983fd8bf 100644 --- a/misk-jdbc-testing/src/main/kotlin/misk/jdbc/MySqlScaleSafetyChecks.kt +++ b/misk-jdbc-testing/src/main/kotlin/misk/jdbc/MySqlScaleSafetyChecks.kt @@ -8,7 +8,7 @@ import java.sql.Connection import java.sql.SQLException import java.sql.Timestamp import java.util.Properties -import javax.inject.Singleton +import jakarta.inject.Singleton import javax.sql.DataSource @Deprecated("Replace the dependency on misk-jdcb-testing with testFixtures(misk-jdbc)") diff --git a/misk-jdbc-testing/src/main/kotlin/misk/jdbc/MySqlTestDatabasePoolBackend.kt b/misk-jdbc-testing/src/main/kotlin/misk/jdbc/MySqlTestDatabasePoolBackend.kt index 8c61eefcca7..d465a384eae 100644 --- a/misk-jdbc-testing/src/main/kotlin/misk/jdbc/MySqlTestDatabasePoolBackend.kt +++ b/misk-jdbc-testing/src/main/kotlin/misk/jdbc/MySqlTestDatabasePoolBackend.kt @@ -5,8 +5,8 @@ import wisp.deployment.TESTING import java.sql.Connection import java.sql.SQLException import java.util.Properties -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import javax.sql.DataSource /** diff --git a/misk-jdbc-testing/src/main/kotlin/misk/jdbc/TruncateTablesService.kt b/misk-jdbc-testing/src/main/kotlin/misk/jdbc/TruncateTablesService.kt index d39505f0c77..a6a17b296a5 100644 --- a/misk-jdbc-testing/src/main/kotlin/misk/jdbc/TruncateTablesService.kt +++ b/misk-jdbc-testing/src/main/kotlin/misk/jdbc/TruncateTablesService.kt @@ -6,7 +6,7 @@ import misk.vitess.shards import misk.vitess.target import wisp.logging.getLogger import java.util.* -import javax.inject.Provider +import com.google.inject.Provider import kotlin.reflect.KClass private val logger = getLogger() diff --git a/misk-jdbc-testing/src/main/kotlin/misk/vitess/VitessScaleSafetyChecks.kt b/misk-jdbc-testing/src/main/kotlin/misk/vitess/VitessScaleSafetyChecks.kt index c7809f26d74..7a3621cbfcc 100644 --- a/misk-jdbc-testing/src/main/kotlin/misk/vitess/VitessScaleSafetyChecks.kt +++ b/misk-jdbc-testing/src/main/kotlin/misk/vitess/VitessScaleSafetyChecks.kt @@ -23,7 +23,7 @@ import java.util.ArrayDeque import java.util.Collections import java.util.regex.Matcher import java.util.regex.Pattern -import javax.inject.Singleton +import jakarta.inject.Singleton import javax.sql.DataSource internal data class Instruction( diff --git a/misk-jdbc/api/misk-jdbc.api b/misk-jdbc/api/misk-jdbc.api index 159f471c482..1ddff59030c 100644 --- a/misk-jdbc/api/misk-jdbc.api +++ b/misk-jdbc/api/misk-jdbc.api @@ -393,7 +393,7 @@ public abstract interface class misk/jdbc/DataSourceDecorator { public abstract fun decorate (Ljavax/sql/DataSource;)Ljavax/sql/DataSource; } -public final class misk/jdbc/DataSourceService : com/google/common/util/concurrent/AbstractIdleService, javax/inject/Provider, misk/jdbc/DataSourceConnector { +public final class misk/jdbc/DataSourceService : com/google/common/util/concurrent/AbstractIdleService, com/google/inject/Provider, misk/jdbc/DataSourceConnector { public static final field Companion Lmisk/jdbc/DataSourceService$Companion; public fun (Lkotlin/reflect/KClass;Lmisk/jdbc/DataSourceConfig;Lwisp/deployment/Deployment;Ljava/util/Set;Lmisk/jdbc/DatabasePool;)V public fun (Lkotlin/reflect/KClass;Lmisk/jdbc/DataSourceConfig;Lwisp/deployment/Deployment;Ljava/util/Set;Lmisk/jdbc/DatabasePool;Lio/prometheus/client/CollectorRegistry;)V @@ -648,10 +648,10 @@ public abstract interface class misk/jdbc/Transacter { } public final class misk/jdbc/TruncateTablesService : com/google/common/util/concurrent/AbstractIdleService { - public fun (Lkotlin/reflect/KClass;Lmisk/jdbc/DataSourceService;Ljavax/inject/Provider;)V - public fun (Lkotlin/reflect/KClass;Lmisk/jdbc/DataSourceService;Ljavax/inject/Provider;Ljava/util/List;)V - public fun (Lkotlin/reflect/KClass;Lmisk/jdbc/DataSourceService;Ljavax/inject/Provider;Ljava/util/List;Ljava/util/List;)V - public synthetic fun (Lkotlin/reflect/KClass;Lmisk/jdbc/DataSourceService;Ljavax/inject/Provider;Ljava/util/List;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun (Lkotlin/reflect/KClass;Lmisk/jdbc/DataSourceService;Lcom/google/inject/Provider;)V + public fun (Lkotlin/reflect/KClass;Lmisk/jdbc/DataSourceService;Lcom/google/inject/Provider;Ljava/util/List;)V + public fun (Lkotlin/reflect/KClass;Lmisk/jdbc/DataSourceService;Lcom/google/inject/Provider;Ljava/util/List;Ljava/util/List;)V + public synthetic fun (Lkotlin/reflect/KClass;Lmisk/jdbc/DataSourceService;Lcom/google/inject/Provider;Ljava/util/List;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V } public final class misk/vitess/ConnectionExtensionsKt { diff --git a/misk-jdbc/build.gradle.kts b/misk-jdbc/build.gradle.kts index b30566d6b7a..39436015487 100644 --- a/misk-jdbc/build.gradle.kts +++ b/misk-jdbc/build.gradle.kts @@ -13,8 +13,9 @@ dependencies { api(Dependencies.datasourceProxy) api(Dependencies.dockerApi) api(Dependencies.dockerCore) + api(Dependencies.guice) api(Dependencies.guava) - api(Dependencies.javaxInject) + api(Dependencies.jakartaInject) api(Dependencies.moshi) api(Dependencies.openTracingApi) api(Dependencies.prometheusClient) @@ -25,7 +26,6 @@ dependencies { api(project(":misk-inject")) implementation(Dependencies.dockerTransport) implementation(Dependencies.dockerTransportHttpClient) - implementation(Dependencies.guice) implementation(Dependencies.hikariCp) implementation(Dependencies.kotlinLogging) implementation(Dependencies.okio) @@ -39,7 +39,7 @@ dependencies { runtimeOnly(Dependencies.postgresql) testFixturesApi(Dependencies.datasourceProxy) - testFixturesApi(Dependencies.javaxInject) + testFixturesApi(Dependencies.jakartaInject) testFixturesApi(Dependencies.moshi) testFixturesApi(Dependencies.okHttp) testFixturesApi(project(":misk-inject")) diff --git a/misk-jdbc/src/main/kotlin/misk/jdbc/DataSourceService.kt b/misk-jdbc/src/main/kotlin/misk/jdbc/DataSourceService.kt index 344146eed91..56313c34924 100644 --- a/misk-jdbc/src/main/kotlin/misk/jdbc/DataSourceService.kt +++ b/misk-jdbc/src/main/kotlin/misk/jdbc/DataSourceService.kt @@ -8,8 +8,8 @@ import com.zaxxer.hikari.metrics.prometheus.PrometheusMetricsTrackerFactory import io.prometheus.client.CollectorRegistry import wisp.deployment.Deployment import wisp.logging.getLogger -import javax.inject.Provider -import javax.inject.Singleton +import com.google.inject.Provider +import jakarta.inject.Singleton import javax.sql.DataSource import kotlin.reflect.KClass diff --git a/misk-jdbc/src/main/kotlin/misk/jdbc/JdbcModule.kt b/misk-jdbc/src/main/kotlin/misk/jdbc/JdbcModule.kt index 6cc6773ca53..0632fb6be52 100644 --- a/misk-jdbc/src/main/kotlin/misk/jdbc/JdbcModule.kt +++ b/misk-jdbc/src/main/kotlin/misk/jdbc/JdbcModule.kt @@ -13,16 +13,18 @@ import misk.inject.setOfType import misk.inject.toKey import misk.resources.ResourceLoader import wisp.deployment.Deployment -import javax.inject.Inject -import javax.inject.Provider +import jakarta.inject.Inject +import com.google.inject.Provider import javax.sql.DataSource import kotlin.reflect.KClass /** * Binds database connectivity for a qualified data source. This binds the following public types: * - * * @Qualifier [javax.sql.DataSource] - * * @Qualifier [misk.jdbc.DataSourceConfig] + * * @Qualifier +[javax.sql.DataSource] + * * @Qualifier +[misk.jdbc.DataSourceConfig] * * [DataSource.getConnection] can be used to get JDBC connections to your database. * diff --git a/misk-jdbc/src/main/kotlin/misk/jdbc/PingDatabaseService.kt b/misk-jdbc/src/main/kotlin/misk/jdbc/PingDatabaseService.kt index a766607239c..3197dab76d3 100644 --- a/misk-jdbc/src/main/kotlin/misk/jdbc/PingDatabaseService.kt +++ b/misk-jdbc/src/main/kotlin/misk/jdbc/PingDatabaseService.kt @@ -8,8 +8,8 @@ import wisp.deployment.Deployment import wisp.logging.getLogger import java.time.Duration import java.util.* -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton private val logger = getLogger() diff --git a/misk-jdbc/src/main/kotlin/misk/jdbc/SchemaMigratorService.kt b/misk-jdbc/src/main/kotlin/misk/jdbc/SchemaMigratorService.kt index 60189d20866..13548c6f72f 100644 --- a/misk-jdbc/src/main/kotlin/misk/jdbc/SchemaMigratorService.kt +++ b/misk-jdbc/src/main/kotlin/misk/jdbc/SchemaMigratorService.kt @@ -8,7 +8,7 @@ import misk.healthchecks.HealthCheck import misk.healthchecks.HealthStatus import wisp.deployment.Deployment import java.time.Duration -import javax.inject.Provider +import com.google.inject.Provider import kotlin.reflect.KClass class SchemaMigratorService internal constructor( diff --git a/misk-jdbc/src/test/kotlin/misk/jdbc/RealTransacterTest.kt b/misk-jdbc/src/test/kotlin/misk/jdbc/RealTransacterTest.kt index 73229240d9b..a8f35968835 100644 --- a/misk-jdbc/src/test/kotlin/misk/jdbc/RealTransacterTest.kt +++ b/misk-jdbc/src/test/kotlin/misk/jdbc/RealTransacterTest.kt @@ -16,7 +16,7 @@ import wisp.config.Config import wisp.deployment.TESTING import java.sql.Connection import java.time.LocalDate -import javax.inject.Inject +import jakarta.inject.Inject import kotlin.test.assertFailsWith import kotlin.test.fail diff --git a/misk-jdbc/src/test/kotlin/misk/jdbc/SchemaMigratorServiceTest.kt b/misk-jdbc/src/test/kotlin/misk/jdbc/SchemaMigratorServiceTest.kt index 5901fec3096..c1aff78f42f 100644 --- a/misk-jdbc/src/test/kotlin/misk/jdbc/SchemaMigratorServiceTest.kt +++ b/misk-jdbc/src/test/kotlin/misk/jdbc/SchemaMigratorServiceTest.kt @@ -13,7 +13,7 @@ import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import wisp.config.Config import wisp.deployment.TESTING -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = false) internal class MySQLSchemaMigratorServiceTest : SchemaMigratorServiceTest(DataSourceType.MYSQL) diff --git a/misk-jdbc/src/test/kotlin/misk/jdbc/SchemaMigratorTest.kt b/misk-jdbc/src/test/kotlin/misk/jdbc/SchemaMigratorTest.kt index d4e3e9da4a3..b8fef088ff3 100644 --- a/misk-jdbc/src/test/kotlin/misk/jdbc/SchemaMigratorTest.kt +++ b/misk-jdbc/src/test/kotlin/misk/jdbc/SchemaMigratorTest.kt @@ -18,7 +18,7 @@ import org.junit.jupiter.api.Test import wisp.config.Config import wisp.deployment.TESTING import java.sql.SQLException -import javax.inject.Inject +import jakarta.inject.Inject import kotlin.test.assertFailsWith @MiskTest(startService = false) diff --git a/misk-jdbc/src/test/kotlin/misk/jdbc/TestDatabasePoolTest.kt b/misk-jdbc/src/test/kotlin/misk/jdbc/TestDatabasePoolTest.kt index e523f45930c..693ec06bd97 100644 --- a/misk-jdbc/src/test/kotlin/misk/jdbc/TestDatabasePoolTest.kt +++ b/misk-jdbc/src/test/kotlin/misk/jdbc/TestDatabasePoolTest.kt @@ -1,7 +1,7 @@ package misk.jdbc import com.google.inject.Module -import com.google.inject.Singleton +import jakarta.inject.Singleton import com.google.inject.util.Modules import misk.MiskTestingServiceModule import misk.inject.KAbstractModule @@ -14,7 +14,7 @@ import org.junit.jupiter.api.assertThrows import java.sql.SQLException import java.time.Clock import java.time.Duration -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = false) class TestDatabasePoolTest { diff --git a/misk-jdbc/src/test/kotlin/misk/jdbc/TruncateTablesServiceTest.kt b/misk-jdbc/src/test/kotlin/misk/jdbc/TruncateTablesServiceTest.kt index 39e5a83214c..7639f59117b 100644 --- a/misk-jdbc/src/test/kotlin/misk/jdbc/TruncateTablesServiceTest.kt +++ b/misk-jdbc/src/test/kotlin/misk/jdbc/TruncateTablesServiceTest.kt @@ -12,8 +12,8 @@ import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import wisp.config.Config import wisp.deployment.TESTING -import javax.inject.Inject -import javax.inject.Qualifier +import jakarta.inject.Inject +import jakarta.inject.Qualifier @MiskTest(startService = true) internal class TruncateTablesServiceTest { diff --git a/misk-jdbc/src/test/kotlin/misk/jdbc/VitessSchemaMigratorTest.kt b/misk-jdbc/src/test/kotlin/misk/jdbc/VitessSchemaMigratorTest.kt index 56ac09d8611..2c7e70115df 100644 --- a/misk-jdbc/src/test/kotlin/misk/jdbc/VitessSchemaMigratorTest.kt +++ b/misk-jdbc/src/test/kotlin/misk/jdbc/VitessSchemaMigratorTest.kt @@ -17,8 +17,8 @@ import org.junit.jupiter.api.Test import wisp.config.Config import wisp.deployment.TESTING import java.sql.Connection -import javax.inject.Inject -import javax.inject.Qualifier +import jakarta.inject.Inject +import jakarta.inject.Qualifier @MiskTest(startService = true) internal class VitessSchemaMigratorTest { diff --git a/misk-jdbc/src/testFixtures/kotlin/misk/jdbc/JdbcTestingModule.kt b/misk-jdbc/src/testFixtures/kotlin/misk/jdbc/JdbcTestingModule.kt index 6e3e45e0fa3..1cec588de0c 100644 --- a/misk-jdbc/src/testFixtures/kotlin/misk/jdbc/JdbcTestingModule.kt +++ b/misk-jdbc/src/testFixtures/kotlin/misk/jdbc/JdbcTestingModule.kt @@ -11,7 +11,7 @@ import misk.inject.toKey import misk.time.ForceUtcTimeZoneService import misk.vitess.VitessScaleSafetyChecks import okhttp3.OkHttpClient -import javax.inject.Provider +import com.google.inject.Provider import kotlin.reflect.KClass /** diff --git a/misk-jdbc/src/testFixtures/kotlin/misk/jdbc/MySqlScaleSafetyChecks.kt b/misk-jdbc/src/testFixtures/kotlin/misk/jdbc/MySqlScaleSafetyChecks.kt index e0ce7e7e2b9..7d7dbb84422 100644 --- a/misk-jdbc/src/testFixtures/kotlin/misk/jdbc/MySqlScaleSafetyChecks.kt +++ b/misk-jdbc/src/testFixtures/kotlin/misk/jdbc/MySqlScaleSafetyChecks.kt @@ -8,7 +8,7 @@ import java.sql.Connection import java.sql.SQLException import java.sql.Timestamp import java.util.Properties -import javax.inject.Singleton +import jakarta.inject.Singleton import javax.sql.DataSource @Singleton diff --git a/misk-jdbc/src/testFixtures/kotlin/misk/jdbc/MySqlTestDatabasePoolBackend.kt b/misk-jdbc/src/testFixtures/kotlin/misk/jdbc/MySqlTestDatabasePoolBackend.kt index c74f1ecc11c..3a28ba052f0 100644 --- a/misk-jdbc/src/testFixtures/kotlin/misk/jdbc/MySqlTestDatabasePoolBackend.kt +++ b/misk-jdbc/src/testFixtures/kotlin/misk/jdbc/MySqlTestDatabasePoolBackend.kt @@ -5,8 +5,8 @@ import wisp.deployment.TESTING import java.sql.Connection import java.sql.SQLException import java.util.Properties -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import javax.sql.DataSource /** diff --git a/misk-jdbc/src/testFixtures/kotlin/misk/jdbc/TruncateTablesService.kt b/misk-jdbc/src/testFixtures/kotlin/misk/jdbc/TruncateTablesService.kt index 8b85b04558d..f0b2a944d4f 100644 --- a/misk-jdbc/src/testFixtures/kotlin/misk/jdbc/TruncateTablesService.kt +++ b/misk-jdbc/src/testFixtures/kotlin/misk/jdbc/TruncateTablesService.kt @@ -6,7 +6,7 @@ import misk.vitess.shards import misk.vitess.target import wisp.logging.getLogger import java.util.* -import javax.inject.Provider +import com.google.inject.Provider import kotlin.reflect.KClass private val logger = getLogger() diff --git a/misk-jdbc/src/testFixtures/kotlin/misk/vitess/VitessScaleSafetyChecks.kt b/misk-jdbc/src/testFixtures/kotlin/misk/vitess/VitessScaleSafetyChecks.kt index c7809f26d74..7a3621cbfcc 100644 --- a/misk-jdbc/src/testFixtures/kotlin/misk/vitess/VitessScaleSafetyChecks.kt +++ b/misk-jdbc/src/testFixtures/kotlin/misk/vitess/VitessScaleSafetyChecks.kt @@ -23,7 +23,7 @@ import java.util.ArrayDeque import java.util.Collections import java.util.regex.Matcher import java.util.regex.Pattern -import javax.inject.Singleton +import jakarta.inject.Singleton import javax.sql.DataSource internal data class Instruction( diff --git a/misk-jobqueue-testing/api/misk-jobqueue-testing.api b/misk-jobqueue-testing/api/misk-jobqueue-testing.api index 59e1166fa48..ffff92f6a21 100644 --- a/misk-jobqueue-testing/api/misk-jobqueue-testing.api +++ b/misk-jobqueue-testing/api/misk-jobqueue-testing.api @@ -47,7 +47,7 @@ public final class misk/jobqueue/FakeJobHandlerModule$Companion { } public final class misk/jobqueue/FakeJobQueue : misk/jobqueue/JobQueue, misk/jobqueue/TransactionalJobQueue { - public fun (Ljava/time/Clock;Ljavax/inject/Provider;Lwisp/token/TokenGenerator;)V + public fun (Ljava/time/Clock;Lcom/google/inject/Provider;Lwisp/token/TokenGenerator;)V public fun batchEnqueue (Lmisk/jobqueue/QueueName;Ljava/util/List;)V public fun enqueue (Lmisk/hibernate/Session;Lmisk/hibernate/Gid;Lmisk/jobqueue/QueueName;Ljava/lang/String;Ljava/lang/String;Ljava/time/Duration;Ljava/util/Map;)V public fun enqueue (Lmisk/hibernate/Session;Lmisk/jobqueue/QueueName;Ljava/lang/String;Ljava/lang/String;Ljava/time/Duration;Ljava/util/Map;)V diff --git a/misk-jobqueue-testing/build.gradle.kts b/misk-jobqueue-testing/build.gradle.kts index cfa1f0b6afe..dd59c000d0f 100644 --- a/misk-jobqueue-testing/build.gradle.kts +++ b/misk-jobqueue-testing/build.gradle.kts @@ -10,7 +10,7 @@ plugins { dependencies { api(Dependencies.guice) - api(Dependencies.javaxInject) + api(Dependencies.jakartaInject) api(project(":wisp:wisp-token")) api(project(":misk")) api(project(":misk-hibernate")) diff --git a/misk-jobqueue-testing/src/main/kotlin/misk/jobqueue/DevelopmentJobProcessor.kt b/misk-jobqueue-testing/src/main/kotlin/misk/jobqueue/DevelopmentJobProcessor.kt index 88abeec5dbe..f5d106634d5 100644 --- a/misk-jobqueue-testing/src/main/kotlin/misk/jobqueue/DevelopmentJobProcessor.kt +++ b/misk-jobqueue-testing/src/main/kotlin/misk/jobqueue/DevelopmentJobProcessor.kt @@ -5,9 +5,9 @@ import com.google.common.util.concurrent.ServiceManager import misk.tasks.RepeatedTaskQueue import misk.tasks.Status import java.time.Duration -import javax.inject.Inject -import javax.inject.Provider -import javax.inject.Singleton +import jakarta.inject.Inject +import com.google.inject.Provider +import jakarta.inject.Singleton @Deprecated("Replace the dependency on misk-jobqueue-testing with testFixtures(misk-jobqueue)") @Singleton diff --git a/misk-jobqueue-testing/src/main/kotlin/misk/jobqueue/DevelopmentJobProcessorModule.kt b/misk-jobqueue-testing/src/main/kotlin/misk/jobqueue/DevelopmentJobProcessorModule.kt index 099e392c76d..72d4bd1caec 100644 --- a/misk-jobqueue-testing/src/main/kotlin/misk/jobqueue/DevelopmentJobProcessorModule.kt +++ b/misk-jobqueue-testing/src/main/kotlin/misk/jobqueue/DevelopmentJobProcessorModule.kt @@ -1,7 +1,7 @@ package misk.jobqueue import com.google.inject.Provides -import com.google.inject.Singleton +import jakarta.inject.Singleton import misk.ServiceModule import misk.inject.KAbstractModule import misk.inject.keyOf diff --git a/misk-jobqueue-testing/src/main/kotlin/misk/jobqueue/FakeJobQueue.kt b/misk-jobqueue-testing/src/main/kotlin/misk/jobqueue/FakeJobQueue.kt index b9f959ecc29..8f210ed9e21 100644 --- a/misk-jobqueue-testing/src/main/kotlin/misk/jobqueue/FakeJobQueue.kt +++ b/misk-jobqueue-testing/src/main/kotlin/misk/jobqueue/FakeJobQueue.kt @@ -11,9 +11,9 @@ import java.time.Instant import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.ConcurrentLinkedDeque import java.util.concurrent.PriorityBlockingQueue -import javax.inject.Inject -import javax.inject.Provider -import javax.inject.Singleton +import jakarta.inject.Inject +import com.google.inject.Provider +import jakarta.inject.Singleton /** * A fake implementation of [JobQueue] and [FakeTransactionalJobQueue] intended for testing. diff --git a/misk-jobqueue-testing/src/main/kotlin/misk/jobqueue/ForDevelopmentHandling.kt b/misk-jobqueue-testing/src/main/kotlin/misk/jobqueue/ForDevelopmentHandling.kt index 28aca9ad758..8a75afe5237 100644 --- a/misk-jobqueue-testing/src/main/kotlin/misk/jobqueue/ForDevelopmentHandling.kt +++ b/misk-jobqueue-testing/src/main/kotlin/misk/jobqueue/ForDevelopmentHandling.kt @@ -1,6 +1,6 @@ package misk.jobqueue -import javax.inject.Qualifier +import jakarta.inject.Qualifier @Deprecated("Replace the dependency on misk-jobqueue-testing with testFixtures(misk-jobqueue)") @Qualifier diff --git a/misk-jobqueue/api/misk-jobqueue.api b/misk-jobqueue/api/misk-jobqueue.api index c4895610c4d..46d5d71ea12 100644 --- a/misk-jobqueue/api/misk-jobqueue.api +++ b/misk-jobqueue/api/misk-jobqueue.api @@ -46,7 +46,7 @@ public final class misk/jobqueue/FakeJobHandlerModule$Companion { } public final class misk/jobqueue/FakeJobQueue : misk/jobqueue/JobQueue, misk/jobqueue/TransactionalJobQueue { - public fun (Ljava/time/Clock;Ljavax/inject/Provider;Lwisp/token/TokenGenerator;)V + public fun (Ljava/time/Clock;Lcom/google/inject/Provider;Lwisp/token/TokenGenerator;)V public fun batchEnqueue (Lmisk/jobqueue/QueueName;Ljava/util/List;)V public fun enqueue (Lmisk/hibernate/Session;Lmisk/hibernate/Gid;Lmisk/jobqueue/QueueName;Ljava/lang/String;Ljava/lang/String;Ljava/time/Duration;Ljava/util/Map;)V public fun enqueue (Lmisk/hibernate/Session;Lmisk/jobqueue/QueueName;Ljava/lang/String;Ljava/lang/String;Ljava/time/Duration;Ljava/util/Map;)V diff --git a/misk-jobqueue/build.gradle.kts b/misk-jobqueue/build.gradle.kts index f253e8625d3..4d4707de13a 100644 --- a/misk-jobqueue/build.gradle.kts +++ b/misk-jobqueue/build.gradle.kts @@ -11,7 +11,7 @@ plugins { dependencies { testFixturesApi(Dependencies.guice) - testFixturesApi(Dependencies.javaxInject) + testFixturesApi(Dependencies.jakartaInject) testFixturesApi(project(":wisp:wisp-token")) testFixturesApi(project(":misk")) testFixturesApi(project(":misk-hibernate")) @@ -23,7 +23,7 @@ dependencies { testImplementation(Dependencies.assertj) testImplementation(Dependencies.guice) - testImplementation(Dependencies.javaxInject) + testImplementation(Dependencies.jakartaInject) testImplementation(Dependencies.junitApi) testImplementation(Dependencies.kotlinLogging) testImplementation(Dependencies.kotlinTest) diff --git a/misk-jobqueue/src/test/kotlin/misk/jobqueue/DevelopmentJobQueueTest.kt b/misk-jobqueue/src/test/kotlin/misk/jobqueue/DevelopmentJobQueueTest.kt index 97070e42ddf..d74c2bfa5a3 100644 --- a/misk-jobqueue/src/test/kotlin/misk/jobqueue/DevelopmentJobQueueTest.kt +++ b/misk-jobqueue/src/test/kotlin/misk/jobqueue/DevelopmentJobQueueTest.kt @@ -8,7 +8,7 @@ import misk.testing.MiskTestModule import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import wisp.logging.LogCollector -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) internal class DevelopmentJobQueueTest { diff --git a/misk-jobqueue/src/test/kotlin/misk/jobqueue/FakeJobQueueTest.kt b/misk-jobqueue/src/test/kotlin/misk/jobqueue/FakeJobQueueTest.kt index ebbc4046e30..e57db2510fc 100644 --- a/misk-jobqueue/src/test/kotlin/misk/jobqueue/FakeJobQueueTest.kt +++ b/misk-jobqueue/src/test/kotlin/misk/jobqueue/FakeJobQueueTest.kt @@ -15,8 +15,8 @@ import wisp.time.FakeClock import java.time.Duration import java.time.temporal.ChronoUnit import java.util.concurrent.ConcurrentHashMap -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import kotlin.test.assertFailsWith @MiskTest(startService = true) diff --git a/misk-jobqueue/src/testFixtures/kotlin/misk/jobqueue/DevelopmentJobProcessor.kt b/misk-jobqueue/src/testFixtures/kotlin/misk/jobqueue/DevelopmentJobProcessor.kt index e76b58a1b66..5565a719f84 100644 --- a/misk-jobqueue/src/testFixtures/kotlin/misk/jobqueue/DevelopmentJobProcessor.kt +++ b/misk-jobqueue/src/testFixtures/kotlin/misk/jobqueue/DevelopmentJobProcessor.kt @@ -5,9 +5,9 @@ import com.google.common.util.concurrent.ServiceManager import misk.tasks.RepeatedTaskQueue import misk.tasks.Status import java.time.Duration -import javax.inject.Inject -import javax.inject.Provider -import javax.inject.Singleton +import jakarta.inject.Inject +import com.google.inject.Provider +import jakarta.inject.Singleton @Singleton internal class DevelopmentJobProcessor @Inject constructor( diff --git a/misk-jobqueue/src/testFixtures/kotlin/misk/jobqueue/DevelopmentJobProcessorModule.kt b/misk-jobqueue/src/testFixtures/kotlin/misk/jobqueue/DevelopmentJobProcessorModule.kt index 829e8818bfc..fb93350b9cd 100644 --- a/misk-jobqueue/src/testFixtures/kotlin/misk/jobqueue/DevelopmentJobProcessorModule.kt +++ b/misk-jobqueue/src/testFixtures/kotlin/misk/jobqueue/DevelopmentJobProcessorModule.kt @@ -1,7 +1,7 @@ package misk.jobqueue import com.google.inject.Provides -import com.google.inject.Singleton +import jakarta.inject.Singleton import misk.ReadyService import misk.ServiceModule import misk.inject.KAbstractModule diff --git a/misk-jobqueue/src/testFixtures/kotlin/misk/jobqueue/FakeJobQueue.kt b/misk-jobqueue/src/testFixtures/kotlin/misk/jobqueue/FakeJobQueue.kt index 16035c1b265..209a7bb0419 100644 --- a/misk-jobqueue/src/testFixtures/kotlin/misk/jobqueue/FakeJobQueue.kt +++ b/misk-jobqueue/src/testFixtures/kotlin/misk/jobqueue/FakeJobQueue.kt @@ -11,9 +11,9 @@ import java.time.Instant import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.ConcurrentLinkedDeque import java.util.concurrent.PriorityBlockingQueue -import javax.inject.Inject -import javax.inject.Provider -import javax.inject.Singleton +import jakarta.inject.Inject +import com.google.inject.Provider +import jakarta.inject.Singleton /** * A fake implementation of [JobQueue] and [FakeTransactionalJobQueue] intended for testing. diff --git a/misk-jobqueue/src/testFixtures/kotlin/misk/jobqueue/ForDevelopmentHandling.kt b/misk-jobqueue/src/testFixtures/kotlin/misk/jobqueue/ForDevelopmentHandling.kt index ab6b33fa15f..4d777222dcd 100644 --- a/misk-jobqueue/src/testFixtures/kotlin/misk/jobqueue/ForDevelopmentHandling.kt +++ b/misk-jobqueue/src/testFixtures/kotlin/misk/jobqueue/ForDevelopmentHandling.kt @@ -1,6 +1,6 @@ package misk.jobqueue -import javax.inject.Qualifier +import jakarta.inject.Qualifier @Qualifier @Target(AnnotationTarget.FIELD, AnnotationTarget.FUNCTION, AnnotationTarget.VALUE_PARAMETER) diff --git a/misk-jooq/api/misk-jooq.api b/misk-jooq/api/misk-jooq.api index 5c704422a53..a42b4faaa6a 100644 --- a/misk-jooq/api/misk-jooq.api +++ b/misk-jooq/api/misk-jooq.api @@ -8,7 +8,7 @@ public final class misk/jooq/JooqExtensionsKt { public final class misk/jooq/JooqHealthCheck : misk/healthchecks/HealthCheck { public static final field Companion Lmisk/jooq/JooqHealthCheck$Companion; - public fun (Lkotlin/reflect/KClass;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljava/time/Clock;)V + public fun (Lkotlin/reflect/KClass;Lcom/google/inject/Provider;Lcom/google/inject/Provider;Ljava/time/Clock;)V public fun status ()Lmisk/healthchecks/HealthStatus; } diff --git a/misk-jooq/build.gradle.kts b/misk-jooq/build.gradle.kts index d8edd6e8e28..41f88535134 100644 --- a/misk-jooq/build.gradle.kts +++ b/misk-jooq/build.gradle.kts @@ -14,13 +14,13 @@ plugins { dependencies { api(Dependencies.guava) - api(Dependencies.javaxInject) + api(Dependencies.guice) api(Dependencies.jooq) api(Dependencies.kotlinLogging) api(project(":misk-core")) api(project(":misk-inject")) api(project(":misk-jdbc")) - implementation(Dependencies.guice) + implementation(Dependencies.jakartaInject) implementation(Dependencies.kotlinRetry) implementation(Dependencies.kotlinxCoroutines) implementation(project(":wisp:wisp-logging")) diff --git a/misk-jooq/src/main/kotlin/misk/jooq/JooqHealthCheck.kt b/misk-jooq/src/main/kotlin/misk/jooq/JooqHealthCheck.kt index edde5c64f39..a63ab4f7392 100644 --- a/misk-jooq/src/main/kotlin/misk/jooq/JooqHealthCheck.kt +++ b/misk-jooq/src/main/kotlin/misk/jooq/JooqHealthCheck.kt @@ -7,7 +7,7 @@ import org.jooq.impl.DSL.now import wisp.logging.getLogger import java.time.Clock import java.time.Duration -import javax.inject.Provider +import com.google.inject.Provider import kotlin.reflect.KClass class JooqHealthCheck( diff --git a/misk-jooq/src/main/kotlin/misk/jooq/JooqModule.kt b/misk-jooq/src/main/kotlin/misk/jooq/JooqModule.kt index e2af8e5f925..714e7b3e79c 100644 --- a/misk-jooq/src/main/kotlin/misk/jooq/JooqModule.kt +++ b/misk-jooq/src/main/kotlin/misk/jooq/JooqModule.kt @@ -26,8 +26,8 @@ import org.jooq.impl.DSL import org.jooq.impl.DefaultExecuteListenerProvider import org.jooq.impl.DefaultTransactionProvider import java.time.Clock -import javax.inject.Inject -import javax.inject.Provider +import jakarta.inject.Inject +import com.google.inject.Provider import kotlin.reflect.KClass class JooqModule @JvmOverloads constructor( diff --git a/misk-jooq/src/test/kotlin/misk/jooq/JooqTransacterTest.kt b/misk-jooq/src/test/kotlin/misk/jooq/JooqTransacterTest.kt index 890329b4380..a167ba5e01e 100644 --- a/misk-jooq/src/test/kotlin/misk/jooq/JooqTransacterTest.kt +++ b/misk-jooq/src/test/kotlin/misk/jooq/JooqTransacterTest.kt @@ -20,7 +20,7 @@ import org.junit.jupiter.api.Test import wisp.time.FakeClock import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) internal class JooqTransacterTest { diff --git a/misk-jooq/src/test/kotlin/misk/jooq/config/ClientJooqTestingModule.kt b/misk-jooq/src/test/kotlin/misk/jooq/config/ClientJooqTestingModule.kt index a9aff03bf2b..0346ba23323 100644 --- a/misk-jooq/src/test/kotlin/misk/jooq/config/ClientJooqTestingModule.kt +++ b/misk-jooq/src/test/kotlin/misk/jooq/config/ClientJooqTestingModule.kt @@ -12,7 +12,7 @@ import misk.jooq.listeners.JooqTimestampRecordListenerOptions import misk.logging.LogCollectorModule import org.jooq.impl.DefaultExecuteListenerProvider import wisp.deployment.TESTING -import javax.inject.Qualifier +import jakarta.inject.Qualifier class ClientJooqTestingModule : KAbstractModule() { override fun configure() { diff --git a/misk-launchdarkly-core/build.gradle.kts b/misk-launchdarkly-core/build.gradle.kts index 70b30fc0ca8..2001756e2c3 100644 --- a/misk-launchdarkly-core/build.gradle.kts +++ b/misk-launchdarkly-core/build.gradle.kts @@ -10,7 +10,7 @@ plugins { dependencies { api(Dependencies.guava) - api(Dependencies.javaxInject) + api(Dependencies.jakartaInject) api(project(":wisp:wisp-feature")) api(project(":wisp:wisp-launchdarkly")) api(project(":misk-feature")) diff --git a/misk-launchdarkly-core/src/main/kotlin/misk/feature/launchdarkly/LaunchDarklyDynamicConfig.kt b/misk-launchdarkly-core/src/main/kotlin/misk/feature/launchdarkly/LaunchDarklyDynamicConfig.kt index 86251aab14a..ee60e019af9 100644 --- a/misk-launchdarkly-core/src/main/kotlin/misk/feature/launchdarkly/LaunchDarklyDynamicConfig.kt +++ b/misk-launchdarkly-core/src/main/kotlin/misk/feature/launchdarkly/LaunchDarklyDynamicConfig.kt @@ -5,7 +5,7 @@ import misk.feature.DynamicConfig import misk.feature.Feature import misk.feature.FeatureFlags import java.util.concurrent.Executor -import javax.inject.Singleton +import jakarta.inject.Singleton @Singleton class LaunchDarklyDynamicConfig(private val featureFlags: FeatureFlags) : DynamicConfig { diff --git a/misk-launchdarkly-core/src/main/kotlin/misk/feature/launchdarkly/LaunchDarklyFeatureFlags.kt b/misk-launchdarkly-core/src/main/kotlin/misk/feature/launchdarkly/LaunchDarklyFeatureFlags.kt index 250403c99f0..d1049538d4f 100644 --- a/misk-launchdarkly-core/src/main/kotlin/misk/feature/launchdarkly/LaunchDarklyFeatureFlags.kt +++ b/misk-launchdarkly-core/src/main/kotlin/misk/feature/launchdarkly/LaunchDarklyFeatureFlags.kt @@ -13,8 +13,8 @@ import wisp.feature.IntFeatureFlag import wisp.feature.JsonFeatureFlag import wisp.feature.StringFeatureFlag import java.util.concurrent.Executor -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * Implementation of [FeatureFlags] using LaunchDarkly's Java SDK. diff --git a/misk-launchdarkly/build.gradle.kts b/misk-launchdarkly/build.gradle.kts index 846b25d2a81..efd76251729 100644 --- a/misk-launchdarkly/build.gradle.kts +++ b/misk-launchdarkly/build.gradle.kts @@ -16,7 +16,7 @@ dependencies { api(project(":misk-config")) api(project(":misk-core")) api(project(":misk-inject")) - implementation(Dependencies.javaxInject) + implementation(Dependencies.jakartaInject) implementation(Dependencies.kotlinStdLibJdk8) implementation(Dependencies.micrometerCore) implementation(Dependencies.moshi) diff --git a/misk-launchdarkly/src/main/kotlin/misk/feature/launchdarkly/LaunchDarklyFeatureFlagsModule.kt b/misk-launchdarkly/src/main/kotlin/misk/feature/launchdarkly/LaunchDarklyFeatureFlagsModule.kt index 080068431ef..02e0c9f9b41 100644 --- a/misk-launchdarkly/src/main/kotlin/misk/feature/launchdarkly/LaunchDarklyFeatureFlagsModule.kt +++ b/misk-launchdarkly/src/main/kotlin/misk/feature/launchdarkly/LaunchDarklyFeatureFlagsModule.kt @@ -23,8 +23,8 @@ import misk.security.ssl.SslLoader import wisp.config.Config import java.net.URI import java.time.Duration -import javax.inject.Inject -import javax.inject.Provider +import jakarta.inject.Inject +import com.google.inject.Provider import javax.net.ssl.X509TrustManager import kotlin.reflect.KClass diff --git a/misk-lease/build.gradle.kts b/misk-lease/build.gradle.kts index 311dbff1d36..cecebdc6c43 100644 --- a/misk-lease/build.gradle.kts +++ b/misk-lease/build.gradle.kts @@ -10,7 +10,7 @@ plugins { dependencies { api(Dependencies.guava) - api(Dependencies.javaxInject) + api(Dependencies.jakartaInject) api(project(":wisp:wisp-lease")) } diff --git a/misk-lease/src/main/kotlin/misk/lease/LeaseService.kt b/misk-lease/src/main/kotlin/misk/lease/LeaseService.kt index e6bbdeb37c1..8e2e6f5f6a4 100644 --- a/misk-lease/src/main/kotlin/misk/lease/LeaseService.kt +++ b/misk-lease/src/main/kotlin/misk/lease/LeaseService.kt @@ -2,8 +2,8 @@ package misk.lease import com.google.common.util.concurrent.AbstractIdleService import wisp.lease.LeaseManager -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton class LeaseService @Inject constructor( diff --git a/misk-metrics-testing/build.gradle.kts b/misk-metrics-testing/build.gradle.kts index 3d463904133..c6b245d73d4 100644 --- a/misk-metrics-testing/build.gradle.kts +++ b/misk-metrics-testing/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } dependencies { - api(Dependencies.javaxInject) + api(Dependencies.jakartaInject) api(Dependencies.prometheusClient) api(project(":misk-inject")) api(project(":misk-metrics")) diff --git a/misk-metrics-testing/src/main/kotlin/misk/metrics/FakeMetrics.kt b/misk-metrics-testing/src/main/kotlin/misk/metrics/FakeMetrics.kt index 83b34367ff3..39e6d88182b 100644 --- a/misk-metrics-testing/src/main/kotlin/misk/metrics/FakeMetrics.kt +++ b/misk-metrics-testing/src/main/kotlin/misk/metrics/FakeMetrics.kt @@ -2,8 +2,8 @@ package misk.metrics import io.prometheus.client.* import io.prometheus.client.Collector.MetricFamilySamples.Sample -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * An in-memory metrics store with APIs to verify which metrics were collected. diff --git a/misk-metrics-testing/src/main/kotlin/misk/metrics/v2/FakeMetrics.kt b/misk-metrics-testing/src/main/kotlin/misk/metrics/v2/FakeMetrics.kt index 83bbf9a7e08..9720994e9e1 100644 --- a/misk-metrics-testing/src/main/kotlin/misk/metrics/v2/FakeMetrics.kt +++ b/misk-metrics-testing/src/main/kotlin/misk/metrics/v2/FakeMetrics.kt @@ -7,8 +7,8 @@ import io.prometheus.client.Counter import io.prometheus.client.Gauge import io.prometheus.client.Histogram import io.prometheus.client.Summary -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * An in-memory metrics store with APIs to verify which metrics were collected. diff --git a/misk-metrics/build.gradle.kts b/misk-metrics/build.gradle.kts index 284c1bd93cc..4f7c30d621c 100644 --- a/misk-metrics/build.gradle.kts +++ b/misk-metrics/build.gradle.kts @@ -15,7 +15,6 @@ dependencies { implementation(Dependencies.guava) implementation(Dependencies.kotlinStdLibJdk8) - testFixturesApi(Dependencies.javaxInject) testFixturesApi(Dependencies.prometheusClient) testFixturesApi(project(":misk-inject")) testFixturesApi(project(":misk-metrics")) @@ -24,7 +23,7 @@ dependencies { testFixturesImplementation(Dependencies.kotlinStdLibJdk8) testImplementation(Dependencies.assertj) - testImplementation(Dependencies.javaxInject) + testImplementation(Dependencies.jakartaInject) testImplementation(Dependencies.junitApi) testImplementation(project(":misk-metrics")) testImplementation(project(":misk-testing")) diff --git a/misk-metrics/src/test/kotlin/misk/metrics/FakeMetricsTest.kt b/misk-metrics/src/test/kotlin/misk/metrics/FakeMetricsTest.kt index 1ffa57fff39..a1909af13b9 100644 --- a/misk-metrics/src/test/kotlin/misk/metrics/FakeMetricsTest.kt +++ b/misk-metrics/src/test/kotlin/misk/metrics/FakeMetricsTest.kt @@ -1,7 +1,7 @@ package misk.metrics import io.prometheus.client.Collector.MetricFamilySamples.Sample -import javax.inject.Inject +import jakarta.inject.Inject import misk.testing.MiskTest import misk.testing.MiskTestModule import org.assertj.core.api.Assertions.assertThat diff --git a/misk-metrics/src/test/kotlin/misk/metrics/v2/FakeMetricsTest.kt b/misk-metrics/src/test/kotlin/misk/metrics/v2/FakeMetricsTest.kt index 67700e77742..88b3f46fcd0 100644 --- a/misk-metrics/src/test/kotlin/misk/metrics/v2/FakeMetricsTest.kt +++ b/misk-metrics/src/test/kotlin/misk/metrics/v2/FakeMetricsTest.kt @@ -1,7 +1,7 @@ package misk.metrics.v2 import io.prometheus.client.Collector.MetricFamilySamples.Sample -import javax.inject.Inject +import jakarta.inject.Inject import misk.testing.MiskTest import misk.testing.MiskTestModule import org.assertj.core.api.Assertions.assertThat diff --git a/misk-metrics/src/testFixtures/kotlin/misk/metrics/FakeMetrics.kt b/misk-metrics/src/testFixtures/kotlin/misk/metrics/FakeMetrics.kt index 7a642f5a220..80720aaeb63 100644 --- a/misk-metrics/src/testFixtures/kotlin/misk/metrics/FakeMetrics.kt +++ b/misk-metrics/src/testFixtures/kotlin/misk/metrics/FakeMetrics.kt @@ -2,8 +2,8 @@ package misk.metrics import io.prometheus.client.* import io.prometheus.client.Collector.MetricFamilySamples.Sample -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * An in-memory metrics store with APIs to verify which metrics were collected. diff --git a/misk-metrics/src/testFixtures/kotlin/misk/metrics/v2/FakeMetrics.kt b/misk-metrics/src/testFixtures/kotlin/misk/metrics/v2/FakeMetrics.kt index a199c754606..4c22b0848b1 100644 --- a/misk-metrics/src/testFixtures/kotlin/misk/metrics/v2/FakeMetrics.kt +++ b/misk-metrics/src/testFixtures/kotlin/misk/metrics/v2/FakeMetrics.kt @@ -7,8 +7,8 @@ import io.prometheus.client.Counter import io.prometheus.client.Gauge import io.prometheus.client.Histogram import io.prometheus.client.Summary -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * An in-memory metrics store with APIs to verify which metrics were collected. diff --git a/misk-policy-testing/build.gradle.kts b/misk-policy-testing/build.gradle.kts index 21a91789e14..3b62a78eaf0 100644 --- a/misk-policy-testing/build.gradle.kts +++ b/misk-policy-testing/build.gradle.kts @@ -12,7 +12,7 @@ dependencies { api(Dependencies.dockerApi) api(Dependencies.dockerCore) api(Dependencies.guava) - api(Dependencies.javaxInject) + api(Dependencies.jakartaInject) api(project(":misk-inject")) api(project(":misk-policy")) implementation(Dependencies.dockerTransport) diff --git a/misk-policy-testing/src/main/kotlin/misk/policy/opa/FakeOpaModule.kt b/misk-policy-testing/src/main/kotlin/misk/policy/opa/FakeOpaModule.kt index 7e4a94486f4..d7376b4ad28 100644 --- a/misk-policy-testing/src/main/kotlin/misk/policy/opa/FakeOpaModule.kt +++ b/misk-policy-testing/src/main/kotlin/misk/policy/opa/FakeOpaModule.kt @@ -1,7 +1,7 @@ package misk.policy.opa import misk.inject.KAbstractModule -import javax.inject.Inject +import jakarta.inject.Inject @Deprecated("Replace the dependency on misk-policy-testing with testFixtures(misk-policy)") class FakeOpaModule @Inject constructor(): KAbstractModule() { diff --git a/misk-policy-testing/src/main/kotlin/misk/policy/opa/FakeOpaPolicyEngine.kt b/misk-policy-testing/src/main/kotlin/misk/policy/opa/FakeOpaPolicyEngine.kt index 79ae6efd01e..3eb1d377327 100644 --- a/misk-policy-testing/src/main/kotlin/misk/policy/opa/FakeOpaPolicyEngine.kt +++ b/misk-policy-testing/src/main/kotlin/misk/policy/opa/FakeOpaPolicyEngine.kt @@ -1,7 +1,7 @@ package misk.policy.opa -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Deprecated("Replace the dependency on misk-policy-testing with testFixtures(misk-policy)") @Singleton diff --git a/misk-policy/build.gradle.kts b/misk-policy/build.gradle.kts index 3de3b3b9815..774596f8f6f 100644 --- a/misk-policy/build.gradle.kts +++ b/misk-policy/build.gradle.kts @@ -11,7 +11,7 @@ plugins { dependencies { api(Dependencies.guice) - api(Dependencies.javaxInject) + api(Dependencies.jakartaInject) api(Dependencies.moshi) api(Dependencies.okHttp) api(Dependencies.retrofit) @@ -23,7 +23,7 @@ dependencies { testFixturesApi(Dependencies.dockerApi) testFixturesApi(Dependencies.dockerCore) - testFixturesApi(Dependencies.javaxInject) + testFixturesApi(Dependencies.jakartaInject) testFixturesApi(project(":misk-inject")) testFixturesApi(project(":misk-policy")) testFixturesImplementation(Dependencies.dockerTransport) diff --git a/misk-policy/src/main/kotlin/misk/policy/opa/OpaModule.kt b/misk-policy/src/main/kotlin/misk/policy/opa/OpaModule.kt index 1a25af026a3..0761cdddec0 100644 --- a/misk-policy/src/main/kotlin/misk/policy/opa/OpaModule.kt +++ b/misk-policy/src/main/kotlin/misk/policy/opa/OpaModule.kt @@ -8,9 +8,9 @@ import misk.client.HttpClientFactory import misk.inject.KAbstractModule import retrofit2.converter.scalars.ScalarsConverterFactory import wisp.moshi.buildMoshi -import javax.inject.Inject -import javax.inject.Named -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Named +import jakarta.inject.Singleton class OpaModule @Inject constructor( private val config: OpaConfig diff --git a/misk-policy/src/main/kotlin/misk/policy/opa/RealOpaPolicyEngine.kt b/misk-policy/src/main/kotlin/misk/policy/opa/RealOpaPolicyEngine.kt index 7fa9c40697a..9f218185a18 100644 --- a/misk-policy/src/main/kotlin/misk/policy/opa/RealOpaPolicyEngine.kt +++ b/misk-policy/src/main/kotlin/misk/policy/opa/RealOpaPolicyEngine.kt @@ -3,8 +3,8 @@ package misk.policy.opa import com.squareup.moshi.Moshi import com.squareup.moshi.Types import okhttp3.ResponseBody -import javax.inject.Inject -import javax.inject.Named +import jakarta.inject.Inject +import jakarta.inject.Named /** * Support for the Open Policy Engine (OPA). diff --git a/misk-policy/src/test/kotlin/misk/policy/opa/FakeOpaPolicyEngineTest.kt b/misk-policy/src/test/kotlin/misk/policy/opa/FakeOpaPolicyEngineTest.kt index d87f83c33d1..49763264a8b 100644 --- a/misk-policy/src/test/kotlin/misk/policy/opa/FakeOpaPolicyEngineTest.kt +++ b/misk-policy/src/test/kotlin/misk/policy/opa/FakeOpaPolicyEngineTest.kt @@ -5,7 +5,7 @@ import misk.testing.MiskTestModule import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = false) internal class FakeOpaPolicyEngineTest { diff --git a/misk-policy/src/test/kotlin/misk/policy/opa/RealOpaPolicyEngineTest.kt b/misk-policy/src/test/kotlin/misk/policy/opa/RealOpaPolicyEngineTest.kt index e9605e53fda..2ee51d556d4 100644 --- a/misk-policy/src/test/kotlin/misk/policy/opa/RealOpaPolicyEngineTest.kt +++ b/misk-policy/src/test/kotlin/misk/policy/opa/RealOpaPolicyEngineTest.kt @@ -21,9 +21,9 @@ import org.mockito.Mockito.anyString import retrofit2.Response import retrofit2.mock.Calls import wisp.moshi.defaultKotlinMoshi -import javax.inject.Inject -import javax.inject.Named -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Named +import jakarta.inject.Singleton @MiskTest(startService = false) internal class RealOpaPolicyEngineTest { diff --git a/misk-policy/src/testFixtures/kotlin/misk/policy/opa/FakeOpaModule.kt b/misk-policy/src/testFixtures/kotlin/misk/policy/opa/FakeOpaModule.kt index 1c55cd1c31a..16a08ea0b15 100644 --- a/misk-policy/src/testFixtures/kotlin/misk/policy/opa/FakeOpaModule.kt +++ b/misk-policy/src/testFixtures/kotlin/misk/policy/opa/FakeOpaModule.kt @@ -1,7 +1,7 @@ package misk.policy.opa import misk.inject.KAbstractModule -import javax.inject.Inject +import jakarta.inject.Inject class FakeOpaModule @Inject constructor(): KAbstractModule() { override fun configure() { diff --git a/misk-policy/src/testFixtures/kotlin/misk/policy/opa/FakeOpaPolicyEngine.kt b/misk-policy/src/testFixtures/kotlin/misk/policy/opa/FakeOpaPolicyEngine.kt index 32b6a618dd8..e8375981940 100644 --- a/misk-policy/src/testFixtures/kotlin/misk/policy/opa/FakeOpaPolicyEngine.kt +++ b/misk-policy/src/testFixtures/kotlin/misk/policy/opa/FakeOpaPolicyEngine.kt @@ -1,7 +1,7 @@ package misk.policy.opa -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton class FakeOpaPolicyEngine @Inject constructor(): OpaPolicyEngine { diff --git a/misk-prometheus/build.gradle.kts b/misk-prometheus/build.gradle.kts index a6d383f8f26..7336f12d9a2 100644 --- a/misk-prometheus/build.gradle.kts +++ b/misk-prometheus/build.gradle.kts @@ -10,7 +10,7 @@ plugins { dependencies { api(Dependencies.guava) - api(Dependencies.javaxInject) + api(Dependencies.jakartaInject) api(Dependencies.prometheusClient) api(project(":wisp:wisp-config")) api(project(":misk-inject")) diff --git a/misk-prometheus/src/main/kotlin/misk/metrics/backends/prometheus/PrometheusConfig.kt b/misk-prometheus/src/main/kotlin/misk/metrics/backends/prometheus/PrometheusConfig.kt index 47ffa8b1b6f..cdd58cc98e9 100644 --- a/misk-prometheus/src/main/kotlin/misk/metrics/backends/prometheus/PrometheusConfig.kt +++ b/misk-prometheus/src/main/kotlin/misk/metrics/backends/prometheus/PrometheusConfig.kt @@ -1,7 +1,7 @@ package misk.metrics.backends.prometheus import wisp.config.Config -import javax.inject.Inject +import jakarta.inject.Inject /** Configuration for exporting metrics to prometheus */ @Suppress("AnnotatePublicApisWithJvmOverloads") diff --git a/misk-prometheus/src/main/kotlin/misk/metrics/backends/prometheus/PrometheusHttpService.kt b/misk-prometheus/src/main/kotlin/misk/metrics/backends/prometheus/PrometheusHttpService.kt index 3cddb39d894..a3f3ec7eef3 100644 --- a/misk-prometheus/src/main/kotlin/misk/metrics/backends/prometheus/PrometheusHttpService.kt +++ b/misk-prometheus/src/main/kotlin/misk/metrics/backends/prometheus/PrometheusHttpService.kt @@ -6,8 +6,8 @@ import io.prometheus.client.exporter.HTTPServer import wisp.logging.getLogger import java.io.IOException import java.net.InetSocketAddress -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton class PrometheusHttpService @Inject internal constructor( diff --git a/misk-prometheus/src/main/kotlin/misk/metrics/backends/prometheus/PrometheusMetrics.kt b/misk-prometheus/src/main/kotlin/misk/metrics/backends/prometheus/PrometheusMetrics.kt index 661dcf78d89..0b379851023 100644 --- a/misk-prometheus/src/main/kotlin/misk/metrics/backends/prometheus/PrometheusMetrics.kt +++ b/misk-prometheus/src/main/kotlin/misk/metrics/backends/prometheus/PrometheusMetrics.kt @@ -7,8 +7,8 @@ import misk.metrics.Histogram import misk.metrics.Metrics import misk.metrics.v2.PeakGauge import misk.metrics.v2.Metrics as MetricsV2 -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * Accepts metrics and writes them to the Prometheus [CollectorRegistry]. diff --git a/misk-prometheus/src/main/kotlin/misk/metrics/backends/prometheus/PrometheusMetricsClientModule.kt b/misk-prometheus/src/main/kotlin/misk/metrics/backends/prometheus/PrometheusMetricsClientModule.kt index bfd5e0953f5..584f04c4434 100644 --- a/misk-prometheus/src/main/kotlin/misk/metrics/backends/prometheus/PrometheusMetricsClientModule.kt +++ b/misk-prometheus/src/main/kotlin/misk/metrics/backends/prometheus/PrometheusMetricsClientModule.kt @@ -7,8 +7,8 @@ import misk.metrics.backends.prometheus.v2.PrometheusMetricsClientModule as Prom import misk.metrics.HistogramRegistry import misk.metrics.Metrics import misk.prometheus.PrometheusHistogramRegistry -import javax.inject.Inject -import javax.inject.Provider +import jakarta.inject.Inject +import com.google.inject.Provider /** * Binds a [Metrics] implementation whose metrics don't write to a Prometheus infrastructure. For diff --git a/misk-prometheus/src/main/kotlin/misk/metrics/backends/prometheus/PrometheusMetricsServiceModule.kt b/misk-prometheus/src/main/kotlin/misk/metrics/backends/prometheus/PrometheusMetricsServiceModule.kt index 367ac3b6490..bf35faa3cb8 100644 --- a/misk-prometheus/src/main/kotlin/misk/metrics/backends/prometheus/PrometheusMetricsServiceModule.kt +++ b/misk-prometheus/src/main/kotlin/misk/metrics/backends/prometheus/PrometheusMetricsServiceModule.kt @@ -12,7 +12,7 @@ import io.prometheus.client.hotspot.VersionInfoExports import misk.ReadyService import misk.ServiceModule import misk.inject.KAbstractModule -import javax.inject.Inject +import jakarta.inject.Inject /** * Exposes prometheus metrics over a dedicated port. Allows internal metrics to be exposed via a k8s diff --git a/misk-prometheus/src/main/kotlin/misk/metrics/backends/prometheus/v2/PrometheusMetrics.kt b/misk-prometheus/src/main/kotlin/misk/metrics/backends/prometheus/v2/PrometheusMetrics.kt index c2becd4499f..a4bd9bbb294 100644 --- a/misk-prometheus/src/main/kotlin/misk/metrics/backends/prometheus/v2/PrometheusMetrics.kt +++ b/misk-prometheus/src/main/kotlin/misk/metrics/backends/prometheus/v2/PrometheusMetrics.kt @@ -7,8 +7,8 @@ import io.prometheus.client.Gauge import io.prometheus.client.Summary import misk.metrics.v2.Metrics import misk.metrics.v2.PeakGauge -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * Accepts metrics and writes them to the Prometheus [CollectorRegistry]. diff --git a/misk-prometheus/src/main/kotlin/misk/prometheus/PrometheusHistogramRegistry.kt b/misk-prometheus/src/main/kotlin/misk/prometheus/PrometheusHistogramRegistry.kt index fa703dc6d47..50b96258abb 100644 --- a/misk-prometheus/src/main/kotlin/misk/prometheus/PrometheusHistogramRegistry.kt +++ b/misk-prometheus/src/main/kotlin/misk/prometheus/PrometheusHistogramRegistry.kt @@ -3,7 +3,7 @@ package misk.prometheus import misk.metrics.Histogram import misk.metrics.HistogramRegistry import misk.metrics.Metrics -import javax.inject.Inject +import jakarta.inject.Inject @Deprecated("use Metrics instead") class PrometheusHistogramRegistry @Inject constructor( diff --git a/misk-redis-testing/build.gradle.kts b/misk-redis-testing/build.gradle.kts index cd5667d096b..02276089180 100644 --- a/misk-redis-testing/build.gradle.kts +++ b/misk-redis-testing/build.gradle.kts @@ -9,7 +9,7 @@ plugins { } dependencies { - api(Dependencies.javaxInject) + api(Dependencies.jakartaInject) api(Dependencies.jedis) api(project(":misk-inject")) api(project(":misk-redis")) diff --git a/misk-redis-testing/src/main/kotlin/misk/redis/testing/FakeRedis.kt b/misk-redis-testing/src/main/kotlin/misk/redis/testing/FakeRedis.kt index b51d1871ecf..2d6465bba7d 100644 --- a/misk-redis-testing/src/main/kotlin/misk/redis/testing/FakeRedis.kt +++ b/misk-redis-testing/src/main/kotlin/misk/redis/testing/FakeRedis.kt @@ -12,7 +12,7 @@ import java.time.Clock import java.time.Duration import java.time.Instant import java.util.concurrent.ConcurrentHashMap -import javax.inject.Inject +import jakarta.inject.Inject import kotlin.math.max import kotlin.math.min import kotlin.random.Random diff --git a/misk-redis-testing/src/main/kotlin/misk/redis/testing/RedisTestModule.kt b/misk-redis-testing/src/main/kotlin/misk/redis/testing/RedisTestModule.kt index 5c8ba4a9d45..1cee3646b85 100644 --- a/misk-redis-testing/src/main/kotlin/misk/redis/testing/RedisTestModule.kt +++ b/misk-redis-testing/src/main/kotlin/misk/redis/testing/RedisTestModule.kt @@ -4,7 +4,7 @@ import misk.inject.KAbstractModule import misk.inject.keyOf import misk.redis.Redis import misk.time.FakeClock -import javax.inject.Qualifier +import jakarta.inject.Qualifier import kotlin.random.Random @Deprecated("Replace the dependency on misk-redis-testing with testFixtures(misk-redis)") diff --git a/misk-redis/build.gradle.kts b/misk-redis/build.gradle.kts index 09774180d69..239b8f61a5e 100644 --- a/misk-redis/build.gradle.kts +++ b/misk-redis/build.gradle.kts @@ -11,7 +11,7 @@ plugins { dependencies { api(Dependencies.guava) - api(Dependencies.javaxInject) + api(Dependencies.jakartaInject) api(Dependencies.jedis) api(project(":wisp:wisp-config")) api(project(":misk-config")) @@ -24,7 +24,6 @@ dependencies { implementation(project(":wisp:wisp-deployment")) implementation(project(":misk-service")) - testFixturesApi(Dependencies.javaxInject) testFixturesApi(Dependencies.jedis) testFixturesApi(project(":misk-inject")) testFixturesApi(project(":misk-redis")) diff --git a/misk-redis/src/main/kotlin/misk/redis/FakeRedis.kt b/misk-redis/src/main/kotlin/misk/redis/FakeRedis.kt index 28d05a797d6..6600c963d9b 100644 --- a/misk-redis/src/main/kotlin/misk/redis/FakeRedis.kt +++ b/misk-redis/src/main/kotlin/misk/redis/FakeRedis.kt @@ -10,7 +10,7 @@ import java.time.Clock import java.time.Duration import java.time.Instant import java.util.concurrent.ConcurrentHashMap -import javax.inject.Inject +import jakarta.inject.Inject import kotlin.math.max import kotlin.math.min import kotlin.random.Random diff --git a/misk-redis/src/main/kotlin/misk/redis/RedisModule.kt b/misk-redis/src/main/kotlin/misk/redis/RedisModule.kt index 83c7d2fd734..666d346d4d2 100644 --- a/misk-redis/src/main/kotlin/misk/redis/RedisModule.kt +++ b/misk-redis/src/main/kotlin/misk/redis/RedisModule.kt @@ -2,7 +2,7 @@ package misk.redis import com.google.common.base.Ticker import com.google.inject.Provides -import com.google.inject.Singleton +import jakarta.inject.Singleton import misk.ReadyService import misk.ServiceModule import misk.inject.KAbstractModule diff --git a/misk-redis/src/main/kotlin/misk/redis/RedisService.kt b/misk-redis/src/main/kotlin/misk/redis/RedisService.kt index c55ed5d23c6..e798b34ca78 100644 --- a/misk-redis/src/main/kotlin/misk/redis/RedisService.kt +++ b/misk-redis/src/main/kotlin/misk/redis/RedisService.kt @@ -1,9 +1,9 @@ package misk.redis import com.google.common.util.concurrent.AbstractIdleService -import javax.inject.Inject -import javax.inject.Provider -import javax.inject.Singleton +import jakarta.inject.Inject +import com.google.inject.Provider +import jakarta.inject.Singleton /** Controls the connection lifecycle for Redis. */ @Singleton diff --git a/misk-redis/src/main/kotlin/misk/redis/RedisTestModule.kt b/misk-redis/src/main/kotlin/misk/redis/RedisTestModule.kt index 902f6737964..092964b51c4 100644 --- a/misk-redis/src/main/kotlin/misk/redis/RedisTestModule.kt +++ b/misk-redis/src/main/kotlin/misk/redis/RedisTestModule.kt @@ -1,7 +1,7 @@ package misk.redis import misk.inject.KAbstractModule -import javax.inject.Qualifier +import jakarta.inject.Qualifier import kotlin.random.Random @Deprecated("Moved to misk-redis-testing.", ReplaceWith("misk.redis.testing.RedisTestModule")) diff --git a/misk-redis/src/test/kotlin/misk/redis/FakeRedisTest.kt b/misk-redis/src/test/kotlin/misk/redis/FakeRedisTest.kt index 5c58c90cc89..8d8ab6d4bfb 100644 --- a/misk-redis/src/test/kotlin/misk/redis/FakeRedisTest.kt +++ b/misk-redis/src/test/kotlin/misk/redis/FakeRedisTest.kt @@ -9,7 +9,7 @@ import okio.ByteString.Companion.encodeUtf8 import org.junit.jupiter.api.Test import wisp.time.FakeClock import java.time.Duration -import javax.inject.Inject +import jakarta.inject.Inject import kotlin.random.Random import kotlin.test.assertEquals import kotlin.test.assertFalse diff --git a/misk-redis/src/test/kotlin/misk/redis/RealRedisTest.kt b/misk-redis/src/test/kotlin/misk/redis/RealRedisTest.kt index 69835c2aa72..3c7e82745e9 100644 --- a/misk-redis/src/test/kotlin/misk/redis/RealRedisTest.kt +++ b/misk-redis/src/test/kotlin/misk/redis/RealRedisTest.kt @@ -10,7 +10,7 @@ import misk.testing.MiskTest import misk.testing.MiskTestModule import redis.clients.jedis.JedisPoolConfig import wisp.deployment.TESTING -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest class RealRedisTest : AbstractRedisTest() { diff --git a/misk-redis/src/test/kotlin/misk/redis/RedisAuthPasswordEnvTest.kt b/misk-redis/src/test/kotlin/misk/redis/RedisAuthPasswordEnvTest.kt index fa71ec459ad..02927758888 100644 --- a/misk-redis/src/test/kotlin/misk/redis/RedisAuthPasswordEnvTest.kt +++ b/misk-redis/src/test/kotlin/misk/redis/RedisAuthPasswordEnvTest.kt @@ -16,7 +16,7 @@ import org.junit.jupiter.api.assertThrows import redis.clients.jedis.JedisPoolConfig import wisp.deployment.PRODUCTION import wisp.deployment.TESTING -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest class RedisAuthPasswordEnvTest { diff --git a/misk-redis/src/test/kotlin/misk/redis/RedisClientMetricsTest.kt b/misk-redis/src/test/kotlin/misk/redis/RedisClientMetricsTest.kt index 622c2106461..ad19f14d423 100644 --- a/misk-redis/src/test/kotlin/misk/redis/RedisClientMetricsTest.kt +++ b/misk-redis/src/test/kotlin/misk/redis/RedisClientMetricsTest.kt @@ -19,7 +19,7 @@ import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import redis.clients.jedis.JedisPoolConfig import wisp.deployment.TESTING -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest class RedisClientMetricsTest { diff --git a/misk-redis/src/testFixtures/kotlin/misk/redis/testing/FakeRedis.kt b/misk-redis/src/testFixtures/kotlin/misk/redis/testing/FakeRedis.kt index bcafb5e4ed2..4546a003178 100644 --- a/misk-redis/src/testFixtures/kotlin/misk/redis/testing/FakeRedis.kt +++ b/misk-redis/src/testFixtures/kotlin/misk/redis/testing/FakeRedis.kt @@ -12,7 +12,7 @@ import java.time.Clock import java.time.Duration import java.time.Instant import java.util.concurrent.ConcurrentHashMap -import javax.inject.Inject +import jakarta.inject.Inject import kotlin.math.max import kotlin.math.min import kotlin.random.Random diff --git a/misk-redis/src/testFixtures/kotlin/misk/redis/testing/RedisTestModule.kt b/misk-redis/src/testFixtures/kotlin/misk/redis/testing/RedisTestModule.kt index 2603f1be18e..66119df4164 100644 --- a/misk-redis/src/testFixtures/kotlin/misk/redis/testing/RedisTestModule.kt +++ b/misk-redis/src/testFixtures/kotlin/misk/redis/testing/RedisTestModule.kt @@ -4,7 +4,7 @@ import misk.inject.KAbstractModule import misk.inject.keyOf import misk.redis.Redis import misk.time.FakeClock -import javax.inject.Qualifier +import jakarta.inject.Qualifier import kotlin.random.Random class RedisTestModule(private val random: Random = Random.Default) : KAbstractModule() { diff --git a/misk-service/build.gradle.kts b/misk-service/build.gradle.kts index a0a09ac195a..ecb6c7ef548 100644 --- a/misk-service/build.gradle.kts +++ b/misk-service/build.gradle.kts @@ -11,13 +11,14 @@ plugins { dependencies { api(Dependencies.guava) api(Dependencies.guice) - api(Dependencies.javaxInject) + api(Dependencies.jakartaInject) api(project(":misk-inject")) implementation(Dependencies.kotlinLogging) implementation(Dependencies.kotlinStdLibJdk8) implementation(project(":wisp:wisp-logging")) testImplementation(Dependencies.assertj) + testImplementation(Dependencies.javaxInject) testImplementation(Dependencies.junitApi) testImplementation(Dependencies.kotlinTest) testImplementation(project(":misk-testing")) diff --git a/misk-service/src/main/kotlin/misk/CoordinatedService.kt b/misk-service/src/main/kotlin/misk/CoordinatedService.kt index aaa9949bcf3..1bdab38ab72 100644 --- a/misk-service/src/main/kotlin/misk/CoordinatedService.kt +++ b/misk-service/src/main/kotlin/misk/CoordinatedService.kt @@ -6,7 +6,7 @@ import com.google.common.util.concurrent.Service import com.google.common.util.concurrent.Service.Listener import com.google.common.util.concurrent.Service.State import java.util.concurrent.atomic.AtomicBoolean -import javax.inject.Provider +import com.google.inject.Provider internal class CoordinatedService( private val serviceProvider: Provider diff --git a/misk-service/src/main/kotlin/misk/ReadyService.kt b/misk-service/src/main/kotlin/misk/ReadyService.kt index 37fce61459b..9d14fd45210 100644 --- a/misk-service/src/main/kotlin/misk/ReadyService.kt +++ b/misk-service/src/main/kotlin/misk/ReadyService.kt @@ -2,8 +2,8 @@ package misk import com.google.common.util.concurrent.AbstractIdleService import wisp.logging.getLogger -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * This is a symbolic service that's useful to define the relationship, generally, between diff --git a/misk-service/src/main/kotlin/misk/ServiceGraphBuilder.kt b/misk-service/src/main/kotlin/misk/ServiceGraphBuilder.kt index 2a869d78eda..da9a4c1e2da 100644 --- a/misk-service/src/main/kotlin/misk/ServiceGraphBuilder.kt +++ b/misk-service/src/main/kotlin/misk/ServiceGraphBuilder.kt @@ -5,7 +5,7 @@ import com.google.common.util.concurrent.Service import com.google.common.util.concurrent.ServiceManager import com.google.inject.Key import misk.CoordinatedService.Companion.CycleValidity -import javax.inject.Provider +import com.google.inject.Provider /** * Builds a graph of [CoordinatedService]s which defer start up and shut down until their dependent diff --git a/misk-service/src/main/kotlin/misk/ServiceManagerModule.kt b/misk-service/src/main/kotlin/misk/ServiceManagerModule.kt index b0ab43bd00e..d9eb343898e 100644 --- a/misk-service/src/main/kotlin/misk/ServiceManagerModule.kt +++ b/misk-service/src/main/kotlin/misk/ServiceManagerModule.kt @@ -9,8 +9,8 @@ import com.google.inject.Scopes import misk.inject.KAbstractModule import misk.inject.asSingleton import wisp.logging.getLogger -import javax.inject.Provider -import javax.inject.Singleton +import com.google.inject.Provider +import jakarta.inject.Singleton class ServiceManagerModule : KAbstractModule() { companion object { diff --git a/misk-service/src/test/kotlin/misk/ServiceManagerModuleTest.kt b/misk-service/src/test/kotlin/misk/ServiceManagerModuleTest.kt index 21953f77781..8ca3bcf73aa 100644 --- a/misk-service/src/test/kotlin/misk/ServiceManagerModuleTest.kt +++ b/misk-service/src/test/kotlin/misk/ServiceManagerModuleTest.kt @@ -7,13 +7,13 @@ import com.google.common.util.concurrent.ServiceManager import com.google.inject.Guice import com.google.inject.Provides import com.google.inject.Scopes -import com.google.inject.Singleton +import jakarta.inject.Singleton import misk.inject.KAbstractModule import misk.inject.getInstance import misk.inject.keyOf import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject import kotlin.test.assertFailsWith internal class ServiceManagerModuleTest { @@ -23,12 +23,18 @@ internal class ServiceManagerModuleTest { override fun shutDown() {} } - @javax.inject.Singleton + @jakarta.inject.Singleton class SingletonService2 : AbstractIdleService() { override fun startUp() {} override fun shutDown() {} } + @javax.inject.Singleton + class SingletonService3 : AbstractIdleService() { + override fun startUp() {} + override fun shutDown() {} + } + class NonSingletonService1 : AbstractIdleService() { override fun startUp() {} override fun shutDown() {} @@ -80,6 +86,7 @@ internal class ServiceManagerModuleTest { // that was bound. multibind().to() multibind().to() + multibind().to() } } ) @@ -103,6 +110,7 @@ internal class ServiceManagerModuleTest { // Should be recognized as singletons install(ServiceModule()) install(ServiceModule()) + install(ServiceModule()) install(ServiceModule()) install(ServiceModule()) bind(keyOf()).toInstance( diff --git a/misk-slack/build.gradle.kts b/misk-slack/build.gradle.kts index 79d569ecfbf..4510077e864 100644 --- a/misk-slack/build.gradle.kts +++ b/misk-slack/build.gradle.kts @@ -10,7 +10,7 @@ plugins { dependencies { api(Dependencies.guice) - api(Dependencies.javaxInject) + api(Dependencies.jakartaInject) api(Dependencies.moshi) api(Dependencies.okHttp) api(Dependencies.retrofit) diff --git a/misk-slack/src/main/kotlin/misk/slack/RealSlackClient.kt b/misk-slack/src/main/kotlin/misk/slack/RealSlackClient.kt index 6d4f418e756..1db14636ea0 100644 --- a/misk-slack/src/main/kotlin/misk/slack/RealSlackClient.kt +++ b/misk-slack/src/main/kotlin/misk/slack/RealSlackClient.kt @@ -1,7 +1,7 @@ package misk.slack import wisp.logging.getLogger -import javax.inject.Inject +import jakarta.inject.Inject class RealSlackClient @Inject constructor( private val slackWebHookApi: SlackWebhookApi, diff --git a/misk-slack/src/main/kotlin/misk/slack/SlackClient.kt b/misk-slack/src/main/kotlin/misk/slack/SlackClient.kt index 327adb53803..adf1e6b9964 100644 --- a/misk-slack/src/main/kotlin/misk/slack/SlackClient.kt +++ b/misk-slack/src/main/kotlin/misk/slack/SlackClient.kt @@ -1,6 +1,6 @@ package misk.slack -import javax.inject.Inject +import jakarta.inject.Inject /** Dummy client that does nothing if SlackModule is not installed .*/ open class SlackClient @Inject constructor() { diff --git a/misk-slack/src/main/kotlin/misk/slack/SlackModule.kt b/misk-slack/src/main/kotlin/misk/slack/SlackModule.kt index 4a4b8320a56..b8aa4ceedb3 100644 --- a/misk-slack/src/main/kotlin/misk/slack/SlackModule.kt +++ b/misk-slack/src/main/kotlin/misk/slack/SlackModule.kt @@ -8,8 +8,8 @@ import misk.inject.KAbstractModule import retrofit2.Retrofit import retrofit2.converter.moshi.MoshiConverterFactory import wisp.moshi.buildMoshi -import javax.inject.Named -import javax.inject.Singleton +import jakarta.inject.Named +import jakarta.inject.Singleton /** * Installs the Slack webhook client. diff --git a/misk-slack/src/main/kotlin/misk/slack/webapi/RealSlackClient.kt b/misk-slack/src/main/kotlin/misk/slack/webapi/RealSlackClient.kt index 541752f3c94..44714040933 100644 --- a/misk-slack/src/main/kotlin/misk/slack/webapi/RealSlackClient.kt +++ b/misk-slack/src/main/kotlin/misk/slack/webapi/RealSlackClient.kt @@ -6,7 +6,7 @@ import misk.slack.webapi.helpers.PostMessageResponse import retrofit2.Response import java.io.IOException import java.io.UncheckedIOException -import javax.inject.Inject +import jakarta.inject.Inject class RealSlackClient @Inject constructor( private val slackApi: SlackApi, diff --git a/misk-slack/src/main/kotlin/misk/slack/webapi/interceptors/SlackClientInterceptor.kt b/misk-slack/src/main/kotlin/misk/slack/webapi/interceptors/SlackClientInterceptor.kt index a78ae28ebf0..28e752fe53d 100644 --- a/misk-slack/src/main/kotlin/misk/slack/webapi/interceptors/SlackClientInterceptor.kt +++ b/misk-slack/src/main/kotlin/misk/slack/webapi/interceptors/SlackClientInterceptor.kt @@ -5,8 +5,8 @@ import misk.slack.webapi.SlackConfig import okhttp3.Interceptor import okhttp3.Response import retrofit2.Invocation -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton class SlackClientInterceptor @Inject constructor( diff --git a/misk-slack/src/main/kotlin/misk/slack/webapi/interceptors/SlackSignedRequestsInterceptor.kt b/misk-slack/src/main/kotlin/misk/slack/webapi/interceptors/SlackSignedRequestsInterceptor.kt index 03bb07b0f8c..bcd037b6a10 100644 --- a/misk-slack/src/main/kotlin/misk/slack/webapi/interceptors/SlackSignedRequestsInterceptor.kt +++ b/misk-slack/src/main/kotlin/misk/slack/webapi/interceptors/SlackSignedRequestsInterceptor.kt @@ -11,8 +11,8 @@ import okio.HashingSink import okio.blackholeSink import okio.buffer import java.time.Clock -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import kotlin.math.abs import kotlin.reflect.full.findAnnotation diff --git a/misk-slack/src/test/kotlin/misk/slack/SlackClientTest.kt b/misk-slack/src/test/kotlin/misk/slack/SlackClientTest.kt index 749c89cae23..3e0e6ff84fc 100644 --- a/misk-slack/src/test/kotlin/misk/slack/SlackClientTest.kt +++ b/misk-slack/src/test/kotlin/misk/slack/SlackClientTest.kt @@ -14,7 +14,7 @@ import org.junit.jupiter.api.Test import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.ValueSource import wisp.deployment.TESTING -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest class SlackClientTest { diff --git a/misk-slack/src/test/kotlin/misk/slack/webapi/MockSlackServer.kt b/misk-slack/src/test/kotlin/misk/slack/webapi/MockSlackServer.kt index aed5c8291e8..6d87b8e5351 100644 --- a/misk-slack/src/test/kotlin/misk/slack/webapi/MockSlackServer.kt +++ b/misk-slack/src/test/kotlin/misk/slack/webapi/MockSlackServer.kt @@ -6,8 +6,8 @@ import misk.slack.webapi.helpers.PostMessageRequest import misk.slack.webapi.helpers.UserData import okhttp3.mockwebserver.MockResponse import okhttp3.mockwebserver.MockWebServer -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * Wrap [MockWebServer] to pretend its a Slack server. diff --git a/misk-slack/src/test/kotlin/misk/slack/webapi/PingSlackActionTest.kt b/misk-slack/src/test/kotlin/misk/slack/webapi/PingSlackActionTest.kt index 0239eb6c531..0c2a4a08c9d 100644 --- a/misk-slack/src/test/kotlin/misk/slack/webapi/PingSlackActionTest.kt +++ b/misk-slack/src/test/kotlin/misk/slack/webapi/PingSlackActionTest.kt @@ -22,8 +22,8 @@ import org.junit.jupiter.api.Test import retrofit2.Retrofit import retrofit2.converter.moshi.MoshiConverterFactory import java.net.HttpURLConnection -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton class PingSlackActionTest { private val server = MockWebServer() diff --git a/misk-slack/src/test/kotlin/misk/slack/webapi/RealSlackClientTest.kt b/misk-slack/src/test/kotlin/misk/slack/webapi/RealSlackClientTest.kt index bda6d2b86d8..077629afe66 100644 --- a/misk-slack/src/test/kotlin/misk/slack/webapi/RealSlackClientTest.kt +++ b/misk-slack/src/test/kotlin/misk/slack/webapi/RealSlackClientTest.kt @@ -23,7 +23,7 @@ import misk.testing.MiskTestModule import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import wisp.deployment.TESTING -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) class RealSlackClientTest { diff --git a/misk-testing/build.gradle.kts b/misk-testing/build.gradle.kts index 5b5a49d8aed..b72534915dc 100644 --- a/misk-testing/build.gradle.kts +++ b/misk-testing/build.gradle.kts @@ -13,7 +13,7 @@ dependencies { api(Dependencies.dockerApi) api(Dependencies.guava) api(Dependencies.guice) - api(Dependencies.javaxInject) + api(Dependencies.jakartaInject) api(Dependencies.jettyServletApi) api(Dependencies.junitApi) api(Dependencies.kotlinLogging) diff --git a/misk-testing/src/main/kotlin/misk/concurrent/FakeScheduledExecutorService.kt b/misk-testing/src/main/kotlin/misk/concurrent/FakeScheduledExecutorService.kt index 7d0491d5eee..7d092d76930 100644 --- a/misk-testing/src/main/kotlin/misk/concurrent/FakeScheduledExecutorService.kt +++ b/misk-testing/src/main/kotlin/misk/concurrent/FakeScheduledExecutorService.kt @@ -10,8 +10,8 @@ import java.util.concurrent.PriorityBlockingQueue import java.util.concurrent.ScheduledExecutorService import java.util.concurrent.ScheduledFuture import java.util.concurrent.TimeUnit -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * ScheduledExecutorService for testing that runs in the current thread and is triggered using the diff --git a/misk-testing/src/main/kotlin/misk/concurrent/FakeSleeper.kt b/misk-testing/src/main/kotlin/misk/concurrent/FakeSleeper.kt index d4a3141f4dd..c2d93fd3c02 100644 --- a/misk-testing/src/main/kotlin/misk/concurrent/FakeSleeper.kt +++ b/misk-testing/src/main/kotlin/misk/concurrent/FakeSleeper.kt @@ -3,8 +3,8 @@ package misk.concurrent import java.time.Clock import java.time.Duration import java.util.concurrent.locks.ReentrantLock -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import kotlin.concurrent.withLock /** diff --git a/misk-testing/src/main/kotlin/misk/concurrent/FakeTicker.kt b/misk-testing/src/main/kotlin/misk/concurrent/FakeTicker.kt index a9c58387364..4bcce00c1a8 100644 --- a/misk-testing/src/main/kotlin/misk/concurrent/FakeTicker.kt +++ b/misk-testing/src/main/kotlin/misk/concurrent/FakeTicker.kt @@ -3,8 +3,8 @@ package misk.concurrent import com.google.common.base.Ticker import java.time.Duration import java.util.concurrent.TimeUnit -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton class FakeTicker @Inject constructor() : Ticker(), Sleeper { diff --git a/misk-testing/src/main/kotlin/misk/logging/LogCollectorModule.kt b/misk-testing/src/main/kotlin/misk/logging/LogCollectorModule.kt index d6a759c3d67..b785dcc7ea9 100644 --- a/misk-testing/src/main/kotlin/misk/logging/LogCollectorModule.kt +++ b/misk-testing/src/main/kotlin/misk/logging/LogCollectorModule.kt @@ -5,7 +5,7 @@ import misk.ServiceModule import misk.inject.KAbstractModule import wisp.logging.LogCollector import wisp.logging.WispQueuedLogCollector -import javax.inject.Provider +import com.google.inject.Provider class LogCollectorModule : KAbstractModule() { override fun configure() { diff --git a/misk-testing/src/main/kotlin/misk/logging/RealLogCollector.kt b/misk-testing/src/main/kotlin/misk/logging/RealLogCollector.kt index cabf545c69c..4ddfb78bbce 100644 --- a/misk-testing/src/main/kotlin/misk/logging/RealLogCollector.kt +++ b/misk-testing/src/main/kotlin/misk/logging/RealLogCollector.kt @@ -3,8 +3,8 @@ package misk.logging import com.google.common.util.concurrent.AbstractIdleService import wisp.logging.LogCollector import wisp.logging.WispQueuedLogCollector -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton internal class RealLogCollector @Inject constructor( diff --git a/misk-testing/src/main/kotlin/misk/random/FakeRandom.kt b/misk-testing/src/main/kotlin/misk/random/FakeRandom.kt index f6fe1a60cc0..06e294af368 100644 --- a/misk-testing/src/main/kotlin/misk/random/FakeRandom.kt +++ b/misk-testing/src/main/kotlin/misk/random/FakeRandom.kt @@ -1,7 +1,7 @@ package misk.random -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton class FakeRandom @Inject constructor() : Random() { diff --git a/misk-testing/src/main/kotlin/misk/services/FakeService.kt b/misk-testing/src/main/kotlin/misk/services/FakeService.kt index 8a74cb7d793..18d3aa42d6a 100644 --- a/misk-testing/src/main/kotlin/misk/services/FakeService.kt +++ b/misk-testing/src/main/kotlin/misk/services/FakeService.kt @@ -1,8 +1,8 @@ package misk.services import com.google.common.util.concurrent.AbstractIdleService -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton class FakeService @Inject constructor() : AbstractIdleService() { diff --git a/misk-testing/src/main/kotlin/misk/testing/ConcurrentMockTracer.kt b/misk-testing/src/main/kotlin/misk/testing/ConcurrentMockTracer.kt index fcdac7053db..4998033bc03 100644 --- a/misk-testing/src/main/kotlin/misk/testing/ConcurrentMockTracer.kt +++ b/misk-testing/src/main/kotlin/misk/testing/ConcurrentMockTracer.kt @@ -4,8 +4,8 @@ import io.opentracing.mock.MockSpan import io.opentracing.mock.MockTracer import java.util.concurrent.LinkedBlockingDeque import java.util.concurrent.TimeUnit -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * Extends [MockTracer] for use in concurrent environments, such as a web server and test client. diff --git a/misk-testing/src/main/kotlin/misk/testing/LogLevelExtension.kt b/misk-testing/src/main/kotlin/misk/testing/LogLevelExtension.kt index 70e9f9761cf..9c74bcfdeec 100644 --- a/misk-testing/src/main/kotlin/misk/testing/LogLevelExtension.kt +++ b/misk-testing/src/main/kotlin/misk/testing/LogLevelExtension.kt @@ -6,7 +6,7 @@ import ch.qos.logback.classic.LoggerContext import org.junit.jupiter.api.extension.BeforeEachCallback import org.junit.jupiter.api.extension.ExtensionContext import org.slf4j.LoggerFactory -import javax.inject.Inject +import jakarta.inject.Inject class LogLevelExtension @Inject constructor() : BeforeEachCallback { override fun beforeEach(context: ExtensionContext?) { diff --git a/misk-testing/src/main/kotlin/misk/testing/MiskTestExtension.kt b/misk-testing/src/main/kotlin/misk/testing/MiskTestExtension.kt index a5d3a22a22d..87a85a8e576 100644 --- a/misk-testing/src/main/kotlin/misk/testing/MiskTestExtension.kt +++ b/misk-testing/src/main/kotlin/misk/testing/MiskTestExtension.kt @@ -14,8 +14,8 @@ import org.junit.jupiter.api.extension.ExtensionContext import wisp.logging.getLogger import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.TimeUnit -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton internal class MiskTestExtension : BeforeEachCallback, AfterEachCallback { diff --git a/misk-testing/src/main/kotlin/misk/testing/TemporaryFolder.kt b/misk-testing/src/main/kotlin/misk/testing/TemporaryFolder.kt index 7e304bd8717..dcff6281991 100644 --- a/misk-testing/src/main/kotlin/misk/testing/TemporaryFolder.kt +++ b/misk-testing/src/main/kotlin/misk/testing/TemporaryFolder.kt @@ -6,8 +6,8 @@ import org.junit.jupiter.api.extension.AfterEachCallback import org.junit.jupiter.api.extension.ExtensionContext import java.nio.file.Files import java.nio.file.Path -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** A temporary folder for use by a given test */ class TemporaryFolder(val root: Path) { diff --git a/misk-testing/src/main/kotlin/misk/time/FakeClock.kt b/misk-testing/src/main/kotlin/misk/time/FakeClock.kt index 0b3231af86b..f889bd1f308 100644 --- a/misk-testing/src/main/kotlin/misk/time/FakeClock.kt +++ b/misk-testing/src/main/kotlin/misk/time/FakeClock.kt @@ -1,7 +1,7 @@ package misk.time -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton class FakeClock @Inject constructor() : wisp.time.FakeClock() diff --git a/misk-testing/src/main/kotlin/misk/web/WebTestClient.kt b/misk-testing/src/main/kotlin/misk/web/WebTestClient.kt index 25f45fa17e4..a93cb677d94 100644 --- a/misk-testing/src/main/kotlin/misk/web/WebTestClient.kt +++ b/misk-testing/src/main/kotlin/misk/web/WebTestClient.kt @@ -8,7 +8,7 @@ import okhttp3.OkHttpClient import okhttp3.Request import okhttp3.RequestBody.Companion.toRequestBody import okhttp3.Response -import javax.inject.Inject +import jakarta.inject.Inject import kotlin.reflect.KClass /** diff --git a/misk-testing/src/test/kotlin/misk/logging/LogCollectorTest.kt b/misk-testing/src/test/kotlin/misk/logging/LogCollectorTest.kt index cbf4c484b88..86ce7e7d2ad 100644 --- a/misk-testing/src/test/kotlin/misk/logging/LogCollectorTest.kt +++ b/misk-testing/src/test/kotlin/misk/logging/LogCollectorTest.kt @@ -10,7 +10,7 @@ import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import wisp.logging.LogCollector import wisp.logging.getLogger -import javax.inject.Inject +import jakarta.inject.Inject import kotlin.test.assertFailsWith @MiskTest(startService = true) diff --git a/misk-testing/src/test/kotlin/misk/testing/LogLevelExtensionTest.kt b/misk-testing/src/test/kotlin/misk/testing/LogLevelExtensionTest.kt index ca4b0dd5198..e3a4036b8e3 100644 --- a/misk-testing/src/test/kotlin/misk/testing/LogLevelExtensionTest.kt +++ b/misk-testing/src/test/kotlin/misk/testing/LogLevelExtensionTest.kt @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test import wisp.logging.LogCollector import wisp.logging.getLogger -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) class LogLevelExtensionTest { diff --git a/misk-testing/src/test/kotlin/misk/testing/NestedTestsTest.kt b/misk-testing/src/test/kotlin/misk/testing/NestedTestsTest.kt index 80c8bb419b1..67f310fe74f 100644 --- a/misk-testing/src/test/kotlin/misk/testing/NestedTestsTest.kt +++ b/misk-testing/src/test/kotlin/misk/testing/NestedTestsTest.kt @@ -7,8 +7,8 @@ import misk.inject.KAbstractModule import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @MiskTest(startService = true) class NestedTestsTest { diff --git a/misk-testing/src/test/kotlin/misk/testing/fieldbind/BindFieldUsingFakeTest.kt b/misk-testing/src/test/kotlin/misk/testing/fieldbind/BindFieldUsingFakeTest.kt index 8dce2d12cf5..381dd6ad09f 100644 --- a/misk-testing/src/test/kotlin/misk/testing/fieldbind/BindFieldUsingFakeTest.kt +++ b/misk-testing/src/test/kotlin/misk/testing/fieldbind/BindFieldUsingFakeTest.kt @@ -4,7 +4,7 @@ import com.google.inject.testing.fieldbinder.Bind import misk.testing.MiskTest import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest class BindFieldUsingFakeTest { diff --git a/misk-testing/src/test/kotlin/misk/testing/fieldbind/BindFieldUsingMockTest.kt b/misk-testing/src/test/kotlin/misk/testing/fieldbind/BindFieldUsingMockTest.kt index 9673c37b3f5..133d9a67265 100644 --- a/misk-testing/src/test/kotlin/misk/testing/fieldbind/BindFieldUsingMockTest.kt +++ b/misk-testing/src/test/kotlin/misk/testing/fieldbind/BindFieldUsingMockTest.kt @@ -6,7 +6,7 @@ import misk.mockito.Mockito.whenever import misk.testing.MiskTest import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest class BindFieldUsingMockTest { diff --git a/misk-testing/src/test/kotlin/misk/testing/fieldbind/BindFieldsUsingProviderTest.kt b/misk-testing/src/test/kotlin/misk/testing/fieldbind/BindFieldsUsingProviderTest.kt index 2e00741ef3f..d88bb33b969 100644 --- a/misk-testing/src/test/kotlin/misk/testing/fieldbind/BindFieldsUsingProviderTest.kt +++ b/misk-testing/src/test/kotlin/misk/testing/fieldbind/BindFieldsUsingProviderTest.kt @@ -4,8 +4,8 @@ import com.google.inject.testing.fieldbinder.Bind import misk.testing.MiskTest import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.inject.Inject -import javax.inject.Provider +import jakarta.inject.Inject +import com.google.inject.Provider @MiskTest class BindFieldsUsingProviderTest { diff --git a/misk-testing/src/test/kotlin/misk/testing/fieldbind/Services.kt b/misk-testing/src/test/kotlin/misk/testing/fieldbind/Services.kt index add344423f8..88c45e5d370 100644 --- a/misk-testing/src/test/kotlin/misk/testing/fieldbind/Services.kt +++ b/misk-testing/src/test/kotlin/misk/testing/fieldbind/Services.kt @@ -1,6 +1,6 @@ package misk.testing.fieldbind -import javax.inject.Inject +import jakarta.inject.Inject interface CountService { fun getAndInc(): Int diff --git a/misk-testing/src/test/kotlin/misk/web/MiskCallerExtensionTest.kt b/misk-testing/src/test/kotlin/misk/web/MiskCallerExtensionTest.kt index 1f5334bca18..0eb580343fb 100644 --- a/misk-testing/src/test/kotlin/misk/web/MiskCallerExtensionTest.kt +++ b/misk-testing/src/test/kotlin/misk/web/MiskCallerExtensionTest.kt @@ -9,7 +9,7 @@ import misk.testing.MiskTestModule import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest class MiskCallerExtensionTest { diff --git a/misk-testing/src/test/kotlin/misk/web/WebTestClientTest.kt b/misk-testing/src/test/kotlin/misk/web/WebTestClientTest.kt index a249e5a8c7c..e23e137f41e 100644 --- a/misk-testing/src/test/kotlin/misk/web/WebTestClientTest.kt +++ b/misk-testing/src/test/kotlin/misk/web/WebTestClientTest.kt @@ -8,7 +8,7 @@ import misk.web.actions.WebAction import misk.web.mediatype.MediaTypes import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) class WebTestClientTest { diff --git a/misk-warmup/build.gradle.kts b/misk-warmup/build.gradle.kts index cd11c3d6211..a1d429ba40c 100644 --- a/misk-warmup/build.gradle.kts +++ b/misk-warmup/build.gradle.kts @@ -12,7 +12,7 @@ dependencies { api(Dependencies.guice) api(project(":misk-inject")) implementation(Dependencies.guava) - implementation(Dependencies.javaxInject) + implementation(Dependencies.jakartaInject) implementation(Dependencies.kotlinLogging) implementation(project(":wisp:wisp-logging")) implementation(project(":misk-core")) diff --git a/misk-warmup/src/main/kotlin/misk/warmup/WarmupRunner.kt b/misk-warmup/src/main/kotlin/misk/warmup/WarmupRunner.kt index 60198b9c131..d62defe780f 100644 --- a/misk-warmup/src/main/kotlin/misk/warmup/WarmupRunner.kt +++ b/misk-warmup/src/main/kotlin/misk/warmup/WarmupRunner.kt @@ -7,9 +7,9 @@ import misk.healthchecks.HealthCheck import misk.healthchecks.HealthStatus import wisp.logging.getLogger import java.util.concurrent.atomic.AtomicInteger -import javax.inject.Inject -import javax.inject.Provider -import javax.inject.Singleton +import jakarta.inject.Inject +import com.google.inject.Provider +import jakarta.inject.Singleton /** * This class is a health check to defer production traffic until all warmup tasks have completed. diff --git a/misk-warmup/src/test/kotlin/misk/warmup/WarmupTest.kt b/misk-warmup/src/test/kotlin/misk/warmup/WarmupTest.kt index 22331f368d5..ed9b89c0d1f 100644 --- a/misk-warmup/src/test/kotlin/misk/warmup/WarmupTest.kt +++ b/misk-warmup/src/test/kotlin/misk/warmup/WarmupTest.kt @@ -20,8 +20,8 @@ import wisp.logging.LogCollector import java.time.Duration import java.util.concurrent.BlockingDeque import java.util.concurrent.LinkedBlockingDeque -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton internal class WarmupTest { private val events = LinkedBlockingDeque() diff --git a/misk/api/misk.api b/misk/api/misk.api index 164130dce6a..73e49e76e57 100644 --- a/misk/api/misk.api +++ b/misk/api/misk.api @@ -594,9 +594,9 @@ public final class misk/client/HttpClientFactory { public fun (Lmisk/security/ssl/SslLoader;Lmisk/security/ssl/SslContextFactory;Lmisk/client/OkHttpClientCommonConfigurator;)V public final fun create (Lmisk/client/HttpClientEndpointConfig;)Lokhttp3/OkHttpClient; public final fun getEnvoyClientEndpointProvider ()Lwisp/client/EnvoyClientEndpointProvider; - public final fun getOkhttpInterceptors ()Ljavax/inject/Provider; + public final fun getOkhttpInterceptors ()Lcom/google/inject/Provider; public final fun setEnvoyClientEndpointProvider (Lwisp/client/EnvoyClientEndpointProvider;)V - public final fun setOkhttpInterceptors (Ljavax/inject/Provider;)V + public final fun setOkhttpInterceptors (Lcom/google/inject/Provider;)V } public final class misk/client/HttpClientFactory$Companion { @@ -1649,7 +1649,7 @@ public final class misk/web/concurrencylimits/ConcurrencyLimiterStrategy : java/ public final class misk/web/concurrencylimits/ConcurrencyLimitsModule : misk/inject/KAbstractModule { public fun (Lmisk/web/ConcurrencyLimiterConfig;)V - public final fun concurrencyLimiterFactory (Ljavax/inject/Provider;Ljava/time/Clock;)Lmisk/web/concurrencylimits/ConcurrencyLimiterFactory; + public final fun concurrencyLimiterFactory (Lcom/google/inject/Provider;Ljava/time/Clock;)Lmisk/web/concurrencylimits/ConcurrencyLimiterFactory; } public final class misk/web/exceptions/ActionExceptionLogLevelConfig : wisp/config/Config { diff --git a/misk/build.gradle.kts b/misk/build.gradle.kts index 58cd2bf2ec5..3809bbf10d7 100644 --- a/misk/build.gradle.kts +++ b/misk/build.gradle.kts @@ -13,9 +13,10 @@ dependencies { api(Dependencies.concurrencyLimitsCore) api(Dependencies.guava) api(Dependencies.guice) + api(Dependencies.jakartaInject) api(Dependencies.jacksonAnotations) api(Dependencies.jacksonDatabind) - api(Dependencies.javaxInject) + api(Dependencies.jakartaInject) api(Dependencies.jettyServer) api(Dependencies.jettyServletApi) api(Dependencies.jettyUtil) diff --git a/misk/src/main/kotlin/misk/MiskCommand.kt b/misk/src/main/kotlin/misk/MiskCommand.kt index e30fd525ac8..47d603730db 100644 --- a/misk/src/main/kotlin/misk/MiskCommand.kt +++ b/misk/src/main/kotlin/misk/MiskCommand.kt @@ -3,7 +3,7 @@ package misk import com.beust.jcommander.JCommander import com.beust.jcommander.ParameterException import com.google.inject.Module -import javax.inject.Inject +import jakarta.inject.Inject /** * A command to run from the command line. Each command has an associated name and diff --git a/misk/src/main/kotlin/misk/MiskDefault.kt b/misk/src/main/kotlin/misk/MiskDefault.kt index b8c635e05ca..5a7d8139d90 100644 --- a/misk/src/main/kotlin/misk/MiskDefault.kt +++ b/misk/src/main/kotlin/misk/MiskDefault.kt @@ -1,6 +1,6 @@ package misk -import javax.inject.Qualifier +import jakarta.inject.Qualifier import kotlin.annotation.AnnotationRetention.RUNTIME /** diff --git a/misk/src/main/kotlin/misk/client/ClientInvocationHandler.kt b/misk/src/main/kotlin/misk/client/ClientInvocationHandler.kt index 6a338bda411..63d098e2c97 100644 --- a/misk/src/main/kotlin/misk/client/ClientInvocationHandler.kt +++ b/misk/src/main/kotlin/misk/client/ClientInvocationHandler.kt @@ -23,7 +23,7 @@ import retrofit2.http.POST import retrofit2.http.PUT import java.lang.reflect.InvocationHandler import java.lang.reflect.Method -import javax.inject.Provider +import com.google.inject.Provider import kotlin.reflect.KClass import kotlin.reflect.KFunction import kotlin.reflect.full.findAnnotation diff --git a/misk/src/main/kotlin/misk/client/ClientLoggingInterceptor.kt b/misk/src/main/kotlin/misk/client/ClientLoggingInterceptor.kt index 8c1c8cf0efe..e5c81e31274 100644 --- a/misk/src/main/kotlin/misk/client/ClientLoggingInterceptor.kt +++ b/misk/src/main/kotlin/misk/client/ClientLoggingInterceptor.kt @@ -4,8 +4,8 @@ import okhttp3.Interceptor import okhttp3.Request import okhttp3.Response import wisp.logging.getLogger -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton internal class ClientLoggingInterceptor @Inject constructor(): Interceptor { // Optional so it defaults to not logging requests when no config is available. diff --git a/misk/src/main/kotlin/misk/client/ClientMetricsInterceptor.kt b/misk/src/main/kotlin/misk/client/ClientMetricsInterceptor.kt index 44644252226..11e8db8c70c 100644 --- a/misk/src/main/kotlin/misk/client/ClientMetricsInterceptor.kt +++ b/misk/src/main/kotlin/misk/client/ClientMetricsInterceptor.kt @@ -14,8 +14,8 @@ import retrofit2.Invocation import java.net.SocketTimeoutException import java.net.URL import java.util.concurrent.TimeUnit -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton class ClientMetricsInterceptor private constructor( val clientName: String, diff --git a/misk/src/main/kotlin/misk/client/GrpcClientModule.kt b/misk/src/main/kotlin/misk/client/GrpcClientModule.kt index 8f31b9a4617..c6b2c2d2f80 100644 --- a/misk/src/main/kotlin/misk/client/GrpcClientModule.kt +++ b/misk/src/main/kotlin/misk/client/GrpcClientModule.kt @@ -5,7 +5,7 @@ import com.google.inject.name.Names import com.squareup.wire.Service import misk.inject.KAbstractModule import okhttp3.OkHttpClient -import javax.inject.Singleton +import jakarta.inject.Singleton import kotlin.reflect.KClass /** diff --git a/misk/src/main/kotlin/misk/client/GrpcClientProvider.kt b/misk/src/main/kotlin/misk/client/GrpcClientProvider.kt index 18d810a0d02..d287fc2a147 100644 --- a/misk/src/main/kotlin/misk/client/GrpcClientProvider.kt +++ b/misk/src/main/kotlin/misk/client/GrpcClientProvider.kt @@ -11,8 +11,8 @@ import java.lang.reflect.InvocationHandler import java.lang.reflect.Method import java.lang.reflect.ParameterizedType import java.lang.reflect.Proxy -import javax.inject.Inject -import javax.inject.Provider +import jakarta.inject.Inject +import com.google.inject.Provider import kotlin.reflect.KClass import kotlin.reflect.cast import kotlin.reflect.full.createType diff --git a/misk/src/main/kotlin/misk/client/HttpClientFactory.kt b/misk/src/main/kotlin/misk/client/HttpClientFactory.kt index 59669baf91b..f7b59aad69d 100644 --- a/misk/src/main/kotlin/misk/client/HttpClientFactory.kt +++ b/misk/src/main/kotlin/misk/client/HttpClientFactory.kt @@ -5,9 +5,9 @@ import misk.security.ssl.SslLoader import okhttp3.Interceptor import okhttp3.OkHttpClient import wisp.client.EnvoyClientEndpointProvider -import javax.inject.Inject -import javax.inject.Provider -import javax.inject.Singleton +import jakarta.inject.Inject +import com.google.inject.Provider +import jakarta.inject.Singleton @Singleton class HttpClientFactory @Inject constructor( diff --git a/misk/src/main/kotlin/misk/client/HttpClientModule.kt b/misk/src/main/kotlin/misk/client/HttpClientModule.kt index 0dcb9b2d29d..1a05bf853fb 100644 --- a/misk/src/main/kotlin/misk/client/HttpClientModule.kt +++ b/misk/src/main/kotlin/misk/client/HttpClientModule.kt @@ -6,7 +6,7 @@ import com.squareup.moshi.Moshi import misk.inject.KAbstractModule import misk.inject.asSingleton import okhttp3.OkHttpClient -import javax.inject.Inject +import jakarta.inject.Inject /** Provides an [OkHttpClient] and [ProtoMessageHttpClient] for a peer service */ class HttpClientModule @JvmOverloads constructor( diff --git a/misk/src/main/kotlin/misk/client/OkHttpClientCommonConfigurator.kt b/misk/src/main/kotlin/misk/client/OkHttpClientCommonConfigurator.kt index d16a8d55c2d..cdae4f12053 100644 --- a/misk/src/main/kotlin/misk/client/OkHttpClientCommonConfigurator.kt +++ b/misk/src/main/kotlin/misk/client/OkHttpClientCommonConfigurator.kt @@ -2,7 +2,7 @@ package misk.client import okhttp3.OkHttpClient import wisp.client.HttpClientEndpointConfig -import javax.inject.Inject +import jakarta.inject.Inject class OkHttpClientCommonConfigurator @Inject constructor() { val delegate = wisp.client.OkHttpClientCommonConfigurator() diff --git a/misk/src/main/kotlin/misk/client/PeerClientFactory.kt b/misk/src/main/kotlin/misk/client/PeerClientFactory.kt index 78b9364e7f6..0ca7e281137 100644 --- a/misk/src/main/kotlin/misk/client/PeerClientFactory.kt +++ b/misk/src/main/kotlin/misk/client/PeerClientFactory.kt @@ -12,7 +12,7 @@ import misk.web.jetty.JettyService import okhttp3.OkHttpClient import java.security.cert.X509Certificate import java.util.concurrent.TimeUnit -import javax.inject.Singleton +import jakarta.inject.Singleton import javax.net.ssl.HostnameVerifier import javax.net.ssl.SSLSession diff --git a/misk/src/main/kotlin/misk/client/TypedHttpClientModule.kt b/misk/src/main/kotlin/misk/client/TypedHttpClientModule.kt index 3d3a6b10b59..3102bc21748 100644 --- a/misk/src/main/kotlin/misk/client/TypedHttpClientModule.kt +++ b/misk/src/main/kotlin/misk/client/TypedHttpClientModule.kt @@ -13,7 +13,7 @@ import okhttp3.EventListener import okhttp3.OkHttpClient import retrofit2.Retrofit import java.lang.reflect.Proxy -import javax.inject.Singleton +import jakarta.inject.Singleton import kotlin.reflect.KClass import kotlin.reflect.cast diff --git a/misk/src/main/kotlin/misk/concurrent/ExecutorServiceModule.kt b/misk/src/main/kotlin/misk/concurrent/ExecutorServiceModule.kt index 1bb5f59dd22..1d245dcb0d4 100644 --- a/misk/src/main/kotlin/misk/concurrent/ExecutorServiceModule.kt +++ b/misk/src/main/kotlin/misk/concurrent/ExecutorServiceModule.kt @@ -4,7 +4,7 @@ import com.google.inject.Provider import misk.inject.KAbstractModule import misk.inject.asSingleton import java.util.concurrent.ExecutorService -import javax.inject.Inject +import jakarta.inject.Inject import kotlin.reflect.KClass /** diff --git a/misk/src/main/kotlin/misk/concurrent/RealExecutorServiceFactory.kt b/misk/src/main/kotlin/misk/concurrent/RealExecutorServiceFactory.kt index f4daabcc6a4..dfa35fc626b 100644 --- a/misk/src/main/kotlin/misk/concurrent/RealExecutorServiceFactory.kt +++ b/misk/src/main/kotlin/misk/concurrent/RealExecutorServiceFactory.kt @@ -15,7 +15,7 @@ import java.util.concurrent.ScheduledExecutorService import java.util.concurrent.ThreadFactory import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicLong -import javax.inject.Singleton +import jakarta.inject.Singleton /** * This is an implementation of ExecutorServiceFactory suitable for production use. It shuts down diff --git a/misk/src/main/kotlin/misk/environment/EnvVars.kt b/misk/src/main/kotlin/misk/environment/EnvVars.kt index 5dcb83b17c8..51eefd08c41 100644 --- a/misk/src/main/kotlin/misk/environment/EnvVars.kt +++ b/misk/src/main/kotlin/misk/environment/EnvVars.kt @@ -4,8 +4,8 @@ import misk.inject.KAbstractModule import wisp.deployment.EnvironmentVariableLoader import wisp.deployment.FakeEnvironmentVariableLoader import wisp.deployment.RealEnvironmentVariableLoader -import javax.inject.Inject -import javax.inject.Qualifier +import jakarta.inject.Inject +import jakarta.inject.Qualifier /* * Soft deprecating for wisp.deployment.EnvironmentVariableLoader diff --git a/misk/src/main/kotlin/misk/grpc/GrpcFeatureBinding.kt b/misk/src/main/kotlin/misk/grpc/GrpcFeatureBinding.kt index e52115938bd..8a77565feea 100644 --- a/misk/src/main/kotlin/misk/grpc/GrpcFeatureBinding.kt +++ b/misk/src/main/kotlin/misk/grpc/GrpcFeatureBinding.kt @@ -12,8 +12,8 @@ import misk.web.PathPattern import misk.web.actions.findAnnotationWithOverrides import misk.web.mediatype.MediaTypes import java.lang.reflect.Type -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton internal class GrpcFeatureBinding( private val requestAdapter: ProtoAdapter, diff --git a/misk/src/main/kotlin/misk/monitoring/JvmMetrics.kt b/misk/src/main/kotlin/misk/monitoring/JvmMetrics.kt index 720009f2c8e..4ebb61d0968 100644 --- a/misk/src/main/kotlin/misk/monitoring/JvmMetrics.kt +++ b/misk/src/main/kotlin/misk/monitoring/JvmMetrics.kt @@ -3,8 +3,8 @@ package misk.monitoring import io.prometheus.client.Gauge import misk.metrics.v2.Metrics import java.lang.management.RuntimeMXBean -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * Exposes additional JVM metrics. diff --git a/misk/src/main/kotlin/misk/moshi/MoshiJsonAdapter.kt b/misk/src/main/kotlin/misk/moshi/MoshiJsonAdapter.kt index 2c5828a10e1..7433ad3b129 100644 --- a/misk/src/main/kotlin/misk/moshi/MoshiJsonAdapter.kt +++ b/misk/src/main/kotlin/misk/moshi/MoshiJsonAdapter.kt @@ -1,6 +1,6 @@ package misk.moshi -import javax.inject.Qualifier +import jakarta.inject.Qualifier @Qualifier @Retention(AnnotationRetention.RUNTIME) diff --git a/misk/src/main/kotlin/misk/moshi/MoshiModule.kt b/misk/src/main/kotlin/misk/moshi/MoshiModule.kt index 18645991009..be3727e3e03 100644 --- a/misk/src/main/kotlin/misk/moshi/MoshiModule.kt +++ b/misk/src/main/kotlin/misk/moshi/MoshiModule.kt @@ -10,7 +10,7 @@ import misk.moshi.time.InstantAdapter import misk.moshi.time.LocalDateAdapter import wisp.moshi.buildMoshi import java.util.Date -import javax.inject.Singleton +import jakarta.inject.Singleton import com.squareup.wire.WireJsonAdapterFactory as WireOnlyJsonAdapterFactory import misk.moshi.wire.WireMessageAdapter as MiskOnlyMessageAdapter diff --git a/misk/src/main/kotlin/misk/moshi/wire/WireMessageAdapter.kt b/misk/src/main/kotlin/misk/moshi/wire/WireMessageAdapter.kt index 3ddc88bd5bc..76a82f987bd 100644 --- a/misk/src/main/kotlin/misk/moshi/wire/WireMessageAdapter.kt +++ b/misk/src/main/kotlin/misk/moshi/wire/WireMessageAdapter.kt @@ -7,7 +7,7 @@ import com.squareup.moshi.Moshi import com.squareup.wire.Message import com.squareup.wire.WireField import java.lang.reflect.Type -import javax.inject.Inject +import jakarta.inject.Inject /** Json marshaling for Wire messages, correctly using Builders to construct properly formed type */ @Deprecated("Use WireJsonAdapterFactory instead") diff --git a/misk/src/main/kotlin/misk/perf/ForPauseDetector.kt b/misk/src/main/kotlin/misk/perf/ForPauseDetector.kt index 7b40aa4be25..e29b2a13012 100644 --- a/misk/src/main/kotlin/misk/perf/ForPauseDetector.kt +++ b/misk/src/main/kotlin/misk/perf/ForPauseDetector.kt @@ -2,7 +2,7 @@ package misk.perf import com.google.common.base.Ticker import misk.concurrent.Sleeper -import javax.inject.Qualifier +import jakarta.inject.Qualifier /** * Used to bind a [Sleeper] and [Ticker] that are suitable for usage by the [PauseDetector] diff --git a/misk/src/main/kotlin/misk/perf/PauseDetector.kt b/misk/src/main/kotlin/misk/perf/PauseDetector.kt index a3ec11a4acd..2e55963b4b4 100644 --- a/misk/src/main/kotlin/misk/perf/PauseDetector.kt +++ b/misk/src/main/kotlin/misk/perf/PauseDetector.kt @@ -11,8 +11,8 @@ import wisp.logging.getLogger import java.time.Duration import java.util.concurrent.TimeUnit.MILLISECONDS import java.util.concurrent.TimeUnit.NANOSECONDS -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * Detects and records pauses experienced by the VM. Garbage collection is a common source of diff --git a/misk/src/main/kotlin/misk/security/authz/AccessInterceptor.kt b/misk/src/main/kotlin/misk/security/authz/AccessInterceptor.kt index 9c9e9914e6c..630b5c9cafa 100644 --- a/misk/src/main/kotlin/misk/security/authz/AccessInterceptor.kt +++ b/misk/src/main/kotlin/misk/security/authz/AccessInterceptor.kt @@ -8,7 +8,7 @@ import misk.exceptions.UnauthenticatedException import misk.exceptions.UnauthorizedException import misk.scope.ActionScoped import wisp.logging.getLogger -import javax.inject.Inject +import jakarta.inject.Inject import kotlin.reflect.KClass class AccessInterceptor private constructor( diff --git a/misk/src/main/kotlin/misk/security/authz/FakeCallerAuthenticator.kt b/misk/src/main/kotlin/misk/security/authz/FakeCallerAuthenticator.kt index a284938647e..7c709e26d1b 100644 --- a/misk/src/main/kotlin/misk/security/authz/FakeCallerAuthenticator.kt +++ b/misk/src/main/kotlin/misk/security/authz/FakeCallerAuthenticator.kt @@ -4,8 +4,8 @@ import com.google.inject.Inject import misk.MiskCaller import misk.scope.ActionScoped import misk.web.HttpCall -import javax.inject.Qualifier -import javax.inject.Singleton +import jakarta.inject.Qualifier +import jakarta.inject.Singleton /** * A caller authenticator that blindly trusts HTTP headers. Unsafe for production use. diff --git a/misk/src/main/kotlin/misk/security/csp/ContentSecurityPolicyInterceptor.kt b/misk/src/main/kotlin/misk/security/csp/ContentSecurityPolicyInterceptor.kt index ccd8b3d8845..709bac4c79b 100644 --- a/misk/src/main/kotlin/misk/security/csp/ContentSecurityPolicyInterceptor.kt +++ b/misk/src/main/kotlin/misk/security/csp/ContentSecurityPolicyInterceptor.kt @@ -3,7 +3,7 @@ package misk.security.csp import misk.Action import misk.web.NetworkChain import misk.web.NetworkInterceptor -import javax.inject.Inject +import jakarta.inject.Inject import kotlin.reflect.full.findAnnotation class ContentSecurityPolicyInterceptor(val rules: List) : NetworkInterceptor { diff --git a/misk/src/main/kotlin/misk/security/ssl/CertificatesModule.kt b/misk/src/main/kotlin/misk/security/ssl/CertificatesModule.kt index 09d1d13df81..e635a3987aa 100644 --- a/misk/src/main/kotlin/misk/security/ssl/CertificatesModule.kt +++ b/misk/src/main/kotlin/misk/security/ssl/CertificatesModule.kt @@ -6,7 +6,7 @@ import misk.scope.ActionScopedProvider import misk.scope.ActionScopedProviderModule import misk.security.cert.X500Name import java.security.cert.X509Certificate -import javax.inject.Inject +import jakarta.inject.Inject import javax.servlet.http.HttpServletRequest /** Installs support for accessing client certificates */ diff --git a/misk/src/main/kotlin/misk/security/ssl/ClientCertAnnotations.kt b/misk/src/main/kotlin/misk/security/ssl/ClientCertAnnotations.kt index 45a1cc77023..268ffdcf373 100644 --- a/misk/src/main/kotlin/misk/security/ssl/ClientCertAnnotations.kt +++ b/misk/src/main/kotlin/misk/security/ssl/ClientCertAnnotations.kt @@ -3,7 +3,7 @@ package misk.security.ssl import misk.scope.ActionScoped import misk.security.cert.X500Name import java.security.cert.X509Certificate -import javax.inject.Qualifier +import jakarta.inject.Qualifier /** * Qualifier annotation for an [ActionScoped] array of [X509Certificate]s containing the diff --git a/misk/src/main/kotlin/misk/tasks/RepeatedTaskQueue.kt b/misk/src/main/kotlin/misk/tasks/RepeatedTaskQueue.kt index 60efbe677a9..88ed226d063 100644 --- a/misk/src/main/kotlin/misk/tasks/RepeatedTaskQueue.kt +++ b/misk/src/main/kotlin/misk/tasks/RepeatedTaskQueue.kt @@ -19,8 +19,8 @@ import java.util.concurrent.ExecutorService import java.util.concurrent.Executors.newSingleThreadExecutor import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicBoolean -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * A [RepeatedTaskQueue] runs repeated tasks at a user controlled rate. Internally it uses diff --git a/misk/src/main/kotlin/misk/time/ForceUtcTimeZoneService.kt b/misk/src/main/kotlin/misk/time/ForceUtcTimeZoneService.kt index d6207cc991d..498a23b6030 100644 --- a/misk/src/main/kotlin/misk/time/ForceUtcTimeZoneService.kt +++ b/misk/src/main/kotlin/misk/time/ForceUtcTimeZoneService.kt @@ -3,8 +3,8 @@ package misk.time import com.google.common.util.concurrent.AbstractIdleService import java.time.ZoneOffset import java.util.TimeZone -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * Forces the default JVM timezone to UTC. diff --git a/misk/src/main/kotlin/misk/web/BoundAction.kt b/misk/src/main/kotlin/misk/web/BoundAction.kt index 7027b979e1a..bbf67357c4d 100644 --- a/misk/src/main/kotlin/misk/web/BoundAction.kt +++ b/misk/src/main/kotlin/misk/web/BoundAction.kt @@ -18,7 +18,7 @@ import okhttp3.HttpUrl import okhttp3.MediaType import org.slf4j.MDC import java.util.regex.Matcher -import javax.inject.Provider +import com.google.inject.Provider import javax.servlet.http.HttpServletRequest import kotlin.reflect.KType diff --git a/misk/src/main/kotlin/misk/web/MiskWebModule.kt b/misk/src/main/kotlin/misk/web/MiskWebModule.kt index 86f554bd151..0f15245ca49 100644 --- a/misk/src/main/kotlin/misk/web/MiskWebModule.kt +++ b/misk/src/main/kotlin/misk/web/MiskWebModule.kt @@ -92,8 +92,8 @@ import java.util.concurrent.BlockingQueue import java.util.concurrent.SynchronousQueue import java.util.concurrent.ThreadPoolExecutor import java.util.concurrent.TimeUnit -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import javax.servlet.http.HttpServletRequest import kotlin.math.min diff --git a/misk/src/main/kotlin/misk/web/WebActionBinding.kt b/misk/src/main/kotlin/misk/web/WebActionBinding.kt index 135684fb047..d8e4c2fdb6f 100644 --- a/misk/src/main/kotlin/misk/web/WebActionBinding.kt +++ b/misk/src/main/kotlin/misk/web/WebActionBinding.kt @@ -5,7 +5,7 @@ import misk.web.actions.WebAction import okio.BufferedSink import okio.BufferedSource import java.util.regex.Matcher -import javax.inject.Inject +import jakarta.inject.Inject import kotlin.reflect.KParameter /** HTTP binding as specified by [FeatureBinding]. */ diff --git a/misk/src/main/kotlin/misk/web/actions/InternalErrorAction.kt b/misk/src/main/kotlin/misk/web/actions/InternalErrorAction.kt index 49cda8ea7ea..67acab45fc7 100644 --- a/misk/src/main/kotlin/misk/web/actions/InternalErrorAction.kt +++ b/misk/src/main/kotlin/misk/web/actions/InternalErrorAction.kt @@ -2,8 +2,8 @@ package misk.web.actions import misk.security.authz.Unauthenticated import misk.web.Get -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton class InternalErrorAction @Inject constructor() : WebAction { diff --git a/misk/src/main/kotlin/misk/web/actions/LivenessCheckAction.kt b/misk/src/main/kotlin/misk/web/actions/LivenessCheckAction.kt index 185e1d4625b..9416111e851 100644 --- a/misk/src/main/kotlin/misk/web/actions/LivenessCheckAction.kt +++ b/misk/src/main/kotlin/misk/web/actions/LivenessCheckAction.kt @@ -9,9 +9,9 @@ import misk.web.Response import misk.web.ResponseContentType import misk.web.mediatype.MediaTypes import wisp.logging.getLogger -import javax.inject.Inject -import javax.inject.Provider -import javax.inject.Singleton +import jakarta.inject.Inject +import com.google.inject.Provider +import jakarta.inject.Singleton private val logger = getLogger() diff --git a/misk/src/main/kotlin/misk/web/actions/NotFoundAction.kt b/misk/src/main/kotlin/misk/web/actions/NotFoundAction.kt index ed9dc32ef3a..a9610c0511e 100644 --- a/misk/src/main/kotlin/misk/web/actions/NotFoundAction.kt +++ b/misk/src/main/kotlin/misk/web/actions/NotFoundAction.kt @@ -16,9 +16,9 @@ import misk.web.mediatype.MediaTypes import misk.web.toResponseBody import okhttp3.Headers.Companion.headersOf import wisp.logging.getLogger -import javax.inject.Inject -import javax.inject.Provider -import javax.inject.Singleton +import jakarta.inject.Inject +import com.google.inject.Provider +import jakarta.inject.Singleton @Singleton class NotFoundAction @Inject internal constructor( diff --git a/misk/src/main/kotlin/misk/web/actions/ReadinessCheckAction.kt b/misk/src/main/kotlin/misk/web/actions/ReadinessCheckAction.kt index a2aedb3deb6..6a92861a4af 100644 --- a/misk/src/main/kotlin/misk/web/actions/ReadinessCheckAction.kt +++ b/misk/src/main/kotlin/misk/web/actions/ReadinessCheckAction.kt @@ -9,9 +9,9 @@ import misk.web.Response import misk.web.ResponseContentType import misk.web.mediatype.MediaTypes import wisp.logging.getLogger -import javax.inject.Inject -import javax.inject.Provider -import javax.inject.Singleton +import jakarta.inject.Inject +import com.google.inject.Provider +import jakarta.inject.Singleton private val logger = getLogger() diff --git a/misk/src/main/kotlin/misk/web/actions/StatusAction.kt b/misk/src/main/kotlin/misk/web/actions/StatusAction.kt index d3af526ad10..699d697f62d 100644 --- a/misk/src/main/kotlin/misk/web/actions/StatusAction.kt +++ b/misk/src/main/kotlin/misk/web/actions/StatusAction.kt @@ -13,9 +13,9 @@ import misk.web.mediatype.MediaTypes import wisp.logging.getLogger import java.time.Clock import java.time.Instant -import javax.inject.Inject -import javax.inject.Provider -import javax.inject.Singleton +import jakarta.inject.Inject +import com.google.inject.Provider +import jakarta.inject.Singleton /** * Returns the current status of the service for programmatic tools that want to diff --git a/misk/src/main/kotlin/misk/web/actions/WebActionFactory.kt b/misk/src/main/kotlin/misk/web/actions/WebActionFactory.kt index 0bd0d748410..11f2ee07b10 100644 --- a/misk/src/main/kotlin/misk/web/actions/WebActionFactory.kt +++ b/misk/src/main/kotlin/misk/web/actions/WebActionFactory.kt @@ -28,8 +28,8 @@ import misk.web.interceptors.ForContentEncoding import misk.web.mediatype.MediaRange import misk.web.mediatype.MediaTypes import okhttp3.MediaType.Companion.toMediaType -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import kotlin.reflect.KClass import kotlin.reflect.KFunction import kotlin.reflect.KParameter diff --git a/misk/src/main/kotlin/misk/web/concurrencylimits/ConcurrencyLimitsModule.kt b/misk/src/main/kotlin/misk/web/concurrencylimits/ConcurrencyLimitsModule.kt index 9e89b6293b1..10fa2574098 100644 --- a/misk/src/main/kotlin/misk/web/concurrencylimits/ConcurrencyLimitsModule.kt +++ b/misk/src/main/kotlin/misk/web/concurrencylimits/ConcurrencyLimitsModule.kt @@ -15,8 +15,8 @@ import misk.Action import misk.inject.KAbstractModule import misk.web.ConcurrencyLimiterConfig import java.time.Clock -import javax.inject.Provider -import javax.inject.Singleton +import com.google.inject.Provider +import jakarta.inject.Singleton class ConcurrencyLimitsModule( private val config: ConcurrencyLimiterConfig diff --git a/misk/src/main/kotlin/misk/web/exceptions/EofExceptionMapper.kt b/misk/src/main/kotlin/misk/web/exceptions/EofExceptionMapper.kt index 5de69443ec7..126e396e15d 100644 --- a/misk/src/main/kotlin/misk/web/exceptions/EofExceptionMapper.kt +++ b/misk/src/main/kotlin/misk/web/exceptions/EofExceptionMapper.kt @@ -7,7 +7,7 @@ import misk.web.toResponseBody import okhttp3.Headers import org.eclipse.jetty.io.EofException import org.slf4j.event.Level -import javax.inject.Inject +import jakarta.inject.Inject internal class EofExceptionMapper @Inject internal constructor() : ExceptionMapper { override fun toResponse(th: EofException) = CLIENT_CLOSED_REQUEST diff --git a/misk/src/main/kotlin/misk/web/exceptions/ExceptionHandlingInterceptor.kt b/misk/src/main/kotlin/misk/web/exceptions/ExceptionHandlingInterceptor.kt index af5c630209e..9aea8bd1fbb 100644 --- a/misk/src/main/kotlin/misk/web/exceptions/ExceptionHandlingInterceptor.kt +++ b/misk/src/main/kotlin/misk/web/exceptions/ExceptionHandlingInterceptor.kt @@ -27,7 +27,7 @@ import java.io.IOException import java.lang.reflect.InvocationTargetException import java.net.HttpURLConnection import java.util.Base64 -import javax.inject.Inject +import jakarta.inject.Inject /** * Converts and logs application and component level dispatch exceptions into the appropriate diff --git a/misk/src/main/kotlin/misk/web/exceptions/ExceptionMapperResolver.kt b/misk/src/main/kotlin/misk/web/exceptions/ExceptionMapperResolver.kt index d83b30fa8a8..647ff9504e2 100644 --- a/misk/src/main/kotlin/misk/web/exceptions/ExceptionMapperResolver.kt +++ b/misk/src/main/kotlin/misk/web/exceptions/ExceptionMapperResolver.kt @@ -2,8 +2,8 @@ package misk.web.exceptions import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.ConcurrentMap -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import kotlin.reflect.KClass import kotlin.reflect.full.isSubclassOf import kotlin.reflect.full.superclasses diff --git a/misk/src/main/kotlin/misk/web/exceptions/GrpcExceptionMapper.kt b/misk/src/main/kotlin/misk/web/exceptions/GrpcExceptionMapper.kt index 0f9999ec2e1..ca284c19383 100644 --- a/misk/src/main/kotlin/misk/web/exceptions/GrpcExceptionMapper.kt +++ b/misk/src/main/kotlin/misk/web/exceptions/GrpcExceptionMapper.kt @@ -2,7 +2,7 @@ package misk.web.exceptions import com.squareup.wire.GrpcException import org.slf4j.event.Level -import javax.inject.Inject +import jakarta.inject.Inject internal class GrpcExceptionMapper @Inject internal constructor() : ExceptionMapper { override fun toResponse(th: GrpcException) = IOExceptionMapper.INTERNAL_SERVER_ERROR_RESPONSE diff --git a/misk/src/main/kotlin/misk/web/exceptions/IOExceptionMapper.kt b/misk/src/main/kotlin/misk/web/exceptions/IOExceptionMapper.kt index c77e00d671f..0021f4e510f 100644 --- a/misk/src/main/kotlin/misk/web/exceptions/IOExceptionMapper.kt +++ b/misk/src/main/kotlin/misk/web/exceptions/IOExceptionMapper.kt @@ -7,7 +7,7 @@ import okhttp3.Headers.Companion.headersOf import org.slf4j.event.Level import java.io.IOException import java.net.HttpURLConnection -import javax.inject.Inject +import jakarta.inject.Inject /** * Maps [IOException]s to HTTP 500. diff --git a/misk/src/main/kotlin/misk/web/exceptions/RequestBodyExceptionMapper.kt b/misk/src/main/kotlin/misk/web/exceptions/RequestBodyExceptionMapper.kt index b4c2311ce69..62adc16ce83 100644 --- a/misk/src/main/kotlin/misk/web/exceptions/RequestBodyExceptionMapper.kt +++ b/misk/src/main/kotlin/misk/web/exceptions/RequestBodyExceptionMapper.kt @@ -7,7 +7,7 @@ import misk.web.mediatype.MediaTypes import misk.web.toResponseBody import okhttp3.Headers import org.slf4j.event.Level -import javax.inject.Inject +import jakarta.inject.Inject class RequestBodyExceptionMapper @Inject internal constructor() : ExceptionMapper { override fun loggingLevel(th: RequestBodyException) = Level.INFO diff --git a/misk/src/main/kotlin/misk/web/exceptions/WebActionExceptionMapper.kt b/misk/src/main/kotlin/misk/web/exceptions/WebActionExceptionMapper.kt index b7c4a259c56..770eedf73a9 100644 --- a/misk/src/main/kotlin/misk/web/exceptions/WebActionExceptionMapper.kt +++ b/misk/src/main/kotlin/misk/web/exceptions/WebActionExceptionMapper.kt @@ -7,7 +7,7 @@ import misk.web.mediatype.MediaTypes import misk.web.toResponseBody import okhttp3.Headers import okhttp3.Headers.Companion.toHeaders -import javax.inject.Inject +import jakarta.inject.Inject /** * Maps [WebActionException]s into the appropriate status code. [WebActionException]s' response diff --git a/misk/src/main/kotlin/misk/web/extractors/RequestBodyFeatureBinding.kt b/misk/src/main/kotlin/misk/web/extractors/RequestBodyFeatureBinding.kt index b6bf1e060c8..f6062250105 100644 --- a/misk/src/main/kotlin/misk/web/extractors/RequestBodyFeatureBinding.kt +++ b/misk/src/main/kotlin/misk/web/extractors/RequestBodyFeatureBinding.kt @@ -11,8 +11,8 @@ import misk.web.marshal.GenericUnmarshallers import misk.web.marshal.Unmarshaller import okhttp3.MediaType.Companion.toMediaTypeOrNull import java.io.IOException -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import kotlin.reflect.KParameter /** Binds parameters annotated [RequestBody] to the unmarshalled request body. */ diff --git a/misk/src/main/kotlin/misk/web/extractors/ResponseBodyFeatureBinding.kt b/misk/src/main/kotlin/misk/web/extractors/ResponseBodyFeatureBinding.kt index d60e4e44e28..7819bbf923d 100644 --- a/misk/src/main/kotlin/misk/web/extractors/ResponseBodyFeatureBinding.kt +++ b/misk/src/main/kotlin/misk/web/extractors/ResponseBodyFeatureBinding.kt @@ -11,8 +11,8 @@ import misk.web.actions.WebSocketListener import misk.web.actions.findAnnotationWithOverrides import misk.web.interceptors.ResponseBodyMarshallerFactory import misk.web.marshal.Marshaller -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton internal class ResponseBodyFeatureBinding( private val responseBodyMarshaller: Marshaller diff --git a/misk/src/main/kotlin/misk/web/formatter/ClassNameFormatter.kt b/misk/src/main/kotlin/misk/web/formatter/ClassNameFormatter.kt index 6a04ecb8d80..76ffdd59d1d 100644 --- a/misk/src/main/kotlin/misk/web/formatter/ClassNameFormatter.kt +++ b/misk/src/main/kotlin/misk/web/formatter/ClassNameFormatter.kt @@ -1,6 +1,6 @@ package misk.web.formatter -import javax.inject.Inject +import jakarta.inject.Inject import kotlin.reflect.KClass class ClassNameFormatter @Inject constructor() { diff --git a/misk/src/main/kotlin/misk/web/interceptors/BeforeContentEncoding.kt b/misk/src/main/kotlin/misk/web/interceptors/BeforeContentEncoding.kt index 177fd445a78..65ac8c34b36 100644 --- a/misk/src/main/kotlin/misk/web/interceptors/BeforeContentEncoding.kt +++ b/misk/src/main/kotlin/misk/web/interceptors/BeforeContentEncoding.kt @@ -1,7 +1,7 @@ package misk.web.interceptors import misk.web.NetworkInterceptor -import javax.inject.Qualifier +import jakarta.inject.Qualifier /** * Denotes a target to be in the first order of execution before any content decoding happens. diff --git a/misk/src/main/kotlin/misk/web/interceptors/ConcurrencyLimitsInterceptor.kt b/misk/src/main/kotlin/misk/web/interceptors/ConcurrencyLimitsInterceptor.kt index 9cd0db9655f..57277e9b874 100644 --- a/misk/src/main/kotlin/misk/web/interceptors/ConcurrencyLimitsInterceptor.kt +++ b/misk/src/main/kotlin/misk/web/interceptors/ConcurrencyLimitsInterceptor.kt @@ -22,8 +22,8 @@ import java.time.Clock import java.time.Duration import java.time.Instant import java.util.concurrent.TimeUnit -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import kotlin.reflect.full.findAnnotation /** diff --git a/misk/src/main/kotlin/misk/web/interceptors/ForContentEncoding.kt b/misk/src/main/kotlin/misk/web/interceptors/ForContentEncoding.kt index f719ea42136..4dcafa28af2 100644 --- a/misk/src/main/kotlin/misk/web/interceptors/ForContentEncoding.kt +++ b/misk/src/main/kotlin/misk/web/interceptors/ForContentEncoding.kt @@ -1,7 +1,7 @@ package misk.web.interceptors import misk.web.NetworkInterceptor -import javax.inject.Qualifier +import jakarta.inject.Qualifier /** * Denotes a target interceptor to handle a message payload represented by a possible list diff --git a/misk/src/main/kotlin/misk/web/interceptors/GunzipRequestBodyInterceptor.kt b/misk/src/main/kotlin/misk/web/interceptors/GunzipRequestBodyInterceptor.kt index 6d42800e2f8..c75a908e048 100644 --- a/misk/src/main/kotlin/misk/web/interceptors/GunzipRequestBodyInterceptor.kt +++ b/misk/src/main/kotlin/misk/web/interceptors/GunzipRequestBodyInterceptor.kt @@ -6,8 +6,8 @@ import misk.web.NetworkChain import misk.web.NetworkInterceptor import okio.GzipSource import okio.buffer -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * Inflates a gzipped compressed request. diff --git a/misk/src/main/kotlin/misk/web/interceptors/InternalErrorInterceptorFactory.kt b/misk/src/main/kotlin/misk/web/interceptors/InternalErrorInterceptorFactory.kt index d877b23a480..1f82f25932d 100644 --- a/misk/src/main/kotlin/misk/web/interceptors/InternalErrorInterceptorFactory.kt +++ b/misk/src/main/kotlin/misk/web/interceptors/InternalErrorInterceptorFactory.kt @@ -6,8 +6,8 @@ import misk.web.NetworkInterceptor import misk.web.extractors.RequestBodyException import wisp.logging.getLogger import java.io.IOException -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton private val logger = getLogger() diff --git a/misk/src/main/kotlin/misk/web/interceptors/LogRateLimiter.kt b/misk/src/main/kotlin/misk/web/interceptors/LogRateLimiter.kt index a66919f8ce0..a7332a8f0a5 100644 --- a/misk/src/main/kotlin/misk/web/interceptors/LogRateLimiter.kt +++ b/misk/src/main/kotlin/misk/web/interceptors/LogRateLimiter.kt @@ -3,8 +3,8 @@ package misk.web.interceptors import misk.sampling.RateLimiter import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.TimeUnit -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * Holds rate limiters for logging success and error responses. There is a rate limiter for every diff --git a/misk/src/main/kotlin/misk/web/interceptors/MetricsInterceptor.kt b/misk/src/main/kotlin/misk/web/interceptors/MetricsInterceptor.kt index 5e976f16a90..183736a1c4e 100644 --- a/misk/src/main/kotlin/misk/web/interceptors/MetricsInterceptor.kt +++ b/misk/src/main/kotlin/misk/web/interceptors/MetricsInterceptor.kt @@ -10,8 +10,8 @@ import misk.scope.ActionScoped import misk.time.timed import misk.web.NetworkChain import misk.web.NetworkInterceptor -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton internal class MetricsInterceptor internal constructor( private val actionName: String, diff --git a/misk/src/main/kotlin/misk/web/interceptors/RebalancingInterceptor.kt b/misk/src/main/kotlin/misk/web/interceptors/RebalancingInterceptor.kt index f1e19809f2d..be58c04fbbf 100644 --- a/misk/src/main/kotlin/misk/web/interceptors/RebalancingInterceptor.kt +++ b/misk/src/main/kotlin/misk/web/interceptors/RebalancingInterceptor.kt @@ -7,8 +7,8 @@ import misk.web.NetworkInterceptor import misk.web.SocketAddress import misk.web.WebConfig import wisp.logging.getLogger -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton private val logger = getLogger() diff --git a/misk/src/main/kotlin/misk/web/interceptors/RequestBodyLoggingInterceptor.kt b/misk/src/main/kotlin/misk/web/interceptors/RequestBodyLoggingInterceptor.kt index 3f331c58cb0..9f759425d05 100644 --- a/misk/src/main/kotlin/misk/web/interceptors/RequestBodyLoggingInterceptor.kt +++ b/misk/src/main/kotlin/misk/web/interceptors/RequestBodyLoggingInterceptor.kt @@ -7,8 +7,8 @@ import misk.MiskCaller import misk.scope.ActionScoped import okhttp3.Headers import wisp.logging.getLogger -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import kotlin.reflect.full.findAnnotation private val logger = getLogger() diff --git a/misk/src/main/kotlin/misk/web/interceptors/RequestLogContextInterceptor.kt b/misk/src/main/kotlin/misk/web/interceptors/RequestLogContextInterceptor.kt index 2374daf74d7..14c3dcfe15f 100644 --- a/misk/src/main/kotlin/misk/web/interceptors/RequestLogContextInterceptor.kt +++ b/misk/src/main/kotlin/misk/web/interceptors/RequestLogContextInterceptor.kt @@ -7,8 +7,8 @@ import misk.web.NetworkChain import misk.web.NetworkInterceptor import misk.web.mdc.LogContextProvider import org.slf4j.MDC -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import javax.servlet.http.HttpServletRequest /** diff --git a/misk/src/main/kotlin/misk/web/interceptors/RequestLoggingInterceptor.kt b/misk/src/main/kotlin/misk/web/interceptors/RequestLoggingInterceptor.kt index e999e552119..b643c8d8ea6 100644 --- a/misk/src/main/kotlin/misk/web/interceptors/RequestLoggingInterceptor.kt +++ b/misk/src/main/kotlin/misk/web/interceptors/RequestLoggingInterceptor.kt @@ -14,8 +14,8 @@ import wisp.deployment.Deployment import wisp.logging.getLogger import wisp.logging.info import java.util.concurrent.TimeUnit -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import kotlin.reflect.full.findAnnotation private val logger = getLogger() diff --git a/misk/src/main/kotlin/misk/web/interceptors/ResponseBodyMarshallerFactory.kt b/misk/src/main/kotlin/misk/web/interceptors/ResponseBodyMarshallerFactory.kt index 31c2f874345..01029c967db 100644 --- a/misk/src/main/kotlin/misk/web/interceptors/ResponseBodyMarshallerFactory.kt +++ b/misk/src/main/kotlin/misk/web/interceptors/ResponseBodyMarshallerFactory.kt @@ -5,8 +5,8 @@ import misk.web.marshal.GenericMarshallers import misk.web.marshal.Marshaller import misk.web.mediatype.MediaTypes import okhttp3.MediaType -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import kotlin.reflect.KType @Singleton diff --git a/misk/src/main/kotlin/misk/web/interceptors/TracingInterceptor.kt b/misk/src/main/kotlin/misk/web/interceptors/TracingInterceptor.kt index 567e3feae75..11ed4c62593 100644 --- a/misk/src/main/kotlin/misk/web/interceptors/TracingInterceptor.kt +++ b/misk/src/main/kotlin/misk/web/interceptors/TracingInterceptor.kt @@ -1,7 +1,7 @@ package misk.web.interceptors import com.google.inject.Inject -import com.google.inject.Singleton +import jakarta.inject.Singleton import io.opentracing.Span import io.opentracing.SpanContext import io.opentracing.Tracer diff --git a/misk/src/main/kotlin/misk/web/interceptors/WideOpenDevelopmentInterceptor.kt b/misk/src/main/kotlin/misk/web/interceptors/WideOpenDevelopmentInterceptor.kt index 03bf188d706..c1f1d066ee9 100644 --- a/misk/src/main/kotlin/misk/web/interceptors/WideOpenDevelopmentInterceptor.kt +++ b/misk/src/main/kotlin/misk/web/interceptors/WideOpenDevelopmentInterceptor.kt @@ -4,7 +4,7 @@ import misk.Action import misk.web.NetworkChain import misk.web.NetworkInterceptor import wisp.deployment.Deployment -import javax.inject.Inject +import jakarta.inject.Inject class WideOpenDevelopmentInterceptor @Inject constructor() : NetworkInterceptor { override fun intercept(chain: NetworkChain) { diff --git a/misk/src/main/kotlin/misk/web/jetty/ConnectionMetrics.kt b/misk/src/main/kotlin/misk/web/jetty/ConnectionMetrics.kt index aad8cf340bf..0eb5c05bbb4 100644 --- a/misk/src/main/kotlin/misk/web/jetty/ConnectionMetrics.kt +++ b/misk/src/main/kotlin/misk/web/jetty/ConnectionMetrics.kt @@ -2,8 +2,8 @@ package misk.web.jetty import com.google.common.annotations.VisibleForTesting import misk.metrics.Metrics -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton internal class ConnectionMetrics @Inject internal constructor(metrics: Metrics) { diff --git a/misk/src/main/kotlin/misk/web/jetty/JettyConnectionMetricsCollector.kt b/misk/src/main/kotlin/misk/web/jetty/JettyConnectionMetricsCollector.kt index c1d57f2e6a9..29edfd287e2 100644 --- a/misk/src/main/kotlin/misk/web/jetty/JettyConnectionMetricsCollector.kt +++ b/misk/src/main/kotlin/misk/web/jetty/JettyConnectionMetricsCollector.kt @@ -3,8 +3,8 @@ package misk.web.jetty import com.google.common.util.concurrent.AbstractScheduledService import java.util.concurrent.CopyOnWriteArrayList import java.util.concurrent.TimeUnit -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton internal class JettyConnectionMetricsCollector @Inject internal constructor( diff --git a/misk/src/main/kotlin/misk/web/jetty/JettyService.kt b/misk/src/main/kotlin/misk/web/jetty/JettyService.kt index 7b4359a0494..5c5788ebe1c 100644 --- a/misk/src/main/kotlin/misk/web/jetty/JettyService.kt +++ b/misk/src/main/kotlin/misk/web/jetty/JettyService.kt @@ -40,8 +40,8 @@ import java.util.EnumSet import java.util.concurrent.SynchronousQueue import java.util.concurrent.ThreadPoolExecutor import java.util.concurrent.TimeUnit -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import javax.servlet.DispatcherType private val logger = getLogger() diff --git a/misk/src/main/kotlin/misk/web/jetty/JettyThreadPoolMetricsCollector.kt b/misk/src/main/kotlin/misk/web/jetty/JettyThreadPoolMetricsCollector.kt index 3159dd5fd4e..157a81865a2 100644 --- a/misk/src/main/kotlin/misk/web/jetty/JettyThreadPoolMetricsCollector.kt +++ b/misk/src/main/kotlin/misk/web/jetty/JettyThreadPoolMetricsCollector.kt @@ -2,8 +2,8 @@ package misk.web.jetty import com.google.common.util.concurrent.AbstractScheduledService import java.util.concurrent.TimeUnit -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton internal class JettyThreadPoolMetricsCollector @Inject internal constructor( diff --git a/misk/src/main/kotlin/misk/web/jetty/ThreadPoolMetrics.kt b/misk/src/main/kotlin/misk/web/jetty/ThreadPoolMetrics.kt index 28b84f03aab..743cfaa8868 100644 --- a/misk/src/main/kotlin/misk/web/jetty/ThreadPoolMetrics.kt +++ b/misk/src/main/kotlin/misk/web/jetty/ThreadPoolMetrics.kt @@ -1,8 +1,8 @@ package misk.web.jetty import misk.metrics.Metrics -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton internal class ThreadPoolMetrics @Inject internal constructor( diff --git a/misk/src/main/kotlin/misk/web/jetty/ThreadPoolQueueMetrics.kt b/misk/src/main/kotlin/misk/web/jetty/ThreadPoolQueueMetrics.kt index fc1b5281a70..889412c1cbb 100644 --- a/misk/src/main/kotlin/misk/web/jetty/ThreadPoolQueueMetrics.kt +++ b/misk/src/main/kotlin/misk/web/jetty/ThreadPoolQueueMetrics.kt @@ -2,8 +2,8 @@ package misk.web.jetty import misk.metrics.Metrics import java.time.Duration -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton class ThreadPoolQueueMetrics @Inject internal constructor( diff --git a/misk/src/main/kotlin/misk/web/jetty/WebActionsServlet.kt b/misk/src/main/kotlin/misk/web/jetty/WebActionsServlet.kt index 1d8cb7d5811..a24e1b37d1e 100644 --- a/misk/src/main/kotlin/misk/web/jetty/WebActionsServlet.kt +++ b/misk/src/main/kotlin/misk/web/jetty/WebActionsServlet.kt @@ -30,8 +30,8 @@ import org.eclipse.jetty.websocket.server.JettyWebSocketServletFactory import wisp.logging.getLogger import java.net.HttpURLConnection import java.net.ProtocolException -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import javax.servlet.http.HttpServletRequest import javax.servlet.http.HttpServletResponse diff --git a/misk/src/main/kotlin/misk/web/marshal/Json.kt b/misk/src/main/kotlin/misk/web/marshal/Json.kt index efe77cb0b13..d045af9eef6 100644 --- a/misk/src/main/kotlin/misk/web/marshal/Json.kt +++ b/misk/src/main/kotlin/misk/web/marshal/Json.kt @@ -9,8 +9,8 @@ import okhttp3.Headers import okhttp3.MediaType import okio.BufferedSink import okio.BufferedSource -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import kotlin.reflect.KType import kotlin.reflect.jvm.javaType diff --git a/misk/src/main/kotlin/misk/web/marshal/MultipartUnmarshaller.kt b/misk/src/main/kotlin/misk/web/marshal/MultipartUnmarshaller.kt index bd1e8738b4d..dc8579a3ecd 100644 --- a/misk/src/main/kotlin/misk/web/marshal/MultipartUnmarshaller.kt +++ b/misk/src/main/kotlin/misk/web/marshal/MultipartUnmarshaller.kt @@ -7,8 +7,8 @@ import okhttp3.MediaType import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.MultipartReader import okio.BufferedSource -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import kotlin.reflect.KType object MultipartUnmarshaller : Unmarshaller { diff --git a/misk/src/main/kotlin/misk/web/marshal/PlainText.kt b/misk/src/main/kotlin/misk/web/marshal/PlainText.kt index 84f6d1018fd..ad9932b7808 100644 --- a/misk/src/main/kotlin/misk/web/marshal/PlainText.kt +++ b/misk/src/main/kotlin/misk/web/marshal/PlainText.kt @@ -7,8 +7,8 @@ import okhttp3.Headers import okhttp3.MediaType import okio.BufferedSource import okio.ByteString -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import kotlin.reflect.KType object PlainTextMarshaller : Marshaller { diff --git a/misk/src/main/kotlin/misk/web/marshal/Protobuf.kt b/misk/src/main/kotlin/misk/web/marshal/Protobuf.kt index 8bcc8a67057..dd3b926f1b5 100644 --- a/misk/src/main/kotlin/misk/web/marshal/Protobuf.kt +++ b/misk/src/main/kotlin/misk/web/marshal/Protobuf.kt @@ -8,8 +8,8 @@ import okhttp3.Headers import okhttp3.MediaType import okio.BufferedSink import okio.BufferedSource -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import kotlin.reflect.KType import kotlin.reflect.jvm.javaType diff --git a/misk/src/main/kotlin/misk/web/mdc/RequestHttpMethodLogContextProvider.kt b/misk/src/main/kotlin/misk/web/mdc/RequestHttpMethodLogContextProvider.kt index 22600b89216..61205e3b820 100644 --- a/misk/src/main/kotlin/misk/web/mdc/RequestHttpMethodLogContextProvider.kt +++ b/misk/src/main/kotlin/misk/web/mdc/RequestHttpMethodLogContextProvider.kt @@ -1,6 +1,6 @@ package misk.web.mdc -import javax.inject.Inject +import jakarta.inject.Inject import javax.servlet.http.HttpServletRequest internal class RequestHttpMethodLogContextProvider @Inject constructor() : LogContextProvider { diff --git a/misk/src/main/kotlin/misk/web/mdc/RequestProtocolLogContextProvider.kt b/misk/src/main/kotlin/misk/web/mdc/RequestProtocolLogContextProvider.kt index 87a8602607a..6ed5c7ee7b3 100644 --- a/misk/src/main/kotlin/misk/web/mdc/RequestProtocolLogContextProvider.kt +++ b/misk/src/main/kotlin/misk/web/mdc/RequestProtocolLogContextProvider.kt @@ -1,6 +1,6 @@ package misk.web.mdc -import javax.inject.Inject +import jakarta.inject.Inject import javax.servlet.http.HttpServletRequest internal class RequestProtocolLogContextProvider @Inject constructor() : LogContextProvider { diff --git a/misk/src/main/kotlin/misk/web/mdc/RequestRemoteAddressLogContextProvider.kt b/misk/src/main/kotlin/misk/web/mdc/RequestRemoteAddressLogContextProvider.kt index 296aa6e7760..93d48fda06e 100644 --- a/misk/src/main/kotlin/misk/web/mdc/RequestRemoteAddressLogContextProvider.kt +++ b/misk/src/main/kotlin/misk/web/mdc/RequestRemoteAddressLogContextProvider.kt @@ -1,6 +1,6 @@ package misk.web.mdc -import javax.inject.Inject +import jakarta.inject.Inject import javax.servlet.http.HttpServletRequest internal class RequestRemoteAddressLogContextProvider @Inject constructor() : LogContextProvider { diff --git a/misk/src/main/kotlin/misk/web/mdc/RequestURILogContextProvider.kt b/misk/src/main/kotlin/misk/web/mdc/RequestURILogContextProvider.kt index 8a1f7ca70ca..cfd515cdf92 100644 --- a/misk/src/main/kotlin/misk/web/mdc/RequestURILogContextProvider.kt +++ b/misk/src/main/kotlin/misk/web/mdc/RequestURILogContextProvider.kt @@ -1,6 +1,6 @@ package misk.web.mdc -import javax.inject.Inject +import jakarta.inject.Inject import javax.servlet.http.HttpServletRequest internal class RequestURILogContextProvider @Inject constructor() : LogContextProvider { diff --git a/misk/src/main/kotlin/misk/web/metadata/webaction/WebActionMetadataList.kt b/misk/src/main/kotlin/misk/web/metadata/webaction/WebActionMetadataList.kt index 67376ab3244..5d3a7abb374 100644 --- a/misk/src/main/kotlin/misk/web/metadata/webaction/WebActionMetadataList.kt +++ b/misk/src/main/kotlin/misk/web/metadata/webaction/WebActionMetadataList.kt @@ -1,9 +1,9 @@ package misk.web.metadata.webaction import misk.web.jetty.WebActionsServlet -import javax.inject.Inject -import javax.inject.Provider -import javax.inject.Singleton +import jakarta.inject.Inject +import com.google.inject.Provider +import jakarta.inject.Singleton @Singleton class WebActionMetadataList @Inject internal constructor( diff --git a/misk/src/main/kotlin/misk/web/proxy/WebProxyAction.kt b/misk/src/main/kotlin/misk/web/proxy/WebProxyAction.kt index 871ade764f4..f5a0ae2a449 100644 --- a/misk/src/main/kotlin/misk/web/proxy/WebProxyAction.kt +++ b/misk/src/main/kotlin/misk/web/proxy/WebProxyAction.kt @@ -19,8 +19,8 @@ import misk.web.toMisk import okhttp3.HttpUrl import okhttp3.OkHttpClient import java.io.IOException -import javax.inject.Named -import javax.inject.Singleton +import jakarta.inject.Named +import jakarta.inject.Singleton /** * WebProxyAction diff --git a/misk/src/main/kotlin/misk/web/resources/ResourceEntryFinder.kt b/misk/src/main/kotlin/misk/web/resources/ResourceEntryFinder.kt index b81f346c803..4758d93c4ba 100644 --- a/misk/src/main/kotlin/misk/web/resources/ResourceEntryFinder.kt +++ b/misk/src/main/kotlin/misk/web/resources/ResourceEntryFinder.kt @@ -3,7 +3,7 @@ package misk.web.resources import misk.web.dashboard.ValidWebEntry import misk.web.proxy.WebProxyEntry import okhttp3.HttpUrl -import javax.inject.Inject +import jakarta.inject.Inject class ResourceEntryFinder @Inject constructor( private val webProxyEntries: List, diff --git a/misk/src/main/kotlin/misk/web/resources/StaticResourceAction.kt b/misk/src/main/kotlin/misk/web/resources/StaticResourceAction.kt index 8313fd937d7..9f780fa4f12 100644 --- a/misk/src/main/kotlin/misk/web/resources/StaticResourceAction.kt +++ b/misk/src/main/kotlin/misk/web/resources/StaticResourceAction.kt @@ -19,8 +19,8 @@ import okhttp3.HttpUrl import okio.BufferedSink import okio.BufferedSource import java.net.HttpURLConnection -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * StaticResourceAction diff --git a/misk/src/test/java/misk/web/extractors/JavaPathParamDispatchTest.java b/misk/src/test/java/misk/web/extractors/JavaPathParamDispatchTest.java index 71e54a88be8..acc705ff4eb 100644 --- a/misk/src/test/java/misk/web/extractors/JavaPathParamDispatchTest.java +++ b/misk/src/test/java/misk/web/extractors/JavaPathParamDispatchTest.java @@ -3,7 +3,7 @@ import com.google.inject.AbstractModule; import com.google.inject.Module; import java.io.IOException; -import javax.inject.Inject; +import jakarta.inject.Inject; import misk.MiskTestingServiceModule; import misk.testing.MiskTest; import misk.testing.MiskTestModule; diff --git a/misk/src/test/kotlin/misk/MiskApplicationTest.kt b/misk/src/test/kotlin/misk/MiskApplicationTest.kt index 185454dcb51..9519b31d164 100644 --- a/misk/src/test/kotlin/misk/MiskApplicationTest.kt +++ b/misk/src/test/kotlin/misk/MiskApplicationTest.kt @@ -4,7 +4,7 @@ import com.beust.jcommander.Parameter import misk.inject.KAbstractModule import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject import kotlin.test.assertFailsWith internal class MiskApplicationTest { diff --git a/misk/src/test/kotlin/misk/MiskCallerTest.kt b/misk/src/test/kotlin/misk/MiskCallerTest.kt index 3ae9985e77a..ca0e21c3079 100644 --- a/misk/src/test/kotlin/misk/MiskCallerTest.kt +++ b/misk/src/test/kotlin/misk/MiskCallerTest.kt @@ -5,8 +5,8 @@ import misk.testing.MiskTest import misk.testing.MiskTestModule import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.inject.Inject -import javax.inject.Qualifier +import jakarta.inject.Inject +import jakarta.inject.Qualifier @MiskTest(startService = false) internal class MiskCallerTest { diff --git a/misk/src/test/kotlin/misk/client/ClientLoggingInterceptorTest.kt b/misk/src/test/kotlin/misk/client/ClientLoggingInterceptorTest.kt index e4344c35873..99c06f36765 100644 --- a/misk/src/test/kotlin/misk/client/ClientLoggingInterceptorTest.kt +++ b/misk/src/test/kotlin/misk/client/ClientLoggingInterceptorTest.kt @@ -20,8 +20,8 @@ import retrofit2.http.Headers import retrofit2.http.POST import wisp.logging.LogCollector import java.time.Duration -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @MiskTest(startService = true) internal class ClientLoggingInterceptorTest { diff --git a/misk/src/test/kotlin/misk/client/ClientMetricsInterceptorTest.kt b/misk/src/test/kotlin/misk/client/ClientMetricsInterceptorTest.kt index d3209d93ab1..8651514d77d 100644 --- a/misk/src/test/kotlin/misk/client/ClientMetricsInterceptorTest.kt +++ b/misk/src/test/kotlin/misk/client/ClientMetricsInterceptorTest.kt @@ -30,8 +30,8 @@ import retrofit2.http.POST import java.net.SocketTimeoutException import java.net.URL import java.time.Duration -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @MiskTest internal class ClientMetricsInterceptorTest { diff --git a/misk/src/test/kotlin/misk/client/ConnectionReuseTest.kt b/misk/src/test/kotlin/misk/client/ConnectionReuseTest.kt index 8eef80d800a..1aff61907a7 100644 --- a/misk/src/test/kotlin/misk/client/ConnectionReuseTest.kt +++ b/misk/src/test/kotlin/misk/client/ConnectionReuseTest.kt @@ -11,9 +11,9 @@ import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import retrofit2.Call import retrofit2.http.GET -import javax.inject.Inject -import javax.inject.Provider -import javax.inject.Singleton +import jakarta.inject.Inject +import com.google.inject.Provider +import jakarta.inject.Singleton @MiskTest internal class ConnectionReuseTest { diff --git a/misk/src/test/kotlin/misk/client/GrpcClientProviderTest.kt b/misk/src/test/kotlin/misk/client/GrpcClientProviderTest.kt index 52be90d2428..acdc994c71b 100644 --- a/misk/src/test/kotlin/misk/client/GrpcClientProviderTest.kt +++ b/misk/src/test/kotlin/misk/client/GrpcClientProviderTest.kt @@ -17,8 +17,8 @@ import misk.ApplicationInterceptor import misk.Chain import java.time.Duration import java.util.concurrent.LinkedBlockingDeque -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import kotlin.test.assertFailsWith import misk.MiskTestingServiceModule import misk.inject.KAbstractModule diff --git a/misk/src/test/kotlin/misk/client/HttpClientEnvoyTest.kt b/misk/src/test/kotlin/misk/client/HttpClientEnvoyTest.kt index 1af83d066c4..15271a26c98 100644 --- a/misk/src/test/kotlin/misk/client/HttpClientEnvoyTest.kt +++ b/misk/src/test/kotlin/misk/client/HttpClientEnvoyTest.kt @@ -20,8 +20,8 @@ import retrofit2.http.POST import wisp.client.EnvoyClientEndpointProvider import java.io.File import java.util.Arrays -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** Demonstrates ability to bind up an envoy-based http client and connect via unix sockets. */ @MiskTest(startService = true) diff --git a/misk/src/test/kotlin/misk/client/HttpClientEventListenerTest.kt b/misk/src/test/kotlin/misk/client/HttpClientEventListenerTest.kt index e21a99b8137..6f6dce02f6d 100644 --- a/misk/src/test/kotlin/misk/client/HttpClientEventListenerTest.kt +++ b/misk/src/test/kotlin/misk/client/HttpClientEventListenerTest.kt @@ -18,8 +18,8 @@ import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import java.net.InetSocketAddress import java.net.Proxy -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @MiskTest(startService = true) internal class HttpClientEventListenerTest { diff --git a/misk/src/test/kotlin/misk/client/HttpClientProviderTest.kt b/misk/src/test/kotlin/misk/client/HttpClientProviderTest.kt index 3a35e1e7c80..4d7838d5d8e 100644 --- a/misk/src/test/kotlin/misk/client/HttpClientProviderTest.kt +++ b/misk/src/test/kotlin/misk/client/HttpClientProviderTest.kt @@ -14,8 +14,8 @@ import okhttp3.mockwebserver.MockWebServer import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import java.time.Duration -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @MiskTest class HttpClientProviderTest { diff --git a/misk/src/test/kotlin/misk/client/MockWebServerService.kt b/misk/src/test/kotlin/misk/client/MockWebServerService.kt index a6b9bc218be..90fb77b5362 100644 --- a/misk/src/test/kotlin/misk/client/MockWebServerService.kt +++ b/misk/src/test/kotlin/misk/client/MockWebServerService.kt @@ -4,7 +4,7 @@ import com.google.common.util.concurrent.AbstractIdleService import okhttp3.mockwebserver.MockWebServer import wisp.client.UnixDomainServerSocketFactory import java.io.File -import javax.inject.Singleton +import jakarta.inject.Singleton @Singleton class MockWebServerService(val unixSocketFile: String?) : AbstractIdleService() { diff --git a/misk/src/test/kotlin/misk/client/PropagatingScopeActionInInterceptorsTest.kt b/misk/src/test/kotlin/misk/client/PropagatingScopeActionInInterceptorsTest.kt index 95ad7d69ce7..b6882c4f926 100644 --- a/misk/src/test/kotlin/misk/client/PropagatingScopeActionInInterceptorsTest.kt +++ b/misk/src/test/kotlin/misk/client/PropagatingScopeActionInInterceptorsTest.kt @@ -38,7 +38,7 @@ import okhttp3.Response import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) class PropagatingScopeActionInInterceptorsTest { diff --git a/misk/src/test/kotlin/misk/client/ProtoMessageHttpClientTest.kt b/misk/src/test/kotlin/misk/client/ProtoMessageHttpClientTest.kt index c45163d79c0..3f59f2bcee4 100644 --- a/misk/src/test/kotlin/misk/client/ProtoMessageHttpClientTest.kt +++ b/misk/src/test/kotlin/misk/client/ProtoMessageHttpClientTest.kt @@ -21,8 +21,8 @@ import misk.web.mediatype.MediaTypes import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @MiskTest(startService = true) class ProtoMessageHttpClientTest { diff --git a/misk/src/test/kotlin/misk/client/TestDino.kt b/misk/src/test/kotlin/misk/client/TestDino.kt index ea40141554a..e78ef6b1469 100644 --- a/misk/src/test/kotlin/misk/client/TestDino.kt +++ b/misk/src/test/kotlin/misk/client/TestDino.kt @@ -13,8 +13,8 @@ import misk.web.mediatype.MediaTypes import retrofit2.Call import retrofit2.http.Body import retrofit2.http.POST -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton internal interface ReturnADinosaur { @POST("/cooldinos") diff --git a/misk/src/test/kotlin/misk/client/TypedHttpClientInterceptorTest.kt b/misk/src/test/kotlin/misk/client/TypedHttpClientInterceptorTest.kt index 5b8017ba11d..4306e01a74c 100644 --- a/misk/src/test/kotlin/misk/client/TypedHttpClientInterceptorTest.kt +++ b/misk/src/test/kotlin/misk/client/TypedHttpClientInterceptorTest.kt @@ -18,7 +18,7 @@ import okhttp3.Response import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) internal class TypedHttpClientInterceptorTest { diff --git a/misk/src/test/kotlin/misk/client/TypedHttpClientTest.kt b/misk/src/test/kotlin/misk/client/TypedHttpClientTest.kt index 8b6d8538041..dda21ccd1c5 100644 --- a/misk/src/test/kotlin/misk/client/TypedHttpClientTest.kt +++ b/misk/src/test/kotlin/misk/client/TypedHttpClientTest.kt @@ -27,8 +27,8 @@ import retrofit2.Call import retrofit2.http.Body import retrofit2.http.Headers import retrofit2.http.POST -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import kotlin.test.assertFailsWith @MiskTest(startService = true) diff --git a/misk/src/test/kotlin/misk/client/TypedPeerHttpClientTest.kt b/misk/src/test/kotlin/misk/client/TypedPeerHttpClientTest.kt index c99beeadd48..fe33a6f17e1 100644 --- a/misk/src/test/kotlin/misk/client/TypedPeerHttpClientTest.kt +++ b/misk/src/test/kotlin/misk/client/TypedPeerHttpClientTest.kt @@ -34,8 +34,8 @@ import org.junit.jupiter.api.Test import retrofit2.Call import retrofit2.http.Body import retrofit2.http.POST -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @MiskTest(startService = true) internal class TypedPeerHttpClientTest { diff --git a/misk/src/test/kotlin/misk/concurrent/ExecutorServiceModuleTest.kt b/misk/src/test/kotlin/misk/concurrent/ExecutorServiceModuleTest.kt index ecc9dc10ae2..0621cd245c8 100644 --- a/misk/src/test/kotlin/misk/concurrent/ExecutorServiceModuleTest.kt +++ b/misk/src/test/kotlin/misk/concurrent/ExecutorServiceModuleTest.kt @@ -10,8 +10,8 @@ import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import java.util.concurrent.ExecutorService import java.util.concurrent.ThreadPoolExecutor -import javax.inject.Inject -import javax.inject.Qualifier +import jakarta.inject.Inject +import jakarta.inject.Qualifier @MiskTest(startService = true) internal class ExecutorServiceModuleTest { diff --git a/misk/src/test/kotlin/misk/grpc/GrpcConnectivityTest.kt b/misk/src/test/kotlin/misk/grpc/GrpcConnectivityTest.kt index 4870351e028..02a7f1cf210 100644 --- a/misk/src/test/kotlin/misk/grpc/GrpcConnectivityTest.kt +++ b/misk/src/test/kotlin/misk/grpc/GrpcConnectivityTest.kt @@ -30,8 +30,8 @@ import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows import java.io.InterruptedIOException import java.time.Duration -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * This test gets Misk running as a GRPC server and then acts as a basic GRPC client to send a diff --git a/misk/src/test/kotlin/misk/grpc/Http2ClientTestingModule.kt b/misk/src/test/kotlin/misk/grpc/Http2ClientTestingModule.kt index 961072260d6..bf4ebd7c83f 100644 --- a/misk/src/test/kotlin/misk/grpc/Http2ClientTestingModule.kt +++ b/misk/src/test/kotlin/misk/grpc/Http2ClientTestingModule.kt @@ -12,7 +12,7 @@ import misk.security.ssl.SslLoader import misk.security.ssl.TrustStoreConfig import misk.web.jetty.JettyService import java.time.Duration -import javax.inject.Singleton +import jakarta.inject.Singleton /** * Configures an OkHttp client with HTTPS and HTTP/2. diff --git a/misk/src/test/kotlin/misk/healthchecks/FakeHealthCheck.kt b/misk/src/test/kotlin/misk/healthchecks/FakeHealthCheck.kt index 543026b7557..d9190aea2d6 100644 --- a/misk/src/test/kotlin/misk/healthchecks/FakeHealthCheck.kt +++ b/misk/src/test/kotlin/misk/healthchecks/FakeHealthCheck.kt @@ -1,7 +1,7 @@ package misk.healthchecks -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton class FakeHealthCheck @Inject constructor() : HealthCheck { diff --git a/misk/src/test/kotlin/misk/moshi/BuiltInAdaptersTest.kt b/misk/src/test/kotlin/misk/moshi/BuiltInAdaptersTest.kt index cb75c14e0d2..0ab8b816934 100644 --- a/misk/src/test/kotlin/misk/moshi/BuiltInAdaptersTest.kt +++ b/misk/src/test/kotlin/misk/moshi/BuiltInAdaptersTest.kt @@ -9,7 +9,7 @@ import okio.ByteString.Companion.decodeHex import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import java.time.Instant -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = false) internal class BuiltInAdaptersTest { diff --git a/misk/src/test/kotlin/misk/moshi/MoshiAdapterPrecedenceTest.kt b/misk/src/test/kotlin/misk/moshi/MoshiAdapterPrecedenceTest.kt index 422f185b55b..921d8c6f085 100644 --- a/misk/src/test/kotlin/misk/moshi/MoshiAdapterPrecedenceTest.kt +++ b/misk/src/test/kotlin/misk/moshi/MoshiAdapterPrecedenceTest.kt @@ -10,7 +10,7 @@ import misk.testing.MiskTest import misk.testing.MiskTestModule import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest internal class MoshiAdapterPrecedenceTest { diff --git a/misk/src/test/kotlin/misk/moshi/MoshiModuleTest.kt b/misk/src/test/kotlin/misk/moshi/MoshiModuleTest.kt index e8f5d7b61e4..64f25931fe8 100644 --- a/misk/src/test/kotlin/misk/moshi/MoshiModuleTest.kt +++ b/misk/src/test/kotlin/misk/moshi/MoshiModuleTest.kt @@ -13,7 +13,7 @@ import misk.testing.MiskTestModule import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import java.math.BigDecimal -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = false) internal class MoshiModuleTest { diff --git a/misk/src/test/kotlin/misk/moshi/wire/WireMessageAdapterTest.kt b/misk/src/test/kotlin/misk/moshi/wire/WireMessageAdapterTest.kt index ab3cb06e3ff..5ee3e7c8a91 100644 --- a/misk/src/test/kotlin/misk/moshi/wire/WireMessageAdapterTest.kt +++ b/misk/src/test/kotlin/misk/moshi/wire/WireMessageAdapterTest.kt @@ -11,7 +11,7 @@ import okio.ByteString.Companion.encodeUtf8 import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.isEqualToAsJson import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject import kotlin.test.assertFailsWith @MiskTest(startService = false) diff --git a/misk/src/test/kotlin/misk/perf/PauseDetectorTest.kt b/misk/src/test/kotlin/misk/perf/PauseDetectorTest.kt index 1a457197159..fa6ddc2cd6c 100644 --- a/misk/src/test/kotlin/misk/perf/PauseDetectorTest.kt +++ b/misk/src/test/kotlin/misk/perf/PauseDetectorTest.kt @@ -17,7 +17,7 @@ import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import wisp.logging.LogCollector import java.util.concurrent.TimeUnit -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) // NB: only starting services here to get log collection to work. class PauseDetectorTest { diff --git a/misk/src/test/kotlin/misk/tasks/RepeatedTaskQueueTest.kt b/misk/src/test/kotlin/misk/tasks/RepeatedTaskQueueTest.kt index 32a10ca0084..aaf88bf075a 100644 --- a/misk/src/test/kotlin/misk/tasks/RepeatedTaskQueueTest.kt +++ b/misk/src/test/kotlin/misk/tasks/RepeatedTaskQueueTest.kt @@ -23,9 +23,9 @@ import java.util.concurrent.PriorityBlockingQueue import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicReference import java.util.concurrent.locks.ReentrantLock -import javax.inject.Inject -import javax.inject.Named -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Named +import jakarta.inject.Singleton import kotlin.concurrent.withLock import kotlin.test.assertEquals diff --git a/misk/src/test/kotlin/misk/testing/InjectingParameterResolverTest.kt b/misk/src/test/kotlin/misk/testing/InjectingParameterResolverTest.kt index ec7606513c2..35137a322eb 100644 --- a/misk/src/test/kotlin/misk/testing/InjectingParameterResolverTest.kt +++ b/misk/src/test/kotlin/misk/testing/InjectingParameterResolverTest.kt @@ -1,6 +1,6 @@ package misk.testing -import com.google.inject.BindingAnnotation +import jakarta.inject.Qualifier import com.google.inject.Provides import misk.inject.KAbstractModule import org.assertj.core.api.Assertions.assertThat @@ -13,7 +13,7 @@ internal class InjectingParameterResolverTest { @Provides @TestAnnotation fun myAnnotatedList(): List = listOf("strings?") } - @BindingAnnotation + @Qualifier annotation class TestAnnotation @InjectTest fun `retrieves all parameters if the method is annotated`( diff --git a/misk/src/test/kotlin/misk/time/FakeResourcePool.kt b/misk/src/test/kotlin/misk/time/FakeResourcePool.kt index cceaf38d0b3..10c5cf65325 100644 --- a/misk/src/test/kotlin/misk/time/FakeResourcePool.kt +++ b/misk/src/test/kotlin/misk/time/FakeResourcePool.kt @@ -4,7 +4,7 @@ import okio.Timeout import java.io.InterruptedIOException import java.time.Duration import java.util.concurrent.TimeUnit -import javax.inject.Inject +import jakarta.inject.Inject /** * Simulates a pool of a limited resource like database connections or disk bandwidth. Configure the diff --git a/misk/src/test/kotlin/misk/tracing/ClientServerTraceTest.kt b/misk/src/test/kotlin/misk/tracing/ClientServerTraceTest.kt index 9a01fe240b0..cc90f71523f 100644 --- a/misk/src/test/kotlin/misk/tracing/ClientServerTraceTest.kt +++ b/misk/src/test/kotlin/misk/tracing/ClientServerTraceTest.kt @@ -7,8 +7,8 @@ import helpers.protos.Dinosaur import io.opentracing.Tracer import io.opentracing.mock.MockSpan import io.opentracing.mock.MockTracer -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import misk.MiskTestingServiceModule import misk.client.HttpClientEndpointConfig import misk.client.HttpClientsConfig diff --git a/misk/src/test/kotlin/misk/web/AbstractRebalancingTest.kt b/misk/src/test/kotlin/misk/web/AbstractRebalancingTest.kt index cd5465319e6..0d4a413438f 100644 --- a/misk/src/test/kotlin/misk/web/AbstractRebalancingTest.kt +++ b/misk/src/test/kotlin/misk/web/AbstractRebalancingTest.kt @@ -22,8 +22,8 @@ import okhttp3.internal.closeQuietly import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton abstract class AbstractRebalancingTest( val percent: Double diff --git a/misk/src/test/kotlin/misk/web/ActionScopedWebDispatchTest.kt b/misk/src/test/kotlin/misk/web/ActionScopedWebDispatchTest.kt index d16f67284d4..a63a7d5e481 100644 --- a/misk/src/test/kotlin/misk/web/ActionScopedWebDispatchTest.kt +++ b/misk/src/test/kotlin/misk/web/ActionScopedWebDispatchTest.kt @@ -18,8 +18,8 @@ import okhttp3.OkHttpClient import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import java.security.Principal -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @MiskTest(startService = true) internal class ActionScopedWebDispatchTest { diff --git a/misk/src/test/kotlin/misk/web/ContentBasedDispatchTest.kt b/misk/src/test/kotlin/misk/web/ContentBasedDispatchTest.kt index ba1a427b5af..e576a985094 100644 --- a/misk/src/test/kotlin/misk/web/ContentBasedDispatchTest.kt +++ b/misk/src/test/kotlin/misk/web/ContentBasedDispatchTest.kt @@ -19,7 +19,7 @@ import okio.ByteString import okio.ByteString.Companion.toByteString import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) internal class ContentBasedDispatchTest { diff --git a/misk/src/test/kotlin/misk/web/CorsFilterTest.kt b/misk/src/test/kotlin/misk/web/CorsFilterTest.kt index 959d094892a..00a48ec1b50 100644 --- a/misk/src/test/kotlin/misk/web/CorsFilterTest.kt +++ b/misk/src/test/kotlin/misk/web/CorsFilterTest.kt @@ -13,7 +13,7 @@ import okhttp3.Request import okhttp3.Response import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) class CorsFilterTest { diff --git a/misk/src/test/kotlin/misk/web/DegradedHealthStressTest.kt b/misk/src/test/kotlin/misk/web/DegradedHealthStressTest.kt index f214ae31e42..eed5f9a3d78 100644 --- a/misk/src/test/kotlin/misk/web/DegradedHealthStressTest.kt +++ b/misk/src/test/kotlin/misk/web/DegradedHealthStressTest.kt @@ -28,7 +28,7 @@ import java.time.Duration import java.util.concurrent.ScheduledExecutorService import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicInteger -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) internal class DegradedHealthStressTest { diff --git a/misk/src/test/kotlin/misk/web/DeterministicRoutingTest.kt b/misk/src/test/kotlin/misk/web/DeterministicRoutingTest.kt index e55ac29566f..bc76afea746 100644 --- a/misk/src/test/kotlin/misk/web/DeterministicRoutingTest.kt +++ b/misk/src/test/kotlin/misk/web/DeterministicRoutingTest.kt @@ -12,7 +12,7 @@ import okhttp3.Request import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import java.util.Collections.shuffle -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) internal class DeterministicRoutingTest { diff --git a/misk/src/test/kotlin/misk/web/GracefulShutdownTest.kt b/misk/src/test/kotlin/misk/web/GracefulShutdownTest.kt index cd32ddd326b..103acbad4f8 100644 --- a/misk/src/test/kotlin/misk/web/GracefulShutdownTest.kt +++ b/misk/src/test/kotlin/misk/web/GracefulShutdownTest.kt @@ -23,8 +23,8 @@ import java.io.IOException import java.time.Duration import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @MiskTest(startService = true) internal class GracefulShutdownTest { diff --git a/misk/src/test/kotlin/misk/web/GzipTest.kt b/misk/src/test/kotlin/misk/web/GzipTest.kt index 4f6fa7214ea..6eecab7575c 100644 --- a/misk/src/test/kotlin/misk/web/GzipTest.kt +++ b/misk/src/test/kotlin/misk/web/GzipTest.kt @@ -18,7 +18,7 @@ import okio.GzipSink import okio.buffer import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) internal class GzipTest : AbstractGzipTest() { diff --git a/misk/src/test/kotlin/misk/web/InvalidActionsTest.kt b/misk/src/test/kotlin/misk/web/InvalidActionsTest.kt index 1bd16c1493d..076c2b61a75 100644 --- a/misk/src/test/kotlin/misk/web/InvalidActionsTest.kt +++ b/misk/src/test/kotlin/misk/web/InvalidActionsTest.kt @@ -15,8 +15,8 @@ import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows import java.time.Duration -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton class InvalidActionsTest { @Test fun failIdenticalActions() { diff --git a/misk/src/test/kotlin/misk/web/JettyHealthCheckTest.kt b/misk/src/test/kotlin/misk/web/JettyHealthCheckTest.kt index 4699e80f27e..f24aa639236 100644 --- a/misk/src/test/kotlin/misk/web/JettyHealthCheckTest.kt +++ b/misk/src/test/kotlin/misk/web/JettyHealthCheckTest.kt @@ -25,8 +25,8 @@ import java.util.concurrent.Phaser import java.util.concurrent.SynchronousQueue import java.util.concurrent.ThreadPoolExecutor import java.util.concurrent.TimeUnit -import javax.inject.Inject -import javax.inject.Qualifier +import jakarta.inject.Inject +import jakarta.inject.Qualifier @MiskTest(startService = true) internal class JettyHealthCheckTest { diff --git a/misk/src/test/kotlin/misk/web/JettyServiceMetricsTest.kt b/misk/src/test/kotlin/misk/web/JettyServiceMetricsTest.kt index b686f325107..a24778f7adc 100644 --- a/misk/src/test/kotlin/misk/web/JettyServiceMetricsTest.kt +++ b/misk/src/test/kotlin/misk/web/JettyServiceMetricsTest.kt @@ -23,7 +23,7 @@ import org.assertj.core.data.Offset import org.eclipse.jetty.util.thread.QueuedThreadPool import org.eclipse.jetty.util.thread.ThreadPool import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) internal class JettyServiceMetricsTest { diff --git a/misk/src/test/kotlin/misk/web/JettyShutdownTest.kt b/misk/src/test/kotlin/misk/web/JettyShutdownTest.kt index 4d502f3fc07..1ecf8603664 100644 --- a/misk/src/test/kotlin/misk/web/JettyShutdownTest.kt +++ b/misk/src/test/kotlin/misk/web/JettyShutdownTest.kt @@ -13,7 +13,7 @@ import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import java.util.concurrent.TimeUnit import java.util.concurrent.TimeoutException -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest internal class ZeroIdleTimeoutTest : AbstractJettyShutdownTest() { diff --git a/misk/src/test/kotlin/misk/web/JsonForProtoEndpointsTest.kt b/misk/src/test/kotlin/misk/web/JsonForProtoEndpointsTest.kt index 5df828bdcf0..5b90d7895bf 100644 --- a/misk/src/test/kotlin/misk/web/JsonForProtoEndpointsTest.kt +++ b/misk/src/test/kotlin/misk/web/JsonForProtoEndpointsTest.kt @@ -27,7 +27,7 @@ import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject /** * Test that we can send JSON to proto and gRPC endpoints. diff --git a/misk/src/test/kotlin/misk/web/SingleRequestThreadTest.kt b/misk/src/test/kotlin/misk/web/SingleRequestThreadTest.kt index d5f1823ca35..6c0349cd9b3 100644 --- a/misk/src/test/kotlin/misk/web/SingleRequestThreadTest.kt +++ b/misk/src/test/kotlin/misk/web/SingleRequestThreadTest.kt @@ -29,8 +29,8 @@ import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.slf4j.MDC import wisp.logging.LogCollector -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton private const val s = "WriteMdc" diff --git a/misk/src/test/kotlin/misk/web/WebDispatchTest.kt b/misk/src/test/kotlin/misk/web/WebDispatchTest.kt index 17080835212..fe23496b461 100644 --- a/misk/src/test/kotlin/misk/web/WebDispatchTest.kt +++ b/misk/src/test/kotlin/misk/web/WebDispatchTest.kt @@ -15,7 +15,7 @@ import okhttp3.Request import okhttp3.RequestBody.Companion.toRequestBody import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject import kotlin.test.assertFailsWith @MiskTest(startService = true) diff --git a/misk/src/test/kotlin/misk/web/WebSocketsTest.kt b/misk/src/test/kotlin/misk/web/WebSocketsTest.kt index 03132aab32f..84e45dac4e7 100644 --- a/misk/src/test/kotlin/misk/web/WebSocketsTest.kt +++ b/misk/src/test/kotlin/misk/web/WebSocketsTest.kt @@ -17,8 +17,8 @@ import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test import wisp.logging.LogCollector -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @MiskTest(startService = true) internal class WebSocketsTest { diff --git a/misk/src/test/kotlin/misk/web/actions/AuthenticationTest.kt b/misk/src/test/kotlin/misk/web/actions/AuthenticationTest.kt index 56a94134644..d4ad53b05a6 100644 --- a/misk/src/test/kotlin/misk/web/actions/AuthenticationTest.kt +++ b/misk/src/test/kotlin/misk/web/actions/AuthenticationTest.kt @@ -20,7 +20,7 @@ import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.ValueSource -import javax.inject.Inject +import jakarta.inject.Inject import kotlin.test.assertFailsWith @MiskTest(startService = true) diff --git a/misk/src/test/kotlin/misk/web/actions/ContentSecurityPolicyHeadersTest.kt b/misk/src/test/kotlin/misk/web/actions/ContentSecurityPolicyHeadersTest.kt index 2f078ac055d..72f11484b28 100644 --- a/misk/src/test/kotlin/misk/web/actions/ContentSecurityPolicyHeadersTest.kt +++ b/misk/src/test/kotlin/misk/web/actions/ContentSecurityPolicyHeadersTest.kt @@ -18,7 +18,7 @@ import okhttp3.OkHttpClient import okhttp3.Request import okhttp3.Response import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject import kotlin.test.assertEquals @MiskTest(startService = true) diff --git a/misk/src/test/kotlin/misk/web/actions/DefaultActionsWorkWithAccessControlModuleTest.kt b/misk/src/test/kotlin/misk/web/actions/DefaultActionsWorkWithAccessControlModuleTest.kt index d4405e738bc..2bee381bccf 100644 --- a/misk/src/test/kotlin/misk/web/actions/DefaultActionsWorkWithAccessControlModuleTest.kt +++ b/misk/src/test/kotlin/misk/web/actions/DefaultActionsWorkWithAccessControlModuleTest.kt @@ -7,7 +7,7 @@ import misk.security.authz.MiskCallerAuthenticator import misk.testing.MiskTest import misk.testing.MiskTestModule import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) internal class DefaultActionsWorkWithAccessControlModuleTest { diff --git a/misk/src/test/kotlin/misk/web/actions/GrpcBindingActionTest.kt b/misk/src/test/kotlin/misk/web/actions/GrpcBindingActionTest.kt index d0a1e4d7650..2e2b99dd394 100644 --- a/misk/src/test/kotlin/misk/web/actions/GrpcBindingActionTest.kt +++ b/misk/src/test/kotlin/misk/web/actions/GrpcBindingActionTest.kt @@ -16,8 +16,8 @@ import misk.web.jetty.JettyService import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @MiskTest(startService = true) class GrpcBindingActionTest { diff --git a/misk/src/test/kotlin/misk/web/actions/LivenessCheckActionTest.kt b/misk/src/test/kotlin/misk/web/actions/LivenessCheckActionTest.kt index e72203eda59..f39463ffa9e 100644 --- a/misk/src/test/kotlin/misk/web/actions/LivenessCheckActionTest.kt +++ b/misk/src/test/kotlin/misk/web/actions/LivenessCheckActionTest.kt @@ -9,7 +9,7 @@ import misk.testing.MiskTestModule import misk.web.WebActionModule import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest class LivenessCheckActionTest { diff --git a/misk/src/test/kotlin/misk/web/actions/NotFoundActionTest.kt b/misk/src/test/kotlin/misk/web/actions/NotFoundActionTest.kt index 747611eb091..9767fd002cd 100644 --- a/misk/src/test/kotlin/misk/web/actions/NotFoundActionTest.kt +++ b/misk/src/test/kotlin/misk/web/actions/NotFoundActionTest.kt @@ -20,7 +20,7 @@ import okhttp3.Request import okhttp3.RequestBody.Companion.toRequestBody import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) class NotFoundActionTest { diff --git a/misk/src/test/kotlin/misk/web/actions/ReadinessCheckActionTest.kt b/misk/src/test/kotlin/misk/web/actions/ReadinessCheckActionTest.kt index bcff4791b5b..9dc43dfedfd 100644 --- a/misk/src/test/kotlin/misk/web/actions/ReadinessCheckActionTest.kt +++ b/misk/src/test/kotlin/misk/web/actions/ReadinessCheckActionTest.kt @@ -11,7 +11,7 @@ import misk.testing.MiskTestModule import misk.web.WebActionModule import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest class ReadinessCheckActionTest { diff --git a/misk/src/test/kotlin/misk/web/actions/ResponseContentTypeTest.kt b/misk/src/test/kotlin/misk/web/actions/ResponseContentTypeTest.kt index d8b76079373..17e679c3527 100644 --- a/misk/src/test/kotlin/misk/web/actions/ResponseContentTypeTest.kt +++ b/misk/src/test/kotlin/misk/web/actions/ResponseContentTypeTest.kt @@ -18,8 +18,8 @@ import okhttp3.Request import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import java.nio.charset.Charset -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @MiskTest(startService = true) class ResponseContentTypeTest { diff --git a/misk/src/test/kotlin/misk/web/actions/StatusActionTest.kt b/misk/src/test/kotlin/misk/web/actions/StatusActionTest.kt index 782164dd9af..2f0e9302526 100644 --- a/misk/src/test/kotlin/misk/web/actions/StatusActionTest.kt +++ b/misk/src/test/kotlin/misk/web/actions/StatusActionTest.kt @@ -13,7 +13,7 @@ import misk.testing.MiskTestModule import misk.web.WebActionModule import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest class StatusActionTest { diff --git a/misk/src/test/kotlin/misk/web/actions/SupportedHttpMethodsTest.kt b/misk/src/test/kotlin/misk/web/actions/SupportedHttpMethodsTest.kt index 49714936487..9503120b08f 100644 --- a/misk/src/test/kotlin/misk/web/actions/SupportedHttpMethodsTest.kt +++ b/misk/src/test/kotlin/misk/web/actions/SupportedHttpMethodsTest.kt @@ -19,7 +19,7 @@ import okhttp3.Request import okhttp3.RequestBody.Companion.toRequestBody import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject // Tests all supported HTTP methods. @MiskTest(startService = true) diff --git a/misk/src/test/kotlin/misk/web/actions/TestWebActionModule.kt b/misk/src/test/kotlin/misk/web/actions/TestWebActionModule.kt index e147f5e9375..3d198487c8c 100644 --- a/misk/src/test/kotlin/misk/web/actions/TestWebActionModule.kt +++ b/misk/src/test/kotlin/misk/web/actions/TestWebActionModule.kt @@ -25,7 +25,7 @@ import misk.web.WebServerTestingModule import misk.web.interceptors.LogRequestResponse import misk.web.mediatype.MediaTypes import misk.web.toResponseBody -import javax.inject.Inject +import jakarta.inject.Inject // Common module for web action-related tests to use to use that bind up some sample web actions class TestWebActionModule : KAbstractModule() { diff --git a/misk/src/test/kotlin/misk/web/concurrencylimits/ConcurrencyLimitsStrategyTest.kt b/misk/src/test/kotlin/misk/web/concurrencylimits/ConcurrencyLimitsStrategyTest.kt index 978b53adf9a..fb2a633441e 100644 --- a/misk/src/test/kotlin/misk/web/concurrencylimits/ConcurrencyLimitsStrategyTest.kt +++ b/misk/src/test/kotlin/misk/web/concurrencylimits/ConcurrencyLimitsStrategyTest.kt @@ -24,7 +24,7 @@ import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test import wisp.deployment.Deployment import wisp.deployment.TESTING -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) class ConcurrencyLimitsStrategyTest { diff --git a/misk/src/test/kotlin/misk/web/exceptions/ExceptionMapperTest.kt b/misk/src/test/kotlin/misk/web/exceptions/ExceptionMapperTest.kt index 3a7db73e4eb..f832d117468 100644 --- a/misk/src/test/kotlin/misk/web/exceptions/ExceptionMapperTest.kt +++ b/misk/src/test/kotlin/misk/web/exceptions/ExceptionMapperTest.kt @@ -27,7 +27,7 @@ import wisp.logging.LogCollector import java.net.HttpURLConnection.HTTP_FORBIDDEN import java.net.HttpURLConnection.HTTP_INTERNAL_ERROR import java.net.HttpURLConnection.HTTP_UNAVAILABLE -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) internal class ExceptionMapperTest { diff --git a/misk/src/test/kotlin/misk/web/extractors/FormValueParameterTest.kt b/misk/src/test/kotlin/misk/web/extractors/FormValueParameterTest.kt index f98832f3894..70ca64721e0 100644 --- a/misk/src/test/kotlin/misk/web/extractors/FormValueParameterTest.kt +++ b/misk/src/test/kotlin/misk/web/extractors/FormValueParameterTest.kt @@ -16,7 +16,7 @@ import okhttp3.OkHttpClient import okhttp3.Request import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) internal class FormValueParameterTest { diff --git a/misk/src/test/kotlin/misk/web/extractors/PathParamDispatchTest.kt b/misk/src/test/kotlin/misk/web/extractors/PathParamDispatchTest.kt index 9d2f9b566db..b05749cab8d 100644 --- a/misk/src/test/kotlin/misk/web/extractors/PathParamDispatchTest.kt +++ b/misk/src/test/kotlin/misk/web/extractors/PathParamDispatchTest.kt @@ -17,7 +17,7 @@ import okhttp3.OkHttpClient import okhttp3.Request import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) internal class PathParamDispatchTest { diff --git a/misk/src/test/kotlin/misk/web/extractors/QueryStringRequestTest.kt b/misk/src/test/kotlin/misk/web/extractors/QueryStringRequestTest.kt index 6bfc2a1020b..5def00df369 100644 --- a/misk/src/test/kotlin/misk/web/extractors/QueryStringRequestTest.kt +++ b/misk/src/test/kotlin/misk/web/extractors/QueryStringRequestTest.kt @@ -16,7 +16,7 @@ import okhttp3.OkHttpClient import okhttp3.Request import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) internal class QueryStringRequestTest { diff --git a/misk/src/test/kotlin/misk/web/interceptors/ConcurrencyLimitsInterceptorTest.kt b/misk/src/test/kotlin/misk/web/interceptors/ConcurrencyLimitsInterceptorTest.kt index eb277cb9d44..762900edc6d 100644 --- a/misk/src/test/kotlin/misk/web/interceptors/ConcurrencyLimitsInterceptorTest.kt +++ b/misk/src/test/kotlin/misk/web/interceptors/ConcurrencyLimitsInterceptorTest.kt @@ -34,8 +34,8 @@ import wisp.logging.LogCollector import java.time.Clock import java.time.Duration import java.time.temporal.ChronoUnit -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @MiskTest(startService = true) class ConcurrencyLimitsInterceptorTest { diff --git a/misk/src/test/kotlin/misk/web/interceptors/LogRateLimiterTest.kt b/misk/src/test/kotlin/misk/web/interceptors/LogRateLimiterTest.kt index 0bba2005d2a..8ca70700d66 100644 --- a/misk/src/test/kotlin/misk/web/interceptors/LogRateLimiterTest.kt +++ b/misk/src/test/kotlin/misk/web/interceptors/LogRateLimiterTest.kt @@ -10,7 +10,7 @@ import misk.testing.MiskTestModule import misk.web.interceptors.LogRateLimiter.LogBucketId import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) class LogRateLimiterTest { diff --git a/misk/src/test/kotlin/misk/web/interceptors/MetricsInterceptorTest.kt b/misk/src/test/kotlin/misk/web/interceptors/MetricsInterceptorTest.kt index cc52cbe4263..412d0433ddc 100644 --- a/misk/src/test/kotlin/misk/web/interceptors/MetricsInterceptorTest.kt +++ b/misk/src/test/kotlin/misk/web/interceptors/MetricsInterceptorTest.kt @@ -21,7 +21,7 @@ import okhttp3.OkHttpClient import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) class MetricsInterceptorTest { diff --git a/misk/src/test/kotlin/misk/web/interceptors/RequestLogContextInterceptorTest.kt b/misk/src/test/kotlin/misk/web/interceptors/RequestLogContextInterceptorTest.kt index 9f0425d5e8c..79085db5f7e 100644 --- a/misk/src/test/kotlin/misk/web/interceptors/RequestLogContextInterceptorTest.kt +++ b/misk/src/test/kotlin/misk/web/interceptors/RequestLogContextInterceptorTest.kt @@ -21,7 +21,7 @@ import okhttp3.OkHttpClient import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.slf4j.MDC -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) internal class RequestLogContextInterceptorTest { diff --git a/misk/src/test/kotlin/misk/web/interceptors/RequestLoggingInterceptorTest.kt b/misk/src/test/kotlin/misk/web/interceptors/RequestLoggingInterceptorTest.kt index 06cb0e6233a..2d2c52046f2 100644 --- a/misk/src/test/kotlin/misk/web/interceptors/RequestLoggingInterceptorTest.kt +++ b/misk/src/test/kotlin/misk/web/interceptors/RequestLoggingInterceptorTest.kt @@ -32,7 +32,7 @@ import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import wisp.logging.LogCollector import java.util.concurrent.TimeUnit -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) internal class RequestLoggingInterceptorTest { diff --git a/misk/src/test/kotlin/misk/web/interceptors/TracingInterceptorTest.kt b/misk/src/test/kotlin/misk/web/interceptors/TracingInterceptorTest.kt index 45f3d999b38..f2d95ffe01e 100644 --- a/misk/src/test/kotlin/misk/web/interceptors/TracingInterceptorTest.kt +++ b/misk/src/test/kotlin/misk/web/interceptors/TracingInterceptorTest.kt @@ -28,7 +28,7 @@ import wisp.tracing.traceWithSpan import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import java.net.HttpURLConnection -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) class TracingInterceptorTest { diff --git a/misk/src/test/kotlin/misk/web/interceptors/UserInterceptorTest.kt b/misk/src/test/kotlin/misk/web/interceptors/UserInterceptorTest.kt index 84a23eb3417..38625b1bbb9 100644 --- a/misk/src/test/kotlin/misk/web/interceptors/UserInterceptorTest.kt +++ b/misk/src/test/kotlin/misk/web/interceptors/UserInterceptorTest.kt @@ -23,7 +23,7 @@ import okhttp3.OkHttpClient import okhttp3.Request import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) class UserInterceptorTest { diff --git a/misk/src/test/kotlin/misk/web/jetty/WebActionsServletTest.kt b/misk/src/test/kotlin/misk/web/jetty/WebActionsServletTest.kt index 8ff450b3905..0eed9cb3c62 100644 --- a/misk/src/test/kotlin/misk/web/jetty/WebActionsServletTest.kt +++ b/misk/src/test/kotlin/misk/web/jetty/WebActionsServletTest.kt @@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test import wisp.client.UnixDomainSocketFactory import java.io.File import java.util.UUID -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) class WebActionsServletTest { diff --git a/misk/src/test/kotlin/misk/web/marshal/JsonRequestTest.kt b/misk/src/test/kotlin/misk/web/marshal/JsonRequestTest.kt index c7fce95a50f..5ebe9801738 100644 --- a/misk/src/test/kotlin/misk/web/marshal/JsonRequestTest.kt +++ b/misk/src/test/kotlin/misk/web/marshal/JsonRequestTest.kt @@ -20,7 +20,7 @@ import okio.source import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import java.io.ByteArrayInputStream -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) internal class JsonRequestTest { diff --git a/misk/src/test/kotlin/misk/web/marshal/JsonResponseTest.kt b/misk/src/test/kotlin/misk/web/marshal/JsonResponseTest.kt index 66f4dfb53e1..fe8da732553 100644 --- a/misk/src/test/kotlin/misk/web/marshal/JsonResponseTest.kt +++ b/misk/src/test/kotlin/misk/web/marshal/JsonResponseTest.kt @@ -17,7 +17,7 @@ import okio.ByteString import okio.ByteString.Companion.encodeUtf8 import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) internal class JsonResponseTest { diff --git a/misk/src/test/kotlin/misk/web/marshal/MultipartRequestTest.kt b/misk/src/test/kotlin/misk/web/marshal/MultipartRequestTest.kt index 0a0e581e4d1..9ea51c5261c 100644 --- a/misk/src/test/kotlin/misk/web/marshal/MultipartRequestTest.kt +++ b/misk/src/test/kotlin/misk/web/marshal/MultipartRequestTest.kt @@ -23,7 +23,7 @@ import okhttp3.RequestBody.Companion.toRequestBody import okio.Buffer import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) internal class MultipartRequestTest { diff --git a/misk/src/test/kotlin/misk/web/marshal/PlainTextRequestTest.kt b/misk/src/test/kotlin/misk/web/marshal/PlainTextRequestTest.kt index 3b4d0479f8b..7c5c86aca49 100644 --- a/misk/src/test/kotlin/misk/web/marshal/PlainTextRequestTest.kt +++ b/misk/src/test/kotlin/misk/web/marshal/PlainTextRequestTest.kt @@ -16,7 +16,7 @@ import misk.web.mediatype.MediaTypes import okio.ByteString import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) internal class PlainTextRequestTest { diff --git a/misk/src/test/kotlin/misk/web/marshal/PlainTextResponseTest.kt b/misk/src/test/kotlin/misk/web/marshal/PlainTextResponseTest.kt index 5dd183beac9..32aa045eab7 100644 --- a/misk/src/test/kotlin/misk/web/marshal/PlainTextResponseTest.kt +++ b/misk/src/test/kotlin/misk/web/marshal/PlainTextResponseTest.kt @@ -17,7 +17,7 @@ import okio.ByteString import okio.ByteString.Companion.encodeUtf8 import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) internal class PlainTextResponseTest { diff --git a/misk/src/test/kotlin/misk/web/marshal/UnspecifiedContentTypeTest.kt b/misk/src/test/kotlin/misk/web/marshal/UnspecifiedContentTypeTest.kt index b97322c5633..4b921a0b151 100644 --- a/misk/src/test/kotlin/misk/web/marshal/UnspecifiedContentTypeTest.kt +++ b/misk/src/test/kotlin/misk/web/marshal/UnspecifiedContentTypeTest.kt @@ -27,7 +27,7 @@ import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.junit.jupiter.api.TestTemplate import java.io.ByteArrayInputStream -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) internal class UnspecifiedContentTypeTest { diff --git a/misk/src/test/kotlin/misk/web/proxy/WebProxyActionTest.kt b/misk/src/test/kotlin/misk/web/proxy/WebProxyActionTest.kt index d10529cad1d..e069aa0bb9c 100644 --- a/misk/src/test/kotlin/misk/web/proxy/WebProxyActionTest.kt +++ b/misk/src/test/kotlin/misk/web/proxy/WebProxyActionTest.kt @@ -25,8 +25,8 @@ import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import java.net.HttpURLConnection import java.util.concurrent.TimeUnit -import javax.inject.Inject -import javax.inject.Provider +import jakarta.inject.Inject +import com.google.inject.Provider import kotlin.test.assertFailsWith @MiskTest(startService = true) diff --git a/misk/src/test/kotlin/misk/web/resource/StaticResourceActionTest.kt b/misk/src/test/kotlin/misk/web/resource/StaticResourceActionTest.kt index b4dfb38ba4f..278f32da2c2 100644 --- a/misk/src/test/kotlin/misk/web/resource/StaticResourceActionTest.kt +++ b/misk/src/test/kotlin/misk/web/resource/StaticResourceActionTest.kt @@ -23,8 +23,8 @@ import okhttp3.OkHttpClient import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test -import javax.inject.Inject -import javax.inject.Named +import jakarta.inject.Inject +import jakarta.inject.Named import kotlin.test.assertFailsWith @MiskTest(startService = true) diff --git a/misk/src/test/kotlin/misk/web/ssl/Http2ConnectivityTest.kt b/misk/src/test/kotlin/misk/web/ssl/Http2ConnectivityTest.kt index 7f9bccc90ca..1df052b3c81 100644 --- a/misk/src/test/kotlin/misk/web/ssl/Http2ConnectivityTest.kt +++ b/misk/src/test/kotlin/misk/web/ssl/Http2ConnectivityTest.kt @@ -48,8 +48,8 @@ import java.io.IOException import java.net.SocketTimeoutException import java.util.concurrent.ArrayBlockingQueue import java.util.concurrent.TimeUnit -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import javax.servlet.http.HttpServletRequest import kotlin.test.assertFailsWith diff --git a/misk/src/test/kotlin/misk/web/ssl/JceksSslClientServerTest.kt b/misk/src/test/kotlin/misk/web/ssl/JceksSslClientServerTest.kt index 3e45cd3741b..4af26e9eaa6 100644 --- a/misk/src/test/kotlin/misk/web/ssl/JceksSslClientServerTest.kt +++ b/misk/src/test/kotlin/misk/web/ssl/JceksSslClientServerTest.kt @@ -34,8 +34,8 @@ import misk.web.mediatype.MediaTypes import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import javax.net.ssl.SSLHandshakeException import kotlin.test.assertFailsWith diff --git a/misk/src/test/kotlin/misk/web/ssl/PemSslClientServerTest.kt b/misk/src/test/kotlin/misk/web/ssl/PemSslClientServerTest.kt index 23f20235ea3..6a3b8430c39 100644 --- a/misk/src/test/kotlin/misk/web/ssl/PemSslClientServerTest.kt +++ b/misk/src/test/kotlin/misk/web/ssl/PemSslClientServerTest.kt @@ -34,8 +34,8 @@ import misk.web.mediatype.MediaTypes import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import javax.net.ssl.SSLHandshakeException import kotlin.test.assertFailsWith diff --git a/misk/src/test/kotlin/misk/web/uds/UDSHttp2ConnectivityTest.kt b/misk/src/test/kotlin/misk/web/uds/UDSHttp2ConnectivityTest.kt index 72807b9b57b..e89a31d7cf4 100644 --- a/misk/src/test/kotlin/misk/web/uds/UDSHttp2ConnectivityTest.kt +++ b/misk/src/test/kotlin/misk/web/uds/UDSHttp2ConnectivityTest.kt @@ -27,8 +27,8 @@ import org.junit.jupiter.api.Test import wisp.client.UnixDomainSocketFactory import java.io.File import java.util.UUID -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @MiskTest(startService = true) class UDSHttp2ConnectivityTest { diff --git a/samples/exemplar/build.gradle.kts b/samples/exemplar/build.gradle.kts index a7a0a8b2571..8c1a565f52b 100644 --- a/samples/exemplar/build.gradle.kts +++ b/samples/exemplar/build.gradle.kts @@ -13,7 +13,7 @@ dependencies { implementation(Dependencies.findBugs) implementation(Dependencies.guava) implementation(Dependencies.guice) - implementation(Dependencies.javaxInject) + implementation(Dependencies.jakartaInject) implementation(Dependencies.kotlinxHtml) implementation(Dependencies.okHttp) implementation(Dependencies.okio) diff --git a/samples/exemplar/src/main/java/com/squareup/exemplar/HelloJavaAction.java b/samples/exemplar/src/main/java/com/squareup/exemplar/HelloJavaAction.java index 9e30da70cfe..2017d173c01 100644 --- a/samples/exemplar/src/main/java/com/squareup/exemplar/HelloJavaAction.java +++ b/samples/exemplar/src/main/java/com/squareup/exemplar/HelloJavaAction.java @@ -1,6 +1,6 @@ package com.squareup.exemplar; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import misk.web.Get; import misk.web.PathParam; import misk.web.RequestHeaders; diff --git a/samples/exemplar/src/main/kotlin/com/squareup/exemplar/actions/DownloadAFileWebAction.kt b/samples/exemplar/src/main/kotlin/com/squareup/exemplar/actions/DownloadAFileWebAction.kt index 8ff036f9292..b6a15952cb0 100644 --- a/samples/exemplar/src/main/kotlin/com/squareup/exemplar/actions/DownloadAFileWebAction.kt +++ b/samples/exemplar/src/main/kotlin/com/squareup/exemplar/actions/DownloadAFileWebAction.kt @@ -9,8 +9,8 @@ import misk.web.ResponseContentType import misk.web.actions.WebAction import misk.web.mediatype.MediaTypes import okhttp3.Headers.Companion.toHeaders -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton class DownloadAFileWebAction @Inject constructor() : WebAction { diff --git a/samples/exemplar/src/main/kotlin/com/squareup/exemplar/actions/EchoFormAction.kt b/samples/exemplar/src/main/kotlin/com/squareup/exemplar/actions/EchoFormAction.kt index 27f914dc971..7eec07b6f6c 100644 --- a/samples/exemplar/src/main/kotlin/com/squareup/exemplar/actions/EchoFormAction.kt +++ b/samples/exemplar/src/main/kotlin/com/squareup/exemplar/actions/EchoFormAction.kt @@ -8,8 +8,8 @@ import misk.web.RequestContentType import misk.web.ResponseContentType import misk.web.actions.WebAction import misk.web.mediatype.MediaTypes -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton class EchoFormAction @Inject constructor() : WebAction { diff --git a/samples/exemplar/src/main/kotlin/com/squareup/exemplar/actions/HelloWebAction.kt b/samples/exemplar/src/main/kotlin/com/squareup/exemplar/actions/HelloWebAction.kt index b05137e3bfa..5399d20ef34 100644 --- a/samples/exemplar/src/main/kotlin/com/squareup/exemplar/actions/HelloWebAction.kt +++ b/samples/exemplar/src/main/kotlin/com/squareup/exemplar/actions/HelloWebAction.kt @@ -10,8 +10,8 @@ import misk.web.ResponseContentType import misk.web.actions.WebAction import misk.web.mediatype.MediaTypes import okhttp3.Headers -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton class HelloWebAction @Inject constructor( diff --git a/samples/exemplar/src/main/kotlin/com/squareup/exemplar/actions/HelloWebPostAction.kt b/samples/exemplar/src/main/kotlin/com/squareup/exemplar/actions/HelloWebPostAction.kt index 45c7e772a5e..8ba3e111d50 100644 --- a/samples/exemplar/src/main/kotlin/com/squareup/exemplar/actions/HelloWebPostAction.kt +++ b/samples/exemplar/src/main/kotlin/com/squareup/exemplar/actions/HelloWebPostAction.kt @@ -8,8 +8,8 @@ import misk.web.RequestContentType import misk.web.ResponseContentType import misk.web.actions.WebAction import misk.web.mediatype.MediaTypes -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton class HelloWebPostAction @Inject constructor() : WebAction { diff --git a/samples/exemplar/src/main/kotlin/com/squareup/exemplar/actions/HelloWebProtoAction.kt b/samples/exemplar/src/main/kotlin/com/squareup/exemplar/actions/HelloWebProtoAction.kt index 86e45e9ca3c..7d9ad1fd284 100644 --- a/samples/exemplar/src/main/kotlin/com/squareup/exemplar/actions/HelloWebProtoAction.kt +++ b/samples/exemplar/src/main/kotlin/com/squareup/exemplar/actions/HelloWebProtoAction.kt @@ -11,7 +11,7 @@ import misk.web.Response import misk.web.ResponseContentType import misk.web.actions.WebAction import misk.web.mediatype.MediaTypes -import javax.inject.Inject +import jakarta.inject.Inject class HelloWebProtoAction @Inject constructor() : WebAction { @Post("/hello/proto/") diff --git a/samples/exemplar/src/main/kotlin/com/squareup/exemplar/dashboard/ExemplarDashboardModule.kt b/samples/exemplar/src/main/kotlin/com/squareup/exemplar/dashboard/ExemplarDashboardModule.kt index 4a15a2bda47..ec78b06578c 100644 --- a/samples/exemplar/src/main/kotlin/com/squareup/exemplar/dashboard/ExemplarDashboardModule.kt +++ b/samples/exemplar/src/main/kotlin/com/squareup/exemplar/dashboard/ExemplarDashboardModule.kt @@ -20,7 +20,7 @@ import misk.web.dashboard.MiskWebTheme import misk.web.metadata.config.ConfigMetadataAction import misk.web.resources.StaticResourceAction import misk.web.resources.StaticResourceEntry -import javax.inject.Qualifier +import jakarta.inject.Qualifier class ExemplarDashboardModule : KAbstractModule() { override fun configure() { diff --git a/samples/exemplar/src/main/kotlin/com/squareup/exemplar/dashboard/admin/AlphaIndexAction.kt b/samples/exemplar/src/main/kotlin/com/squareup/exemplar/dashboard/admin/AlphaIndexAction.kt index d7184a10a67..d14ee324f36 100644 --- a/samples/exemplar/src/main/kotlin/com/squareup/exemplar/dashboard/admin/AlphaIndexAction.kt +++ b/samples/exemplar/src/main/kotlin/com/squareup/exemplar/dashboard/admin/AlphaIndexAction.kt @@ -22,8 +22,8 @@ import misk.web.actions.WebAction import misk.web.dashboard.AdminDashboardAccess import misk.web.mediatype.MediaTypes import misk.web.v2.DashboardPageLayout -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton class AlphaIndexAction @Inject constructor( diff --git a/samples/exemplar/src/main/kotlin/com/squareup/exemplar/dashboard/frontend/EcommerceLandingPage.kt b/samples/exemplar/src/main/kotlin/com/squareup/exemplar/dashboard/frontend/EcommerceLandingPage.kt index 05186003e68..c7b8ebd208a 100644 --- a/samples/exemplar/src/main/kotlin/com/squareup/exemplar/dashboard/frontend/EcommerceLandingPage.kt +++ b/samples/exemplar/src/main/kotlin/com/squareup/exemplar/dashboard/frontend/EcommerceLandingPage.kt @@ -34,8 +34,8 @@ import misk.web.dashboard.AdminDashboardAccess import misk.web.dashboard.HtmlLayout import misk.web.mediatype.MediaTypes import wisp.deployment.Deployment -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * Example page from Tailwind UI diff --git a/samples/exemplar/src/main/kotlin/com/squareup/exemplar/dashboard/frontend/IndexPage.kt b/samples/exemplar/src/main/kotlin/com/squareup/exemplar/dashboard/frontend/IndexPage.kt index 4eae64e9ec7..7dc858c954e 100644 --- a/samples/exemplar/src/main/kotlin/com/squareup/exemplar/dashboard/frontend/IndexPage.kt +++ b/samples/exemplar/src/main/kotlin/com/squareup/exemplar/dashboard/frontend/IndexPage.kt @@ -17,8 +17,8 @@ import misk.web.dashboard.AdminDashboardAccess import misk.web.dashboard.HtmlLayout import misk.web.mediatype.MediaTypes import wisp.deployment.Deployment -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * Example page from Tailwind UI diff --git a/samples/exemplar/src/main/kotlin/com/squareup/exemplar/dashboard/frontend/SimplePage.kt b/samples/exemplar/src/main/kotlin/com/squareup/exemplar/dashboard/frontend/SimplePage.kt index 9f38af20646..6fd2c7f4e27 100644 --- a/samples/exemplar/src/main/kotlin/com/squareup/exemplar/dashboard/frontend/SimplePage.kt +++ b/samples/exemplar/src/main/kotlin/com/squareup/exemplar/dashboard/frontend/SimplePage.kt @@ -11,8 +11,8 @@ import misk.web.actions.WebAction import misk.web.dashboard.AdminDashboardAccess import misk.web.dashboard.HtmlLayout import misk.web.mediatype.MediaTypes -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * Example page from Tailwind UI diff --git a/samples/exemplar/src/main/kotlin/com/squareup/exemplar/dashboard/support/SupportBravoIndexAction.kt b/samples/exemplar/src/main/kotlin/com/squareup/exemplar/dashboard/support/SupportBravoIndexAction.kt index 5944f7eff41..d0a237203ea 100644 --- a/samples/exemplar/src/main/kotlin/com/squareup/exemplar/dashboard/support/SupportBravoIndexAction.kt +++ b/samples/exemplar/src/main/kotlin/com/squareup/exemplar/dashboard/support/SupportBravoIndexAction.kt @@ -7,8 +7,8 @@ import misk.web.actions.WebAction import misk.web.dashboard.AdminDashboardAccess import misk.web.mediatype.MediaTypes import misk.web.v2.DashboardPageLayout -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton class SupportBravoIndexAction @Inject constructor( diff --git a/samples/exemplar/src/main/kotlin/com/squareup/exemplar/dashboard/support/SupportDashboardIndexAction.kt b/samples/exemplar/src/main/kotlin/com/squareup/exemplar/dashboard/support/SupportDashboardIndexAction.kt index 7bcdb002c8d..6767920e13f 100644 --- a/samples/exemplar/src/main/kotlin/com/squareup/exemplar/dashboard/support/SupportDashboardIndexAction.kt +++ b/samples/exemplar/src/main/kotlin/com/squareup/exemplar/dashboard/support/SupportDashboardIndexAction.kt @@ -7,8 +7,8 @@ import misk.web.actions.WebAction import misk.web.dashboard.AdminDashboardAccess import misk.web.mediatype.MediaTypes import misk.web.v2.DashboardPageLayout -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton class SupportDashboardIndexAction @Inject constructor( diff --git a/samples/exemplar/src/test/kotlin/com/squareup/exemplar/ExemplarCompilationTests.kt b/samples/exemplar/src/test/kotlin/com/squareup/exemplar/ExemplarCompilationTests.kt index be54917c8ba..0d0e44f6330 100644 --- a/samples/exemplar/src/test/kotlin/com/squareup/exemplar/ExemplarCompilationTests.kt +++ b/samples/exemplar/src/test/kotlin/com/squareup/exemplar/ExemplarCompilationTests.kt @@ -8,7 +8,7 @@ import misk.tokens.FakeTokenGenerator import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import java.time.Instant -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest class ExemplarCompilationTests { diff --git a/samples/exemplar/src/test/kotlin/com/squareup/exemplar/HelloWebActionTest.kt b/samples/exemplar/src/test/kotlin/com/squareup/exemplar/HelloWebActionTest.kt index 2e5694e5221..77aa8253b2d 100644 --- a/samples/exemplar/src/test/kotlin/com/squareup/exemplar/HelloWebActionTest.kt +++ b/samples/exemplar/src/test/kotlin/com/squareup/exemplar/HelloWebActionTest.kt @@ -8,7 +8,7 @@ import misk.testing.MiskTestModule import okhttp3.Headers.Companion.headersOf import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest class HelloWebActionTest { diff --git a/samples/exemplarchat/build.gradle.kts b/samples/exemplarchat/build.gradle.kts index 6775622d987..4fa7df880fd 100644 --- a/samples/exemplarchat/build.gradle.kts +++ b/samples/exemplarchat/build.gradle.kts @@ -11,7 +11,7 @@ application { } dependencies { - implementation(Dependencies.javaxInject) + implementation(Dependencies.jakartaInject) implementation(project(":wisp:wisp-config")) implementation(project(":misk")) implementation(project(":misk-actions")) diff --git a/samples/exemplarchat/src/main/kotlin/com/squareup/chat/actions/ChatWebSocketAction.kt b/samples/exemplarchat/src/main/kotlin/com/squareup/chat/actions/ChatWebSocketAction.kt index 2861107dd2d..a5f429b68c5 100644 --- a/samples/exemplarchat/src/main/kotlin/com/squareup/chat/actions/ChatWebSocketAction.kt +++ b/samples/exemplarchat/src/main/kotlin/com/squareup/chat/actions/ChatWebSocketAction.kt @@ -7,8 +7,8 @@ import misk.web.actions.WebAction import misk.web.actions.WebSocket import misk.web.actions.WebSocketListener import redis.clients.jedis.JedisPubSub -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton import kotlin.concurrent.thread /** diff --git a/samples/exemplarchat/src/main/kotlin/com/squareup/chat/actions/ToggleManualHealthCheckAction.kt b/samples/exemplarchat/src/main/kotlin/com/squareup/chat/actions/ToggleManualHealthCheckAction.kt index 206d56c9620..e889657f004 100644 --- a/samples/exemplarchat/src/main/kotlin/com/squareup/chat/actions/ToggleManualHealthCheckAction.kt +++ b/samples/exemplarchat/src/main/kotlin/com/squareup/chat/actions/ToggleManualHealthCheckAction.kt @@ -5,8 +5,8 @@ import misk.web.Post import misk.web.QueryParam import misk.web.Response import misk.web.actions.WebAction -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton class ToggleManualHealthCheckAction @Inject constructor() : WebAction { diff --git a/samples/exemplarchat/src/main/kotlin/com/squareup/chat/healthchecks/ManualHealthCheck.kt b/samples/exemplarchat/src/main/kotlin/com/squareup/chat/healthchecks/ManualHealthCheck.kt index 993ba1bd3e2..4f61a5fcf5b 100644 --- a/samples/exemplarchat/src/main/kotlin/com/squareup/chat/healthchecks/ManualHealthCheck.kt +++ b/samples/exemplarchat/src/main/kotlin/com/squareup/chat/healthchecks/ManualHealthCheck.kt @@ -2,7 +2,7 @@ package com.squareup.chat.healthchecks import misk.healthchecks.HealthCheck import misk.healthchecks.HealthStatus -import javax.inject.Singleton +import jakarta.inject.Singleton @Singleton class ManualHealthCheck : HealthCheck { diff --git a/samples/exemplarchat/src/test/kotlin/com/squareup/chat/ChatWebSocketActionTest.kt b/samples/exemplarchat/src/test/kotlin/com/squareup/chat/ChatWebSocketActionTest.kt index f4deb95e0a5..50314763b52 100644 --- a/samples/exemplarchat/src/test/kotlin/com/squareup/chat/ChatWebSocketActionTest.kt +++ b/samples/exemplarchat/src/test/kotlin/com/squareup/chat/ChatWebSocketActionTest.kt @@ -15,7 +15,7 @@ import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import redis.clients.jedis.JedisPoolConfig import wisp.deployment.TESTING -import javax.inject.Inject +import jakarta.inject.Inject @MiskTest(startService = true) class ChatWebSocketActionTest { diff --git a/settings.gradle.kts b/settings.gradle.kts index e1e69b1c0d9..09dcbee0ce8 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -64,6 +64,7 @@ include(":misk-hibernate") include(":misk-hibernate-testing") include(":misk-hotwire") include(":misk-inject") +include(":misk-inject:misk-inject-guice7-test") include(":misk-jdbc") include(":misk-jdbc-testing") include(":misk-jobqueue")