From e4e3690df8be5bd95175d812710800187214d8a1 Mon Sep 17 00:00:00 2001 From: Korna <17145209+Korna@users.noreply.github.com> Date: Tue, 8 Nov 2022 12:51:35 +0300 Subject: [PATCH] Specify bean names for PushMessageNotification converters --- .../provider/fcm/converters/PushTokenMessageConverter.kt | 3 ++- .../provider/hpk/converters/PushTokenMessageConverter.kt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/push-message-provider-fcm/src/main/kotlin/ru/touchin/push/message/provider/fcm/converters/PushTokenMessageConverter.kt b/push-message-provider-fcm/src/main/kotlin/ru/touchin/push/message/provider/fcm/converters/PushTokenMessageConverter.kt index 16f0847..ce0c4b3 100644 --- a/push-message-provider-fcm/src/main/kotlin/ru/touchin/push/message/provider/fcm/converters/PushTokenMessageConverter.kt +++ b/push-message-provider-fcm/src/main/kotlin/ru/touchin/push/message/provider/fcm/converters/PushTokenMessageConverter.kt @@ -5,11 +5,12 @@ import com.google.firebase.messaging.AndroidNotification import com.google.firebase.messaging.ApnsConfig import com.google.firebase.messaging.Aps import com.google.firebase.messaging.Message +import org.springframework.beans.factory.annotation.Qualifier import org.springframework.stereotype.Component import ru.touchin.push.message.provider.dto.PushMessageNotification import ru.touchin.push.message.provider.dto.request.PushTokenMessage -@Component +@Component("push-message-provider.fcm.push-token-message-converter") class PushTokenMessageConverter( private val pushMessageNotificationConverter: PushMessageNotificationConverter ) { diff --git a/push-message-provider-hpk/src/main/kotlin/ru/touchin/push/message/provider/hpk/converters/PushTokenMessageConverter.kt b/push-message-provider-hpk/src/main/kotlin/ru/touchin/push/message/provider/hpk/converters/PushTokenMessageConverter.kt index a0b5237..095f292 100644 --- a/push-message-provider-hpk/src/main/kotlin/ru/touchin/push/message/provider/hpk/converters/PushTokenMessageConverter.kt +++ b/push-message-provider-hpk/src/main/kotlin/ru/touchin/push/message/provider/hpk/converters/PushTokenMessageConverter.kt @@ -12,7 +12,7 @@ import ru.touchin.push.message.provider.hpk.clients.hms_hpk.dto.android.AndroidN import ru.touchin.push.message.provider.hpk.clients.hms_hpk.enums.android.AndroidClickActionType import kotlin.jvm.Throws -@Component +@Component("push-message-provider.hpk.push-token-message-converter") class PushTokenMessageConverter( private val notificationConverter: NotificationConverter, @Qualifier("push-message-provider.hpk.client-objectmapper")