RM-4921 - added new transaction to get the updated node in order to get the updated properties

This commit is contained in:
Ramona Popa
2017-05-12 17:39:43 +03:00
parent 8bdba24a46
commit 00bbe32229
7 changed files with 55 additions and 7 deletions

View File

@@ -130,7 +130,15 @@ public class RecordCategoriesEntityResource implements
};
transactionService.getRetryingTransactionHelper().doInTransaction(callback, false, true);
FileInfo info = fileFolderService.getFileInfo(nodeRef);
RetryingTransactionCallback<FileInfo> readCallback = new RetryingTransactionCallback<FileInfo>()
{
public FileInfo execute()
{
return fileFolderService.getFileInfo(nodeRef);
}
};
FileInfo info = transactionService.getRetryingTransactionHelper().doInTransaction(readCallback, false, true);
return nodesModelFactory.createRecordCategory(info, parameters, null, false);
}

View File

@@ -125,7 +125,15 @@ public class RecordFolderEntityResource implements EntityResourceAction.ReadById
};
transactionService.getRetryingTransactionHelper().doInTransaction(callback, false, true);
FileInfo info = fileFolderService.getFileInfo(nodeRef);
RetryingTransactionCallback<FileInfo> readCallback = new RetryingTransactionCallback<FileInfo>()
{
public FileInfo execute()
{
return fileFolderService.getFileInfo(nodeRef);
}
};
FileInfo info = transactionService.getRetryingTransactionHelper().doInTransaction(readCallback, false, true);
return nodesModelFactory.createRecordFolder(info, parameters, null, false);
}

View File

@@ -217,7 +217,15 @@ public class RecordsEntityResource implements BinaryResourceAction.Read,
transactionService.getRetryingTransactionHelper().doInTransaction(callback, false, true);
// return record state
FileInfo info = fileFolderService.getFileInfo(record);
RetryingTransactionCallback<FileInfo> readCallback = new RetryingTransactionCallback<FileInfo>()
{
public FileInfo execute()
{
return fileFolderService.getFileInfo(record);
}
};
FileInfo info = transactionService.getRetryingTransactionHelper().doInTransaction(readCallback, false, true);
apiUtils.postActivity(info, recordInfo.getParentId(), ActivityType.FILE_UPDATED);
return nodesModelFactory.createRecord(info, parameters, null, false);
}

View File

@@ -128,7 +128,15 @@ public class TransferContainerEntityResource implements
};
transactionService.getRetryingTransactionHelper().doInTransaction(callback, false, true);
FileInfo info = fileFolderService.getFileInfo(nodeRef);
RetryingTransactionCallback<FileInfo> readCallback = new RetryingTransactionCallback<FileInfo>()
{
public FileInfo execute()
{
return fileFolderService.getFileInfo(nodeRef);
}
};
FileInfo info = transactionService.getRetryingTransactionHelper().doInTransaction(readCallback, false, true);
return nodesModelFactory.createTransferContainer(info, parameters, null, false);
}
}

View File

@@ -192,7 +192,7 @@ public class UnfiledContainerChildrenRelation implements RelationshipResourceAct
return createdNodes;
}
};
List<NodeRef> createdNodes = transactionService.getRetryingTransactionHelper().doInTransaction(callback);
List<NodeRef> createdNodes = transactionService.getRetryingTransactionHelper().doInTransaction(callback, false, true);
// Get the nodes info
List<UnfiledContainerChild> result = new LinkedList<>();

View File

@@ -126,7 +126,15 @@ public class UnfiledContainerEntityResource
};
transactionService.getRetryingTransactionHelper().doInTransaction(callback, false, true);
FileInfo info = fileFolderService.getFileInfo(nodeRef);
RetryingTransactionCallback<FileInfo> readCallback = new RetryingTransactionCallback<FileInfo>()
{
public FileInfo execute()
{
return fileFolderService.getFileInfo(nodeRef);
}
};
FileInfo info = transactionService.getRetryingTransactionHelper().doInTransaction(readCallback, false, true);
apiUtils.postActivity(info, unfiledContainerInfo.getParentId(), ActivityType.FILE_UPDATED);
return nodesModelFactory.createUnfiledContainer(info, parameters, null, false);
}

View File

@@ -130,7 +130,15 @@ public class UnfiledRecordFolderEntityResource implements EntityResourceAction.R
};
transactionService.getRetryingTransactionHelper().doInTransaction(callback, false, true);
FileInfo info = fileFolderService.getFileInfo(nodeRef);
RetryingTransactionCallback<FileInfo> readCallback = new RetryingTransactionCallback<FileInfo>()
{
public FileInfo execute()
{
return fileFolderService.getFileInfo(nodeRef);
}
};
FileInfo info = transactionService.getRetryingTransactionHelper().doInTransaction(readCallback, false, true);
apiUtils.postActivity(info, unfiledRecordFolderInfo.getParentId(), ActivityType.FILE_UPDATED);
return nodesModelFactory.createUnfiledRecordFolder(info, parameters, null, false);
}