Use try-with-resources statements

See gh-26449
This commit is contained in:
weixsun 2021-05-13 17:06:49 +08:00 committed by Andy Wilkinson
parent 32d378a348
commit 5ba9db391f
2 changed files with 6 additions and 22 deletions

View File

@ -172,13 +172,9 @@ class HandlerTests {
TestJarCreator.createTestJar(testJar); TestJarCreator.createTestJar(testJar);
URL url = new URL(null, "jar:" + testJar.toURI().toURL() + "!/nested.jar!/3.dat", this.handler); URL url = new URL(null, "jar:" + testJar.toURI().toURL() + "!/nested.jar!/3.dat", this.handler);
JarURLConnection connection = (JarURLConnection) url.openConnection(); JarURLConnection connection = (JarURLConnection) url.openConnection();
JarFile jarFile = JarFileWrapper.unwrap(connection.getJarFile()); try (JarFile jarFile = JarFileWrapper.unwrap(connection.getJarFile())) {
try {
assertThat(jarFile.getRootJarFile().getFile()).isEqualTo(testJar); assertThat(jarFile.getRootJarFile().getFile()).isEqualTo(testJar);
} }
finally {
jarFile.close();
}
} }
@Test @Test
@ -187,13 +183,9 @@ class HandlerTests {
TestJarCreator.createTestJar(testJar); TestJarCreator.createTestJar(testJar);
URL url = new URL(null, "jar:" + testJar.toURI().toURL() + "!/nested.jar!/3.dat", this.handler); URL url = new URL(null, "jar:" + testJar.toURI().toURL() + "!/nested.jar!/3.dat", this.handler);
JarURLConnection connection = (JarURLConnection) url.openConnection(); JarURLConnection connection = (JarURLConnection) url.openConnection();
JarFile jarFile = JarFileWrapper.unwrap(connection.getJarFile()); try (JarFile jarFile = JarFileWrapper.unwrap(connection.getJarFile())) {
try {
assertThat(jarFile.getRootJarFile().getFile()).isEqualTo(testJar); assertThat(jarFile.getRootJarFile().getFile()).isEqualTo(testJar);
} }
finally {
jarFile.close();
}
} }
private void assertStandardAndCustomHandlerUrlsAreEqual(String context, String spec) throws MalformedURLException { private void assertStandardAndCustomHandlerUrlsAreEqual(String context, String spec) throws MalformedURLException {

View File

@ -49,20 +49,12 @@ class SampleIntegrationParentApplicationTests {
void testVanillaExchange(@TempDir Path temp) throws Exception { void testVanillaExchange(@TempDir Path temp) throws Exception {
File inputDir = new File(temp.toFile(), "input"); File inputDir = new File(temp.toFile(), "input");
File outputDir = new File(temp.toFile(), "output"); File outputDir = new File(temp.toFile(), "output");
ConfigurableApplicationContext app = SpringApplication.run(SampleParentContextApplication.class, try (ConfigurableApplicationContext app = SpringApplication.run(SampleParentContextApplication.class,
"--service.input-dir=" + inputDir, "--service.output-dir=" + outputDir); "--service.input-dir=" + inputDir, "--service.output-dir=" + outputDir)) {
try { try (ConfigurableApplicationContext producer = SpringApplication.run(ProducerApplication.class,
ConfigurableApplicationContext producer = SpringApplication.run(ProducerApplication.class, "--service.input-dir=" + inputDir, "--service.output-dir=" + outputDir, "World")) {
"--service.input-dir=" + inputDir, "--service.output-dir=" + outputDir, "World");
try {
awaitOutputContaining(outputDir, "Hello World"); awaitOutputContaining(outputDir, "Hello World");
} }
finally {
producer.close();
}
}
finally {
app.close();
} }
} }