diff --git a/center.manager/src/test/java/center/manager/test/user/WorkTest.java b/center.manager/src/test/java/center/manager/test/user/WorkTest.java index b855561..bee1e91 100644 --- a/center.manager/src/test/java/center/manager/test/user/WorkTest.java +++ b/center.manager/src/test/java/center/manager/test/user/WorkTest.java @@ -5,7 +5,7 @@ import org.springframework.beans.factory.annotation.Autowired; import com.lyms.cm.entity.sys.SysRoles; import com.lyms.cm.entity.sys.SysUsers; -import com.lyms.synch.CenterCallback; +import com.lyms.synch.SyncCallback; import com.lyms.synch.SyncnCenter; import com.lyms.synch.SyncnCenter.Work; import com.lyms.synch.entity.ModelType; @@ -44,7 +44,7 @@ public class WorkTest extends BaseTest { roles.setName("roles"); user.setRoles(roles); - center.buildWork().push(model, new CenterCallback() { + center.buildWork().push(model, new SyncCallback() { @Override public void callBack(Object object) { System.out.println("push callBack : " + object); @@ -85,7 +85,7 @@ public class WorkTest extends BaseTest { Work work = center.buildWork(); try { // final AckObj ack = new AckObj(); - work.pullTmp(new CenterCallback() { + work.pullTmp(new SyncCallback() { @Override public void callBack(Object object) { SyncnModel model = (SyncnModel) object; @@ -110,7 +110,7 @@ public class WorkTest extends BaseTest { Work work2 = center.buildWork(); try { // final AckObj ack = new AckObj(); - work2.pullFix(new CenterCallback() { + work2.pullFix(new SyncCallback() { @Override public void callBack(Object object) { // remote diff --git a/core.sdk/src/main/java/com/lyms/synch/CenterCallback.java b/core.sdk/src/main/java/com/lyms/synch/CenterCallback.java deleted file mode 100644 index f99c637..0000000 --- a/core.sdk/src/main/java/com/lyms/synch/CenterCallback.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.lyms.synch; - -/** - *
  • @ClassName: CenterCallback - *
  • @Description: 数据回调 - *
  • @author maliang - *
  • @date 2017年3月14日 - *
  • - */ -public interface CenterCallback { - public void callBack(Object object); -} diff --git a/core.sdk/src/main/java/com/lyms/synch/SyncCallback.java b/core.sdk/src/main/java/com/lyms/synch/SyncCallback.java new file mode 100644 index 0000000..0a9c660 --- /dev/null +++ b/core.sdk/src/main/java/com/lyms/synch/SyncCallback.java @@ -0,0 +1,12 @@ +package com.lyms.synch; + +/** + *
  • @ClassName: CenterCallback + *
  • @Description: 数据回调 + *
  • @author maliang + *
  • @date 2017年3月14日 + *
  • + */ +public interface SyncCallback { + public void callBack(Object object); +} diff --git a/core.sdk/src/main/java/com/lyms/synch/SyncnCenter.java b/core.sdk/src/main/java/com/lyms/synch/SyncnCenter.java index 9902e9a..d8a2823 100644 --- a/core.sdk/src/main/java/com/lyms/synch/SyncnCenter.java +++ b/core.sdk/src/main/java/com/lyms/synch/SyncnCenter.java @@ -66,7 +66,7 @@ public class SyncnCenter { // public CenterCallback callBack; - public Work push(SyncnModel model, CenterCallback callBack) { + public Work push(SyncnModel model, SyncCallback callBack) { this.model = model; Boolean tag = queue.push(model); callBack.callBack(tag); @@ -84,7 +84,7 @@ public class SyncnCenter { *
  • 修改人: *
  • 修改时间: */ - public Work pullFix(CenterCallback callBack) { + public Work pullFix(SyncCallback callBack) { SyncnModel model = queue.pull(ModelType.GET); this.model = model; callBack.callBack(model); @@ -102,7 +102,7 @@ public class SyncnCenter { *
  • 修改人: *
  • 修改时间: */ - public Work pullTmp(CenterCallback callBack) { + public Work pullTmp(SyncCallback callBack) { SyncnModel model = queue.pull(null); this.model = model; callBack.callBack(model); @@ -120,7 +120,7 @@ public class SyncnCenter { *
  • 修改时间: */ public void backPressure() { - this.push(model, new CenterCallback() { + this.push(model, new SyncCallback() { boolean tag = false; @Override