|
6 | 6 | import java.io.IOException;
|
7 | 7 | import java.io.InputStream;
|
8 | 8 | import java.io.InputStreamReader;
|
| 9 | +import java.io.Reader; |
9 | 10 | import java.nio.charset.StandardCharsets;
|
10 | 11 | import java.text.ParseException;
|
11 | 12 | import java.text.SimpleDateFormat;
|
|
19 | 20 |
|
20 | 21 | import org.apache.commons.lang3.StringUtils;
|
21 | 22 |
|
22 |
| -import com.opencsv.CSVReaderBuilder; |
23 |
| -import com.opencsv.exceptions.CsvException; |
| 23 | +import de.siegmar.fastcsv.reader.CsvReader; |
| 24 | +import de.siegmar.fastcsv.reader.NamedCsvRecord; |
24 | 25 |
|
25 | 26 | import com.imsweb.mph.internal.HematoDTO;
|
26 | 27 |
|
|
30 | 31 | */
|
31 | 32 | public class DefaultHematoDataProvider implements HematoDataProvider {
|
32 | 33 |
|
33 |
| - private Map<String, List<HematoDTO>> _samePrimaryDto; |
34 |
| - private Map<String, List<HematoDTO>> _transformToDto; |
35 |
| - private Map<String, List<HematoDTO>> _transformFromDto; |
| 34 | + private final Map<String, List<HematoDTO>> _samePrimaryDto; |
| 35 | + private final Map<String, List<HematoDTO>> _transformToDto; |
| 36 | + private final Map<String, List<HematoDTO>> _transformFromDto; |
36 | 37 |
|
37 | 38 | public DefaultHematoDataProvider() {
|
| 39 | + |
38 | 40 | _samePrimaryDto = new HashMap<>();
|
39 | 41 | try (InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream("Hematopoietic2010SamePrimaryPairs.csv")) {
|
40 | 42 | if (is == null)
|
41 | 43 | throw new IllegalStateException("Unable to get Hematopoietic2010SamePrimaryPairs.csv");
|
42 |
| - for (String[] row : new CSVReaderBuilder(new InputStreamReader(is, StandardCharsets.US_ASCII)).withSkipLines(1).build().readAll()) { |
43 |
| - Short validStartYear = StringUtils.isNotBlank(row[1]) ? Short.valueOf(row[1]) : null; |
44 |
| - Short validEndYear = StringUtils.isNotBlank(row[2]) ? Short.valueOf(row[2]) : null; |
45 |
| - Short startYear = StringUtils.isNotBlank(row[3]) ? Short.valueOf(row[3]) : null; |
46 |
| - Short endYear = StringUtils.isNotBlank(row[4]) ? Short.valueOf(row[4]) : null; |
47 |
| - if (_samePrimaryDto.containsKey(row[0])) |
48 |
| - _samePrimaryDto.get(row[0]).add(new HematoDTO(validStartYear, validEndYear, startYear, endYear, row[5])); |
49 |
| - else { |
50 |
| - List<HematoDTO> list = new ArrayList<>(); |
51 |
| - list.add(new HematoDTO(validStartYear, validEndYear, startYear, endYear, row[5])); |
52 |
| - _samePrimaryDto.put(row[0], list); |
53 |
| - } |
| 44 | + try (Reader reader = new InputStreamReader(is, StandardCharsets.US_ASCII); CsvReader<NamedCsvRecord> csvReader = CsvReader.builder().ofNamedCsvRecord(reader)) { |
| 45 | + csvReader.stream().forEach(line -> { |
| 46 | + Short validStartYear = StringUtils.isNotBlank(line.getField(1)) ? Short.valueOf(line.getField(1)) : null; |
| 47 | + Short validEndYear = StringUtils.isNotBlank(line.getField(2)) ? Short.valueOf(line.getField(2)) : null; |
| 48 | + Short startYear = StringUtils.isNotBlank(line.getField(3)) ? Short.valueOf(line.getField(3)) : null; |
| 49 | + Short endYear = StringUtils.isNotBlank(line.getField(4)) ? Short.valueOf(line.getField(4)) : null; |
| 50 | + if (_samePrimaryDto.containsKey(line.getField(0))) |
| 51 | + _samePrimaryDto.get(line.getField(0)).add(new HematoDTO(validStartYear, validEndYear, startYear, endYear, line.getField(5))); |
| 52 | + else { |
| 53 | + List<HematoDTO> list = new ArrayList<>(); |
| 54 | + list.add(new HematoDTO(validStartYear, validEndYear, startYear, endYear, line.getField(5))); |
| 55 | + _samePrimaryDto.put(line.getField(0), list); |
| 56 | + } |
| 57 | + }); |
54 | 58 | }
|
55 | 59 | }
|
56 |
| - catch (CsvException | IOException e) { |
| 60 | + catch (IOException e) { |
57 | 61 | throw new IllegalStateException(e);
|
58 | 62 | }
|
| 63 | + |
59 | 64 | _transformToDto = new HashMap<>();
|
60 | 65 | try (InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream("Hematopoietic2010TransformToPairs.csv")) {
|
61 | 66 | if (is == null)
|
62 | 67 | throw new IllegalStateException("Unable to get Hematopoietic2010TransformToPairs.csv");
|
63 |
| - for (String[] row : new CSVReaderBuilder(new InputStreamReader(is, StandardCharsets.US_ASCII)).withSkipLines(1).build().readAll()) { |
64 |
| - Short validStartYear = StringUtils.isNotBlank(row[1]) ? Short.valueOf(row[1]) : null; |
65 |
| - Short validEndYear = StringUtils.isNotBlank(row[2]) ? Short.valueOf(row[2]) : null; |
66 |
| - Short startYear = StringUtils.isNotBlank(row[3]) ? Short.valueOf(row[3]) : null; |
67 |
| - Short endYear = StringUtils.isNotBlank(row[4]) ? Short.valueOf(row[4]) : null; |
68 |
| - if (_transformToDto.containsKey(row[0])) |
69 |
| - _transformToDto.get(row[0]).add(new HematoDTO(validStartYear, validEndYear, startYear, endYear, row[5])); |
70 |
| - else { |
71 |
| - List<HematoDTO> list = new ArrayList<>(); |
72 |
| - list.add(new HematoDTO(validStartYear, validEndYear, startYear, endYear, row[5])); |
73 |
| - _transformToDto.put(row[0], list); |
74 |
| - } |
| 68 | + try (Reader reader = new InputStreamReader(is, StandardCharsets.US_ASCII); CsvReader<NamedCsvRecord> csvReader = CsvReader.builder().ofNamedCsvRecord(reader)) { |
| 69 | + csvReader.stream().forEach(line -> { |
| 70 | + Short validStartYear = StringUtils.isNotBlank(line.getField(1)) ? Short.valueOf(line.getField(1)) : null; |
| 71 | + Short validEndYear = StringUtils.isNotBlank(line.getField(2)) ? Short.valueOf(line.getField(2)) : null; |
| 72 | + Short startYear = StringUtils.isNotBlank(line.getField(3)) ? Short.valueOf(line.getField(3)) : null; |
| 73 | + Short endYear = StringUtils.isNotBlank(line.getField(4)) ? Short.valueOf(line.getField(4)) : null; |
| 74 | + if (_transformToDto.containsKey(line.getField(0))) |
| 75 | + _transformToDto.get(line.getField(0)).add(new HematoDTO(validStartYear, validEndYear, startYear, endYear, line.getField(5))); |
| 76 | + else { |
| 77 | + List<HematoDTO> list = new ArrayList<>(); |
| 78 | + list.add(new HematoDTO(validStartYear, validEndYear, startYear, endYear, line.getField(5))); |
| 79 | + _transformToDto.put(line.getField(0), list); |
| 80 | + } |
| 81 | + }); |
75 | 82 | }
|
76 | 83 | }
|
77 |
| - catch (CsvException | IOException e) { |
| 84 | + catch (IOException e) { |
78 | 85 | throw new IllegalStateException(e);
|
79 | 86 | }
|
| 87 | + |
80 | 88 | _transformFromDto = new HashMap<>();
|
81 | 89 | try (InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream("Hematopoietic2010TransformFromPairs.csv")) {
|
82 | 90 | if (is == null)
|
83 | 91 | throw new IllegalStateException("Unable to get Hematopoietic2010TransformFromPairs.csv");
|
84 |
| - for (String[] row : new CSVReaderBuilder(new InputStreamReader(is, StandardCharsets.US_ASCII)).withSkipLines(1).build().readAll()) { |
85 |
| - Short validStartYear = StringUtils.isNotBlank(row[1]) ? Short.valueOf(row[1]) : null; |
86 |
| - Short validEndYear = StringUtils.isNotBlank(row[2]) ? Short.valueOf(row[2]) : null; |
87 |
| - Short startYear = StringUtils.isNotBlank(row[3]) ? Short.valueOf(row[3]) : null; |
88 |
| - Short endYear = StringUtils.isNotBlank(row[4]) ? Short.valueOf(row[4]) : null; |
89 |
| - if (_transformFromDto.containsKey(row[0])) |
90 |
| - _transformFromDto.get(row[0]).add(new HematoDTO(validStartYear, validEndYear, startYear, endYear, row[5])); |
91 |
| - else { |
92 |
| - List<HematoDTO> list = new ArrayList<>(); |
93 |
| - list.add(new HematoDTO(validStartYear, validEndYear, startYear, endYear, row[5])); |
94 |
| - _transformFromDto.put(row[0], list); |
95 |
| - } |
| 92 | + try (Reader reader = new InputStreamReader(is, StandardCharsets.US_ASCII); CsvReader<NamedCsvRecord> csvReader = CsvReader.builder().ofNamedCsvRecord(reader)) { |
| 93 | + csvReader.stream().forEach(line -> { |
| 94 | + Short validStartYear = StringUtils.isNotBlank(line.getField(1)) ? Short.valueOf(line.getField(1)) : null; |
| 95 | + Short validEndYear = StringUtils.isNotBlank(line.getField(2)) ? Short.valueOf(line.getField(2)) : null; |
| 96 | + Short startYear = StringUtils.isNotBlank(line.getField(3)) ? Short.valueOf(line.getField(3)) : null; |
| 97 | + Short endYear = StringUtils.isNotBlank(line.getField(4)) ? Short.valueOf(line.getField(4)) : null; |
| 98 | + if (_transformFromDto.containsKey(line.getField(0))) |
| 99 | + _transformFromDto.get(line.getField(0)).add(new HematoDTO(validStartYear, validEndYear, startYear, endYear, line.getField(5))); |
| 100 | + else { |
| 101 | + List<HematoDTO> list = new ArrayList<>(); |
| 102 | + list.add(new HematoDTO(validStartYear, validEndYear, startYear, endYear, line.getField(5))); |
| 103 | + _transformFromDto.put(line.getField(0), list); |
| 104 | + } |
| 105 | + }); |
96 | 106 | }
|
97 | 107 | }
|
98 |
| - catch (CsvException | IOException e) { |
| 108 | + catch (IOException e) { |
99 | 109 | throw new IllegalStateException(e);
|
100 | 110 | }
|
101 | 111 |
|
|
0 commit comments