Implement AutoCloseable in GzippedFiles

Author: sbrannen

spring-webflux/src/test/java/org/springframework/web/reactive/resource/GzipSupport.java

@@ -19,14 +19,14 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.zip.GZIPOutputStream;
 
-import org.junit.jupiter.api.extension.AfterEachCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
 import org.junit.jupiter.api.extension.ExtensionContext.Store;
@@ -40,21 +40,13 @@
 
 /**
  * @author Andy Wilkinson
+ * @author Sam Brannen
  * @since 5.2.2
  */
-class GzipSupport implements AfterEachCallback, ParameterResolver {
+class GzipSupport implements ParameterResolver {
 
 	private static final Namespace namespace = Namespace.create(GzipSupport.class);
 
-	@Override
-	public void afterEach(ExtensionContext context) {
-		GzippedFiles gzippedFiles = getStore(context).remove(GzippedFiles.class, GzippedFiles.class);
-		if (gzippedFiles != null) {
-			for (File gzippedFile: gzippedFiles.created) {
-				gzippedFile.delete();
-			}
-		}
-	}
 
 	@Override
 	public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) {
@@ -70,13 +62,14 @@ private Store getStore(ExtensionContext extensionContext) {
 		return extensionContext.getStore(namespace);
 	}
 
-	static class GzippedFiles {
+
+	static class GzippedFiles implements AutoCloseable {
 
 		private final Set<File> created = new HashSet<>();
 
 		void create(String filePath) {
 			try {
-				Resource location = new ClassPathResource("test/", EncodedResourceResolverTests.class);
+				Resource location = new ClassPathResource("test/", getClass());
 				Resource resource = new FileSystemResource(location.createRelative(filePath).getFile());
 
 				Path gzFilePath = Paths.get(resource.getFile().getAbsolutePath() + ".gz");
@@ -85,13 +78,19 @@ void create(String filePath) {
 				File gzFile = Files.createFile(gzFilePath).toFile();
 				GZIPOutputStream out = new GZIPOutputStream(new FileOutputStream(gzFile));
 				FileCopyUtils.copy(resource.getInputStream(), out);
-				created.add(gzFile);
+				this.created.add(gzFile);
 			}
 			catch (IOException ex) {
-				throw new RuntimeException(ex);
+				throw new UncheckedIOException(ex);
 			}
 		}
 
+		@Override
+		public void close() {
+			for (File file: this.created) {
+				file.delete();
+			}
+		}
 	}
 
 }

spring-webmvc/src/test/java/org/springframework/web/servlet/resource/GzipSupport.java

@@ -19,14 +19,14 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.zip.GZIPOutputStream;
 
-import org.junit.jupiter.api.extension.AfterEachCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
 import org.junit.jupiter.api.extension.ExtensionContext.Store;
@@ -40,21 +40,13 @@
 
 /**
  * @author Andy Wilkinson
+ * @author Sam Brannen
  * @since 5.2.2
  */
-class GzipSupport implements AfterEachCallback, ParameterResolver {
+class GzipSupport implements ParameterResolver {
 
 	private static final Namespace namespace = Namespace.create(GzipSupport.class);
 
-	@Override
-	public void afterEach(ExtensionContext context) {
-		GzippedFiles gzippedFiles = getStore(context).remove(GzippedFiles.class, GzippedFiles.class);
-		if (gzippedFiles != null) {
-			for (File gzippedFile: gzippedFiles.created) {
-				gzippedFile.delete();
-			}
-		}
-	}
 
 	@Override
 	public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) {
@@ -70,13 +62,14 @@ private Store getStore(ExtensionContext extensionContext) {
 		return extensionContext.getStore(namespace);
 	}
 
-	static class GzippedFiles {
+
+	static class GzippedFiles implements AutoCloseable {
 
 		private final Set<File> created = new HashSet<>();
 
 		void create(String filePath) {
 			try {
-				Resource location = new ClassPathResource("test/", EncodedResourceResolverTests.class);
+				Resource location = new ClassPathResource("test/", getClass());
 				Resource resource = new FileSystemResource(location.createRelative(filePath).getFile());
 
 				Path gzFilePath = Paths.get(resource.getFile().getAbsolutePath() + ".gz");
@@ -85,13 +78,19 @@ void create(String filePath) {
 				File gzFile = Files.createFile(gzFilePath).toFile();
 				GZIPOutputStream out = new GZIPOutputStream(new FileOutputStream(gzFile));
 				FileCopyUtils.copy(resource.getInputStream(), out);
-				created.add(gzFile);
+				this.created.add(gzFile);
 			}
 			catch (IOException ex) {
-				throw new RuntimeException(ex);
+				throw new UncheckedIOException(ex);
 			}
 		}
 
+		@Override
+		public void close() {
+			for (File file: this.created) {
+				file.delete();
+			}
+		}
 	}
 
 }

spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java

@@ -37,6 +37,7 @@
 import org.springframework.web.HttpRequestMethodNotSupportedException;
 import org.springframework.web.context.support.StaticWebApplicationContext;
 import org.springframework.web.servlet.HandlerMapping;
+import org.springframework.web.servlet.resource.GzipSupport.GzippedFiles;
 import org.springframework.web.testfixture.servlet.MockHttpServletRequest;
 import org.springframework.web.testfixture.servlet.MockHttpServletResponse;
 import org.springframework.web.testfixture.servlet.MockServletContext;
@@ -357,7 +358,7 @@ void partialContentMultipleByteRanges() throws Exception {
 		}
 
 		@Test  // gh-25976
-		void partialContentByteRangeWithEncodedResource(GzipSupport.GzippedFiles gzippedFiles) throws Exception {
+		void partialContentByteRangeWithEncodedResource(GzippedFiles gzippedFiles) throws Exception {
 			String path = "js/foo.js";
 			gzippedFiles.create(path);