You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by pe...@apache.org on 2020/12/14 01:42:20 UTC
[tika] branch main updated: Simplify init code of some Set and List
This is an automated email from the ASF dual-hosted git repository.
peterlee 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 3571725 Simplify init code of some Set and List
3571725 is described below
commit 3571725a948a4676f1904799209271eeaf18b102
Author: PeterAlfredLee <pe...@gmail.com>
AuthorDate: Tue Dec 1 10:40:33 2020 +0800
Simplify init code of some Set and List
---
.../org/apache/tika/batch/fs/strawman/StrawManTikaAppDriver.java | 4 +---
.../src/main/java/org/apache/tika/config/TikaConfigSerializer.java | 3 +--
tika-core/src/main/java/org/apache/tika/fork/ForkClient.java | 6 ++----
.../main/java/org/apache/tika/fuzzing/pdf/PDFTransformerConfig.java | 3 +--
.../test/java/org/apache/tika/parser/ner/NamedEntityParserTest.java | 3 +--
.../src/test/java/org/apache/tika/parser/html/HtmlParserTest.java | 6 ++----
.../src/main/java/org/apache/tika/parser/pkg/CompressorParser.java | 6 ++----
tika-server/src/main/java/org/apache/tika/server/ServerStatus.java | 4 +---
8 files changed, 11 insertions(+), 24 deletions(-)
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 dd3cd48..7b0bd1e 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
@@ -226,10 +226,8 @@ public class StrawManTikaAppDriver implements Callable<Integer> {
}
}
- List<String> commandLine = new ArrayList<>();
-
int initialParams = (fileList == null) ? 3 : 4;
- commandLine.addAll(Arrays.asList(args).subList(initialParams, args.length));
+ List<String> commandLine = new ArrayList<>(Arrays.asList(args).subList(initialParams, args.length));
totalThreads = (totalThreads < 1) ? 1 : totalThreads;
ExecutorService ex = Executors.newFixedThreadPool(totalThreads);
ExecutorCompletionService<Integer> completionService =
diff --git a/tika-core/src/main/java/org/apache/tika/config/TikaConfigSerializer.java b/tika-core/src/main/java/org/apache/tika/config/TikaConfigSerializer.java
index 2e16567..dbe63e3 100644
--- a/tika-core/src/main/java/org/apache/tika/config/TikaConfigSerializer.java
+++ b/tika-core/src/main/java/org/apache/tika/config/TikaConfigSerializer.java
@@ -273,8 +273,7 @@ public class TikaConfigSerializer {
Set<MediaType> addedTypes = new TreeSet<>();
Set<MediaType> excludedTypes = new TreeSet<>();
if (decorator != null) {
- Set<MediaType> types = new TreeSet<>();
- types.addAll(decorator.getSupportedTypes(context));
+ Set<MediaType> types = new TreeSet<>(decorator.getSupportedTypes(context));
addedTypes.addAll(types);
for (MediaType type : parser.getSupportedTypes(context)) {
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 94c9262..15c31fd 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
@@ -79,8 +79,7 @@ class ForkClient {
loader = null;
boolean ok = false;
ProcessBuilder builder = new ProcessBuilder();
- List<String> command = new ArrayList<>();
- command.addAll(java);
+ List<String> command = new ArrayList<>(java);
command.add("-cp");
String dirString = tikaDir.toAbsolutePath().toString();
if (!dirString.endsWith("/")) {
@@ -134,8 +133,7 @@ class ForkClient {
this.jar = createBootstrapJar();
ProcessBuilder builder = new ProcessBuilder();
- List<String> command = new ArrayList<>();
- command.addAll(java);
+ List<String> command = new ArrayList<>(java);
command.add("-jar");
command.add(jar.getPath());
command.add(Long.toString(timeoutLimits.getPulseMS()));
diff --git a/tika-fuzzing/src/main/java/org/apache/tika/fuzzing/pdf/PDFTransformerConfig.java b/tika-fuzzing/src/main/java/org/apache/tika/fuzzing/pdf/PDFTransformerConfig.java
index aa7729c..41f0daf 100644
--- a/tika-fuzzing/src/main/java/org/apache/tika/fuzzing/pdf/PDFTransformerConfig.java
+++ b/tika-fuzzing/src/main/java/org/apache/tika/fuzzing/pdf/PDFTransformerConfig.java
@@ -156,8 +156,7 @@ public class PDFTransformerConfig {
numFilters = minFilters + random.nextInt(maxFilters - minFilters);
}
- List<COSName> allowable = new ArrayList<>();
- allowable.addAll(allowableFilters);
+ List<COSName> allowable = new ArrayList<>(allowableFilters);
List<COSName> filters = new ArrayList<>();
for (int i = 0; i < numFilters; i++) {
diff --git a/tika-parsers/tika-parsers-advanced/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/ner/NamedEntityParserTest.java b/tika-parsers/tika-parsers-advanced/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/ner/NamedEntityParserTest.java
index a7aef2f..97279f9 100644
--- a/tika-parsers/tika-parsers-advanced/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/ner/NamedEntityParserTest.java
+++ b/tika-parsers/tika-parsers-advanced/tika-parser-nlp-module/src/test/java/org/apache/tika/parser/ner/NamedEntityParserTest.java
@@ -52,8 +52,7 @@ public class NamedEntityParserTest extends TikaTest {
Metadata md = new Metadata();
tika.parse(new ByteArrayInputStream(text.getBytes(Charset.defaultCharset())), md);
- HashSet<String> set = new HashSet<String>();
- set.addAll(Arrays.asList(md.getValues("X-Parsed-By")));
+ HashSet<String> set = new HashSet<String>(Arrays.asList(md.getValues("X-Parsed-By")));
assumeTrue(set.contains(NamedEntityParser.class.getName()));
set.clear();
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java
index ba13d00..3b26443 100644
--- a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java
+++ b/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-html-module/src/test/java/org/apache/tika/parser/html/HtmlParserTest.java
@@ -1312,10 +1312,8 @@ public class HtmlParserTest extends TikaTest {
@Test
public void testMultiThreadingEncodingDetection() throws Exception {
- List<EncodingDetector> detectors = new ArrayList<>();
- ServiceLoader loader =
- new ServiceLoader(AutoDetectReader.class.getClassLoader());
- detectors.addAll(loader.loadServiceProviders(EncodingDetector.class));
+ ServiceLoader loader = new ServiceLoader(AutoDetectReader.class.getClassLoader());
+ List<EncodingDetector> detectors = new ArrayList<>(loader.loadServiceProviders(EncodingDetector.class));
for (EncodingDetector detector : detectors) {
testDetector(detector);
}
diff --git a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-pkg-module/src/main/java/org/apache/tika/parser/pkg/CompressorParser.java b/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-pkg-module/src/main/java/org/apache/tika/parser/pkg/CompressorParser.java
index e428b73..9e1087c 100644
--- a/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-pkg-module/src/main/java/org/apache/tika/parser/pkg/CompressorParser.java
+++ b/tika-parsers/tika-parsers-classic/tika-parsers-classic-modules/tika-parser-pkg-module/src/main/java/org/apache/tika/parser/pkg/CompressorParser.java
@@ -83,10 +83,8 @@ public class CompressorParser extends AbstractParser {
private static Map<String, String> MIMES_TO_NAME;
static {
- Set<MediaType> TMP_SET = new HashSet<>();
- TMP_SET.addAll(
- MediaType.set(BZIP, BZIP2, DEFLATE64, GZIP, GZIP_ALT, LZ4_FRAMED, COMPRESS,
- XZ, PACK, SNAPPY_FRAMED, ZLIB, LZMA));
+ Set<MediaType> TMP_SET = new HashSet<>(MediaType.set(
+ BZIP, BZIP2, DEFLATE64, GZIP, GZIP_ALT, LZ4_FRAMED, COMPRESS, XZ, PACK, SNAPPY_FRAMED, ZLIB, LZMA));
try {
Class.forName("org.brotli.dec.BrotliInputStream");
TMP_SET.add(BROTLI);
diff --git a/tika-server/src/main/java/org/apache/tika/server/ServerStatus.java b/tika-server/src/main/java/org/apache/tika/server/ServerStatus.java
index bc9ad0a..b49ecbc 100644
--- a/tika-server/src/main/java/org/apache/tika/server/ServerStatus.java
+++ b/tika-server/src/main/java/org/apache/tika/server/ServerStatus.java
@@ -125,9 +125,7 @@ public class ServerStatus {
}
public synchronized Map<Long, TaskStatus> getTasks() {
- Map<Long, TaskStatus> ret = new HashMap<>();
- ret.putAll(tasks);
- return ret;
+ return new HashMap<>(tasks);
}
public synchronized long getFilesProcessed() {