You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@rocketmq.apache.org by GitBox <gi...@apache.org> on 2018/07/14 03:10:17 UTC

[GitHub] vongosling closed pull request #337: [ISSUE #336]add DelayTimeLevel enum

vongosling closed pull request #337: [ISSUE #336]add DelayTimeLevel enum
URL: https://github.com/apache/rocketmq/pull/337
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/common/src/main/java/org/apache/rocketmq/common/message/DelayTimeLevel.java b/common/src/main/java/org/apache/rocketmq/common/message/DelayTimeLevel.java
new file mode 100644
index 000000000..ba64b9a48
--- /dev/null
+++ b/common/src/main/java/org/apache/rocketmq/common/message/DelayTimeLevel.java
@@ -0,0 +1,37 @@
+package org.apache.rocketmq.common.message;
+
+public enum DelayTimeLevel {
+    // org.apache.rocketmq.store.config.MessageStoreConfig
+    // messageDelayLevel = "1s 5s 10s 30s 1m 2m 3m 4m 5m 6m 7m 8m 9m 10m 20m 30m 1h 2h";
+    ONE_SECOND(1),
+    FIVE_SECONDS(2),
+    TEN_SECONDS(3),
+    THIRTY_SECONDS(4),
+    ONE_MINUTE(5),
+    TWO_MINUTES(6),
+    THREE_MINUTES(7),
+    FOUR_MINUTES(8),
+    FIVE_MINUTES(9),
+    SIX_MINUTES(10),
+    SEVEN_MINUTES(11),
+    EIGHT_MINUTES(12),
+    NINE_MINUTES(13),
+    TEN_MINUTES(14),
+    TWENTY_MINUTES(15),
+    THIRTY_MINUTES(16),
+    ONE_HOUR(17),
+    TWO_HOURS(18);
+
+    private int i;
+    private DelayTimeLevel(int i){
+        this.i = i;
+    }
+
+    public int getI() {
+        return i;
+    }
+
+    public void setI(int i) {
+        this.i = i;
+    }
+}
diff --git a/common/src/main/java/org/apache/rocketmq/common/message/Message.java b/common/src/main/java/org/apache/rocketmq/common/message/Message.java
index 15ba2142c..4db042946 100644
--- a/common/src/main/java/org/apache/rocketmq/common/message/Message.java
+++ b/common/src/main/java/org/apache/rocketmq/common/message/Message.java
@@ -147,6 +147,10 @@ public void setDelayTimeLevel(int level) {
         this.putProperty(MessageConst.PROPERTY_DELAY_TIME_LEVEL, String.valueOf(level));
     }
 
+    public void setDelayTimeLevel(DelayTimeLevel level){
+        this.setDelayTimeLevel(level.getI());
+    }
+
     public boolean isWaitStoreMsgOK() {
         String result = this.getProperty(MessageConst.PROPERTY_WAIT_STORE_MSG_OK);
         if (null == result)
diff --git a/common/src/test/java/org/apache/rocketmq/common/MessageBatchTest.java b/common/src/test/java/org/apache/rocketmq/common/MessageBatchTest.java
index f26442076..29c05ae2c 100644
--- a/common/src/test/java/org/apache/rocketmq/common/MessageBatchTest.java
+++ b/common/src/test/java/org/apache/rocketmq/common/MessageBatchTest.java
@@ -19,6 +19,8 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
+import org.apache.rocketmq.common.message.DelayTimeLevel;
 import org.apache.rocketmq.common.message.Message;
 import org.apache.rocketmq.common.message.MessageBatch;
 import org.junit.Test;
@@ -62,6 +64,13 @@ public void testGenerate_Delay() throws Exception {
         MessageBatch.generateFromList(messages);
     }
 
+    @Test(expected = UnsupportedOperationException.class)
+    public void testGenerate_Delay_Enum() throws Exception {
+        List<Message> messages = generateMessages();
+        messages.get(1).setDelayTimeLevel(DelayTimeLevel.ONE_SECOND);
+        MessageBatch.generateFromList(messages);
+    }
+
     @Test(expected = UnsupportedOperationException.class)
     public void testGenerate_Retry() throws Exception {
         List<Message> messages = generateMessages();


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services