← Back to branch summary

~dhis2-devs-core/dhis2/sqlvalidation

« back to all changes in this revision

Viewing changes to dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventController.java

  • Committer: Morten Olav Hansen
  • Date: 2016-08-18 07:22:12 UTC
  • Revision ID: morten@dhis2.org-20160818072212-v72c24iix6ads36r
support compressed POST/PUTs for tracked endpoints

Show diffs side-by-side

added added

removed removed

Lines of Context:
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventController.java
110
110
import java.util.List;
111
111
import java.util.Map;
112
112
import java.util.Set;
113
 
import java.util.zip.GZIPInputStream;
114
113
import java.util.zip.GZIPOutputStream;
115
114
 
116
115
/**
624
623
            throw new WebMessageException( WebMessageUtils.notFound( "Event not found for ID " + uid ) );
625
624
        }
626
625
 
627
 
        Event event = renderService.fromJson( request.getInputStream(), Event.class );
 
626
        InputStream inputStream = StreamUtils.wrapAndCheckCompressionFormat( request.getInputStream() );
 
627
        Event event = renderService.fromJson( inputStream, Event.class );
628
628
        event.setEvent( uid );
629
629
 
630
630
        eventService.updateEventForNote( event );
636
636
    public void postCsvEvents( @RequestParam( required = false, defaultValue = "false" ) boolean skipFirst,
637
637
        HttpServletResponse response, HttpServletRequest request, ImportOptions importOptions ) throws IOException
638
638
    {
639
 
        InputStream inputStream = ContextUtils.isAcceptCsvGzip( request ) ? new GZIPInputStream( request.getInputStream() ) : request.getInputStream();
 
639
        InputStream inputStream = StreamUtils.wrapAndCheckCompressionFormat( request.getInputStream() );
640
640
 
641
641
        Events events = csvEventService.readEvents( inputStream, skipFirst );
642
642
 
668
668
            throw new WebMessageException( WebMessageUtils.notFound( "Event not found for ID " + uid ) );
669
669
        }
670
670
 
671
 
        Event updatedEvent = renderService.fromXml( request.getInputStream(), Event.class );
 
671
        InputStream inputStream = StreamUtils.wrapAndCheckCompressionFormat( request.getInputStream() );
 
672
        Event updatedEvent = renderService.fromXml( inputStream, Event.class );
672
673
        updatedEvent.setEvent( uid );
673
674
 
674
675
        ImportSummary importSummary = eventService.updateEvent( updatedEvent, false, importOptions );
685
686
            throw new WebMessageException( WebMessageUtils.notFound( "Event not found for ID " + uid ) );
686
687
        }
687
688
 
688
 
        Event updatedEvent = renderService.fromJson( request.getInputStream(), Event.class );
 
689
        InputStream inputStream = StreamUtils.wrapAndCheckCompressionFormat( request.getInputStream() );
 
690
        Event updatedEvent = renderService.fromJson( inputStream, Event.class );
689
691
        updatedEvent.setEvent( uid );
690
692
 
691
693
        ImportSummary importSummary = eventService.updateEvent( updatedEvent, false, importOptions );
709
711
            throw new WebMessageException( WebMessageUtils.notFound( "DataElement not found for ID " + dataElementUid ) );
710
712
        }
711
713
 
712
 
        Event updatedEvent = renderService.fromJson( request.getInputStream(), Event.class );
 
714
        InputStream inputStream = StreamUtils.wrapAndCheckCompressionFormat( request.getInputStream() );
 
715
        Event updatedEvent = renderService.fromJson( inputStream, Event.class );
713
716
        updatedEvent.setEvent( uid );
714
717
 
715
718
        ImportSummary importSummary = eventService.updateEvent( updatedEvent, true );
726
729
            throw new WebMessageException( WebMessageUtils.notFound( "Event not found for ID " + uid ) );
727
730
        }
728
731
 
729
 
        Event updatedEvent = renderService.fromJson( request.getInputStream(), Event.class );
 
732
        InputStream inputStream = StreamUtils.wrapAndCheckCompressionFormat( request.getInputStream() );
 
733
        Event updatedEvent = renderService.fromJson( inputStream, Event.class );
730
734
        updatedEvent.setEvent( uid );
731
735
 
732
736
        eventService.updateEventForEventDate( updatedEvent );