Refactor broadcast example

Author: devdevx

src/main/java/com/devdevx/examples/springbootrabbitmq/broadcast/Runner.java

@@ -30,6 +30,12 @@ public class BroadcastRmqConfig {
     @Value("${app.rabbitmq.broadcast.queue-three}")
     private String queueNameThree;
 
+    @Bean
+    FanoutExchange exchange() {
+        log.info("Creating exchange: {}", exchangeName);
+        return new FanoutExchange(exchangeName);
+    }
+
     @Bean
     Queue queueOne() {
         log.info("Creating queue: {}", queueNameOne);
@@ -48,12 +54,6 @@ Queue queueThree() {
         return new Queue(queueNameThree, false);
     }
 
-    @Bean
-    FanoutExchange exchange() {
-        log.info("Creating exchange: {}", exchangeName);
-        return new FanoutExchange(exchangeName);
-    }
-
     @Bean
     Binding bindingOne(@Qualifier("queueOne") Queue queue, FanoutExchange exchange) {
         log.info("Binding queue '{}' to the exchange '{}'", queue.getName(), exchange.getName());

src/main/java/com/devdevx/examples/springbootrabbitmq/broadcast/config/BroadcastRmqConfig.java

@@ -3,15 +3,13 @@
 public class BroadcastMessage {
     private Integer id;
     private String message;
-    private Integer ms;
 
     public BroadcastMessage() {
     }
 
-    public BroadcastMessage(Integer id, String message, Integer ms) {
+    public BroadcastMessage(Integer id, String message) {
         this.id = id;
         this.message = message;
-        this.ms = ms;
     }
 
     public Integer getId() {
@@ -30,20 +28,11 @@ public void setMessage(String message) {
         this.message = message;
     }
 
-    public Integer getMs() {
-        return ms;
-    }
-
-    public void setMs(Integer ms) {
-        this.ms = ms;
-    }
-
     @Override
     public String toString() {
         return "BroadcastMessage{" +
                 "id=" + id +
                 ", message='" + message + '\'' +
-                ", ms=" + ms +
                 '}';
     }
 }

src/main/java/com/devdevx/examples/springbootrabbitmq/broadcast/messaging/BroadcastMessage.java

@@ -26,34 +26,16 @@ public class BroadcastMessageReceiver {
 
     @RabbitListener(queues = "${app.rabbitmq.broadcast.queue-one}")
     public void receiveOne(BroadcastMessage message) {
-        log.info("Broadcast message received on queue '{}' : {}", queueNameOne, message);
-        try {
-            log.info("Sleeping {}ms", message.getMs());
-            Thread.sleep(message.getMs());
-        } catch (InterruptedException e) {
-            log.error("Sleeping error", e);
-        }
+        log.info("Message received on queue '{}' : {}", queueNameOne, message);
     }
 
     @RabbitListener(queues = "${app.rabbitmq.broadcast.queue-two}")
     public void receiveTwo(BroadcastMessage message) {
-        log.info("Broadcast message received on queue '{}' : {}", queueNameTwo, message);
-        try {
-            log.info("Sleeping {}ms", message.getMs());
-            Thread.sleep(message.getMs());
-        } catch (InterruptedException e) {
-            log.error("Sleeping error", e);
-        }
+        log.info("Message received on queue '{}' : {}", queueNameTwo, message);
     }
 
     @RabbitListener(queues = "${app.rabbitmq.broadcast.queue-three}")
     public void receiveThree(BroadcastMessage message) {
-        log.info("Broadcast message received on queue '{}' : {}", queueNameThree, message);
-        try {
-            log.info("Sleeping {}ms", message.getMs());
-            Thread.sleep(message.getMs());
-        } catch (InterruptedException e) {
-            log.error("Sleeping error", e);
-        }
+        log.info("Message received on queue '{}' : {}", queueNameThree, message);
     }
 }

src/main/java/com/devdevx/examples/springbootrabbitmq/broadcast/messaging/BroadcastMessageReceiver.java

@@ -5,10 +5,10 @@
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Profile;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
-import java.util.Random;
 
 @Profile("producer")
 @Component
@@ -25,9 +25,10 @@ public BroadcastMessageSender(RabbitTemplate rabbitTemplate) {
         this.rabbitTemplate = rabbitTemplate;
     }
 
+    @Scheduled(fixedDelayString = "${app.rabbitmq.delay-ms}")
     public void send() {
-        BroadcastMessage message = new BroadcastMessage(id++, LocalDateTime.now().toString(), new Random().nextInt(3) * 1000);
-        log.info("Sending broadcast message: {}", message);
+        BroadcastMessage message = new BroadcastMessage(id++, LocalDateTime.now().toString());
+        log.info("Sending message: {}", message);
         rabbitTemplate.convertAndSend(message);
     }
 }