Skip to content

Commit

Permalink
Move opencsv to be non-shaded via liquibase
Browse files Browse the repository at this point in the history
for details see liquibase/liquibase#2903
  • Loading branch information
Johannes Graf committed Nov 25, 2022
1 parent bf6ca94 commit 770d92d
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 9 deletions.
7 changes: 7 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,13 @@
<scope>test</scope>
</dependency>

<!-- csv file export -->
<dependency>
<groupId>com.opencsv</groupId>
<artifactId>opencsv</artifactId>
<version>5.6</version>
</dependency>

<!-- Shedlock -->
<dependency>
<groupId>net.javacrumbs.shedlock</groupId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.synyx.urlaubsverwaltung.application.statistics;

import liquibase.util.csv.CSVWriter;

import com.opencsv.CSVWriter;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.MessageSource;
import org.springframework.stereotype.Service;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.synyx.urlaubsverwaltung.csv;

import liquibase.util.csv.CSVWriter;

import com.opencsv.CSVWriter;
import net.fortuna.ical4j.validate.ValidationException;
import org.springframework.core.io.ByteArrayResource;
import org.synyx.urlaubsverwaltung.web.FilterPeriod;
Expand All @@ -10,9 +11,10 @@
import java.io.OutputStreamWriter;
import java.util.List;

import static com.opencsv.ICSVWriter.DEFAULT_LINE_END;
import static com.opencsv.ICSVWriter.DEFAULT_QUOTE_CHARACTER;
import static com.opencsv.ICSVWriter.NO_QUOTE_CHARACTER;
import static java.nio.charset.StandardCharsets.UTF_8;
import static liquibase.util.csv.CSVReader.DEFAULT_QUOTE_CHARACTER;
import static liquibase.util.csv.opencsv.CSVWriter.NO_QUOTE_CHARACTER;

public interface CsvExportService<T> {

Expand Down Expand Up @@ -77,7 +79,7 @@ default ByteArrayResource resource(FilterPeriod period, List<T> data) {
byteArrayOutputStream.write(bom());

try (final OutputStreamWriter outputStreamWriter = new OutputStreamWriter(byteArrayOutputStream, UTF_8)) {
try (final CSVWriter csvWriter = new CSVWriter(outputStreamWriter, separator(), NO_QUOTE_CHARACTER, DEFAULT_QUOTE_CHARACTER)) {
try (final CSVWriter csvWriter = new CSVWriter(outputStreamWriter, separator(), NO_QUOTE_CHARACTER, DEFAULT_QUOTE_CHARACTER, DEFAULT_LINE_END)) {
write(period, data, csvWriter);
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.synyx.urlaubsverwaltung.sicknote.statistics;

import liquibase.util.csv.CSVWriter;

import com.opencsv.CSVWriter;
import org.springframework.context.MessageSource;
import org.springframework.stereotype.Service;
import org.synyx.urlaubsverwaltung.csv.CsvExportService;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.synyx.urlaubsverwaltung.application.statistics;

import liquibase.util.csv.CSVWriter;
import com.opencsv.CSVWriter;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.synyx.urlaubsverwaltung.csv;

import liquibase.util.csv.CSVWriter;
import com.opencsv.CSVWriter;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Spy;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.synyx.urlaubsverwaltung.sicknote.statistics;

import liquibase.util.csv.CSVWriter;
import com.opencsv.CSVWriter;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
Expand Down

0 comments on commit 770d92d

Please sign in to comment.