Reactive test

sonus21 · Apr 11, 2021 · d480b0e · d480b0e
1 parent d1d8234
commit d480b0e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/...c/main/java/com/github/sonus21/rqueue/test/application/ApplicationBasicConfiguration.java b/...c/main/java/com/github/sonus21/rqueue/test/application/ApplicationBasicConfiguration.java
@@ -51,6 +51,9 @@ public abstract class ApplicationBasicConfiguration extends RedisBootstrapperBas
   @Value("${monitor.enabled:false}")
   protected boolean monitoringEnabled;
 
+  @Value("${rqueue.reactive.enabled:false}")
+  protected boolean reactiveEnabled;
+
   protected void init() {
     final BootstrapRedis bootstrapRedis =
         Javanna.createAnnotation(

diff --git a/...in/java/com/github/sonus21/rqueue/test/application/CustomMessageConverterApplication.java b/...in/java/com/github/sonus21/rqueue/test/application/CustomMessageConverterApplication.java
@@ -21,7 +21,6 @@
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import org.springframework.context.annotation.Bean;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
 import org.springframework.messaging.MessageHeaders;
 import org.springframework.messaging.converter.MappingJackson2MessageConverter;
@@ -45,10 +44,14 @@ public LettuceConnectionFactory redisConnectionFactory() {
 
   @Bean
   public SimpleRqueueListenerContainerFactory simpleRqueueListenerContainerFactory(
-      RedisConnectionFactory redisConnectionFactory) {
+      LettuceConnectionFactory redisConnectionFactory) {
     SimpleRqueueListenerContainerFactory simpleRqueueListenerContainerFactory =
         new SimpleRqueueListenerContainerFactory();
     simpleRqueueListenerContainerFactory.setRedisConnectionFactory(redisConnectionFactory);
+    if (reactiveEnabled) {
+      simpleRqueueListenerContainerFactory.setReactiveRedisConnectionFactory(
+          redisConnectionFactory);
+    }
     simpleRqueueListenerContainerFactory.setMessageConverters(
         Collections.singletonList(new MappingJackson2MessageConverter()));
     MessageHeaders messageHeaders =

diff --git a/.../main/java/com/github/sonus21/rqueue/test/application/MultiRedisSprigBaseApplication.java b/.../main/java/com/github/sonus21/rqueue/test/application/MultiRedisSprigBaseApplication.java
@@ -82,6 +82,9 @@ public SimpleRqueueListenerContainerFactory simpleRqueueListenerContainerFactory
     LettuceConnectionFactory connectionFactory = new LettuceConnectionFactory(redisConfiguration);
     connectionFactory.afterPropertiesSet();
     simpleRqueueListenerContainerFactory.setRedisConnectionFactory(connectionFactory);
+    if(reactiveEnabled){
+      simpleRqueueListenerContainerFactory.setReactiveRedisConnectionFactory(connectionFactory);
+    }
     return simpleRqueueListenerContainerFactory;
   }
 }
diff --git a/...src/main/java/com/github/sonus21/rqueue/test/application/RedisClusterBaseApplication.java b/...src/main/java/com/github/sonus21/rqueue/test/application/RedisClusterBaseApplication.java
@@ -21,16 +21,13 @@
 import com.github.sonus21.rqueue.utils.Constants;
 import java.util.ArrayList;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.data.redis.connection.RedisClusterConfiguration;
 import org.springframework.data.redis.connection.RedisNode;
 import org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration;
 import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
 
 public abstract class RedisClusterBaseApplication extends ApplicationBasicConfiguration {
-  @Value("${rqueue.reactive.enabled:false}")
-  private boolean reactiveEnabled;
 
   @Bean
   public SimpleRqueueListenerContainerFactory simpleRqueueListenerContainerFactory(
@@ -56,11 +53,8 @@ public SimpleRqueueListenerContainerFactory simpleRqueueListenerContainerFactory
     simpleRqueueListenerContainerFactory.setPollingInterval(Constants.ONE_MILLI);
     simpleRqueueListenerContainerFactory.setRqueueMessageHandler(rqueueMessageHandler);
     if (reactiveEnabled) {
-      LettuceConnectionFactory reactiveRedisConnectionFactory =
-          new LettuceConnectionFactory(redisClusterConfiguration);
-      lettuceConnectionFactory.afterPropertiesSet();
       simpleRqueueListenerContainerFactory.setReactiveRedisConnectionFactory(
-          reactiveRedisConnectionFactory);
+          lettuceConnectionFactory);
     }
     return simpleRqueueListenerContainerFactory;
   }