You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2020/11/19 13:02:54 UTC
[tika] branch main updated: Simplify some loop by use method
Collection.addAll and method Arrarys.asList (#371)
This is an automated email from the ASF dual-hosted git repository.
tallison 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 372ccd2 Simplify some loop by use method Collection.addAll and method Arrarys.asList (#371)
372ccd2 is described below
commit 372ccd23e6399de9b5d9d93906645e1e4349ec99
Author: Lee <55...@users.noreply.github.com>
AuthorDate: Thu Nov 19 21:02:44 2020 +0800
Simplify some loop by use method Collection.addAll and method Arrarys.asList (#371)
---
.../java/org/apache/tika/detect/CompositeEncodingDetector.java | 4 +---
.../src/main/java/org/apache/tika/embedder/ExternalEmbedder.java | 4 +---
.../java/org/apache/tika/metadata/filter/TestMetadataFilter.java | 7 ++-----
.../java/org/apache/tika/parser/font/AdobeFontMetricParser.java | 5 +----
.../main/java/org/apache/tika/parser/html/DefaultHtmlMapper.java | 7 ++-----
.../java/org/apache/tika/parser/microsoft/SummaryExtractor.java | 5 ++---
.../tika/parser/microsoft/ooxml/XSSFExcelExtractorDecorator.java | 5 +----
.../src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java | 5 +----
8 files changed, 11 insertions(+), 31 deletions(-)
diff --git a/tika-core/src/main/java/org/apache/tika/detect/CompositeEncodingDetector.java b/tika-core/src/main/java/org/apache/tika/detect/CompositeEncodingDetector.java
index a0a19ea..21d7947 100644
--- a/tika-core/src/main/java/org/apache/tika/detect/CompositeEncodingDetector.java
+++ b/tika-core/src/main/java/org/apache/tika/detect/CompositeEncodingDetector.java
@@ -49,9 +49,7 @@ public class CompositeEncodingDetector implements EncodingDetector, Serializable
public CompositeEncodingDetector(List<EncodingDetector> detectors) {
this.detectors = new LinkedList<>();
- for (EncodingDetector encodingDetector : detectors) {
- this.detectors.add(encodingDetector);
- }
+ this.detectors.addAll(detectors);
}
/**
diff --git a/tika-core/src/main/java/org/apache/tika/embedder/ExternalEmbedder.java b/tika-core/src/main/java/org/apache/tika/embedder/ExternalEmbedder.java
index 25581be..61acb0a 100644
--- a/tika-core/src/main/java/org/apache/tika/embedder/ExternalEmbedder.java
+++ b/tika-core/src/main/java/org/apache/tika/embedder/ExternalEmbedder.java
@@ -331,9 +331,7 @@ public class ExternalEmbedder implements Embedder {
}
if (commandSegment.indexOf(METADATA_COMMAND_ARGUMENTS_TOKEN) != -1) {
if (hasMetadataCommandArguments) {
- for (String commandMetadataSegment : commandMetadataSegments) {
- cmd.add(commandMetadataSegment);
- }
+ cmd.addAll(commandMetadataSegments);
}
replacedMetadataCommandArgumentsToken = true;
} else {
diff --git a/tika-core/src/test/java/org/apache/tika/metadata/filter/TestMetadataFilter.java b/tika-core/src/test/java/org/apache/tika/metadata/filter/TestMetadataFilter.java
index e933d0c..3982e74 100644
--- a/tika-core/src/test/java/org/apache/tika/metadata/filter/TestMetadataFilter.java
+++ b/tika-core/src/test/java/org/apache/tika/metadata/filter/TestMetadataFilter.java
@@ -23,6 +23,7 @@ import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
import org.junit.Test;
+import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
@@ -161,10 +162,6 @@ public class TestMetadataFilter extends AbstractTikaConfigTest {
}
private static Set<String> set(String ... items) {
- Set<String> set = new HashSet<>();
- for (String item : items) {
- set.add(item);
- }
- return set;
+ return new HashSet<>(Arrays.asList(items));
}
}
diff --git a/tika-parser-modules/tika-parser-font-module/src/main/java/org/apache/tika/parser/font/AdobeFontMetricParser.java b/tika-parser-modules/tika-parser-font-module/src/main/java/org/apache/tika/parser/font/AdobeFontMetricParser.java
index ea6f4ee..daedad2 100644
--- a/tika-parser-modules/tika-parser-font-module/src/main/java/org/apache/tika/parser/font/AdobeFontMetricParser.java
+++ b/tika-parser-modules/tika-parser-font-module/src/main/java/org/apache/tika/parser/font/AdobeFontMetricParser.java
@@ -77,10 +77,7 @@ public class AdobeFontMetricParser extends AbstractParser {
// Get the comments in the file to display in xhtml
List<String> unModifiableComments = fontMetrics.getComments();
//have to copy because we modify list in extractCreationDate
- List<String> comments = new ArrayList<>();
- for (String comment : unModifiableComments) {
- comments.add(comment);
- }
+ List<String> comments = new ArrayList<>(unModifiableComments);
// Get the creation date
extractCreationDate( metadata, comments );
diff --git a/tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/DefaultHtmlMapper.java b/tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/DefaultHtmlMapper.java
index 4217ac5..dd5a256 100644
--- a/tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/DefaultHtmlMapper.java
+++ b/tika-parser-modules/tika-parser-html-module/src/main/java/org/apache/tika/parser/html/DefaultHtmlMapper.java
@@ -16,6 +16,7 @@
*/
package org.apache.tika.parser.html;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -106,11 +107,7 @@ public class DefaultHtmlMapper implements HtmlMapper {
}};
private static Set<String> attrSet(String... attrs) {
- Set<String> result = new HashSet<String>();
- for (String attr : attrs) {
- result.add(attr);
- }
- return result;
+ return new HashSet<>(Arrays.asList(attrs));
}
public String mapSafeElement(String name) {
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/SummaryExtractor.java b/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/SummaryExtractor.java
index 522baa4..d408462 100644
--- a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/SummaryExtractor.java
+++ b/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/SummaryExtractor.java
@@ -18,6 +18,7 @@ package org.apache.tika.parser.microsoft;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.util.Arrays;
import java.util.Date;
import java.util.HashSet;
import java.util.Set;
@@ -238,9 +239,7 @@ public class SummaryExtractor {
String[] current = metadata.getValues(property);
Set<String> seen = new HashSet<>();
if (current != null) {
- for (String val : current) {
- seen.add(val);
- }
+ seen.addAll(Arrays.asList(current));
}
for (String part : parts) {
if (! seen.contains(part)) {
diff --git a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/XSSFExcelExtractorDecorator.java b/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/XSSFExcelExtractorDecorator.java
index 1f906ba..56a0f10 100644
--- a/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/XSSFExcelExtractorDecorator.java
+++ b/tika-parser-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/XSSFExcelExtractorDecorator.java
@@ -395,10 +395,7 @@ public class XSSFExcelExtractorDecorator extends AbstractOOXMLExtractor {
//add main document so that macros can be extracted
//by AbstractOOXMLExtractor
- for (PackagePart part : extractor.getPackage().
- getPartsByRelationshipType(PackageRelationshipTypes.CORE_DOCUMENT)) {
- parts.add(part);
- }
+ parts.addAll(extractor.getPackage().getPartsByRelationshipType(PackageRelationshipTypes.CORE_DOCUMENT));
return parts;
}
diff --git a/tika-parser-modules/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java b/tika-parser-modules/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
index fbc898f..8d5fddc 100644
--- a/tika-parser-modules/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
+++ b/tika-parser-modules/tika-parser-pdf-module/src/test/java/org/apache/tika/parser/pdf/PDFParserTest.java
@@ -683,10 +683,7 @@ public class PDFParserTest extends TikaTest {
}
//now test full 11.x
XMLResult r = getXML("testPDF_Version.11.x.PDFA-1b.pdf");
- Set<String> versions = new HashSet<String>();
- for (String fmt : r.metadata.getValues("dc:format")) {
- versions.add(fmt);
- }
+ Set<String> versions = new HashSet<>(Arrays.asList(r.metadata.getValues("dc:format")));
for (String hit : new String[]{"application/pdf; version=1.7",
"application/pdf; version=\"A-1b\"",