Skip to content

Commit f968848

Browse files
adrwadrw
authored
Remove usages of deprecated AsyncKAbstractModule (#3478)
1 parent 2f1c5ee commit f968848

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

‎misk-aws/api/misk-aws.api‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public final class misk/jobqueue/sqs/AwsSqsBatchJobHandlerModule$Companion {
6464
public static synthetic fun create$default (Lmisk/jobqueue/sqs/AwsSqsBatchJobHandlerModule$Companion;Lmisk/jobqueue/QueueName;Lkotlin/reflect/KClass;ZLjava/util/List;ILjava/lang/Object;)Lmisk/jobqueue/sqs/AwsSqsBatchJobHandlerModule;
6565
}
6666

67-
public final class misk/jobqueue/sqs/AwsSqsJobHandlerModule : misk/inject/AsyncKAbstractModule {
67+
public final class misk/jobqueue/sqs/AwsSqsJobHandlerModule : misk/inject/KAbstractModule, misk/inject/AsyncModule {
6868
public static final field Companion Lmisk/jobqueue/sqs/AwsSqsJobHandlerModule$Companion;
6969
public synthetic fun <init> (Lmisk/jobqueue/QueueName;Lkotlin/reflect/KClass;ZLjava/util/List;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
7070
public static final fun create (Lmisk/jobqueue/QueueName;Ljava/lang/Class;)Lmisk/jobqueue/sqs/AwsSqsJobHandlerModule;
@@ -109,7 +109,7 @@ public final class misk/jobqueue/sqs/AwsSqsJobQueueConfig : misk/config/Config {
109109
public final fun getTask_queue ()Lmisk/tasks/RepeatedTaskQueueConfig;
110110
}
111111

112-
public class misk/jobqueue/sqs/AwsSqsJobQueueModule : misk/inject/AsyncKAbstractModule {
112+
public class misk/jobqueue/sqs/AwsSqsJobQueueModule : misk/inject/KAbstractModule, misk/inject/AsyncModule {
113113
public static final field Companion Lmisk/jobqueue/sqs/AwsSqsJobQueueModule$Companion;
114114
public fun <init> (Lmisk/jobqueue/sqs/AwsSqsJobQueueConfig;)V
115115
protected fun configure ()V

‎misk-aws/src/main/kotlin/misk/jobqueue/sqs/AwsSqsJobHandlerModule.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.google.inject.Key
55
import misk.ReadyService
66
import misk.ServiceModule
77
import misk.annotation.ExperimentalMiskApi
8-
import misk.inject.AsyncKAbstractModule
8+
import misk.inject.AsyncModule
99
import misk.inject.KAbstractModule
1010
import misk.inject.toKey
1111
import misk.jobqueue.BatchJobHandler
@@ -22,7 +22,7 @@ class AwsSqsJobHandlerModule<T : JobHandler> private constructor(
2222
private val handler: KClass<T>,
2323
private val installRetryQueue: Boolean,
2424
private val dependsOn: List<Key<out Service>>,
25-
) : AsyncKAbstractModule() {
25+
) : AsyncModule, KAbstractModule() {
2626
override fun configure() {
2727
install(CommonModule(queueName, handler, installRetryQueue))
2828

‎misk-aws/src/main/kotlin/misk/jobqueue/sqs/AwsSqsJobQueueModule.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import misk.cloud.aws.AwsRegion
1919
import misk.concurrent.ExecutorServiceModule
2020
import misk.config.AppName
2121
import misk.feature.FeatureFlags
22-
import misk.inject.AsyncKAbstractModule
22+
import misk.inject.AsyncModule
2323
import misk.inject.KAbstractModule
2424
import misk.inject.keyOf
2525
import misk.jobqueue.JobConsumer
@@ -34,7 +34,7 @@ import wisp.lease.LeaseManager
3434
/** [AwsSqsJobQueueModule] installs job queue support provided by SQS. */
3535
open class AwsSqsJobQueueModule(
3636
private val config: AwsSqsJobQueueConfig
37-
) : AsyncKAbstractModule() {
37+
) : AsyncModule, KAbstractModule() {
3838
override fun configure() {
3939
install(CommonModule(config, ::configureSyncClient, ::configureAsyncClient))
4040

‎misk-aws2-sqs/api/misk-aws2-sqs.api‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public final class misk/aws2/sqs/jobqueue/SqsJobEnqueuer : misk/jobqueue/v2/JobE
6060
public fun enqueueBlocking (Lmisk/jobqueue/QueueName;Ljava/lang/String;Ljava/lang/String;Ljava/time/Duration;Ljava/util/Map;)V
6161
}
6262

63-
public final class misk/aws2/sqs/jobqueue/SqsJobHandlerModule : misk/inject/AsyncKAbstractModule {
63+
public final class misk/aws2/sqs/jobqueue/SqsJobHandlerModule : misk/inject/KAbstractModule, misk/inject/AsyncModule {
6464
public static final field Companion Lmisk/aws2/sqs/jobqueue/SqsJobHandlerModule$Companion;
6565
public synthetic fun <init> (Lmisk/jobqueue/QueueName;Lkotlin/reflect/KClass;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
6666
public fun moduleWhenAsyncDisabled ()Lmisk/inject/KAbstractModule;
@@ -70,7 +70,7 @@ public final class misk/aws2/sqs/jobqueue/SqsJobHandlerModule$Companion {
7070
public final fun create (Lmisk/jobqueue/QueueName;Lkotlin/reflect/KClass;)Lmisk/aws2/sqs/jobqueue/SqsJobHandlerModule;
7171
}
7272

73-
public class misk/aws2/sqs/jobqueue/SqsJobQueueModule : misk/inject/AsyncKAbstractModule {
73+
public class misk/aws2/sqs/jobqueue/SqsJobQueueModule : misk/inject/KAbstractModule, misk/inject/AsyncModule {
7474
public fun <init> (Lmisk/aws2/sqs/jobqueue/config/SqsConfig;)V
7575
public fun <init> (Lmisk/aws2/sqs/jobqueue/config/SqsConfig;Lkotlin/jvm/functions/Function1;)V
7676
public synthetic fun <init> (Lmisk/aws2/sqs/jobqueue/config/SqsConfig;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V

‎misk-aws2-sqs/src/main/kotlin/misk/aws2/sqs/jobqueue/SqsJobHandlerModule.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package misk.aws2.sqs.jobqueue
33
import misk.ReadyService
44
import misk.ServiceModule
55
import misk.annotation.ExperimentalMiskApi
6-
import misk.inject.AsyncKAbstractModule
6+
import misk.inject.AsyncModule
77
import misk.inject.KAbstractModule
88
import misk.jobqueue.QueueName
99
import misk.jobqueue.v2.JobHandler
@@ -15,7 +15,7 @@ import kotlin.reflect.KClass
1515
class SqsJobHandlerModule private constructor(
1616
private val queueName: QueueName,
1717
private val handler: KClass<out JobHandler>,
18-
) : AsyncKAbstractModule() {
18+
) : AsyncModule, KAbstractModule() {
1919
override fun configure() {
2020
install(CommonModule(queueName, handler))
2121
install(ServiceModule<SubscriptionService>().dependsOn<ReadyService>())

‎misk-aws2-sqs/src/main/kotlin/misk/aws2/sqs/jobqueue/SqsJobQueueModule.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import misk.ServiceModule
66
import misk.annotation.ExperimentalMiskApi
77
import misk.aws2.sqs.jobqueue.config.SqsConfig
88
import misk.cloud.aws.AwsRegion
9-
import misk.inject.AsyncKAbstractModule
9+
import misk.inject.AsyncModule
1010
import misk.inject.KAbstractModule
1111
import misk.jobqueue.v2.JobConsumer
1212
import misk.jobqueue.v2.JobEnqueuer
@@ -17,7 +17,7 @@ import software.amazon.awssdk.services.sqs.SqsAsyncClientBuilder
1717
open class SqsJobQueueModule @JvmOverloads constructor(
1818
private val config: SqsConfig,
1919
private val configureClient: SqsAsyncClientBuilder.() -> Unit = {}
20-
) : AsyncKAbstractModule() {
20+
) : AsyncModule, KAbstractModule() {
2121
override fun configure() {
2222
install(CommonModule(config, configureClient))
2323
install(ServiceModule<SqsJobConsumer>().dependsOn<ReadyService>())

0 commit comments

Comments
 (0)