diff --git a/spring-boot-starter/src/main/java/com/jmsoftware/maf/springbootstarter/MafAutoConfiguration.java b/spring-boot-starter/src/main/java/com/jmsoftware/maf/springbootstarter/MafAutoConfiguration.java index 5f32006e..b0659d03 100644 --- a/spring-boot-starter/src/main/java/com/jmsoftware/maf/springbootstarter/MafAutoConfiguration.java +++ b/spring-boot-starter/src/main/java/com/jmsoftware/maf/springbootstarter/MafAutoConfiguration.java @@ -67,7 +67,11 @@ @ConditionalOnWebApplication @AutoConfigureOrder(Integer.MIN_VALUE) @EnableConfigurationProperties(MafConfiguration.class) -@Import({MyBatisPlusConfiguration.class, Swagger2Configuration.class}) +@Import({ + MyBatisPlusConfiguration.class, + RedisConfiguration.class, + Swagger2Configuration.class +}) public class MafAutoConfiguration { @PostConstruct public void postConstruct() { @@ -173,18 +177,6 @@ public JwtConfiguration jwtConfiguration(MafProjectProperty mafProjectProperty) return new JwtConfiguration(mafProjectProperty); } - @Bean - public RedisCachingConfiguration redisCachingConfiguration(RedisConnectionFactory redisConnectionFactory) { - log.warn("Initial bean: '{}'", RedisCachingConfiguration.class.getSimpleName()); - return new RedisCachingConfiguration(redisConnectionFactory); - } - - @Bean - public RedisConfiguration redisConfiguration(ObjectMapper objectMapper) { - log.warn("Initial bean: '{}'", RedisConfiguration.class.getSimpleName()); - return new RedisConfiguration(objectMapper); - } - @Bean @LoadBalanced public RestTemplate restTemplate() { diff --git a/spring-boot-starter/src/main/java/com/jmsoftware/maf/springbootstarter/redis/RedisCachingConfiguration.java b/spring-boot-starter/src/main/java/com/jmsoftware/maf/springbootstarter/redis/RedisCachingConfiguration.java index ce01055d..933abcf0 100644 --- a/spring-boot-starter/src/main/java/com/jmsoftware/maf/springbootstarter/redis/RedisCachingConfiguration.java +++ b/spring-boot-starter/src/main/java/com/jmsoftware/maf/springbootstarter/redis/RedisCachingConfiguration.java @@ -41,6 +41,7 @@ private void postConstruct() { @Bean @Override public CacheManager cacheManager() { + log.warn("Initial bean: '{}'", CacheManager.class.getSimpleName()); RedisCacheConfiguration cacheConfiguration = defaultCacheConfig() .disableCachingNullValues() .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer( @@ -54,12 +55,14 @@ public CacheManager cacheManager() { @Bean @Override public CacheResolver cacheResolver() { + log.warn("Initial bean: '{}'", SimpleCacheResolver.class.getSimpleName()); return new SimpleCacheResolver(Objects.requireNonNull(cacheManager())); } @Bean @Override public KeyGenerator keyGenerator() { + log.warn("Initial bean: '{}'", KeyGenerator.class.getSimpleName()); return (target, method, params) -> { StringBuilder stringBuilder = new StringBuilder(); stringBuilder.append(target.getClass().getName()).append("#").append(method.getName()); @@ -73,6 +76,7 @@ public KeyGenerator keyGenerator() { @Bean @Override public CacheErrorHandler errorHandler() { + log.warn("Initial bean: '{}'", CacheErrorHandler.class.getSimpleName()); return new SimpleCacheErrorHandler(); } } diff --git a/spring-boot-starter/src/main/java/com/jmsoftware/maf/springbootstarter/redis/RedisConfiguration.java b/spring-boot-starter/src/main/java/com/jmsoftware/maf/springbootstarter/redis/RedisConfiguration.java index 8b3ca117..0d88c980 100644 --- a/spring-boot-starter/src/main/java/com/jmsoftware/maf/springbootstarter/redis/RedisConfiguration.java +++ b/spring-boot-starter/src/main/java/com/jmsoftware/maf/springbootstarter/redis/RedisConfiguration.java @@ -1,10 +1,14 @@ package com.jmsoftware.maf.springbootstarter.redis; import com.fasterxml.jackson.databind.ObjectMapper; +import com.jmsoftware.maf.springbootstarter.configuration.Swagger2Configuration; +import com.jmsoftware.maf.springbootstarter.database.MyBatisPlusConfiguration; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.cloud.client.loadbalancer.LoadBalanced; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; import org.springframework.data.redis.connection.ReactiveRedisConnectionFactory; import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.core.ReactiveRedisTemplate; @@ -24,6 +28,9 @@ @Slf4j @Configuration @RequiredArgsConstructor +@Import({ + RedisCachingConfiguration.class +}) public class RedisConfiguration { private final ObjectMapper objectMapper;