diff --git a/hippo4j-adapter/hippo4j-adapter-spring-cloud-stream-rabbitmq/src/main/java/cn/hippo4j/adapter/springcloud/stream/rabbitmq/SpringCloudStreamRabbitMQThreadPoolAdapter.java b/hippo4j-adapter/hippo4j-adapter-spring-cloud-stream-rabbitmq/src/main/java/cn/hippo4j/adapter/springcloud/stream/rabbitmq/SpringCloudStreamRabbitMQThreadPoolAdapter.java index edabaedf..ca71513b 100644 --- a/hippo4j-adapter/hippo4j-adapter-spring-cloud-stream-rabbitmq/src/main/java/cn/hippo4j/adapter/springcloud/stream/rabbitmq/SpringCloudStreamRabbitMQThreadPoolAdapter.java +++ b/hippo4j-adapter/hippo4j-adapter-spring-cloud-stream-rabbitmq/src/main/java/cn/hippo4j/adapter/springcloud/stream/rabbitmq/SpringCloudStreamRabbitMQThreadPoolAdapter.java @@ -53,7 +53,7 @@ public class SpringCloudStreamRabbitMQThreadPoolAdapter implements ThreadPoolAda @Override public String mark() { - return "rabbitMQSpringCloudStream"; + return "RabbitMQSpringCloudStream"; } @Override @@ -71,7 +71,6 @@ public class SpringCloudStreamRabbitMQThreadPoolAdapter implements ThreadPoolAda } else { result.setMaximumSize(concurrentConsumers); } - } else if (messageListenerContainer instanceof DirectMessageListenerContainer) { int consumersPerQueue = (int) ReflectUtil.getFieldValue(messageListenerContainer, "consumersPerQueue"); result.setCoreSize(consumersPerQueue); @@ -79,7 +78,7 @@ public class SpringCloudStreamRabbitMQThreadPoolAdapter implements ThreadPoolAda } return result; } - log.warn("[{}] rabbitMQ consuming thread pool not found.", identify); + log.warn("[{}] RabbitMQ consuming thread pool not found.", identify); return result; } @@ -116,7 +115,7 @@ public class SpringCloudStreamRabbitMQThreadPoolAdapter implements ThreadPoolAda simpleMessageListenerContainer.setMaxConcurrentConsumers(maximumPoolSize); simpleMessageListenerContainer.setConcurrentConsumers(corePoolSize); } - log.info("[{}] rabbitMQ consumption thread pool parameter change. coreSize: {}, maximumSize: {}", + log.info("[{}] RabbitMQ consumption thread pool parameter change. coreSize: {}, maximumSize: {}", threadPoolKey, String.format(CHANGE_DELIMITER, originalCoreSize, corePoolSize), String.format(CHANGE_DELIMITER, originalMaximumPoolSize, maximumPoolSize)); @@ -124,18 +123,17 @@ public class SpringCloudStreamRabbitMQThreadPoolAdapter implements ThreadPoolAda int originalCoreSize = (int) ReflectUtil.getFieldValue(messageListenerContainer, "consumersPerQueue"); DirectMessageListenerContainer directMessageListenerContainer = (DirectMessageListenerContainer) messageListenerContainer; directMessageListenerContainer.setConsumersPerQueue(maximumPoolSize); - log.info("[{}] rabbitMQ consumption thread pool parameter change. coreSize: {}", + log.info("[{}] RabbitMQ consumption thread pool parameter change. coreSize: {}", threadPoolKey, String.format(CHANGE_DELIMITER, originalCoreSize, corePoolSize)); } else { - log.warn("[{}] rabbitMQ consuming thread pool not support. messageListenerContainer: {}", threadPoolKey, messageListenerContainer.getClass()); + log.warn("[{}] RabbitMQ consuming thread pool not support. messageListenerContainer: {}", threadPoolKey, messageListenerContainer.getClass()); return false; } } - return true; } - log.warn("[{}] rabbitMQ consuming thread pool not found.", threadPoolKey); + log.warn("[{}] RabbitMQ consuming thread pool not found.", threadPoolKey); return false; } @@ -144,7 +142,6 @@ public class SpringCloudStreamRabbitMQThreadPoolAdapter implements ThreadPoolAda InputBindingLifecycle bindingLifecycle = ApplicationContextHolder.getBean(InputBindingLifecycle.class); Collection> inputBindings = Optional.ofNullable(ReflectUtil.getFieldValue(bindingLifecycle, "inputBindings")) .map(each -> (Collection>) each).orElse(null); - if (CollectionUtil.isEmpty(inputBindings)) { log.info("InputBindings record not found."); return; diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter-adapter/hippo4j-spring-boot-starter-adapter-spring-cloud-stream-rabbitmq/src/main/java/cn/hippo4j/springboot/starter/adapter/springcloud/stream/rabbitmq/SpringCloudStreamRabbitMQAdapterAutoConfiguration.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter-adapter/hippo4j-spring-boot-starter-adapter-spring-cloud-stream-rabbitmq/src/main/java/cn/hippo4j/springboot/starter/adapter/springcloud/stream/rabbitmq/SpringCloudStreamRabbitMQAdapterAutoConfiguration.java index 8a722629..4d87afb9 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter-adapter/hippo4j-spring-boot-starter-adapter-spring-cloud-stream-rabbitmq/src/main/java/cn/hippo4j/springboot/starter/adapter/springcloud/stream/rabbitmq/SpringCloudStreamRabbitMQAdapterAutoConfiguration.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter-adapter/hippo4j-spring-boot-starter-adapter-spring-cloud-stream-rabbitmq/src/main/java/cn/hippo4j/springboot/starter/adapter/springcloud/stream/rabbitmq/SpringCloudStreamRabbitMQAdapterAutoConfiguration.java @@ -28,8 +28,6 @@ import org.springframework.context.annotation.Configuration; /** * Spring cloud stream rabbitmq adapter auto configuration. - * - * @author lijianxin */ @Configuration(proxyBeanMethods = false) @ConditionalOnClass(RabbitMessageChannelBinderConfiguration.class)