diff --git a/java-sql-lhod/src/main/java/internal/sys/DefaultResourceExtractor.java b/java-sql-lhod/src/main/java/internal/sys/DefaultResourceExtractor.java index 87393b8e..d43f1d82 100644 --- a/java-sql-lhod/src/main/java/internal/sys/DefaultResourceExtractor.java +++ b/java-sql-lhod/src/main/java/internal/sys/DefaultResourceExtractor.java @@ -23,6 +23,7 @@ import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; +import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.StandardCopyOption; @@ -46,18 +47,18 @@ public class DefaultResourceExtractor implements ResourceExtractor { if (stream == null) { throw new FileNotFoundException(resourceName); } - File result = createEmptyFile(repository, resourceName); - Files.copy(stream, result.toPath(), StandardCopyOption.REPLACE_EXISTING); + Path result = createEmptyFile(repository.toPath(), resourceName); + Files.copy(stream, result, StandardCopyOption.REPLACE_EXISTING); if (!persist) { - result.deleteOnExit(); + result.toFile().deleteOnExit(); } - return result; + return result.toFile(); } } public static Builder builder() { return new Builder() - .repository(getTempFolder()) + .repository(getTempFolder().toFile()) .persist(false); } @@ -65,15 +66,15 @@ public static DefaultResourceExtractor of(Class anchor) { return builder().anchor(anchor).build(); } - private static File getTempFolder() { - return Paths.get(System.getProperty("java.io.tmpdir")).toFile(); + private static Path getTempFolder() { + return Paths.get(System.getProperty("java.io.tmpdir")); } - private static File createEmptyFile(File parent, String resourceName) throws IOException { + private static Path createEmptyFile(Path parent, String resourceName) throws IOException { int idx = resourceName.lastIndexOf("."); return idx != -1 - ? File.createTempFile(resourceName.substring(0, idx), resourceName.substring(idx), parent) - : File.createTempFile("rsrc", resourceName, parent); + ? Files.createTempFile(parent, "rsrc", resourceName.substring(idx)) + : Files.createTempFile(parent, "rsrc", resourceName); } // fix javadoc diff --git a/java-sql-lhod/src/test/java/_test/Excel.java b/java-sql-lhod/src/test/java/_test/Excel.java index fc28902a..e8e2fb20 100644 --- a/java-sql-lhod/src/test/java/_test/Excel.java +++ b/java-sql-lhod/src/test/java/_test/Excel.java @@ -8,6 +8,8 @@ import java.io.File; import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.Optional; public final class Excel { @@ -30,7 +32,8 @@ private static boolean isExcel(OdbcDriver driver) { } public static File createTempFile(ArraySheet table) throws IOException { - File excelFile = File.createTempFile("book1", ".xlsx"); + Path tempFile = Files.createTempFile("book1", ".xlsx"); + File excelFile = tempFile.toFile(); new FastExcelBookFactory().store(excelFile, table.toBook()); return excelFile; } diff --git a/pom.xml b/pom.xml index a8df8c85..76c4d8fe 100644 --- a/pom.xml +++ b/pom.xml @@ -150,7 +150,7 @@ org.gaul modernizer-maven-plugin - 3.4.0 + 3.5.0 de.thetaphi