Author: arunpatidar
Date: Tue Jan 22 13:14:49 2019
New Revision: 1851812
URL: http://svn.apache.org/viewvc?rev=1851812&view=rev
Log:
Applied fix from trunk for revision: 1851805
===
Fixed: EntitySync Push and Pull functionalities
(OFBIZ-10818)
Removed unneccessary service implementation and used entity-auto
Fixed some create/update code block in the flow
Modified:
ofbiz/ofbiz-framework/branches/release17.12/ (props changed)
ofbiz/ofbiz-framework/branches/release17.12/framework/entityext/minilang/EntitySyncServices.xml
ofbiz/ofbiz-framework/branches/release17.12/framework/entityext/servicedef/services.xml
ofbiz/ofbiz-framework/branches/release17.12/framework/entityext/src/main/java/org/apache/ofbiz/entityext/synchronization/EntitySyncContext.java
Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 22 13:14:49 2019
@@ -10,4 +10,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1819947,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826780,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871,1837857,1838032,1838256,1838381,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1844943,1845418,1845420,1845466,1845544,1845552,1845558,1845933,1845995,1846097,1846107,1846214,1846594,1846632,1847398,1847478,1847670,1847715,
1847890,1848263,1848336,1848386,1848398,1848441,1848444,1848447,1848449,1848467,1848469,1848745,1848849-1848850,1849021,1849191,1849193,1849275,1849467,1849528,1849540,1849567,1849693,1850015,1850023,1850530,1850647,1850685,1850694,1850914,1850918,1850948,1850953,1851006,1851068,1851074,1851130,1851158,1851163,1851200,1851247,1851319,1851350
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1819947,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826780,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871,1837857,1838032,1838256,1838381,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1844943,1845418,1845420,1845466,1845544,1845552,1845558,1845933,1845995,1846097,1846107,1846214,1846594,1846632,1847398,1847478,1847670,1847715,
1847890,1848263,1848336,1848386,1848398,1848441,1848444,1848447,1848449,1848467,1848469,1848745,1848849-1848850,1849021,1849191,1849193,1849275,1849467,1849528,1849540,1849567,1849693,1850015,1850023,1850530,1850647,1850685,1850694,1850914,1850918,1850948,1850953,1851006,1851068,1851074,1851130,1851158,1851163,1851200,1851247,1851319,1851350,1851805
Modified:
ofbiz/ofbiz-framework/branches/release17.12/framework/entityext/minilang/EntitySyncServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/framework/entityext/minilang/EntitySyncServices.xml?rev=1851812&r1=1851811&r2=1851812&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/branches/release17.12/framework/entityext/minilang/EntitySyncServices.xml
(original)
+++
ofbiz/ofbiz-framework/branches/release17.12/framework/entityext/minilang/EntitySyncServices.xml
Tue Jan 22 13:14:49 2019
@@ -40,27 +40,6 @@ under the License.
</if-compare>
</simple-method>
- <!-- EntitySyncHistory services -->
- <simple-method method-name="createEntitySyncHistory"
short-description="Create EntitySyncHistory">
- <make-value entity-name="EntitySyncHistory" value-field="newEntity"/>
- <set-pk-fields map="parameters" value-field="newEntity"/>
- <now-timestamp field="newEntity.startDate"/>
- <field-to-result field="newEntity.startDate" result-name="startDate"/>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
- <create-value value-field="newEntity"/>
-
- <!-- also set the lastHistoryStartDate on the EntitySync -->
- <entity-one entity-name="EntitySync" value-field="entitySync"/>
- <set from-field="newEntity.startDate"
field="entitySync.lastHistoryStartDate"/>
- <store-value value-field="entitySync"/>
- </simple-method>
- <simple-method method-name="deleteEntitySyncHistory"
short-description="Delete EntitySyncHistory">
- <make-value entity-name="EntitySyncHistory" value-field="lookupPKMap"/>
- <set-pk-fields map="parameters" value-field="lookupPKMap"/>
- <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
-
<!-- EntitySyncInclude services -->
<simple-method method-name="createEntitySyncInclude"
short-description="Create EntitySyncInclude">
<make-value entity-name="EntitySyncInclude" value-field="newEntity"/>
Modified:
ofbiz/ofbiz-framework/branches/release17.12/framework/entityext/servicedef/services.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/framework/entityext/servicedef/services.xml?rev=1851812&r1=1851811&r2=1851812&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/branches/release17.12/framework/entityext/servicedef/services.xml
(original)
+++
ofbiz/ofbiz-framework/branches/release17.12/framework/entityext/servicedef/services.xml
Tue Jan 22 13:14:49 2019
@@ -200,22 +200,28 @@ under the License.
<permission-service service-name="entitySyncPermissionCheck"
main-action="DELETE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
</service>
- <service name="createEntitySyncHistory"
default-entity-name="EntitySyncHistory" engine="simple"
- location="component://entityext/minilang/EntitySyncServices.xml"
invoke="createEntitySyncHistory" auth="true" require-new-transaction="true">
+
+ <service name="updateEntitySyncRunning" default-entity-name="EntitySync"
engine="entity-auto" invoke="update" auth="true">
+ <description>Update EntitySync</description>
+ <permission-service service-name="entitySyncPermissionCheck"
main-action="UPDATE"/>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
+
+ <service name="createEntitySyncHistory"
default-entity-name="EntitySyncHistory" engine="entity-auto" invoke="create"
auth="true">
<description>Create EntitySyncHistory</description>
<permission-service service-name="entitySyncPermissionCheck"
main-action="CREATE"/>
- <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="pk" mode="INOUT" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
<override name="startDate" mode="OUT"/>
</service>
- <service name="updateEntitySyncHistory"
default-entity-name="EntitySyncHistory" engine="entity-auto" invoke="update"
auth="true" require-new-transaction="true">
+ <service name="updateEntitySyncHistory"
default-entity-name="EntitySyncHistory" engine="entity-auto" invoke="update"
auth="true">
<description>Update EntitySyncHistory</description>
<permission-service service-name="entitySyncPermissionCheck"
main-action="UPDATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="deleteEntitySyncHistory"
default-entity-name="EntitySyncHistory" engine="simple"
- location="component://entityext/minilang/EntitySyncServices.xml"
invoke="deleteEntitySyncHistory" auth="true" require-new-transaction="true">
+ <service name="deleteEntitySyncHistory"
default-entity-name="EntitySyncHistory" engine="entity-auto" invoke="delete"
auth="true">
<description>Delete EntitySyncHistory</description>
<permission-service service-name="entitySyncPermissionCheck"
main-action="DELETE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
Modified:
ofbiz/ofbiz-framework/branches/release17.12/framework/entityext/src/main/java/org/apache/ofbiz/entityext/synchronization/EntitySyncContext.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/framework/entityext/src/main/java/org/apache/ofbiz/entityext/synchronization/EntitySyncContext.java?rev=1851812&r1=1851811&r2=1851812&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/branches/release17.12/framework/entityext/src/main/java/org/apache/ofbiz/entityext/synchronization/EntitySyncContext.java
(original)
+++
ofbiz/ofbiz-framework/branches/release17.12/framework/entityext/src/main/java/org/apache/ofbiz/entityext/synchronization/EntitySyncContext.java
Tue Jan 22 13:14:49 2019
@@ -302,11 +302,17 @@ public class EntitySyncContext {
public void createInitialHistory() throws SyncDataErrorException,
SyncServiceErrorException {
String errorMsg = "Not running EntitySync [" + entitySyncId + "],
could not create EntitySyncHistory";
try {
- Map<String, Object> initialHistoryRes =
dispatcher.runSync("createEntitySyncHistory", UtilMisc.toMap("entitySyncId",
entitySyncId, "runStatusId", "ESR_RUNNING", "beginningSynchTime",
this.currentRunStartTime, "lastCandidateEndTime", this.currentRunEndTime,
"userLogin", userLogin));
+ Timestamp startDateTime = UtilDateTime.nowTimestamp();
+ Map<String, Object> initialHistoryRes =
dispatcher.runSync("createEntitySyncHistory", UtilMisc.toMap("entitySyncId",
entitySyncId, "runStatusId", "ESR_RUNNING", "beginningSynchTime",
this.currentRunStartTime, "lastCandidateEndTime", this.currentRunEndTime,
"startDate", startDateTime, "userLogin", userLogin));
if (ServiceUtil.isError(initialHistoryRes)) {
throw new SyncDataErrorException(errorMsg, null, null,
initialHistoryRes, null);
}
this.startDate = (Timestamp) initialHistoryRes.get("startDate");
+
+ Map<String, Object> result =
dispatcher.runSync("updateEntitySync", UtilMisc.toMap("entitySyncId",
entitySyncId, "lastHistoryStartDate", this.startDate, "userLogin", userLogin));
+ if (ServiceUtil.isError(result)) {
+ throw new SyncDataErrorException(errorMsg, null, null, result,
null);
+ }
} catch (GenericServiceException e) {
throw new SyncServiceErrorException(errorMsg, e);
}
@@ -403,7 +409,7 @@ public class EntitySyncContext {
}
throw new SyncDataErrorException("Error getting values
to create from the datasource", e);
}
-
+
Timestamp nextTxTime;
if (firstVal != null) {
nextTxTime =
firstVal.getTimestamp(ModelEntity.CREATE_STAMP_TX_FIELD);
@@ -415,7 +421,7 @@ public class EntitySyncContext {
this.nextCreateTxTime = nextTxTime;
Debug.logInfo("EntitySync: Set nextCreateTxTime to ["
+ nextTxTime + "]", module);
}
-
+
Timestamp curEntityNextTxTime =
this.nextEntityCreateTxTime.get(modelEntity.getEntityName());
if (curEntityNextTxTime == null ||
nextTxTime.before(curEntityNextTxTime)) {
this.nextEntityCreateTxTime.put(modelEntity.getEntityName(), nextTxTime);
@@ -430,7 +436,7 @@ public class EntitySyncContext {
}
throw new SyncDataErrorException("Caught runtime error while
getting values to create", t);
}
-
+
try {
TransactionUtil.commit(beganTransaction);
} catch (GenericTransactionException e) {
@@ -508,10 +514,10 @@ public class EntitySyncContext {
EntityCondition.makeCondition(ModelEntity.STAMP_TX_FIELD,
EntityOperator.LESS_THAN, currentRunEndTime),
createdBeforeStartCond);
EntityListIterator eli = EntityQuery.use(delegator)
-
.from(modelEntity.getEntityName())
- .where(findValCondition)
-
.orderBy(ModelEntity.STAMP_TX_FIELD, ModelEntity.STAMP_FIELD)
- .queryIterator();
+ .from(modelEntity.getEntityName())
+ .where(findValCondition)
+ .orderBy(ModelEntity.STAMP_TX_FIELD,
ModelEntity.STAMP_FIELD)
+ .queryIterator();
GenericValue nextValue = null;
long valuesPerEntity = 0;
while ((nextValue = eli.next()) != null) {
@@ -543,10 +549,10 @@ public class EntitySyncContext {
EntityCondition.makeCondition(ModelEntity.CREATE_STAMP_TX_FIELD,
EntityOperator.NOT_EQUAL, null),
EntityCondition.makeCondition(ModelEntity.CREATE_STAMP_TX_FIELD,
EntityOperator.LESS_THAN, currentRunEndTime));
EntityListIterator eliNext = EntityQuery.use(delegator)
-
.from(modelEntity.getEntityName())
-
.where(findNextCondition)
-
.orderBy(ModelEntity.STAMP_TX_FIELD)
- .queryIterator();
+ .from(modelEntity.getEntityName())
+ .where(findNextCondition)
+ .orderBy(ModelEntity.STAMP_TX_FIELD)
+ .queryIterator();
// get the first element and it's tx time value...
GenericValue firstVal = eliNext.next();
eliNext.close();
@@ -608,12 +614,12 @@ public class EntitySyncContext {
}
Debug.logInfo(toStoreInfo.toString(), module);
}
-
+
// As the this.nextUpdateTxTime calculation is only based on entities
without values to store, if there at least one value to store returned
// this calculation is false, so it needs to be nullified
if (valuesToStore.size() > 0) {
this.nextUpdateTxTime = null;
- }
+ }
return valuesToStore;
}
@@ -642,10 +648,10 @@ public class EntitySyncContext {
EntityCondition.makeCondition(ModelEntity.STAMP_TX_FIELD,
EntityOperator.GREATER_THAN_EQUAL_TO, currentRunStartTime),
EntityCondition.makeCondition(ModelEntity.STAMP_TX_FIELD,
EntityOperator.LESS_THAN, currentRunEndTime));
EntityListIterator removeEli = EntityQuery.use(delegator)
- .from("EntitySyncRemove")
- .where(findValCondition)
-
.orderBy(ModelEntity.STAMP_TX_FIELD, ModelEntity.STAMP_FIELD)
- .queryIterator();
+ .from("EntitySyncRemove")
+ .where(findValCondition)
+ .orderBy(ModelEntity.STAMP_TX_FIELD,
ModelEntity.STAMP_FIELD)
+ .queryIterator();
GenericValue entitySyncRemove = null;
while ((entitySyncRemove = removeEli.next()) != null) {
// pull the PK from the EntitySyncRemove in the
primaryKeyRemoved field, de-XML-serialize it
@@ -687,10 +693,10 @@ public class EntitySyncContext {
if (keysToRemove.size() == 0) {
EntityCondition findNextCondition =
EntityCondition.makeCondition(ModelEntity.STAMP_TX_FIELD,
EntityOperator.GREATER_THAN_EQUAL_TO, currentRunEndTime);
EntityListIterator eliNext = EntityQuery.use(delegator)
-
.from("EntitySyncRemove")
-
.where(findNextCondition)
-
.orderBy(ModelEntity.STAMP_TX_FIELD)
- .queryIterator();
+ .from("EntitySyncRemove")
+ .where(findNextCondition)
+ .orderBy(ModelEntity.STAMP_TX_FIELD)
+ .queryIterator();
// get the first element and it's tx time value...
GenericValue firstVal = eliNext.next();
eliNext.close();
@@ -743,7 +749,7 @@ public class EntitySyncContext {
if (keysToRemove.size() > 0) {
this.nextRemoveTxTime = null;
}
-
+
return keysToRemove;
}
@@ -780,43 +786,50 @@ public class EntitySyncContext {
// store latest result on EntitySync, ie update
lastSuccessfulSynchTime, should run in own tx
Map<String, Object> updateEsRunResult =
dispatcher.runSync("updateEntitySyncRunning", UtilMisc.toMap("entitySyncId",
entitySyncId, "lastSuccessfulSynchTime", this.currentRunEndTime, "userLogin",
userLogin));
- // store result of service call on history with results so far,
should run in own tx
- Map<String, Object> updateHistoryMap =
UtilMisc.toMap("entitySyncId", entitySyncId, "startDate", startDate,
- "lastSuccessfulSynchTime", this.currentRunEndTime,
"lastCandidateEndTime", this.getNextRunEndTime(),
- "lastSplitStartTime", Long.valueOf(this.splitStartTime));
- updateHistoryMap.put("toCreateInserted",
Long.valueOf(toCreateInserted));
- updateHistoryMap.put("toCreateUpdated",
Long.valueOf(toCreateUpdated));
- updateHistoryMap.put("toCreateNotUpdated",
Long.valueOf(toCreateNotUpdated));
- updateHistoryMap.put("toStoreInserted",
Long.valueOf(toStoreInserted));
- updateHistoryMap.put("toStoreUpdated",
Long.valueOf(toStoreUpdated));
- updateHistoryMap.put("toStoreNotUpdated",
Long.valueOf(toStoreNotUpdated));
- updateHistoryMap.put("toRemoveDeleted",
Long.valueOf(toRemoveDeleted));
- updateHistoryMap.put("toRemoveAlreadyDeleted",
Long.valueOf(toRemoveAlreadyDeleted));
- updateHistoryMap.put("runningTimeMillis",
Long.valueOf(runningTimeMillis));
- updateHistoryMap.put("totalStoreCalls",
Long.valueOf(totalStoreCalls));
- updateHistoryMap.put("totalSplits", Long.valueOf(totalSplits));
- updateHistoryMap.put("totalRowsExported",
Long.valueOf(totalRowsExported));
- updateHistoryMap.put("totalRowsToCreate",
Long.valueOf(totalRowsToCreate));
- updateHistoryMap.put("totalRowsToStore",
Long.valueOf(totalRowsToStore));
- updateHistoryMap.put("totalRowsToRemove",
Long.valueOf(totalRowsToRemove));
- updateHistoryMap.put("perSplitMinMillis",
Long.valueOf(perSplitMinMillis));
- updateHistoryMap.put("perSplitMaxMillis",
Long.valueOf(perSplitMaxMillis));
- updateHistoryMap.put("perSplitMinItems",
Long.valueOf(perSplitMinItems));
- updateHistoryMap.put("perSplitMaxItems",
Long.valueOf(perSplitMaxItems));
- updateHistoryMap.put("userLogin", userLogin);
- Map<String, Object> updateEsHistRunResult =
dispatcher.runSync("updateEntitySyncHistory", updateHistoryMap);
-
- // now we have updated EntitySync and EntitySyncHistory, check
both ops for errors...
- if (ServiceUtil.isError(updateEsRunResult)) {
- String errorMsg = "Error running EntitySync [" + entitySyncId
+ "], update of EntitySync record with lastSuccessfulSynchTime failed.";
- throw new SyncDataErrorException(errorMsg, null, null,
updateEsRunResult, null);
- }
-
- if (ServiceUtil.isError(updateEsHistRunResult)) {
- String errorMsg = "Error running EntitySync [" + entitySyncId
+ "], update of EntitySyncHistory (startDate:[" + startDate + "]) record with
lastSuccessfulSynchTime and result stats failed.";
- throw new SyncDataErrorException(errorMsg, null, null,
updateEsHistRunResult, null);
+ GenericValue entitySyncHistory =
EntityQuery.use(delegator).from("EntitySyncHistory").where("startDate",startDate,
"entitySyncId", entitySyncId).queryOne();
+ if(entitySyncHistory != null) {
+ // store result of service call on history with results so
far, should run in own tx
+ ModelService model =
dispatcher.getDispatchContext().getModelService("updateEntitySyncHistory");
+ Map<String, Object> updateHistoryMap =
model.makeValid(entitySyncHistory, ModelService.IN_PARAM);
+
+ updateHistoryMap.put("lastSuccessfulSynchTime",
this.currentRunEndTime);
+ updateHistoryMap.put("lastCandidateEndTime",
this.getNextRunEndTime());
+ updateHistoryMap.put("lastSplitStartTime",
Long.valueOf(this.splitStartTime));
+ updateHistoryMap.put("toCreateInserted",
Long.valueOf(toCreateInserted));
+ updateHistoryMap.put("toCreateUpdated",
Long.valueOf(toCreateUpdated));
+ updateHistoryMap.put("toCreateNotUpdated",
Long.valueOf(toCreateNotUpdated));
+ updateHistoryMap.put("toStoreInserted",
Long.valueOf(toStoreInserted));
+ updateHistoryMap.put("toStoreUpdated",
Long.valueOf(toStoreUpdated));
+ updateHistoryMap.put("toStoreNotUpdated",
Long.valueOf(toStoreNotUpdated));
+ updateHistoryMap.put("toRemoveDeleted",
Long.valueOf(toRemoveDeleted));
+ updateHistoryMap.put("toRemoveAlreadyDeleted",
Long.valueOf(toRemoveAlreadyDeleted));
+ updateHistoryMap.put("runningTimeMillis",
Long.valueOf(runningTimeMillis));
+ updateHistoryMap.put("totalStoreCalls",
Long.valueOf(totalStoreCalls));
+ updateHistoryMap.put("totalSplits", Long.valueOf(totalSplits));
+ updateHistoryMap.put("totalRowsExported",
Long.valueOf(totalRowsExported));
+ updateHistoryMap.put("totalRowsToCreate",
Long.valueOf(totalRowsToCreate));
+ updateHistoryMap.put("totalRowsToStore",
Long.valueOf(totalRowsToStore));
+ updateHistoryMap.put("totalRowsToRemove",
Long.valueOf(totalRowsToRemove));
+ updateHistoryMap.put("perSplitMinMillis",
Long.valueOf(perSplitMinMillis));
+ updateHistoryMap.put("perSplitMaxMillis",
Long.valueOf(perSplitMaxMillis));
+ updateHistoryMap.put("perSplitMinItems",
Long.valueOf(perSplitMinItems));
+ updateHistoryMap.put("perSplitMaxItems",
Long.valueOf(perSplitMaxItems));
+ updateHistoryMap.put("userLogin", userLogin);
+ Map<String, Object> updateEsHistRunResult =
dispatcher.runSync("updateEntitySyncHistory", updateHistoryMap);
+
+ // now we have updated EntitySync and EntitySyncHistory, check
both ops for errors...
+ if (ServiceUtil.isError(updateEsRunResult)) {
+ String errorMsg = "Error running EntitySync [" +
entitySyncId + "], update of EntitySync record with lastSuccessfulSynchTime
failed.";
+ throw new SyncDataErrorException(errorMsg, null, null,
updateEsRunResult, null);
+ }
+
+
+ if (ServiceUtil.isError(updateEsHistRunResult)) {
+ String errorMsg = "Error running EntitySync [" +
entitySyncId + "], update of EntitySyncHistory (startDate:[" + startDate + "])
record with lastSuccessfulSynchTime and result stats failed.";
+ throw new SyncDataErrorException(errorMsg, null, null,
updateEsHistRunResult, null);
+ }
}
- } catch (GenericServiceException e) {
+ } catch (GenericServiceException | GenericEntityException e) {
throw new SyncServiceErrorException("Error saving results reported
from data store", e);
}
}
@@ -899,11 +912,11 @@ public class EntitySyncContext {
// find all instances of this entity with the STAMP_TX_FIELD
!= null, sort ascending to get lowest/oldest value first, then grab first and
consider as candidate currentRunStartTime
fieldsToSelect.add(ModelEntity.STAMP_TX_FIELD);
EntityListIterator eli = EntityQuery.use(delegator)
- .select(fieldsToSelect)
-
.from(modelEntity.getEntityName())
-
.where(EntityCondition.makeCondition(ModelEntity.STAMP_TX_FIELD,
EntityOperator.NOT_EQUAL, null))
-
.orderBy(ModelEntity.STAMP_TX_FIELD)
- .queryIterator();
+ .select(fieldsToSelect)
+ .from(modelEntity.getEntityName())
+
.where(EntityCondition.makeCondition(ModelEntity.STAMP_TX_FIELD,
EntityOperator.NOT_EQUAL, null))
+ .orderBy(ModelEntity.STAMP_TX_FIELD)
+ .queryIterator();
GenericValue nextValue = eli.next();
eli.close();
if (nextValue != null) {
@@ -989,6 +1002,11 @@ public class EntitySyncContext {
}
String serviceErrorMsg = "Error running EntitySync [" +
entitySyncId + "], call to store service [" + targetServiceName + "] failed.";
try {
+
+ //TODO: It should use authentic user instead of system, think
on alternate solution
+ GenericValue userLogin =
EntityQuery.use(delegator).from("UserLogin").where("userLoginId",
"system").queryOne();
+ targetServiceMap.put("userLogin", userLogin);
+
Map<String, Object> remoteStoreResult =
dispatcher.runSync(targetServiceName, targetServiceMap);
if (ServiceUtil.isError(remoteStoreResult)) {
throw new SyncOtherErrorException(serviceErrorMsg, null,
null, remoteStoreResult, null);
@@ -1013,7 +1031,7 @@ public class EntitySyncContext {
this.toStoreNotUpdated += toStoreNotUpdatedCur;
this.toRemoveDeleted += toRemoveDeletedCur;
this.toRemoveAlreadyDeleted += toRemoveAlreadyDeletedCur;
- } catch (GenericServiceException e) {
+ } catch (GenericServiceException | GenericEntityException e) {
throw new SyncServiceErrorException(serviceErrorMsg, e);
}
}
