Skip to content

Commit

Permalink
task: Support the zip/gzip format in tracker exporter endpoints [ DHI…
Browse files Browse the repository at this point in the history
…S2-16165 ] [ 2.40 ] (#16046)

* task: add gzip/unzip support to tracker/events

* fix: harmonize compressione support events/trackedentities

* fix: compress csv object, improve testing

* fix: unit tests
  • Loading branch information
lucaCambi77 authored Jan 8, 2024
1 parent 00d60a0 commit 952837e
Show file tree
Hide file tree
Showing 15 changed files with 1,392 additions and 518 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@ public interface CsvEventService<T> {
void writeEvents(OutputStream outputStream, List<T> events, boolean withHeader)
throws IOException;

void writeZip(OutputStream outputStream, List<T> toCompress, boolean withHeader, String file)
throws IOException;

void writeGzip(OutputStream outputStream, List<T> toCompress, boolean withHeader)
throws IOException;

List<T> readEvents(InputStream inputStream, boolean skipFirst)
throws IOException, org.locationtech.jts.io.ParseException;
}
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,19 @@ public void writeEvents(OutputStream outputStream, List<Event> events, boolean w
writer.writeValue(outputStream, dataValues);
}

@Override
public void writeZip(
OutputStream outputStream, List<Event> toCompress, boolean withHeader, String file)
throws IOException {
// in use only in the new tracker endpoints
}

@Override
public void writeGzip(OutputStream outputStream, List<Event> toCompress, boolean withHeader)
throws IOException {
// in use only in the new tracker endpoints
}

@Override
public List<Event> readEvents(InputStream inputStream, boolean skipFirst)
throws IOException, ParseException {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
/*
* Copyright (c) 2004-2023, University of Oslo
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
* Neither the name of the HISP project nor the names of its contributors may
* be used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.hisp.dhis.webapi.controller.tracker.export;

import static org.mockito.Mockito.mock;

import org.hisp.dhis.dxf2.events.event.EventService;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.context.annotation.Profile;

@Configuration
class TrackerEventExportTestConfiguration {

@Primary
@Profile("TrackerEventExport")
@Bean
EventService eventService() {
return mock(EventService.class);
}
}
Loading

0 comments on commit 952837e

Please sign in to comment.