This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 8296397fd4125f91e8d56a044f4680c91aae78d6 Author: Colm O hEigeartaigh <[email protected]> AuthorDate: Thu Jun 20 14:00:41 2019 +0100 Switch to use Files.createTemFile --- .../management/persistence/FilesystemExchangeDataDAO.java | 13 +++++++------ .../cxf/systests/cdi/base/tomcat/AbstractTomcatServer.java | 3 ++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/rt/management/src/main/java/org/apache/cxf/management/persistence/FilesystemExchangeDataDAO.java b/rt/management/src/main/java/org/apache/cxf/management/persistence/FilesystemExchangeDataDAO.java index e346990..620185f 100644 --- a/rt/management/src/main/java/org/apache/cxf/management/persistence/FilesystemExchangeDataDAO.java +++ b/rt/management/src/main/java/org/apache/cxf/management/persistence/FilesystemExchangeDataDAO.java @@ -18,10 +18,11 @@ */ package org.apache.cxf.management.persistence; -import java.io.File; import java.io.OutputStream; import java.io.StringWriter; import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.logging.Level; import java.util.logging.Logger; @@ -40,12 +41,12 @@ public class FilesystemExchangeDataDAO implements ExchangeDataDAO { } public void save(ExchangeData exchange) throws Exception { - File file = null; + Path file = null; if (this.directory == null) { - file = File.createTempFile("cxf-management-", "." + this.extension); + file = Files.createTempFile("cxf-management-", "." + this.extension); } else { - file = File.createTempFile("cxf-management-", "." + this.extension, new File(this.directory)); + file = Files.createTempFile(Paths.get(this.directory), "cxf-management-", "." + this.extension); } StringWriter stringWriter = new StringWriter(); @@ -117,12 +118,12 @@ public class FilesystemExchangeDataDAO implements ExchangeDataDAO { } } - try (OutputStream fileOutputStream = Files.newOutputStream(file.toPath())) { + try (OutputStream fileOutputStream = Files.newOutputStream(file)) { fileOutputStream.write(stringWriter.getBuffer().toString().getBytes()); } if (LOG.isLoggable(Level.FINE)) { - LOG.fine("Exchange data saved in " + file.getAbsolutePath()); + LOG.fine("Exchange data saved in " + file); } } diff --git a/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/tomcat/AbstractTomcatServer.java b/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/tomcat/AbstractTomcatServer.java index fb431b5..bc45212 100644 --- a/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/tomcat/AbstractTomcatServer.java +++ b/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/tomcat/AbstractTomcatServer.java @@ -21,6 +21,7 @@ package org.apache.cxf.systests.cdi.base.tomcat; import java.io.File; import java.io.IOException; +import java.nio.file.Files; import org.apache.catalina.startup.Tomcat; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; @@ -64,7 +65,7 @@ public abstract class AbstractTomcatServer extends AbstractBusTestServerBase { } private static File createTemporaryDirectory() throws IOException { - final File base = File.createTempFile("tmp-", ""); + final File base = Files.createTempFile("tmp-", "").toFile(); if (!base.delete()) { throw new IOException("Cannot (re)create base folder: " + base.getAbsolutePath());
