doc/property update

sonus21 · Jul 26, 2021 · 4fa2751 · 4fa2751
1 parent 009b34b
commit 4fa2751
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 20 deletions.
diff --git a/.../src/main/java/com/github/sonus21/rqueue/config/SimpleRqueueListenerContainerFactory.java b/.../src/main/java/com/github/sonus21/rqueue/config/SimpleRqueueListenerContainerFactory.java
@@ -21,8 +21,8 @@
 
 import com.github.sonus21.rqueue.annotation.MessageListener;
 import com.github.sonus21.rqueue.annotation.RqueueListener;
+import com.github.sonus21.rqueue.converter.DefaultMessageConverterProvider;
 import com.github.sonus21.rqueue.converter.MessageConverterProvider;
-import com.github.sonus21.rqueue.core.DefaultRqueueMessageConverter;
 import com.github.sonus21.rqueue.core.RqueueMessageTemplate;
 import com.github.sonus21.rqueue.core.impl.RqueueMessageTemplateImpl;
 import com.github.sonus21.rqueue.core.middleware.Middleware;
@@ -236,20 +236,26 @@ public void setMaxNumWorkers(int maxNumWorkers) {
     this.maxNumWorkers = maxNumWorkers;
   }
 
-  /** @return the message converter */
-  public MessageConverter getMessageConverter() {
+  /**
+   * Message converter must be configured before calling this method.
+   *
+   * @return the message converter object
+   */
+  public MessageConverter getMessageConverter() throws IllegalAccessException {
+    if (messageConverterProvider == null) {
+      throw new IllegalAccessException("messageConverterProvider is not configured");
+    }
     return messageConverterProvider.getConverter();
   }
 
   /**
-   * A default message converter {@link DefaultRqueueMessageConverter} is added that can handle all
-   * type of data serialization/deserialization and all data is serialized to and from JSON. You can
-   * use other mechanism to serialize/deserialize class object like MessagePack or any other format.
+   * Rqueue configures a default message converter that can convert message to/from for any object.
    *
-   * @param messageConverterProvider the message converter
+   * @see DefaultMessageConverterProvider
+   * @param messageConverterProvider the message converter provider
    */
   public void setMessageConverterProvider(MessageConverterProvider messageConverterProvider) {
-    notNull(messageConverterProvider, "message converter provider must not be null");
+    notNull(messageConverterProvider, "messageConverterProvider must not be null");
     this.messageConverterProvider = messageConverterProvider;
   }
 

diff --git a/rqueue-core/src/main/resources/META-INF/spring-configuration-metadata.json b/rqueue-core/src/main/resources/META-INF/spring-configuration-metadata.json
@@ -351,6 +351,13 @@
       "description": "How long Rqueue should wait for aggregate job to complete o shutdown (mili seconds)",
       "type": "java.lang.Integer",
       "defaultValue": 500
+    },
+    {
+      "sourceType": "com.github.sonus21.rqueue.config.RqueueWebConfig",
+      "name": "rqueue.web.collect.statistic.aggregate.event.lock.duration",
+      "description": "How long Rqueue should wait for Redis lock when aggregation data is being saved(mili seconds)",
+      "type": "java.lang.Integer",
+      "defaultValue": 500
     }
   ]
 }
diff --git a/.../test/java/com/github/sonus21/rqueue/config/SimpleRqueueListenerContainerFactoryTest.java b/.../test/java/com/github/sonus21/rqueue/config/SimpleRqueueListenerContainerFactoryTest.java
@@ -115,19 +115,19 @@ void setMaxNumWorkers() {
   }
 
   @Test
-  void getMessageConverterNPE() {
-    assertThrows(
-        NullPointerException.class,
-        () -> simpleRqueueListenerContainerFactory.getMessageConverter());
-  }
-
-  @Test
-  void getMessageConverter() {
+  void getMessageConverter() throws IllegalAccessException {
     simpleRqueueListenerContainerFactory.setMessageConverterProvider(
         new DefaultMessageConverterProvider());
     assertNotNull(simpleRqueueListenerContainerFactory.getMessageConverter());
   }
 
+  @Test
+  void getMessageConverterIAE() {
+    assertThrows(
+        IllegalAccessException.class,
+        () -> simpleRqueueListenerContainerFactory.getMessageConverter());
+  }
+
   @Test
   void setRedisConnectionFactory() {
     assertThrows(
@@ -173,7 +173,8 @@ void createMessageListenerContainer3() {
     simpleRqueueListenerContainerFactory.setRedisConnectionFactory(new LettuceConnectionFactory());
     simpleRqueueListenerContainerFactory.setRqueueMessageHandler(
         new RqueueMessageHandler(new DefaultRqueueMessageConverter()));
-    simpleRqueueListenerContainerFactory.setMessageConverterProvider(new DefaultMessageConverterProvider());
+    simpleRqueueListenerContainerFactory.setMessageConverterProvider(
+        new DefaultMessageConverterProvider());
     RqueueMessageListenerContainer container =
         simpleRqueueListenerContainerFactory.createMessageListenerContainer();
     assertNotNull(container);
@@ -192,7 +193,8 @@ void deadLetterMessageProcessor() {
     simpleRqueueListenerContainerFactory.setRedisConnectionFactory(new LettuceConnectionFactory());
     simpleRqueueListenerContainerFactory.setRqueueMessageHandler(
         new RqueueMessageHandler(new DefaultRqueueMessageConverter()));
-    simpleRqueueListenerContainerFactory.setMessageConverterProvider(new DefaultMessageConverterProvider());
+    simpleRqueueListenerContainerFactory.setMessageConverterProvider(
+        new DefaultMessageConverterProvider());
     RqueueMessageListenerContainer container =
         simpleRqueueListenerContainerFactory.createMessageListenerContainer();
     assertNotNull(container);
@@ -215,7 +217,8 @@ void discardMessageProcessor() {
     simpleRqueueListenerContainerFactory.setRedisConnectionFactory(new LettuceConnectionFactory());
     simpleRqueueListenerContainerFactory.setRqueueMessageHandler(
         new RqueueMessageHandler(new DefaultRqueueMessageConverter()));
-    simpleRqueueListenerContainerFactory.setMessageConverterProvider(new DefaultMessageConverterProvider());
+    simpleRqueueListenerContainerFactory.setMessageConverterProvider(
+        new DefaultMessageConverterProvider());
     RqueueMessageListenerContainer container =
         simpleRqueueListenerContainerFactory.createMessageListenerContainer();
     assertNotNull(container);
@@ -310,7 +313,8 @@ void createContainer() {
     simpleRqueueListenerContainerFactory.setTaskExecutionBackOff(backOff);
     simpleRqueueListenerContainerFactory.setTaskExecutor(executor);
     simpleRqueueListenerContainerFactory.setPriorityMode(PriorityMode.WEIGHTED);
-    simpleRqueueListenerContainerFactory.setMessageConverterProvider(new DefaultMessageConverterProvider());
+    simpleRqueueListenerContainerFactory.setMessageConverterProvider(
+        new DefaultMessageConverterProvider());
 
     RqueueMessageListenerContainer container =
         simpleRqueueListenerContainerFactory.createMessageListenerContainer();