TouchInstinct
/
Backend-common
308
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stop using qualifier as bean-name specifier

This commit is contained in:
Korna 2022-11-08 13:05:45 +03:00
parent e4e3690df8
commit 7594f4acc0
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
push-message-provider-fcm/src/main/kotlin/ru/touchin/push/message/provider/fcm/configurations/PushMessageProviderFcmConfiguration.kt
View File

@ -25,6 +25,7 @@ class PushMessageProviderFcmConfiguration {
@Bean
fun firebaseMessaging(
properties: PushMessageProviderFcmProperties,
@Qualifier("push-message-provider.fcm.credentials-object-mapper")
objectMapper: ObjectMapper
): FirebaseMessaging {
val credentials = when {
@ -60,8 +61,7 @@ class PushMessageProviderFcmConfiguration {
return FirebaseMessaging.getInstance(firebaseApp)
}
@Bean
@Qualifier("push-message-provider.fcm.auth")
@Bean("push-message-provider.fcm.auth")
fun simpleDateFormat(): SimpleDateFormat {
return SimpleDateFormat("yyyy-MM-dd HH:mm:ss X", Locale.getDefault())
}

2
push-message-provider-fcm/src/test/kotlin/ru/touchin/push/message/provider/fcm/PushMessageProviderFcmTestApplication.kt
View File

@ -18,7 +18,7 @@ import java.text.SimpleDateFormat
@EnablePushMessageProviderFcm
class PushMessageProviderFcmTestApplication : ApplicationListener<ContextRefreshedEvent> {
@Bean
@Bean("push-message-provider.fcm.credentials-object-mapper")
fun objectMapper(
@Qualifier("push-message-provider.fcm.auth")
simpleDateFormat: SimpleDateFormat

10
push-message-provider-hpk/src/main/kotlin/ru/touchin/push/message/provider/hpk/configurations/PushMessageProviderHpkConfiguration.kt
View File

@ -6,7 +6,6 @@ import com.fasterxml.jackson.databind.ObjectMapper
import com.fasterxml.jackson.databind.PropertyNamingStrategies
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import org.springframework.beans.factory.annotation.Qualifier
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
import org.springframework.boot.context.properties.ConfigurationPropertiesScan
import org.springframework.cache.CacheManager
@ -23,8 +22,7 @@ import ru.touchin.push.message.provider.hpk.services.HmsOauthAccessTokenCacheSer
@Import(value = [PushMessageProviderConfiguration::class])
class PushMessageProviderHpkConfiguration {
@Bean
@Qualifier("push-message-provider.hpk.webclient-objectmapper")
@Bean("push-message-provider.hpk.webclient-objectmapper")
fun webclientObjectMapper(): ObjectMapper {
return jacksonObjectMapper()
.registerModule(JavaTimeModule())
@ -34,8 +32,7 @@ class PushMessageProviderHpkConfiguration {
.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
}
@Bean
@Qualifier("push-message-provider.hpk.client-objectmapper")
@Bean("push-message-provider.hpk.client-objectmapper")
fun clientObjectMapper(): ObjectMapper {
return jacksonObjectMapper()
.registerModule(JavaTimeModule())
@ -43,9 +40,8 @@ class PushMessageProviderHpkConfiguration {
.setSerializationInclusion(JsonInclude.Include.NON_EMPTY)
}
@Bean
@Bean("push-message-provider.hpk.webclient-cachemanager")
@ConditionalOnMissingBean
@Qualifier("push-message-provider.hpk.webclient-cachemanager")
fun cacheManager(): CacheManager {
return SimpleCacheManager().also {
it.setCaches(