honeymoose/hapi-fhir
1
0
Fork 0
mirror of https://github.com/hapifhir/hapi-fhir.git synced 2025-02-18 02:45:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make preDelete consistent with postCreate

Browse Source
This commit is contained in:
James 2017-02-14 21:09:01 -05:00
parent 5589990eb5
commit 7ea7bd45cf
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirResourceDao.java
View File

@ -192,7 +192,7 @@ public abstract class BaseHapiFhirResourceDao<T extends IBaseResource> extends B
validateOkToDelete(deleteConflicts, entity); validateOkToDelete(deleteConflicts, entity);
preDelete(resourceToDelete); preDelete(resourceToDelete, entity);
// Notify interceptors // Notify interceptors
if (theRequestDetails != null) { if (theRequestDetails != null) {
@ -722,7 +722,8 @@ public abstract class BaseHapiFhirResourceDao<T extends IBaseResource> extends B
* Subclasses may override to provide behaviour. Invoked within a delete * Subclasses may override to provide behaviour. Invoked within a delete
* transaction with the resource that is about to be deleted. * transaction with the resource that is about to be deleted.
*/ */
protected void preDelete(T theResourceToDelete) { @SuppressWarnings("unused")
protected void preDelete(T theResourceToDelete, ResourceTable theEntityToDelete) {
// nothing by default // nothing by default
} }

4
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoSearchParameterDstu3.java
View File

@ -98,8 +98,8 @@ public class FhirResourceDaoSearchParameterDstu3 extends FhirResourceDaoDstu3<Se
} }
@Override @Override
protected void preDelete(SearchParameter theResourceToDelete) { protected void preDelete(SearchParameter theResourceToDelete, ResourceTable theEntityToDelete) {
super.preDelete(theResourceToDelete); super.preDelete(theResourceToDelete, theEntityToDelete);
markAffectedResources(theResourceToDelete); markAffectedResources(theResourceToDelete);
} }