p85126437
/
datagear
forked from p81075629/datagear
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' 

Conflicts:
	datagear-dataexchange/src/main/java/org/datagear/dataexchange/BatchDataExchangeService.java
This commit is contained in:
datagear 2019-07-05 19:01:34 +08:00
parent 46194c1a12 cfba22741d
commit fc92c0fbc9
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
datagear-dataexchange/src/main/java/org/datagear/dataexchange/BatchDataExchangeListener.java
View File

@ -23,6 +23,7 @@ public interface BatchDataExchangeListener extends DataExchangeListener
* 子数据交换提交失败。
*
* @param subDataExchange
* @param cause
*/
void onSubmitFail(SubDataExchange subDataExchange);

1
datagear-dataexchange/src/main/java/org/datagear/dataexchange/BatchDataExchangeService.java
View File

@ -9,7 +9,6 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import org.datagear.dataexchange.support.AbstractDevotedDataExchangeService;
import org.datagear.dataexchange.support.DefaultBatchDataExchangeContext;
/**
* 批量数据交换服务。

7
datagear-dataexchange/src/main/java/org/datagear/dataexchange/support/DefaultBatchDataExchangeContext.java → datagear-dataexchange/src/main/java/org/datagear/dataexchange/DefaultBatchDataExchangeContext.java
View File

@ -2,7 +2,7 @@
* Copyright (c) 2018 datagear.org. All Rights Reserved.
*/
package org.datagear.dataexchange.support;
package org.datagear.dataexchange;
import java.util.HashSet;
import java.util.Iterator;
@ -12,11 +12,6 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.FutureTask;
import java.util.concurrent.atomic.AtomicBoolean;
import org.datagear.dataexchange.BatchDataExchangeContext;
import org.datagear.dataexchange.BatchDataExchangeListener;
import org.datagear.dataexchange.DataExchange;
import org.datagear.dataexchange.DataExchangeService;
import org.datagear.dataexchange.SubDataExchange;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;