diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/PropertyValueArtifact.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/PropertyValueArtifact.java index bcafe1394..f4cf5509b 100644 --- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/PropertyValueArtifact.java +++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/PropertyValueArtifact.java @@ -22,6 +22,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.nio.file.Files; import java.util.Collection; import java.util.LinkedList; @@ -162,7 +163,7 @@ public void detach() throws IOException, RepositoryException { // ensure caching of content type getContentType(); // copy value to temp file - tmpFile = File.createTempFile("jcrfs", "dat"); + tmpFile = Files.createTempFile("jcrfs", "dat").toFile(); tmpFile.setLastModified(getLastModified()); tmpFile.deleteOnExit(); try (FileOutputStream out = new FileOutputStream(tmpFile); @@ -371,4 +372,4 @@ public boolean markSupported() { } } -} \ No newline at end of file +} diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/VaultFileOutputImpl.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/VaultFileOutputImpl.java index eb2b7d7ef..523035c75 100644 --- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/VaultFileOutputImpl.java +++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/VaultFileOutputImpl.java @@ -21,6 +21,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; +import java.nio.file.Files; import javax.jcr.RepositoryException; @@ -61,7 +62,7 @@ public OutputStream getOutputStream() throws IOException { if (out != null) { throw new IOException("Output stream already obtained."); } - tmpFile = File.createTempFile("vltfs", ".tmp"); + tmpFile = Files.createTempFile("vltfs", ".tmp").toFile(); tmpFile.deleteOnExit(); out = new FileOutputStream(tmpFile); return out; @@ -85,4 +86,4 @@ public void close() throws IOException, RepositoryException { } } -} \ No newline at end of file +} diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/ZipStreamArchive.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/ZipStreamArchive.java index f2e2e0f78..f5bd41b51 100644 --- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/ZipStreamArchive.java +++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/ZipStreamArchive.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.RandomAccessFile; +import java.nio.file.Files; import java.util.Collection; import java.util.Collections; import java.util.LinkedHashMap; @@ -232,7 +233,7 @@ private long copyToBuffer(@NotNull InputStream in) throws IOException { pos += read; if (pos == decompressed.length) { // switch to raf - tmpFile = File.createTempFile("__vlttmpbuffer", ".dat"); + tmpFile = Files.createTempFile("__vlttmpbuffer", ".dat").toFile(); raf = new RandomAccessFile(tmpFile, "rw"); raf.write(decompressed); decompressed = null; diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageImpl.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageImpl.java index 99bb82424..ab69dae93 100644 --- a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageImpl.java +++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageImpl.java @@ -21,6 +21,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.nio.file.Files; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -321,7 +322,7 @@ protected VaultPackage getPackage(boolean forceFileArchive) throws RepositoryExc throw new IOException("Error while reading stream", e); } } else { - File tmpFile = File.createTempFile("vaultpack", ".zip"); + File tmpFile = Files.createTempFile("vaultpack", ".zip").toFile(); Binary bin = getData().getBinary(); try (FileOutputStream out = FileUtils.openOutputStream(tmpFile); InputStream in = bin.getStream()) { diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/PackageManagerImpl.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/PackageManagerImpl.java index 2507bd8db..5064b5aa8 100644 --- a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/PackageManagerImpl.java +++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/PackageManagerImpl.java @@ -24,6 +24,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.net.URISyntaxException; +import java.nio.file.Files; import java.util.Collections; import java.util.HashSet; import java.util.Set; @@ -109,7 +110,7 @@ public VaultPackage assemble(Session s, ExportOptions opts, File file) boolean success = false; try { if (file == null) { - file = File.createTempFile("filevault", ".zip"); + file = Files.createTempFile("filevault", ".zip").toFile(); isTmp = true; } out = FileUtils.openOutputStream(file); @@ -176,7 +177,7 @@ public VaultPackage rewrap(ExportOptions opts, VaultPackage src, File file) boolean isTmp = false; boolean success = false; if (file == null) { - file = File.createTempFile("filevault", ".zip"); + file = Files.createTempFile("filevault", ".zip").toFile(); isTmp = true; } try (OutputStream out = FileUtils.openOutputStream(file);){ diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/fs/io/JarExporterTest.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/fs/io/JarExporterTest.java index 5c6c4b472..71a6fb7de 100644 --- a/vault-core/src/test/java/org/apache/jackrabbit/vault/fs/io/JarExporterTest.java +++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/fs/io/JarExporterTest.java @@ -27,6 +27,7 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; +import java.nio.file.Files; import java.util.Date; import java.util.zip.ZipException; @@ -54,7 +55,7 @@ public class JarExporterTest { public void testEntriesWithSuppressedCompression() throws RepositoryException, IOException { Mocks m = new Mocks("org/apache/jackrabbit/vault/fs/io/JarExporter/testEntriesWithSuppressedCompression"); for (int level : new int[] { NO_COMPRESSION, BEST_COMPRESSION, BEST_SPEED }) { - File target = File.createTempFile("testEntriesWithSuppressedCompression", ".zip", null); + File target = Files.createTempFile("testEntriesWithSuppressedCompression", ".zip").toFile(); ZipStreamArchive archive = null; try { JarExporter exporter = new JarExporter(target, level); diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ACEsAtRootIT.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ACEsAtRootIT.java index af4607ef4..2dcae72b1 100644 --- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ACEsAtRootIT.java +++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ACEsAtRootIT.java @@ -21,6 +21,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; +import java.nio.file.Files; import java.security.Principal; import java.util.Properties; import java.util.zip.Deflater; @@ -121,7 +122,7 @@ public void export() throws RepositoryException, IOException, PackageException, opts.setRootPath("/"); opts.setCompressionLevel(Deflater.BEST_SPEED); - File tmpFile = File.createTempFile("vaulttest", ".zip"); + File tmpFile = Files.createTempFile("vaulttest", ".zip").toFile(); OutputStream os = new FileOutputStream(tmpFile); Session session = repository.login(new SimpleCredentials(userId, userPwd.toCharArray())); packMgr.assemble(admin, opts, os); diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/EscapedExportIT.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/EscapedExportIT.java index b6ffbf51b..f7e0b0091 100644 --- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/EscapedExportIT.java +++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/EscapedExportIT.java @@ -20,6 +20,7 @@ import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; +import java.nio.file.Files; import java.util.Properties; import javax.jcr.Node; @@ -113,7 +114,7 @@ public void unicodeEscapedPropertiesExportAndImportOk() throws IOException, Repo } private void assembleAndReinstallPackage() throws IOException, PackageException, RepositoryException { - File pkgFile = File.createTempFile("vaulttest", ".zip"); + File pkgFile = Files.createTempFile("vaulttest", ".zip").toFile(); try { ExportOptions options = new ExportOptions(); @@ -139,4 +140,4 @@ private void assembleAndReinstallPackage() throws IOException, PackageException, } } -} \ No newline at end of file +} diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ExportWithQuotedPatternIT.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ExportWithQuotedPatternIT.java index 255e7a61f..2387a6c3c 100644 --- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ExportWithQuotedPatternIT.java +++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ExportWithQuotedPatternIT.java @@ -18,6 +18,7 @@ import java.io.File; import java.io.IOException; +import java.nio.file.Files; import java.util.Properties; import java.util.regex.Pattern; @@ -79,7 +80,7 @@ public void quotedPattern() throws IOException, RepositoryException, PackageExce private File assemblePackage(WorkspaceFilter filter) throws IOException, RepositoryException { - File tmpFile = File.createTempFile("vaulttest", ".zip"); + File tmpFile = Files.createTempFile("vaulttest", ".zip").toFile(); ExportOptions options = new ExportOptions(); DefaultMetaInf meta = new DefaultMetaInf(); diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/FilteredPropertiesIT.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/FilteredPropertiesIT.java index 23190b426..d479a548f 100644 --- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/FilteredPropertiesIT.java +++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/FilteredPropertiesIT.java @@ -23,6 +23,7 @@ import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; +import java.nio.file.Files; import java.util.Properties; import javax.jcr.Node; @@ -531,7 +532,7 @@ private Node setupProperties(Node node) private File assemblePackage(WorkspaceFilter filter) throws IOException, RepositoryException { - File tmpFile = File.createTempFile("vaulttest", ".zip"); + File tmpFile = Files.createTempFile("vaulttest", ".zip").toFile(); packMgr.assemble(admin, createExportOptions(filter), tmpFile).close(); return tmpFile; } @@ -566,4 +567,4 @@ private void assertPropertiesMissg(String rootPath, String... propNames) } } -} \ No newline at end of file +} diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ManifestCreationExportIT.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ManifestCreationExportIT.java index 707641813..573ac2be8 100644 --- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ManifestCreationExportIT.java +++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ManifestCreationExportIT.java @@ -19,6 +19,7 @@ import java.io.File; import java.io.IOException; +import java.nio.file.Files; import java.util.Collections; import java.util.Properties; @@ -58,7 +59,7 @@ public void exportPackageCreatesManifest() throws RepositoryException, IOExcepti inf.setProperties(props); opts.setMetaInf(inf); - File tmpFile = File.createTempFile("e-vaulttest", ".zip"); + File tmpFile = Files.createTempFile("e-vaulttest", ".zip").toFile(); try (VaultPackage pkg = packMgr.assemble(admin, opts, tmpFile)) { String expected = "Content-Package-Dependencies:foo:bar:[1.0,2.0)\n" + @@ -73,4 +74,4 @@ public void exportPackageCreatesManifest() throws RepositoryException, IOExcepti } } -} \ No newline at end of file +} diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/MappedExportIT.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/MappedExportIT.java index c06b8fdc5..b35ecd7d5 100644 --- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/MappedExportIT.java +++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/MappedExportIT.java @@ -19,6 +19,7 @@ import java.io.File; import java.io.IOException; +import java.nio.file.Files; import java.util.Properties; import javax.jcr.RepositoryException; @@ -58,7 +59,7 @@ public void exportMapped() throws RepositoryException, IOException, PackageExcep opts.setMetaInf(inf); opts.setMountPath("/tmp/foo"); opts.setRootPath("/content/geometrixx"); - File tmpFile = File.createTempFile("vaulttest", "zip"); + File tmpFile = Files.createTempFile("vaulttest", "zip").toFile(); VaultPackage pkg = packMgr.assemble(admin, opts, tmpFile); // check if entries are present @@ -69,4 +70,4 @@ public void exportMapped() throws RepositoryException, IOException, PackageExcep tmpFile.delete(); } -} \ No newline at end of file +} diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/NamespaceImportIT.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/NamespaceImportIT.java index 8a52e268c..8d1ce22e2 100644 --- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/NamespaceImportIT.java +++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/NamespaceImportIT.java @@ -22,6 +22,7 @@ import java.io.File; import java.io.IOException; +import java.nio.file.Files; import java.util.Properties; import javax.jcr.NamespaceException; @@ -107,7 +108,7 @@ public void importClashingNamespace() throws RepositoryException, IOException, P inf.setProperties(props); opts.setMetaInf(inf); - File tmpFile = File.createTempFile("vaulttest", "zip"); + File tmpFile = Files.createTempFile("vaulttest", "zip").toFile(); try (VaultPackage pkg = sourceOakRepository.packMgr.assemble(sourceOakRepository.admin, opts, tmpFile)) { Archive archive = pkg.getArchive(); @@ -142,7 +143,7 @@ public void importClashingNamespaceOnPath() throws RepositoryException, IOExcept inf.setProperties(props); opts.setMetaInf(inf); - File tmpFile = File.createTempFile("vaulttest", "zip"); + File tmpFile = Files.createTempFile("vaulttest", "zip").toFile(); try (VaultPackage pkg = sourceOakRepository.packMgr.assemble(sourceOakRepository.admin, opts, tmpFile)) { Archive archive = pkg.getArchive(); diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/PackageTypesIT.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/PackageTypesIT.java index b96dafe6e..518d12f13 100644 --- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/PackageTypesIT.java +++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/PackageTypesIT.java @@ -19,6 +19,7 @@ import java.io.File; import java.io.IOException; +import java.nio.file.Files; import java.util.Properties; import javax.jcr.RepositoryException; @@ -77,7 +78,7 @@ private void verifyPackageTypeViaPackageCreation(WorkspaceFilter filter, Package options.setMetaInf(meta); - File tmpFile = File.createTempFile("vaulttest", "zip"); + File tmpFile = Files.createTempFile("vaulttest", "zip").toFile(); try (VaultPackage pkg = packMgr.assemble(admin, options, tmpFile)) { PackageType result = pkg.getProperties().getPackageType(); assertEquals("Package type", expected, result); @@ -159,4 +160,4 @@ public void test_export_mixed() throws IOException, RepositoryException { filter.add(new PathFilterSet("/libs/foo")); verifyPackageTypeViaPackageCreation(filter, PackageType.MIXED); } -} \ No newline at end of file +} diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/SerializationIT.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/SerializationIT.java index ec407a3f9..c14d7f5d0 100644 --- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/SerializationIT.java +++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/SerializationIT.java @@ -22,6 +22,7 @@ import java.io.File; import java.io.IOException; +import java.nio.file.Files; import java.util.Properties; import javax.jcr.Node; @@ -59,7 +60,7 @@ public void exportJcrXmlTest() throws RepositoryException, IOException, PackageE inf.setProperties(props); opts.setMetaInf(inf); - File tmpFile = File.createTempFile("vaulttest", "zip"); + File tmpFile = Files.createTempFile("vaulttest", "zip").toFile(); VaultPackage pkg = packMgr.assemble(admin, opts, tmpFile); // check if entries are present @@ -81,4 +82,4 @@ public void exportJcrXmlTest() throws RepositoryException, IOException, PackageE tmpFile.delete(); } -} \ No newline at end of file +} diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/SpecialDoublePropertiesIT.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/SpecialDoublePropertiesIT.java index 7e3c2fda4..7b9fdec81 100644 --- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/SpecialDoublePropertiesIT.java +++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/SpecialDoublePropertiesIT.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.io.InputStreamReader; import java.io.Reader; +import java.nio.file.Files; import java.util.Properties; import javax.jcr.Node; @@ -64,7 +65,7 @@ public void exportDoubles() throws RepositoryException, IOException, PackageExce inf.setProperties(props); opts.setMetaInf(inf); - File tmpFile = File.createTempFile("vaulttest", ".zip"); + File tmpFile = Files.createTempFile("vaulttest", ".zip").toFile(); VaultPackage pkg = packMgr.assemble(admin, opts, tmpFile); Archive.Entry e = pkg.getArchive().getEntry("jcr_root/tmp/.content.xml"); @@ -100,4 +101,4 @@ public void importDoubles() throws RepositoryException, IOException, PackageExce assertEquals(Double.NEGATIVE_INFINITY, tmp.getProperty("double_neg_inf").getDouble(), 0.0); } -} \ No newline at end of file +} diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/UserContentPackageIT.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/UserContentPackageIT.java index 22e3c84d0..aa5b88ade 100644 --- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/UserContentPackageIT.java +++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/UserContentPackageIT.java @@ -19,6 +19,7 @@ import java.io.File; import java.io.IOException; +import java.nio.file.Files; import java.util.Properties; import javax.jcr.Node; @@ -507,7 +508,7 @@ private File createPackage(String group, String name, String... paths) throws Re opts.setMetaInf(inf); - File tmpFile = File.createTempFile("vaulttest", ".zip"); + File tmpFile = Files.createTempFile("vaulttest", ".zip").toFile(); VaultPackage pkg = packMgr.assemble(admin, opts, tmpFile); pkg.close(); @@ -515,4 +516,4 @@ private File createPackage(String group, String name, String... paths) throws Re return tmpFile; } -} \ No newline at end of file +} diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/registry/impl/CompositePackageRegistryTest.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/registry/impl/CompositePackageRegistryTest.java index 67b21a9ee..d2dce1bf5 100644 --- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/registry/impl/CompositePackageRegistryTest.java +++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/registry/impl/CompositePackageRegistryTest.java @@ -19,6 +19,7 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; +import java.nio.file.Files; import java.util.Arrays; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -78,7 +79,7 @@ public void testRegisterWithExistingPackageIdInOtherRegistry() throws PackageExi new MockPackageRegistry(PACKAGE1), new MockPackageRegistry(MockPackageRegistry.NEW_PACKAGE_ID) ); - File file = File.createTempFile("vlt", null); + File file = Files.createTempFile("vlt", null).toFile(); try { registry.register(file, false); } finally { @@ -92,7 +93,7 @@ public void testRegisterFile() throws PackageExistsException, IOException { new MockPackageRegistry(PACKAGE1), new MockPackageRegistry(PACKAGE3) ); - File file = File.createTempFile("vlt", null); + File file = Files.createTempFile("vlt", null).toFile(); try { registry.register(file, false); } finally { @@ -119,7 +120,7 @@ public void testRegisterExternal() throws PackageExistsException, IOException { new MockPackageRegistry(PACKAGE1), new MockPackageRegistry(PACKAGE3) ); - File file = File.createTempFile("vlt", null); + File file = Files.createTempFile("vlt", null).toFile(); try { registry.registerExternal(file, false); } finally { diff --git a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSRegisteredPackageTest.java b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSRegisteredPackageTest.java index 222ce8d19..df979caa0 100644 --- a/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSRegisteredPackageTest.java +++ b/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSRegisteredPackageTest.java @@ -25,6 +25,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.nio.file.Files; import java.util.Properties; import org.apache.commons.io.FileUtils; @@ -43,7 +44,7 @@ public class FSRegisteredPackageTest { private static final PackageId DUMMY_ID = new PackageId("someGroup", "someName", "someVersion"); private File getTempFile(String name) throws IOException { - File tmpFile = File.createTempFile("vaultpack", ".zip"); + File tmpFile = Files.createTempFile("vaultpack", ".zip").toFile(); try (InputStream in = getClass().getResourceAsStream(name); FileOutputStream out = FileUtils.openOutputStream(tmpFile)) { IOUtils.copy(in, out); diff --git a/vault-vlt/src/main/java/org/apache/jackrabbit/vault/vlt/meta/xml/zip/UpdateableZipFile.java b/vault-vlt/src/main/java/org/apache/jackrabbit/vault/vlt/meta/xml/zip/UpdateableZipFile.java index b70539708..3333e037c 100644 --- a/vault-vlt/src/main/java/org/apache/jackrabbit/vault/vlt/meta/xml/zip/UpdateableZipFile.java +++ b/vault-vlt/src/main/java/org/apache/jackrabbit/vault/vlt/meta/xml/zip/UpdateableZipFile.java @@ -23,6 +23,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.nio.file.Files; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -155,7 +156,7 @@ public void sync() throws IOException { return; } // create tmp file - File newZip = File.createTempFile(file.getName(), ".tmp", file.getParentFile()); + File newZip = Files.createTempFile(file.getParentFile().toPath(), file.getName(), ".tmp").toFile(); try (ZipOutputStream out = new ZipOutputStream( new BufferedOutputStream(new FileOutputStream(newZip)))) { out.setLevel(Deflater.NO_COMPRESSION); @@ -208,4 +209,4 @@ protected static void copy(InputStream in, ZipOutputStream out) throws IOExcepti public void close() throws IOException { sync(); } -} \ No newline at end of file +} diff --git a/vault-vlt/src/main/java/org/apache/jackrabbit/vault/vlt/meta/xml/zip/ZipMetaFile.java b/vault-vlt/src/main/java/org/apache/jackrabbit/vault/vlt/meta/xml/zip/ZipMetaFile.java index bea6b0a76..a5c7db093 100644 --- a/vault-vlt/src/main/java/org/apache/jackrabbit/vault/vlt/meta/xml/zip/ZipMetaFile.java +++ b/vault-vlt/src/main/java/org/apache/jackrabbit/vault/vlt/meta/xml/zip/ZipMetaFile.java @@ -25,6 +25,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; +import java.nio.file.Files; import java.util.zip.ZipEntry; import org.apache.commons.io.FileUtils; @@ -111,7 +112,7 @@ public void delete() throws IOException { public File openTempFile() throws IOException { if (tmpFile == null) { File parentDir = parent.getZip().getZipFile().getParentFile(); - tmpFile = File.createTempFile(".vlt-", ".tmp", parentDir); + tmpFile = Files.createTempFile(parentDir.toPath(), ".vlt-", ".tmp").toFile(); tmpFile.createNewFile(); copyToSilent(tmpFile, true); } @@ -177,4 +178,4 @@ private boolean copyToSilent(File file, boolean preserveFileDate) throws IOExcep public String toString() { return getPath(); } -} \ No newline at end of file +}