=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/csv/DefaultCsvEventService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/csv/DefaultCsvEventService.java 2014-10-08 06:15:25 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/csv/DefaultCsvEventService.java 2014-10-08 06:16:03 +0000 @@ -34,13 +34,11 @@ import com.fasterxml.jackson.dataformat.csv.CsvMapper; import com.fasterxml.jackson.dataformat.csv.CsvParser; import com.fasterxml.jackson.dataformat.csv.CsvSchema; -import org.hisp.dhis.common.IdentifiableObjectManager; import org.hisp.dhis.dxf2.events.event.Coordinate; import org.hisp.dhis.dxf2.events.event.DataValue; import org.hisp.dhis.dxf2.events.event.Event; import org.hisp.dhis.dxf2.events.event.Events; import org.hisp.dhis.event.EventStatus; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; import java.io.IOException; @@ -58,9 +56,6 @@ private static CsvSchema csvSchema = csvMapper.schemaFor( CsvEventDataValue.class ).withLineSeparator( "\n" ); - @Autowired - private IdentifiableObjectManager manager; - static { csvMapper.enable( CsvParser.Feature.WRAP_AS_ARRAY ); @@ -131,7 +126,8 @@ { event = new Event(); event.setEvent( dataValue.getEvent() ); - event.setStatus( StringUtils.isEmpty( dataValue.getStatus() ) ? EventStatus.ACTIVE : Enum.valueOf( EventStatus.class, dataValue.getStatus() ) ); + event.setStatus( StringUtils.isEmpty( dataValue.getStatus() ) ? EventStatus.ACTIVE : Enum.valueOf( EventStatus.class, + dataValue.getStatus() ) ); event.setProgram( dataValue.getProgram() ); event.setProgramStage( dataValue.getProgramStage() ); event.setEnrollment( dataValue.getEnrollment() );