diff --git a/src/main/java/com/jd/platform/async/callback/ITimeoutWorker.java b/src/main/java/com/jd/platform/async/callback/ITimeoutWorker.java deleted file mode 100644 index be5e7ec..0000000 --- a/src/main/java/com/jd/platform/async/callback/ITimeoutWorker.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jd.platform.async.callback; - -/** - * @author wuweifeng wrote on 2019-12-20 - * @version 1.0 - */ -public interface ITimeoutWorker extends IWorker { - /** - * 每个worker都可以设置超时时间 - * @return 毫秒超时时间 - */ - long timeOut(); - - /** - * 是否开启单个执行单元的超时功能(有时是一个group设置个超时,而不具备关心单个worker的超时) - *

注意,如果开启了单个执行单元的超时检测,将使线程池数量多出一倍

- * @return 是否开启 - */ - boolean enableTimeOut(); -} diff --git a/src/main/java/com/jd/platform/async/wrapper/WorkerWrapper.java b/src/main/java/com/jd/platform/async/wrapper/WorkerWrapper.java index c0155c1..d1135d9 100755 --- a/src/main/java/com/jd/platform/async/wrapper/WorkerWrapper.java +++ b/src/main/java/com/jd/platform/async/wrapper/WorkerWrapper.java @@ -74,10 +74,6 @@ public class WorkerWrapper { * 注意,该属性仅在nextWrapper数量<=1时有效,>1时的情况是不存在的 */ private volatile boolean needCheckNextWrapperResult = true; - /** - * 超时时间 - */ - private Long delayMs; private static final int FINISH = 1; private static final int ERROR = 2; @@ -629,12 +625,4 @@ public class WorkerWrapper { return wrapper; } } - - public Long getDelayMs() { - return delayMs; - } - - public void setDelayMs(Long delayMs) { - this.delayMs = delayMs; - } } diff --git a/src/test/java/depend/DeWorker.java b/src/test/java/depend/DeWorker.java index aca60fb..dacefd7 100755 --- a/src/test/java/depend/DeWorker.java +++ b/src/test/java/depend/DeWorker.java @@ -23,6 +23,10 @@ public class DeWorker implements IWorker, ICallback return new User("user0"); } + @Override + public int timeout() { + return 75; + } @Override public User defaultValue() { diff --git a/src/test/java/depend/Test.java b/src/test/java/depend/Test.java index 05e4853..8cfc658 100644 --- a/src/test/java/depend/Test.java +++ b/src/test/java/depend/Test.java @@ -46,7 +46,6 @@ public class Test { .callback(w) .build(); - workerWrapper.setDelayMs(73L); //虽然尚未执行,但是也可以先取得结果的引用,作为下一个任务的入参。V1.2前写法,需要手工给 //V1.3后,不用给wrapper setParam了,直接在worker的action里自行根据id获取即可.参考dependnew包下代码