diff --git a/blade-starter-redis/src/main/java/org/springblade/core/redis/config/RPubSubListenerLazyFilter.java b/blade-starter-redis/src/main/java/org/springblade/core/redis/config/RPubSubListenerLazyFilter.java new file mode 100644 index 0000000..d20657c --- /dev/null +++ b/blade-starter-redis/src/main/java/org/springblade/core/redis/config/RPubSubListenerLazyFilter.java @@ -0,0 +1,54 @@ +/** + * Copyright (c) 2018-2099, DreamLu 卢春梦 (qq596392912@gmail.com). + *

+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * http://www.gnu.org/licenses/lgpl.html + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springblade.core.redis.config; + +import org.springblade.core.redis.pubsub.RPubSubListener; +import org.springframework.beans.factory.config.BeanDefinition; +import org.springframework.boot.LazyInitializationExcludeFilter; +import org.springframework.core.annotation.AnnotationUtils; +import org.springframework.util.ReflectionUtils; + +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.List; + +/** + * mqtt 客户端订阅延迟加载排除 + * + * @author L.cm + */ +public class RPubSubListenerLazyFilter implements LazyInitializationExcludeFilter { + + @Override + public boolean isExcluded(String beanName, BeanDefinition beanDefinition, Class beanType) { + // 类上有注解的情况 + RPubSubListener subscribe = AnnotationUtils.findAnnotation(beanType, RPubSubListener.class); + if (subscribe != null) { + return true; + } + // 方法上的注解 + List methodList = new ArrayList<>(); + ReflectionUtils.doWithMethods(beanType, method -> { + RPubSubListener clientSubscribe = AnnotationUtils.findAnnotation(method, RPubSubListener.class); + if (clientSubscribe != null) { + methodList.add(method); + } + }, ReflectionUtils.USER_DECLARED_METHODS); + return !methodList.isEmpty(); + } + +} diff --git a/blade-starter-redis/src/main/java/org/springblade/core/redis/config/RedisAutoCacheManager.java b/blade-starter-redis/src/main/java/org/springblade/core/redis/config/RedisAutoCacheManager.java index dd3ccce..07d4cc6 100644 --- a/blade-starter-redis/src/main/java/org/springblade/core/redis/config/RedisAutoCacheManager.java +++ b/blade-starter-redis/src/main/java/org/springblade/core/redis/config/RedisAutoCacheManager.java @@ -39,7 +39,7 @@ public class RedisAutoCacheManager extends RedisCacheManager { public RedisAutoCacheManager(RedisCacheWriter cacheWriter, RedisCacheConfiguration defaultCacheConfiguration, Map initialCacheConfigurations, boolean allowInFlightCacheCreation) { - super(cacheWriter, defaultCacheConfiguration, initialCacheConfigurations, allowInFlightCacheCreation); + super(cacheWriter, defaultCacheConfiguration, allowInFlightCacheCreation, initialCacheConfigurations); } @NonNull diff --git a/blade-starter-redis/src/main/java/org/springblade/core/redis/config/RedisPubSubConfiguration.java b/blade-starter-redis/src/main/java/org/springblade/core/redis/config/RedisPubSubConfiguration.java index c08ed0d..3189c61 100644 --- a/blade-starter-redis/src/main/java/org/springblade/core/redis/config/RedisPubSubConfiguration.java +++ b/blade-starter-redis/src/main/java/org/springblade/core/redis/config/RedisPubSubConfiguration.java @@ -58,4 +58,9 @@ public class RedisPubSubConfiguration { return new RPubSubListenerDetector(redisMessageListenerContainer, redisSerializer); } + @Bean + public RPubSubListenerLazyFilter rPubSubListenerLazyFilter() { + return new RPubSubListenerLazyFilter(); + } + }