close resources

Author: dernasherbrezon

src/main/java/ru/r2cloud/satellite/ObservationDao.java

@@ -111,8 +111,8 @@ private List<Observation> loadFromDisk(String satelliteId) {
 			return Collections.emptyList();
 		}
 		List<Path> observations;
-		try {
-			observations = Util.toList(Files.newDirectoryStream(dataRoot));
+		try (DirectoryStream<Path> ds = Files.newDirectoryStream(dataRoot)) {
+			observations = Util.toList(ds);
 		} catch (IOException e) {
 			LOG.error("unable to load observations", e);
 			return Collections.emptyList();
@@ -230,7 +230,7 @@ private static List<Path> resolveMultipleByPrefix(Path baseDir, String prefix) {
 				result.add(cur.toPath());
 			}
 		}
-		//FIXME sort by name
+		// FIXME sort by name
 		return result;
 	}
 

src/test/java/ru/r2cloud/satellite/TimeSizeRetentionTest.java

@@ -7,6 +7,7 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
@@ -113,7 +114,10 @@ public void testUpdateFolderContents() throws Exception {
 	}
 
 	private static Path getObservationFolder(Path satelliteFolder) throws Exception {
-		List<Path> observations = Util.toList(Files.newDirectoryStream(satelliteFolder.resolve("data")));
+		List<Path> observations;
+		try (DirectoryStream<Path> ds = Files.newDirectoryStream(satelliteFolder.resolve("data"))) {
+			observations = Util.toList(ds);
+		}
 		assertEquals(1, observations.size());
 		return observations.get(0);
 	}
@@ -124,8 +128,8 @@ private static void assertFolder(boolean expectedFolder, Path folder) {
 
 	private static void assertFolder(boolean expectedFolder, boolean expectedRaw, boolean expectedData, Path folder) {
 		List<Path> observations;
-		try {
-			observations = Util.toList(Files.newDirectoryStream(folder.resolve("data")));
+		try (DirectoryStream<Path> ds = Files.newDirectoryStream(folder.resolve("data"))) {
+			observations = Util.toList(ds);
 		} catch (IOException e) {
 			e.printStackTrace();
 			fail("unable to get list of directories " + e.getMessage());