From 9b987981643a324851a98b19929e9164e01d90c2 Mon Sep 17 00:00:00 2001 From: "chen.ma" Date: Sat, 28 May 2022 11:52:12 +0800 Subject: [PATCH] Rabbitmq code formatting --- .../rabbitmq/RabbitMQThreadPoolAdapter.java | 11 ++++++----- .../example/config/RabbitMQThreadPoolConfig.java | 1 - .../example/constants/SimpleMQConstant.java | 2 -- .../rabbitmq/example/consumer/MessageConsumer.java | 14 +------------- .../rabbitmq/RabbitMQAdapterAutoConfiguration.java | 1 - 5 files changed, 7 insertions(+), 22 deletions(-) diff --git a/hippo4j-adapter/hippo4j-adapter-rabbitmq/src/main/java/cn/hippo4j/adapter/rabbitmq/RabbitMQThreadPoolAdapter.java b/hippo4j-adapter/hippo4j-adapter-rabbitmq/src/main/java/cn/hippo4j/adapter/rabbitmq/RabbitMQThreadPoolAdapter.java index b99623f3..6595a0b4 100644 --- a/hippo4j-adapter/hippo4j-adapter-rabbitmq/src/main/java/cn/hippo4j/adapter/rabbitmq/RabbitMQThreadPoolAdapter.java +++ b/hippo4j-adapter/hippo4j-adapter-rabbitmq/src/main/java/cn/hippo4j/adapter/rabbitmq/RabbitMQThreadPoolAdapter.java @@ -47,10 +47,11 @@ public class RabbitMQThreadPoolAdapter implements ThreadPoolAdapter, Application private static final String RABBITMQ = "RabbitMQ"; private static final String FiledName = "executorService"; - - // todo: Configurable name + + /** + * TODO Configurable name + */ private static final String RABBITMQ_EXECUTOR_SERVICE = "Rabbitmq_Executor_Service"; - private final AbstractConnectionFactory abstractConnectionFactory; @@ -72,7 +73,8 @@ public class RabbitMQThreadPoolAdapter implements ThreadPoolAdapter, Application } return threadPoolAdapterState; } - + + @Override public List getThreadPoolStates() { List adapterStateList = Lists.newArrayList(); RABBITMQ_THREAD_POOL_TASK_EXECUTOR.forEach( @@ -110,7 +112,6 @@ public class RabbitMQThreadPoolAdapter implements ThreadPoolAdapter, Application } else { log.warn("Custom thread pools only support ThreadPoolExecutor"); } - } } } diff --git a/hippo4j-example/hippo4j-spring-boot-starter-adapter-rabbitmq-example/src/main/java/cn/hippo4j/springboot/starter/adapter/rabbitmq/example/config/RabbitMQThreadPoolConfig.java b/hippo4j-example/hippo4j-spring-boot-starter-adapter-rabbitmq-example/src/main/java/cn/hippo4j/springboot/starter/adapter/rabbitmq/example/config/RabbitMQThreadPoolConfig.java index 799e8743..ca24ff83 100644 --- a/hippo4j-example/hippo4j-spring-boot-starter-adapter-rabbitmq-example/src/main/java/cn/hippo4j/springboot/starter/adapter/rabbitmq/example/config/RabbitMQThreadPoolConfig.java +++ b/hippo4j-example/hippo4j-spring-boot-starter-adapter-rabbitmq-example/src/main/java/cn/hippo4j/springboot/starter/adapter/rabbitmq/example/config/RabbitMQThreadPoolConfig.java @@ -51,7 +51,6 @@ public class RabbitMQThreadPoolConfig { MessageConverter messageConverter, AbstractConnectionFactory abstractConnectionFactory) { DirectRabbitListenerContainerFactory factory = new DirectRabbitListenerContainerFactory(); factory.setConnectionFactory(abstractConnectionFactory); -// factory.setTaskExecutor(rabbitListenerTaskExecutor); factory.setMessageConverter(messageConverter); factory.setConsumersPerQueue(10); abstractConnectionFactory.setExecutor(rabbitListenerTaskExecutor); diff --git a/hippo4j-example/hippo4j-spring-boot-starter-adapter-rabbitmq-example/src/main/java/cn/hippo4j/springboot/starter/adapter/rabbitmq/example/constants/SimpleMQConstant.java b/hippo4j-example/hippo4j-spring-boot-starter-adapter-rabbitmq-example/src/main/java/cn/hippo4j/springboot/starter/adapter/rabbitmq/example/constants/SimpleMQConstant.java index 1ee50b9e..3b3898a1 100644 --- a/hippo4j-example/hippo4j-spring-boot-starter-adapter-rabbitmq-example/src/main/java/cn/hippo4j/springboot/starter/adapter/rabbitmq/example/constants/SimpleMQConstant.java +++ b/hippo4j-example/hippo4j-spring-boot-starter-adapter-rabbitmq-example/src/main/java/cn/hippo4j/springboot/starter/adapter/rabbitmq/example/constants/SimpleMQConstant.java @@ -23,6 +23,4 @@ package cn.hippo4j.springboot.starter.adapter.rabbitmq.example.constants; public interface SimpleMQConstant { String QUEUE_NAME = "framework_message-center_queue"; - - String QUEUE_NAME1 = "framework_message-center_queue1"; } diff --git a/hippo4j-example/hippo4j-spring-boot-starter-adapter-rabbitmq-example/src/main/java/cn/hippo4j/springboot/starter/adapter/rabbitmq/example/consumer/MessageConsumer.java b/hippo4j-example/hippo4j-spring-boot-starter-adapter-rabbitmq-example/src/main/java/cn/hippo4j/springboot/starter/adapter/rabbitmq/example/consumer/MessageConsumer.java index a3419d71..b4ae7bd9 100644 --- a/hippo4j-example/hippo4j-spring-boot-starter-adapter-rabbitmq-example/src/main/java/cn/hippo4j/springboot/starter/adapter/rabbitmq/example/consumer/MessageConsumer.java +++ b/hippo4j-example/hippo4j-spring-boot-starter-adapter-rabbitmq-example/src/main/java/cn/hippo4j/springboot/starter/adapter/rabbitmq/example/consumer/MessageConsumer.java @@ -37,22 +37,10 @@ public class MessageConsumer { @RabbitHandler @RabbitListener(queuesToDeclare = @Queue(SimpleMQConstant.QUEUE_NAME), containerFactory = "defaultRabbitListenerContainerFactory") -// @RabbitListener(queuesToDeclare = @Queue(SimpleMQConstant.QUEUE_NAME)) public void receiveObject(SendMessageDTO simple) throws Exception { TimeUnit.SECONDS.sleep(1); ObjectMapper objectMapper = new ObjectMapper(); String message = objectMapper.writeValueAsString(simple); - log.info("consumer1 threadId {} Message: {}", Thread.currentThread().getName(),message); + log.info("consumer1 threadId {} Message: {}", Thread.currentThread().getName(), message); } - -// @RabbitHandler -// @RabbitListener(queuesToDeclare = @Queue(SimpleMQConstant.QUEUE_NAME1)) -// public void receiveObject1(SendMessageDTO simple) throws Exception { -// TimeUnit.SECONDS.sleep(1); -// ObjectMapper objectMapper = new ObjectMapper(); -// String message = objectMapper.writeValueAsString(simple); -// log.info("consumer threadId {} Message: {}", Thread.currentThread().getName(),message); -// } - - } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter-adapter/hippo4j-spring-boot-starter-adapter-rabbitmq/src/main/java/cn/hippo4j/springboot/starter/adapter/rabbitmq/RabbitMQAdapterAutoConfiguration.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter-adapter/hippo4j-spring-boot-starter-adapter-rabbitmq/src/main/java/cn/hippo4j/springboot/starter/adapter/rabbitmq/RabbitMQAdapterAutoConfiguration.java index 7eeba70e..23ca19da 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter-adapter/hippo4j-spring-boot-starter-adapter-rabbitmq/src/main/java/cn/hippo4j/springboot/starter/adapter/rabbitmq/RabbitMQAdapterAutoConfiguration.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter-adapter/hippo4j-spring-boot-starter-adapter-rabbitmq/src/main/java/cn/hippo4j/springboot/starter/adapter/rabbitmq/RabbitMQAdapterAutoConfiguration.java @@ -33,7 +33,6 @@ import org.springframework.context.annotation.Configuration; @RequiredArgsConstructor public class RabbitMQAdapterAutoConfiguration { - private final AbstractConnectionFactory abstractConnectionFactories; @Bean