import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
}
try {
- BufferedReader br;
- try {
- br = new BufferedReader(new InputStreamReader(is,"UTF-8"));
- } catch(UnsupportedEncodingException e) {
- throw new RuntimeException(e);
- }
-
- try {
+ try(BufferedReader br = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
FunctionDataBuilder fdb = new FunctionDataBuilder(400);
while (true) {
}
return fdb.build();
- } finally {
- br.close();
}
} finally {
is.close();
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
+import java.nio.charset.StandardCharsets;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Iterator;
}
private static void copyStreamAndInjectWorksheet(InputStream in, OutputStream out, InputStream worksheetData) throws IOException {
- InputStreamReader inReader=new InputStreamReader(in,"UTF-8");
- OutputStreamWriter outWriter=new OutputStreamWriter(out,"UTF-8");
+ InputStreamReader inReader = new InputStreamReader(in, StandardCharsets.UTF_8);
+ OutputStreamWriter outWriter = new OutputStreamWriter(out, StandardCharsets.UTF_8);
boolean needsStartTag = true;
int c;
int pos=0;
} finally {
out.close();
}
- String string = new String(out.toByteArray(), "UTF-8");
+ String string = out.toString("UTF-8");
assertTrue("Had: " + string,
string.contains("Table C-13--Lemons"));
} finally {