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:40:57 UTC
[tika] branch branch_1x updated: TIKA-3705: use Files.createTempFile(), as suggested by Colm O hEigeartaigh; closes #275
This is an automated email from the ASF dual-hosted git repository.
tilman pushed a commit to branch branch_1x
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/branch_1x by this push:
new cfa059dea TIKA-3705: use Files.createTempFile(), as suggested by Colm O hEigeartaigh; closes #275
cfa059dea is described below
commit cfa059deac9c3f647c5acb9ae8604dd938ee2f14
Author: Tilman Hausherr <ti...@snafu.de>
AuthorDate: Sun May 29 11:37:52 2022 +0200
TIKA-3705: use Files.createTempFile(), as suggested by Colm O hEigeartaigh; closes #275
---
tika-app/src/main/java/org/apache/tika/gui/TikaGUI.java | 6 +++---
.../src/test/java/org/apache/tika/cli/TikaCLITest.java | 17 ++++-------------
.../src/main/java/org/apache/tika/fork/ForkClient.java | 3 ++-
.../org/apache/tika/utils/RereadableInputStream.java | 3 ++-
.../java/org/apache/tika/TestRereadableInputStream.java | 3 ++-
.../apache/tika/example/DumpTikaConfigExampleTest.java | 3 ++-
.../parser/microsoft/ooxml/OOXMLExtractorFactory.java | 8 ++++----
7 files changed, 19 insertions(+), 24 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 ecd33f8fb..4a677ac9c 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
@@ -28,7 +28,6 @@ import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTextPane;
-import javax.swing.ProgressMonitorInputStream;
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
import javax.swing.event.HyperlinkEvent;
@@ -89,6 +88,7 @@ import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
import static java.nio.charset.StandardCharsets.UTF_8;
+import java.nio.file.Files;
/**
* Simple Swing GUI for Apache Tika. You can drag and drop files on top
@@ -628,7 +628,7 @@ public class TikaGUI extends JFrame
this.downstreamParser = downstreamParser;
try {
- File t = File.createTempFile("tika", ".test");
+ File t = Files.createTempFile("tika", ".test").toFile();
tmpDir = t.getParentFile();
} catch(IOException e) {}
}
@@ -641,7 +641,7 @@ public class TikaGUI extends JFrame
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-app/src/test/java/org/apache/tika/cli/TikaCLITest.java b/tika-app/src/test/java/org/apache/tika/cli/TikaCLITest.java
index 8864fcc78..cc0b47f77 100644
--- a/tika-app/src/test/java/org/apache/tika/cli/TikaCLITest.java
+++ b/tika-app/src/test/java/org/apache/tika/cli/TikaCLITest.java
@@ -23,23 +23,14 @@ import static org.junit.Assert.assertTrue;
import java.io.ByteArrayOutputStream;
import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InvalidObjectException;
-import java.io.OutputStream;
import java.io.PrintStream;
import java.net.URI;
-import java.nio.charset.StandardCharsets;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-import java.util.zip.ZipOutputStream;
+import java.nio.file.Files;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.FilenameUtils;
import org.apache.tika.exception.TikaException;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
/**
@@ -334,7 +325,7 @@ public class TikaCLITest {
testExtract(targetFile, expectedChildrenFileNames, expectedChildrenFileNames.length);
}
private void testExtract(String targetFile, String[] expectedChildrenFileNames, int expectedLength) throws Exception {
- File tempFile = File.createTempFile("tika-test-", "");
+ File tempFile = Files.createTempFile("tika-test-", "").toFile();
tempFile.delete();
tempFile.mkdir();
@@ -362,7 +353,7 @@ public class TikaCLITest {
@Test
public void testExtractTgz() throws Exception {
//TIKA-2564
- File tempFile = File.createTempFile("tika-test-", "");
+ File tempFile = Files.createTempFile("tika-test-", "").toFile();
tempFile.delete();
tempFile.mkdir();
@@ -431,7 +422,7 @@ public class TikaCLITest {
@Test
public void testExtractInlineImages() throws Exception {
- File tempFile = File.createTempFile("tika-test-", "");
+ File tempFile = Files.createTempFile("tika-test-", "").toFile();
tempFile.delete();
tempFile.mkdir(); // not really good method for production usage, but ok for tests
// google guava library has better solution
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 509008464..82396196b 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;
@@ -309,7 +310,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 b3a528fef..056b2351a 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;
/**
@@ -251,7 +252,7 @@ public class RereadableInputStream extends InputStream {
if (!bufferIsInFile) {
boolean switchToFile = (size == (maxBytesInMemory));
if (switchToFile) {
- storeFile = File.createTempFile("TIKA_streamstore_", ".tmp");
+ storeFile = Files.createTempFile("TIKA_streamstore_", ".tmp").toFile();
bufferIsInFile = true;
storeOutputStream = new BufferedOutputStream(
new FileOutputStream(storeFile));
diff --git a/tika-core/src/test/java/org/apache/tika/TestRereadableInputStream.java b/tika-core/src/test/java/org/apache/tika/TestRereadableInputStream.java
index 9d9398bf2..a68e90d83 100644
--- a/tika-core/src/test/java/org/apache/tika/TestRereadableInputStream.java
+++ b/tika-core/src/test/java/org/apache/tika/TestRereadableInputStream.java
@@ -22,6 +22,7 @@ import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.file.Files;
import org.apache.tika.utils.RereadableInputStream;
import org.junit.Test;
@@ -98,7 +99,7 @@ public class TestRereadableInputStream {
}
private File createTestFile() throws IOException {
- File testfile = File.createTempFile("TIKA_ris_test", ".tmp");
+ File testfile = Files.createTempFile("TIKA_ris_test", ".tmp").toFile();
testfile.deleteOnExit();
FileOutputStream fos = new FileOutputStream(testfile);
for (int i = 0; i < TEST_SIZE; i++) {
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 3f406001f..7052e2848 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
@@ -28,6 +28,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.apache.tika.config.TikaConfig;
import org.apache.tika.config.TikaConfigSerializer;
@@ -44,7 +45,7 @@ public class DumpTikaConfigExampleTest {
@Before
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/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLExtractorFactory.java b/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLExtractorFactory.java
index 88c0f591d..7345a7895 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/OOXMLExtractorFactory.java
+++ b/tika-parsers/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;
@@ -39,7 +40,6 @@ import org.apache.poi.util.LocaleUtil;
import org.apache.poi.xslf.extractor.XSLFExtractor;
import org.apache.poi.xslf.usermodel.XMLSlideShow;
import org.apache.poi.xslf.usermodel.XSLFRelation;
-import org.apache.poi.xslf.usermodel.XSLFSlideShow;
import org.apache.poi.xssf.extractor.XSSFBEventBasedExcelExtractor;
import org.apache.poi.xssf.extractor.XSSFEventBasedExcelExtractor;
import org.apache.poi.xwpf.extractor.XWPFWordExtractor;
@@ -111,7 +111,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);
}
@@ -130,7 +130,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
@@ -146,7 +146,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