From 25a600cb1d5c316c324834a7a292e408a69bdfb8 Mon Sep 17 00:00:00 2001 From: xb205 <62425964+devxb@users.noreply.github.com> Date: Sat, 6 Apr 2024 17:00:48 +0900 Subject: [PATCH] fix: Primary to reactiveRedisTemplate and reactiveRedisConnection (#132) * fix: Primary to reactiveRedisTemplate and reactiveRedisConnection * docs: version 0.4.0 to 0.4.1 --- README.md | 2 +- gradle.properties | 2 +- gradle/publish.gradle | 2 +- settings.gradle | 2 +- src/main/kotlin/org/rooftop/netx/redis/RedisSagaConfigurer.kt | 4 ++++ 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 6e7d749..998e080 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@
-![version 0.4.0](https://img.shields.io/badge/version-0.4.0-black?labelColor=black&style=flat-square) ![jdk 17](https://img.shields.io/badge/minimum_jdk-17-orange?labelColor=black&style=flat-square) ![load-test](https://img.shields.io/badge/load%20test%2010%2C000%2C000-success-brightgreen?labelColor=black&style=flat-square) +![version 0.4.1](https://img.shields.io/badge/version-0.4.1-black?labelColor=black&style=flat-square) ![jdk 17](https://img.shields.io/badge/minimum_jdk-17-orange?labelColor=black&style=flat-square) ![load-test](https://img.shields.io/badge/load%20test%2010%2C000%2C000-success-brightgreen?labelColor=black&style=flat-square) ![redis--stream](https://img.shields.io/badge/-redis--stream-da2020?style=flat-square&logo=Redis&logoColor=white) **TPS(6,000)** on my Macbook air m2(default options). _[link](#Test1-TPS)_ diff --git a/gradle.properties b/gradle.properties index 1912027..19bc5ad 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ kotlin.code.style=official ### Project ### group=org.rooftopmsa -version=0.4.0 +version=0.4.1 compatibility=17 ### Sonarcloud ### diff --git a/gradle/publish.gradle b/gradle/publish.gradle index c5b1a84..6caab3d 100644 --- a/gradle/publish.gradle +++ b/gradle/publish.gradle @@ -35,7 +35,7 @@ publishing { licenses { license { name = 'The Apache License, Version 2.0' - url = 'https://github.com/devxb/Netx/blob/main/LICENSE' + url = 'https://github.com/devxb/netx/blob/main/LICENSE' } } diff --git a/settings.gradle b/settings.gradle index 161fb4a..b4c1c62 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,3 @@ -rootProject.name = 'Netx' +rootProject.name = 'netx' diff --git a/src/main/kotlin/org/rooftop/netx/redis/RedisSagaConfigurer.kt b/src/main/kotlin/org/rooftop/netx/redis/RedisSagaConfigurer.kt index 9fa72da..0cd41bd 100644 --- a/src/main/kotlin/org/rooftop/netx/redis/RedisSagaConfigurer.kt +++ b/src/main/kotlin/org/rooftop/netx/redis/RedisSagaConfigurer.kt @@ -16,6 +16,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty import org.springframework.context.ApplicationContext import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration +import org.springframework.context.annotation.Primary import org.springframework.data.redis.connection.ReactiveRedisConnectionFactory import org.springframework.data.redis.connection.RedisPassword import org.springframework.data.redis.connection.RedisStandaloneConfiguration @@ -150,6 +151,7 @@ class RedisSagaConfigurer( } @Bean + @Primary @ConditionalOnProperty(prefix = "netx", name = ["mode"], havingValue = "redis") internal fun sagaReactiveRedisTemplate(): ReactiveRedisTemplate { val keySerializer = StringRedisSerializer() @@ -165,6 +167,7 @@ class RedisSagaConfigurer( } @Bean + @Primary @ConditionalOnProperty(prefix = "netx", name = ["mode"], havingValue = "redis") internal fun reactiveRedisTemplate(): ReactiveRedisTemplate { val keySerializer = StringRedisSerializer() @@ -179,6 +182,7 @@ class RedisSagaConfigurer( } @Bean + @Primary @ConditionalOnProperty(prefix = "netx", name = ["mode"], havingValue = "redis") internal fun reactiveRedisConnectionFactory(): ReactiveRedisConnectionFactory { val port: String = System.getProperty("netx.port") ?: port