JGitTestUtil: Open auto-closeable resources in try-with-resource
Change-Id: Ibc8dd8509109708628e5189888fa528add486452 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
This commit is contained in:
parent
0b4e781f7c
commit
f91ce7faad
|
@ -182,18 +182,11 @@ public static void copyTestResource(String name, File dest)
|
||||||
URL url = cl().getResource(CLASSPATH_TO_RESOURCES + name);
|
URL url = cl().getResource(CLASSPATH_TO_RESOURCES + name);
|
||||||
if (url == null)
|
if (url == null)
|
||||||
throw new FileNotFoundException(name);
|
throw new FileNotFoundException(name);
|
||||||
InputStream in = url.openStream();
|
try (InputStream in = url.openStream();
|
||||||
try {
|
FileOutputStream out = new FileOutputStream(dest)) {
|
||||||
FileOutputStream out = new FileOutputStream(dest);
|
byte[] buf = new byte[4096];
|
||||||
try {
|
for (int n; (n = in.read(buf)) > 0;)
|
||||||
byte[] buf = new byte[4096];
|
out.write(buf, 0, n);
|
||||||
for (int n; (n = in.read(buf)) > 0;)
|
|
||||||
out.write(buf, 0, n);
|
|
||||||
} finally {
|
|
||||||
out.close();
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
in.close();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -252,11 +245,9 @@ public static File writeTrashFile(final Repository db,
|
||||||
public static void write(final File f, final String body)
|
public static void write(final File f, final String body)
|
||||||
throws IOException {
|
throws IOException {
|
||||||
FileUtils.mkdirs(f.getParentFile(), true);
|
FileUtils.mkdirs(f.getParentFile(), true);
|
||||||
Writer w = new OutputStreamWriter(new FileOutputStream(f), UTF_8);
|
try (Writer w = new OutputStreamWriter(new FileOutputStream(f),
|
||||||
try {
|
UTF_8)) {
|
||||||
w.write(body);
|
w.write(body);
|
||||||
} finally {
|
|
||||||
w.close();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue