honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add removeAll function to DeleteConflictList

This commit is contained in:
Tadgh 2020-08-01 13:15:22 -07:00
parent 46251af81a
commit ad887428b3
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hapi-fhir-jpaserver-api/src/main/java/ca/uhn/fhir/jpa/api/model/DeleteConflictList.java
View File

@ -127,6 +127,10 @@ public class DeleteConflictList implements Iterable<DeleteConflict> {
return myList.size(); return myList.size();
} }
public void removeAll() {
this.removeIf(x -> true);
}
@Override @Override
public String toString() { public String toString() {
return myList.toString(); return myList.toString();

4
hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiPersonDeletingSvc.java
View File

@ -95,10 +95,10 @@ public class EmpiPersonDeletingSvc {
DeleteConflictList newBatch = new DeleteConflictList(); DeleteConflictList newBatch = new DeleteConflictList();
for (DeleteConflict next : theDcl) { for (DeleteConflict next : theDcl) {
IdDt nextSource = next.getSourceId(); IdDt nextSource = next.getSourceId();
ourLog.info("Have delete conflict {} - Cascading delete", next); ourLog.info("Have delete conflict {} - Cascading delete", nextSource);
theDao.delete(nextSource.toVersionless(), newBatch, null, null); theDao.delete(nextSource.toVersionless(), newBatch, null, null);
} }
theDcl.removeIf(x -> true); theDcl.removeAll();
theDcl.addAll(newBatch); theDcl.addAll(newBatch);
} }
} }