Skip to content

Commit 988561a

Browse files
authored
chore: Additional fixes
1 parent 290e3c8 commit 988561a

1 file changed

Lines changed: 6 additions & 15 deletions

File tree

dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/ClasspathUtils.java

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import java.io.BufferedOutputStream;
66
import java.io.ByteArrayOutputStream;
77
import java.io.File;
8-
import java.io.FileOutputStream;
98
import java.io.IOException;
109
import java.io.InputStream;
1110
import java.lang.reflect.Method;
@@ -30,14 +29,9 @@ public static byte[] convertToByteArray(final InputStream resource) throws IOExc
3029
}
3130

3231
public static byte[] convertToByteArray(final Class<?> clazz) throws IOException {
33-
InputStream inputStream = null;
34-
try {
35-
inputStream = clazz.getClassLoader().getResourceAsStream(getResourceName(clazz.getName()));
32+
try (InputStream inputStream =
33+
clazz.getClassLoader().getResourceAsStream(getResourceName(clazz.getName()))) {
3634
return convertToByteArray(inputStream);
37-
} finally {
38-
if (inputStream != null) {
39-
inputStream.close();
40-
}
4135
}
4236
}
4337

@@ -82,11 +76,13 @@ public static URL createJarWithClasses(final ClassLoader loader, final String...
8276
* @throws IOException
8377
*/
8478
public static URL createJarWithClasses(final Class<?>... classes) throws IOException {
85-
final File tmpJar = File.createTempFile(UUID.randomUUID().toString() + "", ".jar");
79+
final File tmpJar = File.createTempFile(UUID.randomUUID().toString(), ".jar");
8680
tmpJar.deleteOnExit();
8781

8882
final Manifest manifest = new Manifest();
89-
final JarOutputStream target = new JarOutputStream(new FileOutputStream(tmpJar), manifest);
83+
final JarOutputStream target =
84+
new JarOutputStream(
85+
new BufferedOutputStream(Files.newOutputStream(tmpJar.toPath())), manifest);
9086
for (final Class<?> clazz : classes) {
9187
addToJar(getResourceName(clazz.getName()), convertToByteArray(clazz), target);
9288
}
@@ -95,11 +91,6 @@ public static URL createJarWithClasses(final Class<?>... classes) throws IOExcep
9591
return tmpJar.toURI().toURL();
9692
}
9793

98-
public static URL createJarWithClasses() {
99-
100-
return null;
101-
}
102-
10394
private static void addToJar(
10495
final String resourceName, final byte[] bytes, final JarOutputStream jarOutputStream)
10596
throws IOException {

0 commit comments

Comments
 (0)