Merge pull request eugenp#8119 from alimate/BAEL-3275-2

BAEL-3275: Using blocking queue for pub-sub

Author: eric-martin

persistence-modules/spring-data-redis/src/main/java/com/baeldung/spring/data/redis/queue/RedisMessageSubscriber.java

@@ -4,16 +4,16 @@
 import org.springframework.data.redis.connection.MessageListener;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
 
 @Service
 public class RedisMessageSubscriber implements MessageListener {
 
-    public static List<String> messageList = new ArrayList<String>();
+    public static BlockingQueue<String> messages = new ArrayBlockingQueue<String>(100);
 
     public void onMessage(final Message message, final byte[] pattern) {
-        messageList.add(message.toString());
+        messages.add(message.toString());
         System.out.println("Message received: " + new String(message.getBody()));
     }
 }

persistence-modules/spring-data-redis/src/test/java/com/baeldung/spring/data/redis/RedisMessageListenerIntegrationTest.java

@@ -1,10 +1,8 @@
 package com.baeldung.spring.data.redis;
 
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.util.UUID;
-
+import com.baeldung.spring.data.redis.config.RedisConfig;
+import com.baeldung.spring.data.redis.queue.RedisMessagePublisher;
+import com.baeldung.spring.data.redis.queue.RedisMessageSubscriber;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -14,12 +12,12 @@
 import org.springframework.test.annotation.DirtiesContext.ClassMode;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import redis.embedded.RedisServerBuilder;
 
-import com.baeldung.spring.data.redis.config.RedisConfig;
-import com.baeldung.spring.data.redis.queue.RedisMessagePublisher;
-import com.baeldung.spring.data.redis.queue.RedisMessageSubscriber;
+import java.io.IOException;
+import java.util.UUID;
 
-import redis.embedded.RedisServerBuilder;
+import static org.junit.Assert.assertTrue;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = RedisConfig.class)
@@ -46,7 +44,6 @@ public static void stopRedisServer() throws IOException {
     public void testOnMessage() throws Exception {
         String message = "Message " + UUID.randomUUID();
         redisMessagePublisher.publish(message);
-        Thread.sleep(1000);
-        assertTrue(RedisMessageSubscriber.messageList.get(0).contains(message));
+        assertTrue(RedisMessageSubscriber.messages.take().contains(message));
     }
 }