diff --git a/guerlab-cloud-redis/src/main/java/org/springframework/boot/autoconfigure/data/redis/KeyFormat.java b/guerlab-cloud-redis/src/main/java/net/guerlab/cloud/redis/autoconfgure/KeyFormat.java similarity index 92% rename from guerlab-cloud-redis/src/main/java/org/springframework/boot/autoconfigure/data/redis/KeyFormat.java rename to guerlab-cloud-redis/src/main/java/net/guerlab/cloud/redis/autoconfgure/KeyFormat.java index 0d25aef6b47e76103d7d4b83e108ffe53b7907a3..976eef08eb37812f4f9622a99f667a3ed328472b 100644 --- a/guerlab-cloud-redis/src/main/java/org/springframework/boot/autoconfigure/data/redis/KeyFormat.java +++ b/guerlab-cloud-redis/src/main/java/net/guerlab/cloud/redis/autoconfgure/KeyFormat.java @@ -11,7 +11,7 @@ * limitations under the License. */ -package org.springframework.boot.autoconfigure.data.redis; +package net.guerlab.cloud.redis.autoconfgure; /** * key格式化. diff --git a/guerlab-cloud-redis/src/main/java/org/springframework/boot/autoconfigure/data/redis/KeyRedisSerializerProxy.java b/guerlab-cloud-redis/src/main/java/net/guerlab/cloud/redis/autoconfgure/KeyRedisSerializerProxy.java similarity index 97% rename from guerlab-cloud-redis/src/main/java/org/springframework/boot/autoconfigure/data/redis/KeyRedisSerializerProxy.java rename to guerlab-cloud-redis/src/main/java/net/guerlab/cloud/redis/autoconfgure/KeyRedisSerializerProxy.java index aee2051e843178a92f3eab7de63928fce546e2bd..a1ffa9ebf8c7655d5e9fd843b8083c9f4d1a3664 100644 --- a/guerlab-cloud-redis/src/main/java/org/springframework/boot/autoconfigure/data/redis/KeyRedisSerializerProxy.java +++ b/guerlab-cloud-redis/src/main/java/net/guerlab/cloud/redis/autoconfgure/KeyRedisSerializerProxy.java @@ -11,7 +11,7 @@ * limitations under the License. */ -package org.springframework.boot.autoconfigure.data.redis; +package net.guerlab.cloud.redis.autoconfgure; import java.util.List; import java.util.ServiceLoader; diff --git a/guerlab-cloud-redis/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisTemplateAutoConfigure.java b/guerlab-cloud-redis/src/main/java/net/guerlab/cloud/redis/autoconfgure/RedisTemplateAutoConfigure.java similarity index 84% rename from guerlab-cloud-redis/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisTemplateAutoConfigure.java rename to guerlab-cloud-redis/src/main/java/net/guerlab/cloud/redis/autoconfgure/RedisTemplateAutoConfigure.java index 10f4d3ca1f195f19c4919cb8b508510c60605de7..058ad94a904d96c2123c6614ab663f24e383295b 100644 --- a/guerlab-cloud-redis/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisTemplateAutoConfigure.java +++ b/guerlab-cloud-redis/src/main/java/net/guerlab/cloud/redis/autoconfgure/RedisTemplateAutoConfigure.java @@ -11,20 +11,20 @@ * limitations under the License. */ -package org.springframework.boot.autoconfigure.data.redis; +package net.guerlab.cloud.redis.autoconfgure; import com.fasterxml.jackson.databind.ObjectMapper; +import lombok.extern.slf4j.Slf4j; import org.redisson.api.RedissonClient; import org.redisson.spring.data.connection.RedissonConnectionFactory; import org.redisson.spring.starter.RedissonAutoConfiguration; -import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Import; +import org.springframework.context.annotation.Configuration; import org.springframework.data.redis.connection.RedisConnectionFactory; -import org.springframework.data.redis.core.RedisOperations; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer; @@ -34,12 +34,12 @@ import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSeriali * * @author guer */ -@ConditionalOnClass(RedisOperations.class) -@AutoConfiguration(before = { +@Slf4j +@Configuration +@AutoConfigureBefore({ RedisAutoConfiguration.class, RedissonAutoConfiguration.class }) -@Import({LettuceConnectionConfiguration.class, JedisConnectionConfiguration.class}) public class RedisTemplateAutoConfigure { /** @@ -47,8 +47,8 @@ public class RedisTemplateAutoConfigure { */ @Bean @ConditionalOnMissingBean(RedisConnectionFactory.class) - @ConditionalOnClass(RedissonClient.class) public RedissonConnectionFactory redissonConnectionFactory(RedissonClient redisson) { + log.debug("init redissonConnectionFactory"); return new RedissonConnectionFactory(redisson); } @@ -62,6 +62,7 @@ public class RedisTemplateAutoConfigure { @Bean @ConditionalOnMissingBean(name = "redisTemplate") public RedisTemplate redisTemplate(RedisConnectionFactory factory, ObjectMapper objectMapper) { + log.debug("init redisTemplate"); ObjectMapper mapper = objectMapper.copy(); mapper.activateDefaultTyping(mapper.getPolymorphicTypeValidator(), ObjectMapper.DefaultTyping.NON_FINAL); @@ -85,8 +86,10 @@ public class RedisTemplateAutoConfigure { @Bean @ConditionalOnMissingBean(StringRedisTemplate.class) public StringRedisTemplate stringRedisTemplate(RedisConnectionFactory factory) { + log.debug("init stringRedisTemplate"); StringRedisTemplate template = new StringRedisTemplate(); template.setConnectionFactory(factory); return template; } + } diff --git a/guerlab-cloud-redis/src/main/java/org/springframework/boot/autoconfigure/data/redis/package-info.java b/guerlab-cloud-redis/src/main/java/net/guerlab/cloud/redis/autoconfgure/package-info.java similarity index 89% rename from guerlab-cloud-redis/src/main/java/org/springframework/boot/autoconfigure/data/redis/package-info.java rename to guerlab-cloud-redis/src/main/java/net/guerlab/cloud/redis/autoconfgure/package-info.java index fea4585fba24325547a6cef8dae6e750fea50f8f..10c1b33fa4c3937219be12515ee650d5c4349c6f 100644 --- a/guerlab-cloud-redis/src/main/java/org/springframework/boot/autoconfigure/data/redis/package-info.java +++ b/guerlab-cloud-redis/src/main/java/net/guerlab/cloud/redis/autoconfgure/package-info.java @@ -15,6 +15,6 @@ * */ @NonNullApi -package org.springframework.boot.autoconfigure.data.redis; +package net.guerlab.cloud.redis.autoconfgure; import org.springframework.lang.NonNullApi; diff --git a/guerlab-cloud-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/guerlab-cloud-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index d766d4ba74ec58bc9c70f89f2754a31510b2468f..73d71da968c808a481720b2558c3d801a2bf9ff6 100644 --- a/guerlab-cloud-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/guerlab-cloud-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -org.springframework.boot.autoconfigure.data.redis.RedisTemplateAutoConfigure +net.guerlab.cloud.redis.autoconfgure.RedisTemplateAutoConfigure diff --git a/guerlab-cloud-searchparams/guerlab-cloud-searchparams-mybatisplus/src/main/java/net/guerlab/cloud/searchparams/mybatisplus/StringHandler.java b/guerlab-cloud-searchparams/guerlab-cloud-searchparams-mybatisplus/src/main/java/net/guerlab/cloud/searchparams/mybatisplus/StringHandler.java index 4f4529cbb369846996a7da14066f4c58d32c8c42..6b9a1e7213fdb876c9c99020f56c233a0669d623 100644 --- a/guerlab-cloud-searchparams/guerlab-cloud-searchparams-mybatisplus/src/main/java/net/guerlab/cloud/searchparams/mybatisplus/StringHandler.java +++ b/guerlab-cloud-searchparams/guerlab-cloud-searchparams-mybatisplus/src/main/java/net/guerlab/cloud/searchparams/mybatisplus/StringHandler.java @@ -59,10 +59,10 @@ public class StringHandler extends AbstractMyBatisPlusSearchParamsHandler { if (dbType == DbType.MYSQL) { String sqlTemplate; if (searchModelType == SearchModelType.NOT_IN) { - sqlTemplate = "JSON_SEARCH(%s, 'one', '{0}', null, '%s') IS NULL"; + sqlTemplate = "JSON_SEARCH(%s, 'one', {0}, null, '%s') IS NULL"; } else { - sqlTemplate = "JSON_SEARCH(%s, 'one', '{0}', null, '%s') IS NOT NULL"; + sqlTemplate = "JSON_SEARCH(%s, 'one', {0}, null, '%s') IS NOT NULL"; } wrapper.apply(sqlTemplate.formatted(columnName, jsonPath), str); } diff --git a/guerlab-cloud-searchparams/guerlab-cloud-searchparams-mybatisplus/src/test/java/net/guerlab/cloud/searchparams/mybatisplus/MybatisPlusSearchParamsTest.java b/guerlab-cloud-searchparams/guerlab-cloud-searchparams-mybatisplus/src/test/java/net/guerlab/cloud/searchparams/mybatisplus/MybatisPlusSearchParamsTest.java index affa417c7c37e3561d6a7c30b608f839a5b454dd..892ecc044aa23bbf11c7587cb80f8dd41dc9f9a8 100644 --- a/guerlab-cloud-searchparams/guerlab-cloud-searchparams-mybatisplus/src/test/java/net/guerlab/cloud/searchparams/mybatisplus/MybatisPlusSearchParamsTest.java +++ b/guerlab-cloud-searchparams/guerlab-cloud-searchparams-mybatisplus/src/test/java/net/guerlab/cloud/searchparams/mybatisplus/MybatisPlusSearchParamsTest.java @@ -207,7 +207,7 @@ class MybatisPlusSearchParamsTest { SearchParamsUtils.handler(searchParams, queryWrapper); Assertions.assertEquals( - "(JSON_SEARCH(t9, 'one', '#{ew.paramNameValuePairs.MPGENVAL1}', null, '$.a.b') IS NOT NULL)", + "(JSON_SEARCH(t9, 'one', #{ew.paramNameValuePairs.MPGENVAL1}, null, '$.a.b') IS NOT NULL)", queryWrapper.getSqlSegment()); } @@ -243,7 +243,7 @@ class MybatisPlusSearchParamsTest { SearchParamsUtils.handler(searchParams, queryWrapper); Assertions.assertEquals( - "(JSON_SEARCH(t10, 'one', '#{ew.paramNameValuePairs.MPGENVAL1}', null, '$.a.b') IS NULL)", + "(JSON_SEARCH(t10, 'one', #{ew.paramNameValuePairs.MPGENVAL1}, null, '$.a.b') IS NULL)", queryWrapper.getSqlSegment()); } diff --git a/pom.xml b/pom.xml index 8511528c9386c0b98542c3c1328b3b00381f7096..184735f954139d8d64f6b709d063c781c134b460 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ - 2024.10.5 + 2024.10.6 ${basedir} 17