=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/JacksonEnrollmentService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/JacksonEnrollmentService.java 2015-10-23 05:32:46 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/JacksonEnrollmentService.java 2015-10-23 07:11:19 +0000 @@ -170,6 +170,10 @@ } } } + else if ( importOptions.getImportStrategy().isUpdate() ) + { + update.addAll( enrollments ); + } else if ( importOptions.getImportStrategy().isDelete() ) { delete.addAll( enrollments.stream().map( Enrollment::getEnrollment ).collect( Collectors.toList() ) ); === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JacksonEventService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JacksonEventService.java 2015-10-23 04:36:05 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JacksonEventService.java 2015-10-23 07:11:19 +0000 @@ -178,6 +178,10 @@ } } } + else if ( importOptions.getImportStrategy().isUpdate() ) + { + update.addAll( events ); + } else if ( importOptions.getImportStrategy().isDelete() ) { delete.addAll( events.stream().map( Event::getEvent ).collect( Collectors.toList() ) ); === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/JacksonTrackedEntityInstanceService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/JacksonTrackedEntityInstanceService.java 2015-10-23 05:08:59 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/JacksonTrackedEntityInstanceService.java 2015-10-23 07:11:19 +0000 @@ -34,7 +34,6 @@ import org.hisp.dhis.dxf2.common.ImportOptions; import org.hisp.dhis.dxf2.importsummary.ImportSummaries; import org.hisp.dhis.dxf2.importsummary.ImportSummary; -import org.hisp.dhis.importexport.ImportStrategy; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StreamUtils; import org.springframework.util.StringUtils; @@ -171,6 +170,10 @@ } } } + else if ( importOptions.getImportStrategy().isUpdate() ) + { + update.addAll( trackedEntityInstances ); + } else if ( importOptions.getImportStrategy().isDelete() ) { delete.addAll( trackedEntityInstances.stream().map( TrackedEntityInstance::getTrackedEntityInstance ).collect( Collectors.toList() ) );