Skip to content

Commit

Permalink
Do not hand writer to the outside (reviewers comment)
Browse files Browse the repository at this point in the history
  • Loading branch information
ckittl committed Aug 30, 2021
1 parent c447398 commit 274a267
Showing 1 changed file with 4 additions and 19 deletions.
23 changes: 4 additions & 19 deletions src/main/java/edu/ie3/datamodel/io/sink/CsvFileSink.java
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,9 @@ public void shutdown() {
public <E extends TimeSeriesEntry<V>, V extends Value> void persistTimeSeries(
TimeSeries<E, V> timeSeries) {
try {
BufferedCsvWriter writer = getWriterForTimeSeries(timeSeries);
TimeSeriesProcessorKey key = new TimeSeriesProcessorKey(timeSeries);
String[] headerElements = csvHeaderElements(processorProvider.getHeaderElements(key));
BufferedCsvWriter writer = connector.getOrInitWriter(timeSeries, headerElements, csvSep);
persistTimeSeries(timeSeries, writer);
connector.closeTimeSeriesWriter(timeSeries.getUuid());
} catch (ProcessorProviderException e) {
Expand All @@ -279,24 +281,7 @@ public <E extends TimeSeriesEntry<V>, V extends Value> void persistTimeSeries(
}
}

/**
* Provide a suitable {@link BufferedCsvWriter} for the targeted time series
*
* @param timeSeries The time series to persist
* @param <E> Type of Entry within the time series
* @param <V> Actually carried value
* @return A suitable {@link BufferedCsvWriter}
* @throws ProcessorProviderException If there is no handling known for the given time series
* @throws ConnectorException If there is no suitable writer known for this time series
*/
public <E extends TimeSeriesEntry<V>, V extends Value> BufferedCsvWriter getWriterForTimeSeries(
TimeSeries<E, V> timeSeries) throws ProcessorProviderException, ConnectorException {
TimeSeriesProcessorKey key = new TimeSeriesProcessorKey(timeSeries);
String[] headerElements = csvHeaderElements(processorProvider.getHeaderElements(key));
return connector.getOrInitWriter(timeSeries, headerElements, csvSep);
}

public <E extends TimeSeriesEntry<V>, V extends Value> void persistTimeSeries(
private <E extends TimeSeriesEntry<V>, V extends Value> void persistTimeSeries(
TimeSeries<E, V> timeSeries, BufferedCsvWriter writer) {
TimeSeriesProcessorKey key = new TimeSeriesProcessorKey(timeSeries);

Expand Down

0 comments on commit 274a267

Please sign in to comment.