You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by kk...@apache.org on 2020/11/05 22:59:37 UTC
[tika] branch main updated: Modify some calls of method
Collection.toArray
This is an automated email from the ASF dual-hosted git repository.
kkrugler 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 f29362d Modify some calls of method Collection.toArray
new 7595d82 Merge pull request #372 from PeterAlfredLee/modifyCall-toArray
f29362d is described below
commit f29362d91b46864a7f924c60f7cf691ac18f11b2
Author: PeterAlfredLee <pe...@gmail.com>
AuthorDate: Thu Oct 29 14:59:37 2020 +0800
Modify some calls of method Collection.toArray
Use method with empty array instead of pre size array.
Because it's more safe and faster.
---
.../main/java/org/apache/tika/cli/BatchCommandLineBuilder.java | 2 +-
tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java | 2 +-
.../main/java/org/apache/tika/batch/BatchProcessDriverCLI.java | 2 +-
.../apache/tika/batch/fs/strawman/StrawManTikaAppDriver.java | 2 +-
.../test/java/org/apache/tika/batch/fs/FSBatchTestBase.java | 10 ++++------
.../java/org/apache/tika/language/LanguageProfilerBuilder.java | 3 +--
tika-core/src/main/java/org/apache/tika/metadata/Metadata.java | 2 +-
tika-core/src/main/java/org/apache/tika/metadata/Property.java | 3 +--
.../src/main/java/org/apache/tika/mime/MimeTypesFactory.java | 2 +-
.../apache/tika/parser/external/ExternalParsersFactory.java | 2 +-
.../src/test/java/org/apache/tika/MultiThreadedTikaTest.java | 2 +-
.../test/java/org/apache/tika/sax/XHTMLContentHandlerTest.java | 2 +-
tika-eval/src/main/java/org/apache/tika/eval/TikaEvalCLI.java | 6 +++---
.../main/java/org/apache/tika/fuzzing/pdf/EvilCOSWriter.java | 2 +-
.../java/org/apache/tika/langdetect/LanguageDetectorTest.java | 2 +-
.../src/main/java/org/apache/tika/parser/mp3/Mp3Parser.java | 2 +-
.../org/apache/tika/parser/digestutils/CommonsDigester.java | 2 +-
.../org/apache/tika/parser/microsoft/OutlookExtractor.java | 2 +-
.../main/java/org/apache/tika/parser/dbf/DBFFileHeader.java | 2 +-
.../org/apache/tika/parser/odf/OpenDocumentMetaParser.java | 2 +-
.../java/org/apache/tika/parser/strings/StringsParser.java | 4 ++--
.../main/java/org/apache/tika/parser/txt/CharsetDetector.java | 6 ++----
.../src/main/java/org/apache/tika/server/TikaServerCli.java | 2 +-
23 files changed, 30 insertions(+), 36 deletions(-)
diff --git a/tika-app/src/main/java/org/apache/tika/cli/BatchCommandLineBuilder.java b/tika-app/src/main/java/org/apache/tika/cli/BatchCommandLineBuilder.java
index f953db3..15bdf40 100644
--- a/tika-app/src/main/java/org/apache/tika/cli/BatchCommandLineBuilder.java
+++ b/tika-app/src/main/java/org/apache/tika/cli/BatchCommandLineBuilder.java
@@ -96,7 +96,7 @@ class BatchCommandLineBuilder {
fullCommand.add(commandLineSafe(e.getValue()));
}
}
- return fullCommand.toArray(new String[fullCommand.size()]);
+ return fullCommand.toArray(new String[0]);
}
protected static String commandLineSafe(String arg) {
diff --git a/tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java b/tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java
index a3cb9b3..b9fef21 100644
--- a/tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java
+++ b/tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java
@@ -811,7 +811,7 @@ public class TikaCLI {
private Parser[] sortParsers(Map<Parser, Set<MediaType>> parsers) {
// Get a nicely sorted list of the parsers
- Parser[] sortedParsers = parsers.keySet().toArray(new Parser[parsers.size()]);
+ Parser[] sortedParsers = parsers.keySet().toArray(new Parser[0]);
Arrays.sort(sortedParsers, new Comparator<Parser>() {
public int compare(Parser p1, Parser p2) {
String name1 = p1.getClass().getName();
diff --git a/tika-batch/src/main/java/org/apache/tika/batch/BatchProcessDriverCLI.java b/tika-batch/src/main/java/org/apache/tika/batch/BatchProcessDriverCLI.java
index a1b19f6..d570f72 100644
--- a/tika-batch/src/main/java/org/apache/tika/batch/BatchProcessDriverCLI.java
+++ b/tika-batch/src/main/java/org/apache/tika/batch/BatchProcessDriverCLI.java
@@ -100,7 +100,7 @@ public class BatchProcessDriverCLI {
args.add(arg);
}
}
- return args.toArray(new String[args.size()]);
+ return args.toArray(new String[0]);
}
public void execute() throws Exception {
diff --git a/tika-batch/src/main/java/org/apache/tika/batch/fs/strawman/StrawManTikaAppDriver.java b/tika-batch/src/main/java/org/apache/tika/batch/fs/strawman/StrawManTikaAppDriver.java
index 1814e87..dd3cd48 100644
--- a/tika-batch/src/main/java/org/apache/tika/batch/fs/strawman/StrawManTikaAppDriver.java
+++ b/tika-batch/src/main/java/org/apache/tika/batch/fs/strawman/StrawManTikaAppDriver.java
@@ -238,7 +238,7 @@ public class StrawManTikaAppDriver implements Callable<Integer> {
for (int i = 0; i < totalThreads; i++) {
StrawManTikaAppDriver driver =
new StrawManTikaAppDriver(inputDir, outputDir, totalThreads, fileList,
- commandLine.toArray(new String[commandLine.size()]));
+ commandLine.toArray(new String[0]));
completionService.submit(driver);
}
diff --git a/tika-batch/src/test/java/org/apache/tika/batch/fs/FSBatchTestBase.java b/tika-batch/src/test/java/org/apache/tika/batch/fs/FSBatchTestBase.java
index 5cc901f..558f2b4 100644
--- a/tika-batch/src/test/java/org/apache/tika/batch/fs/FSBatchTestBase.java
+++ b/tika-batch/src/test/java/org/apache/tika/batch/fs/FSBatchTestBase.java
@@ -137,7 +137,7 @@ public abstract class FSBatchTestBase extends TikaTest {
args.add(e.getValue());
}
}
- return args.toArray(new String[args.size()]);
+ return args.toArray(new String[0]);
}
@@ -165,8 +165,7 @@ public abstract class FSBatchTestBase extends TikaTest {
argList.add(e.getValue());
}
- String[] fullCommandLine = commandLine(testConfig, loggerProps,
- argList.toArray(new String[argList.size()]));
+ String[] fullCommandLine = commandLine(testConfig, loggerProps, argList.toArray(new String[0]));
return new ProcessBuilder(fullCommandLine);
}
@@ -195,7 +194,7 @@ public abstract class FSBatchTestBase extends TikaTest {
commandLine.add(configFile);
commandLine.addAll(Arrays.asList(args));
- return commandLine.toArray(new String[commandLine.size()]);
+ return commandLine.toArray(new String[0]);
}
public BatchProcessDriverCLI getNewDriver(String testConfig,
@@ -221,8 +220,7 @@ public abstract class FSBatchTestBase extends TikaTest {
commandLine.addAll(Arrays.asList(args));
- BatchProcessDriverCLI driver = new BatchProcessDriverCLI(
- commandLine.toArray(new String[commandLine.size()]));
+ BatchProcessDriverCLI driver = new BatchProcessDriverCLI(commandLine.toArray(new String[0]));
driver.setRedirectChildProcessToStdOut(false);
return driver;
}
diff --git a/tika-core/src/main/java/org/apache/tika/language/LanguageProfilerBuilder.java b/tika-core/src/main/java/org/apache/tika/language/LanguageProfilerBuilder.java
index 8705b47..ccdaf87 100644
--- a/tika-core/src/main/java/org/apache/tika/language/LanguageProfilerBuilder.java
+++ b/tika-core/src/main/java/org/apache/tika/language/LanguageProfilerBuilder.java
@@ -412,8 +412,7 @@ public class LanguageProfilerBuilder {
// size of ngram)
List<NGramEntry> list = new ArrayList<>();
List<NGramEntry> sublist = new ArrayList<>();
- NGramEntry[] entries = ngrams.values().toArray(
- new NGramEntry[ngrams.size()]);
+ NGramEntry[] entries = ngrams.values().toArray(new NGramEntry[0]);
for (int i = minLength; i <= maxLength; i++) {
for (int j = 0; j < entries.length; j++) {
if (entries[j].getSeq().length() == i) {
diff --git a/tika-core/src/main/java/org/apache/tika/metadata/Metadata.java b/tika-core/src/main/java/org/apache/tika/metadata/Metadata.java
index ce69e0a..44c8a43 100644
--- a/tika-core/src/main/java/org/apache/tika/metadata/Metadata.java
+++ b/tika-core/src/main/java/org/apache/tika/metadata/Metadata.java
@@ -117,7 +117,7 @@ public class Metadata implements CreativeCommons, Geographic, HttpHeaders,
* @return Metadata names
*/
public String[] names() {
- return metadata.keySet().toArray(new String[metadata.keySet().size()]);
+ return metadata.keySet().toArray(new String[0]);
}
/**
diff --git a/tika-core/src/main/java/org/apache/tika/metadata/Property.java b/tika-core/src/main/java/org/apache/tika/metadata/Property.java
index 1097061..d01cc15 100644
--- a/tika-core/src/main/java/org/apache/tika/metadata/Property.java
+++ b/tika-core/src/main/java/org/apache/tika/metadata/Property.java
@@ -329,8 +329,7 @@ public final class Property implements Comparable<Property> {
}
String[] choices = null;
if (primaryProperty.getChoices() != null) {
- choices = primaryProperty.getChoices().toArray(
- new String[primaryProperty.getChoices().size()]);
+ choices = primaryProperty.getChoices().toArray(new String[0]);
}
return new Property(primaryProperty.getName(),
primaryProperty.isInternal(), PropertyType.COMPOSITE,
diff --git a/tika-core/src/main/java/org/apache/tika/mime/MimeTypesFactory.java b/tika-core/src/main/java/org/apache/tika/mime/MimeTypesFactory.java
index c6ffd25..0837471 100644
--- a/tika-core/src/main/java/org/apache/tika/mime/MimeTypesFactory.java
+++ b/tika-core/src/main/java/org/apache/tika/mime/MimeTypesFactory.java
@@ -186,6 +186,6 @@ public class MimeTypesFactory {
urls.add(externalURL);
}
- return create( urls.toArray(new URL[urls.size()]) );
+ return create(urls.toArray(new URL[0]));
}
}
diff --git a/tika-core/src/main/java/org/apache/tika/parser/external/ExternalParsersFactory.java b/tika-core/src/main/java/org/apache/tika/parser/external/ExternalParsersFactory.java
index 3922418..8319195 100644
--- a/tika-core/src/main/java/org/apache/tika/parser/external/ExternalParsersFactory.java
+++ b/tika-core/src/main/java/org/apache/tika/parser/external/ExternalParsersFactory.java
@@ -55,7 +55,7 @@ public class ExternalParsersFactory {
"/" + filename;
Enumeration<URL> files = loader.findServiceResources(filepath);
ArrayList<URL> list = Collections.list(files);
- URL[] urls = list.toArray(new URL[list.size()]);
+ URL[] urls = list.toArray(new URL[0]);
return create(urls);
}
diff --git a/tika-core/src/test/java/org/apache/tika/MultiThreadedTikaTest.java b/tika-core/src/test/java/org/apache/tika/MultiThreadedTikaTest.java
index 981e94c..6e4ad3b 100644
--- a/tika-core/src/test/java/org/apache/tika/MultiThreadedTikaTest.java
+++ b/tika-core/src/test/java/org/apache/tika/MultiThreadedTikaTest.java
@@ -242,7 +242,7 @@ public class MultiThreadedTikaTest extends TikaTest {
return FileVisitResult.CONTINUE;
}
});
- return files.toArray(new Path[files.size()]);
+ return files.toArray(new Path[0]);
}
private static ConcurrentHashMap<Path, MediaType> getBaselineDetection(Detector detector, Path[] files) {
diff --git a/tika-core/src/test/java/org/apache/tika/sax/XHTMLContentHandlerTest.java b/tika-core/src/test/java/org/apache/tika/sax/XHTMLContentHandlerTest.java
index eb24970..4d296bb 100644
--- a/tika-core/src/test/java/org/apache/tika/sax/XHTMLContentHandlerTest.java
+++ b/tika-core/src/test/java/org/apache/tika/sax/XHTMLContentHandlerTest.java
@@ -214,7 +214,7 @@ public class XHTMLContentHandlerTest {
}
}
- return words.toArray(new String[words.size()]);
+ return words.toArray(new String[0]);
}
}
diff --git a/tika-eval/src/main/java/org/apache/tika/eval/TikaEvalCLI.java b/tika-eval/src/main/java/org/apache/tika/eval/TikaEvalCLI.java
index 4baa3b0..6117f0f 100644
--- a/tika-eval/src/main/java/org/apache/tika/eval/TikaEvalCLI.java
+++ b/tika-eval/src/main/java/org/apache/tika/eval/TikaEvalCLI.java
@@ -65,7 +65,7 @@ public class TikaEvalCLI {
private void handleStartDB(String[] args) throws SQLException {
List<String> argList = new ArrayList<>();
argList.add("-web");
- Console.main(argList.toArray(new String[argList.size()]));
+ Console.main(argList.toArray(new String[0]));
while(true) {
try {
Thread.sleep(1000);
@@ -147,7 +147,7 @@ public class TikaEvalCLI {
argList.add(tmpBCConfig.toAbsolutePath().toString());
}
- String[] updatedArgs = argList.toArray(new String[argList.size()]);
+ String[] updatedArgs = argList.toArray(new String[0]);
DefaultParser defaultCLIParser = new DefaultParser();
try {
CommandLine commandLine = defaultCLIParser.parse(ExtractProfiler.OPTIONS, updatedArgs);
@@ -238,7 +238,7 @@ public class TikaEvalCLI {
argList.add(tmpBCConfig.toAbsolutePath().toString());
}
- String[] updatedArgs = argList.toArray(new String[argList.size()]);
+ String[] updatedArgs = argList.toArray(new String[0]);
DefaultParser defaultCLIParser = new DefaultParser();
try {
CommandLine commandLine = defaultCLIParser.parse(ExtractComparer.OPTIONS, updatedArgs);
diff --git a/tika-fuzzing/src/main/java/org/apache/tika/fuzzing/pdf/EvilCOSWriter.java b/tika-fuzzing/src/main/java/org/apache/tika/fuzzing/pdf/EvilCOSWriter.java
index 15e84a2..bc40216 100644
--- a/tika-fuzzing/src/main/java/org/apache/tika/fuzzing/pdf/EvilCOSWriter.java
+++ b/tika-fuzzing/src/main/java/org/apache/tika/fuzzing/pdf/EvilCOSWriter.java
@@ -983,7 +983,7 @@ public class EvilCOSWriter implements ICOSVisitor, Closeable {
list.add(last - count + 1);
list.add(count);
}
- return list.toArray(new Long[list.size()]);
+ return list.toArray(new Long[0]);
}
/**
diff --git a/tika-langdetect/tika-langdetect-commons/src/test/java/org/apache/tika/langdetect/LanguageDetectorTest.java b/tika-langdetect/tika-langdetect-commons/src/test/java/org/apache/tika/langdetect/LanguageDetectorTest.java
index 5c2b892..3486910 100644
--- a/tika-langdetect/tika-langdetect-commons/src/test/java/org/apache/tika/langdetect/LanguageDetectorTest.java
+++ b/tika-langdetect/tika-langdetect-commons/src/test/java/org/apache/tika/langdetect/LanguageDetectorTest.java
@@ -47,7 +47,7 @@ public abstract class LanguageDetectorTest {
result.add(language);
}
}
- return result.toArray(new String[result.size()]);
+ return result.toArray(new String[0]);
}
}
diff --git a/tika-parser-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/Mp3Parser.java b/tika-parser-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/Mp3Parser.java
index 52dad7c..72684e1 100644
--- a/tika-parser-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/Mp3Parser.java
+++ b/tika-parser-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp3/Mp3Parser.java
@@ -241,7 +241,7 @@ public class Mp3Parser extends AbstractParser {
ID3TagsAndAudio ret = new ID3TagsAndAudio();
ret.audio = firstAudio;
ret.lyrics = lyrics;
- ret.tags = tags.toArray(new ID3Tags[tags.size()]);
+ ret.tags = tags.toArray(new ID3Tags[0]);
ret.duration = duration;
return ret;
}
diff --git a/tika-parser-modules/tika-parser-digest-commons/src/main/java/org/apache/tika/parser/digestutils/CommonsDigester.java b/tika-parser-modules/tika-parser-digest-commons/src/main/java/org/apache/tika/parser/digestutils/CommonsDigester.java
index dd631e4..c32e0ae 100644
--- a/tika-parser-modules/tika-parser-digest-commons/src/main/java/org/apache/tika/parser/digestutils/CommonsDigester.java
+++ b/tika-parser-modules/tika-parser-digest-commons/src/main/java/org/apache/tika/parser/digestutils/CommonsDigester.java
@@ -114,7 +114,7 @@ public class CommonsDigester extends CompositeDigester {
for (String algoString : s.split(",")) {
ret.add(getDigestAlgorithm(algoString));
}
- return ret.toArray(new DigestAlgorithm[ret.size()]);
+ return ret.toArray(new DigestAlgorithm[0]);
}
private static DigestAlgorithm getDigestAlgorithm(String algoString) {
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/OutlookExtractor.java b/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/OutlookExtractor.java
index 5fce1b8..9e09bbe 100644
--- a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/OutlookExtractor.java
+++ b/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/OutlookExtractor.java
@@ -553,7 +553,7 @@ public class OutlookExtractor extends AbstractPOIFSExtractor {
//convert to array
for (Map.Entry<String, List<String>> e : headers.entrySet()) {
- ret.put(e.getKey(), e.getValue().toArray(new String[e.getValue().size()]));
+ ret.put(e.getKey(), e.getValue().toArray(new String[0]));
}
return ret;
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dbf/DBFFileHeader.java b/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dbf/DBFFileHeader.java
index 565699c..54af5fe 100644
--- a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dbf/DBFFileHeader.java
+++ b/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/dbf/DBFFileHeader.java
@@ -78,7 +78,7 @@ class DBFFileHeader {
}
}
- header.cols = headers.toArray(new DBFColumnHeader[headers.size()]);
+ header.cols = headers.toArray(new DBFColumnHeader[0]);
int endOfHeader = is.read();
if (endOfHeader != 13) {
diff --git a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/OpenDocumentMetaParser.java b/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/OpenDocumentMetaParser.java
index e97c291..42bb0e6 100644
--- a/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/OpenDocumentMetaParser.java
+++ b/tika-parser-modules/tika-parser-miscoffice-module/src/main/java/org/apache/tika/parser/odf/OpenDocumentMetaParser.java
@@ -193,7 +193,7 @@ public class OpenDocumentMetaParser extends XMLParser {
if (subjects.size() > 0) {
metadata.set(TikaCoreProperties.SUBJECT,
- subjects.toArray(new String[subjects.size()]));
+ subjects.toArray(new String[0]));
}
}
diff --git a/tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/strings/StringsParser.java b/tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/strings/StringsParser.java
index 4d69d2e..cea6b7c 100644
--- a/tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/strings/StringsParser.java
+++ b/tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/strings/StringsParser.java
@@ -203,7 +203,7 @@ public class StringsParser extends AbstractParser {
}
cmdList.add(input.getPath());
- String[] cmd = cmdList.toArray(new String[cmdList.size()]);
+ String[] cmd = cmdList.toArray(new String[0]);
ProcessBuilder pb = new ProcessBuilder(cmd);
final Process process = pb.start();
@@ -305,7 +305,7 @@ public class StringsParser extends AbstractParser {
}
cmdList.add(input.getPath());
- String[] cmd = cmdList.toArray(new String[cmdList.size()]);
+ String[] cmd = cmdList.toArray(new String[0]);
ProcessBuilder pb = new ProcessBuilder(cmd);
final Process process = pb.start();
diff --git a/tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetDetector.java b/tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetDetector.java
index 2f8c54f..e9affa8 100644
--- a/tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetDetector.java
+++ b/tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/CharsetDetector.java
@@ -328,9 +328,7 @@ public class CharsetDetector {
}
Collections.sort(matches); // CharsetMatch compares on confidence
Collections.reverse(matches); // Put best match first.
- CharsetMatch[] resultArray = new CharsetMatch[matches.size()];
- resultArray = matches.toArray(resultArray);
- return resultArray;
+ return matches.toArray(new CharsetMatch[0]);
}
/**
@@ -547,7 +545,7 @@ public class CharsetDetector {
csnames.add(rcinfo.recognizer.getName());
}
}
- return csnames.toArray(new String[csnames.size()]);
+ return csnames.toArray(new String[0]);
}
/**
diff --git a/tika-server/src/main/java/org/apache/tika/server/TikaServerCli.java b/tika-server/src/main/java/org/apache/tika/server/TikaServerCli.java
index 1f0c711..3ece666 100644
--- a/tika-server/src/main/java/org/apache/tika/server/TikaServerCli.java
+++ b/tika-server/src/main/java/org/apache/tika/server/TikaServerCli.java
@@ -175,7 +175,7 @@ public class TikaServerCli {
ret.add(args[i]);
}
}
- return ret.toArray(new String[ret.size()]);
+ return ret.toArray(new String[0]);
}
private static void executeLegacy(CommandLine line, Options options) throws Exception {