step8-1 코드 정리

villainscode · villainscode · commit 96875415310a · 2024-12-26T21:35:09.000+09:00
diff --git a/src/main/java/net/harunote/hellomessagequeue/step8/OrderConsumer.java b/src/main/java/net/harunote/hellomessagequeue/step8/OrderConsumer.java
@@ -1,19 +1,14 @@
 package net.harunote.hellomessagequeue.step8;
 
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.retry.RetryCallback;
-import org.springframework.retry.RetryContext;
-import org.springframework.retry.RetryListener;
-import org.springframework.retry.policy.SimpleRetryPolicy;
-import org.springframework.retry.support.RetryTemplate;
 import org.springframework.stereotype.Component;
 
 @Component
 public class OrderConsumer {
 
     private int retryCount;
 
-    @RabbitListener(queues = RabbitMQConfig.TOPIC_QUEUE)
+    @RabbitListener(queues = RabbitMQConfig.ORDER_COMPLETED_QUEUE)
     public void processMessage(String message) {
         System.out.println("Received message: "+ message + "count : " + retryCount++);
         if ("fail".equals(message)) {
diff --git a/src/main/java/net/harunote/hellomessagequeue/step8/OrderDeadLetterRetry.java b/src/main/java/net/harunote/hellomessagequeue/step8/OrderDeadLetterRetry.java
@@ -2,7 +2,6 @@
 
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.messaging.handler.annotation.Header;
 import org.springframework.stereotype.Component;
 
 /**
@@ -21,18 +20,20 @@ public OrderDeadLetterRetry(RabbitTemplate rabbitTemplate) {
         this.rabbitTemplate = rabbitTemplate;
     }
 
-    @RabbitListener(queues = RabbitMQConfig.TOPIC_DLQ)
+    @RabbitListener(queues = RabbitMQConfig.DLQ)
     public void processDlqMessage(String failedMessage) {
         try {
             System.out.println("[DLQ Received]: " + failedMessage);
 
             // 실패한 메시지를 성공 메시지로 변경
-            String modifiedMessage = "success";
+            String message = "success";
 
             // 수정된 메시지를 원래 큐로 재전송
-            rabbitTemplate.convertAndSend(RabbitMQConfig.TOPIC_EXCHANGE, "order.completed.shipping", modifiedMessage);
+            rabbitTemplate.convertAndSend(RabbitMQConfig.ORDER_TOPIC_EXCHANGE,
+                    "order.completed.shipping",
+                    message);
 
-            System.out.println("Message successfully reprocessed : " + modifiedMessage);
+            System.out.println("Message successfully reprocessed : " + message);
 
         } catch (Exception e) {
             System.err.println("Error processing DLQ message : " + e);
diff --git a/src/main/java/net/harunote/hellomessagequeue/step8/OrderProducer.java b/src/main/java/net/harunote/hellomessagequeue/step8/OrderProducer.java
@@ -12,7 +12,7 @@ public OrderProducer(RabbitTemplate rabbitTemplate) {
     }
 
     public void sendShipping(String message) {
-        rabbitTemplate.convertAndSend(RabbitMQConfig.TOPIC_EXCHANGE, "order.completed.shipping", message);
+        rabbitTemplate.convertAndSend(RabbitMQConfig.ORDER_TOPIC_EXCHANGE, "order.completed.shipping", message);
         System.out.println("[주문 완료. 배송 지시 메시지 생성 : " + message + "]");
     }
 }
diff --git a/src/main/java/net/harunote/hellomessagequeue/step8/RabbitMQConfig.java b/src/main/java/net/harunote/hellomessagequeue/step8/RabbitMQConfig.java
@@ -7,33 +7,33 @@
 @Configuration
 public class RabbitMQConfig {
 
-    public static final String TOPIC_EXCHANGE = "order.topic.exchange";
-    public static final String TOPIC_QUEUE = "order.completed.queue";
-    public static final String TOPIC_DLQ = "order.topic.dlq";
-    public static final String TOPIC_DLX = "order.topic.dlx";
-    public static final String DEAD_LETTER_ROUTING_KEY = "dlx.#";
-
+    public static final String ORDER_COMPLETED_QUEUE = "orderCompletedQueue";
+    public static final String DLQ = "deadLetterQueue";
+    public static final String ORDER_TOPIC_EXCHANGE = "orderExchange";
+    public static final String ORDER_TOPIC_DLX = "deadLetterExchange";
+    public static final String DEAD_LETTER_ROUTING_KEY = "dead.letter";
     @Bean
+
     public TopicExchange exchange() {
-        return new TopicExchange(TOPIC_EXCHANGE);
+        return new TopicExchange(ORDER_TOPIC_EXCHANGE);
     }
 
     @Bean
     public TopicExchange deadLetterExchange() {
-        return new TopicExchange(TOPIC_DLX);
+        return new TopicExchange(ORDER_TOPIC_DLX);
     }
 
     @Bean
     public Queue queue() {
-        return QueueBuilder.durable(TOPIC_QUEUE)
-                .withArgument("x-dead-letter-exchange", TOPIC_DLX)
+        return QueueBuilder.durable(ORDER_COMPLETED_QUEUE)
+                .withArgument("x-dead-letter-exchange", ORDER_TOPIC_DLX)
                 .withArgument("x-dead-letter-routing-key", DEAD_LETTER_ROUTING_KEY)
                 .build();
     }
 
     @Bean
     public Queue deadLetterQueue() {
-        return new Queue(TOPIC_DLQ);
+        return new Queue(DLQ);
     }
 
     @Bean

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public OrderProducer(RabbitTemplate rabbitTemplate) {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`public void sendShipping(String message) {`
`15`		`- rabbitTemplate.convertAndSend(RabbitMQConfig.TOPIC_EXCHANGE, "order.completed.shipping", message);`
	`15`	`+ rabbitTemplate.convertAndSend(RabbitMQConfig.ORDER_TOPIC_EXCHANGE, "order.completed.shipping", message);`
`16`	`16`	`System.out.println("[주문 완료. 배송 지시 메시지 생성 : " + message + "]");`
`17`	`17`	`}`
`18`	`18`	`}`