Skip to content

Commit e0cea29

Browse files
committed
Update CSVEncoder and TemplateEncoder.
1 parent faf179f commit e0cea29

3 files changed

Lines changed: 13 additions & 22 deletions

File tree

kilo-client/src/main/java/org/httprpc/kilo/io/CSVEncoder.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,11 @@ public void write(Iterable<?> row, Writer writer) throws IOException {
6262
throw new IllegalArgumentException();
6363
}
6464

65-
encode(row, writer);
65+
try {
66+
encode(row, writer);
67+
} finally {
68+
writer.flush();
69+
}
6670
}
6771

6872
/**

kilo-client/src/main/java/org/httprpc/kilo/io/TemplateEncoder.java

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -365,21 +365,19 @@ public void bind(String name, Modifier modifier) {
365365

366366
@Override
367367
public void write(Object value, Writer writer) throws IOException {
368-
if (writer == null) {
368+
if (value == null || writer == null) {
369369
throw new IllegalArgumentException();
370370
}
371371

372-
if (value != null) {
373-
try (var inputStream = type.getResourceAsStream(name)) {
374-
Reader reader = new PagedReader(new InputStreamReader(inputStream, getCharset()));
372+
try (var inputStream = type.getResourceAsStream(name)) {
373+
Reader reader = new PagedReader(new InputStreamReader(inputStream, getCharset()));
375374

376-
var bufferedWriter = new BufferedWriter(writer);
375+
var bufferedWriter = new BufferedWriter(writer);
377376

378-
try {
379-
encode(BeanAdapter.adapt(value), bufferedWriter, reader);
380-
} finally {
381-
bufferedWriter.flush();
382-
}
377+
try {
378+
encode(BeanAdapter.adapt(value), bufferedWriter, reader);
379+
} finally {
380+
bufferedWriter.flush();
383381
}
384382
}
385383
}

kilo-client/src/test/java/org/httprpc/kilo/io/TemplateEncoderTest.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,6 @@
3737
import static org.junit.jupiter.api.Assertions.*;
3838

3939
public class TemplateEncoderTest {
40-
@Test
41-
public void testNull() throws IOException {
42-
var templateEncoder = new TemplateEncoder(getClass(), "dictionary.txt");
43-
44-
var writer = new StringWriter();
45-
46-
templateEncoder.write(null, writer);
47-
48-
assertEquals("", writer.toString());
49-
}
50-
5140
@Test
5241
public void testMap() throws IOException {
5342
var templateEncoder = new TemplateEncoder(getClass(), "dictionary.txt");

0 commit comments

Comments
 (0)