You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ti...@apache.org on 2022/05/29 09:05:42 UTC
[tika] branch main updated: TIKA-3705: use Files.createTempFile(), as suggested by Colm O hEigeartaigh
This is an automated email from the ASF dual-hosted git repository.
tilman pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/main by this push:
new fb145d0bc TIKA-3705: use Files.createTempFile(), as suggested by Colm O hEigeartaigh
fb145d0bc is described below
commit fb145d0bca91dd568dea1f73008c7b40f716e15a
Author: Tilman Hausherr <ti...@apache.org>
AuthorDate: Sun May 29 11:05:16 2022 +0200
TIKA-3705: use Files.createTempFile(), as suggested by Colm O hEigeartaigh
---
tika-app/src/main/java/org/apache/tika/gui/TikaGUI.java | 5 +++--
tika-core/src/main/java/org/apache/tika/fork/ForkClient.java | 3 ++-
.../src/main/java/org/apache/tika/utils/RereadableInputStream.java | 3 ++-
.../java/org/apache/tika/example/DumpTikaConfigExampleTest.java | 3 ++-
.../apache/tika/parser/microsoft/ooxml/OOXMLExtractorFactory.java | 7 ++++---
.../org/apache/tika/language/translate/impl/MarianTranslator.java | 4 ++--
6 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/tika-app/src/main/java/org/apache/tika/gui/TikaGUI.java b/tika-app/src/main/java/org/apache/tika/gui/TikaGUI.java
index f23da189f..c942ee2ca 100644
--- a/tika-app/src/main/java/org/apache/tika/gui/TikaGUI.java
+++ b/tika-app/src/main/java/org/apache/tika/gui/TikaGUI.java
@@ -35,6 +35,7 @@ import java.io.StringWriter;
import java.io.Writer;
import java.net.MalformedURLException;
import java.net.URL;
+import java.nio.file.Files;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
@@ -598,7 +599,7 @@ public class TikaGUI extends JFrame implements ActionListener, HyperlinkListener
this.downstreamParser = downstreamParser;
try {
- File t = File.createTempFile("tika", ".test");
+ File t = Files.createTempFile("tika", ".test").toFile();
tmpDir = t.getParentFile();
} catch (IOException e) {
//swallow
@@ -613,7 +614,7 @@ public class TikaGUI extends JFrame implements ActionListener, HyperlinkListener
embeddedName.substring(splitAt);
}
- File tmp = File.createTempFile("tika-embedded-", suffix);
+ File tmp = Files.createTempFile("tika-embedded-", suffix).toFile();
wanted.put(embeddedName, tmp);
return tmp;
}
diff --git a/tika-core/src/main/java/org/apache/tika/fork/ForkClient.java b/tika-core/src/main/java/org/apache/tika/fork/ForkClient.java
index 6cceeeb99..e5417eac4 100644
--- a/tika-core/src/main/java/org/apache/tika/fork/ForkClient.java
+++ b/tika-core/src/main/java/org/apache/tika/fork/ForkClient.java
@@ -25,6 +25,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.NotSerializableException;
+import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
@@ -174,7 +175,7 @@ class ForkClient {
* @throws IOException if the bootstrap archive could not be created
*/
private static File createBootstrapJar() throws IOException {
- File file = File.createTempFile("apache-tika-fork-", ".jar");
+ File file = Files.createTempFile("apache-tika-fork-", ".jar").toFile();
boolean ok = false;
try {
fillBootstrapJar(file);
diff --git a/tika-core/src/main/java/org/apache/tika/utils/RereadableInputStream.java b/tika-core/src/main/java/org/apache/tika/utils/RereadableInputStream.java
index 782a0b8f0..b611f038a 100644
--- a/tika-core/src/main/java/org/apache/tika/utils/RereadableInputStream.java
+++ b/tika-core/src/main/java/org/apache/tika/utils/RereadableInputStream.java
@@ -25,6 +25,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.nio.file.Files;
/**
@@ -213,7 +214,7 @@ public class RereadableInputStream extends InputStream {
if (byteBuffer != null) {
if (bufferPointer == maxBytesInMemory) {
// Need to switch to file
- storeFile = File.createTempFile("TIKA_streamstore_", ".tmp");
+ storeFile = Files.createTempFile("TIKA_streamstore_", ".tmp").toFile();
storeOutputStream = new BufferedOutputStream(new FileOutputStream(storeFile));
// Save what we have so far in buffer
storeOutputStream.write(byteBuffer, 0, bufferPointer);
diff --git a/tika-example/src/test/java/org/apache/tika/example/DumpTikaConfigExampleTest.java b/tika-example/src/test/java/org/apache/tika/example/DumpTikaConfigExampleTest.java
index e10e06f35..85696ab68 100644
--- a/tika-example/src/test/java/org/apache/tika/example/DumpTikaConfigExampleTest.java
+++ b/tika-example/src/test/java/org/apache/tika/example/DumpTikaConfigExampleTest.java
@@ -27,6 +27,7 @@ import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.Writer;
import java.nio.charset.Charset;
+import java.nio.file.Files;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -45,7 +46,7 @@ public class DumpTikaConfigExampleTest {
@BeforeEach
public void setUp() {
try {
- configFile = File.createTempFile("tmp", ".xml");
+ configFile = Files.createTempFile("tmp", ".xml").toFile();
} catch (IOException e) {
throw new RuntimeException("Failed to create tmp file");
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLExtractorFactory.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLExtractorFactory.java
index 138ebdcdb..ca1f180b1 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLExtractorFactory.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLExtractorFactory.java
@@ -20,6 +20,7 @@ import java.io.EOFException;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.file.Files;
import java.util.Locale;
import org.apache.commons.compress.archivers.zip.UnsupportedZipFeatureException;
@@ -108,7 +109,7 @@ public class OOXMLExtractorFactory {
try {
pkg = OPCPackage.open(tis.getFile().getPath(), PackageAccess.READ);
} catch (InvalidOperationException e) {
- tmpRepairedCopy = File.createTempFile("tika-ooxml-repair-", "");
+ tmpRepairedCopy = Files.createTempFile("tika-ooxml-repair-", "").toFile();
ZipSalvager.salvageCopy(tis.getFile(), tmpRepairedCopy);
pkg = OPCPackage.open(tmpRepairedCopy, PackageAccess.READ);
}
@@ -126,7 +127,7 @@ public class OOXMLExtractorFactory {
throw e;
}
rereadableInputStream.rewind();
- tmpRepairedCopy = File.createTempFile("tika-ooxml-repair-", "");
+ tmpRepairedCopy = Files.createTempFile("tika-ooxml-repair-", "").toFile();
ZipSalvager.salvageCopy(rereadableInputStream, tmpRepairedCopy, false);
//if there isn't enough left to be opened as a package
//throw an exception -- we may want to fall back to streaming
@@ -142,7 +143,7 @@ public class OOXMLExtractorFactory {
throw e;
}
rereadableInputStream.rewind();
- tmpRepairedCopy = File.createTempFile("tika-ooxml-repair-", "");
+ tmpRepairedCopy = Files.createTempFile("tika-ooxml-repair-", "").toFile();
ZipSalvager.salvageCopy(rereadableInputStream, tmpRepairedCopy, false);
//if there isn't enough left to be opened as a package
//throw an exception -- we may want to fall back to streaming
diff --git a/tika-translate/src/main/java/org/apache/tika/language/translate/impl/MarianTranslator.java b/tika-translate/src/main/java/org/apache/tika/language/translate/impl/MarianTranslator.java
index 3e5b50393..143b6d467 100644
--- a/tika-translate/src/main/java/org/apache/tika/language/translate/impl/MarianTranslator.java
+++ b/tika-translate/src/main/java/org/apache/tika/language/translate/impl/MarianTranslator.java
@@ -126,12 +126,12 @@ public class MarianTranslator extends AbstractTranslator {
}
StringBuilder translation = new StringBuilder();
- File tmpFile = File.createTempFile(INPUT_TMP_NAME, ".tmp");
+ File tmpFile = Files.createTempFile(INPUT_TMP_NAME, ".tmp").toFile();
tmpFile.deleteOnExit();
try (OutputStreamWriter out = new OutputStreamWriter(new FileOutputStream(tmpFile), Charset.defaultCharset())) {
out.append(text).append('\n').close();
}
- File tmpTranslatedFile = File.createTempFile(OUTPUT_TMP_NAME, ".tmp");
+ File tmpTranslatedFile = Files.createTempFile(OUTPUT_TMP_NAME, ".tmp").toFile();
tmpTranslatedFile.deleteOnExit();
try {