=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventController.java 2014-11-17 07:54:34 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventController.java 2014-11-24 11:08:48 +0000 @@ -208,7 +208,7 @@ OutputStream outputStream = response.getOutputStream(); response.setContentType( "application/csv" ); - if ( isGzip( request ) ) + if ( ContextUtils.isAcceptGzip( request ) ) { response.addHeader( ContextUtils.HEADER_CONTENT_TRANSFER_ENCODING, "binary" ); outputStream = new GZIPOutputStream( outputStream ); @@ -522,7 +522,7 @@ @RequestParam( required = false, defaultValue = "false" ) boolean skipFirst, HttpServletResponse response, HttpServletRequest request, ImportOptions importOptions ) throws IOException { - InputStream inputStream = isGzip( request ) ? new GZIPInputStream( request.getInputStream() ) : request.getInputStream(); + InputStream inputStream = ContextUtils.isAcceptGzip( request ) ? new GZIPInputStream( request.getInputStream() ) : request.getInputStream(); Events events = csvEventService.readEvents( inputStream, skipFirst ); @@ -667,11 +667,4 @@ response.setStatus( HttpServletResponse.SC_NO_CONTENT ); eventService.deleteEvent( event ); } - - private boolean isGzip( HttpServletRequest request ) - { - return request != null && ( - (request.getPathInfo() != null && request.getPathInfo().endsWith( ".gz" )) - || (request.getHeader( "Accept" ) != null && request.getHeader( "Accept" ).contains( "application/csv+gzip" ))); - } } \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/ContextUtils.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/ContextUtils.java 2014-11-17 22:18:59 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/ContextUtils.java 2014-11-24 11:08:48 +0000 @@ -410,4 +410,18 @@ return false; } + + /** + * Indicates whether the given requests indicates that it accepts a compressed + * response. + * + * @param request the HttpServletRequest. + * @return whether the given requests indicates that it accepts a compressed + * response. + */ + public static boolean isAcceptGzip( HttpServletRequest request ) + { + return request != null && ( ( request.getPathInfo() != null && request.getPathInfo().endsWith( ".gz" ) ) + || ( request.getHeader( "Accept" ) != null && request.getHeader( "Accept" ).contains( "application/csv+gzip" ) ) ); + } } \ No newline at end of file