#743 revise reconsume api

vipshop · Apr 28, 2021 · bc865cd · bc865cd
1 parent 2440ac0
commit bc865cd
Showing 1 changed file with 9 additions and 19 deletions.
diff --git a/saturn-job-api/src/main/java/com/vip/saturn/job/SaturnJobReturn.java b/saturn-job-api/src/main/java/com/vip/saturn/job/SaturnJobReturn.java
@@ -199,6 +199,10 @@ public void reconsumeLater(SaturnDelayedLevel delayLevel) {
 		prop.put(SaturnJobReturn.DELAY_LEVEL_WHEN_RECONSUME_PROP_KEY, String.valueOf(delayLevel.getValue()));
 	}
 
+	public void setDelayLevel(SaturnDelayedLevel delayLevel) {
+		prop.put(SaturnJobReturn.DELAY_LEVEL_WHEN_RECONSUME_PROP_KEY, String.valueOf(delayLevel.getValue()));
+	}
+
 	/**
 	 * only use for single consume
 	 */
@@ -247,19 +251,8 @@ public List<String> getCompleteOffsets() {
 	 * only use for batch consume
 	 */
 	public void reconsumeSome(List<MsgHolder> msgHolders) {
-		reconsumeSome(msgHolders, null);
-	}
-
-	/**
-	 * only use for batch consume
-	 */
-	public void reconsumeSome(List<MsgHolder> msgHolders, SaturnDelayedLevel delayLevel) {
 		String finalOffsets = mergeOffsets(prop.get(MSG_BATCH_CONSUME_DELAY_OFFSETS), msgHolders);
 		prop.put(MSG_BATCH_CONSUME_DELAY_OFFSETS, finalOffsets);
-		if (delayLevel != null) {
-			prop.put(SaturnJobReturn.DELAY_LEVEL_WHEN_RECONSUME_PROP_KEY, String.valueOf(delayLevel.getValue()));
-		}
-
 	}
 
 	/**
@@ -407,6 +400,11 @@ public SaturnJobReturnBuilder errorGroup(int errorGroup) {
 			return this;
 		}
 
+		public SaturnJobReturnBuilder deleyLevel(SaturnDelayedLevel delayedLevel) {
+			saturnJobReturn.setDelayLevel(delayedLevel);
+			return this;
+		}
+
 		/**
 		 * only use for single consume
 		 */
@@ -463,14 +461,6 @@ public SaturnJobReturnBuilder reconsumeSome(List<MsgHolder> msgHolders) {
 			return this;
 		}
 
-		/**
-		 * only use for batch consume
-		 */
-		public SaturnJobReturnBuilder reconsumeSome(List<MsgHolder> msgHolders, SaturnDelayedLevel delayLevel) {
-			saturnJobReturn.reconsumeSome(msgHolders, delayLevel);
-			return this;
-		}
-
 		/**
 		 * only use for batch consume
 		 */