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 2024/08/07 05:46:52 UTC
(tika) branch main updated: TIKA-4290 Removed unused collections and a method call (#1875)
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 330dc58fe TIKA-4290 Removed unused collections and a method call (#1875)
330dc58fe is described below
commit 330dc58fea1f015894ac6e150b3bafe68d36cf68
Author: Dmitry Kryukov <dk...@users.noreply.github.com>
AuthorDate: Wed Aug 7 08:46:48 2024 +0300
TIKA-4290 Removed unused collections and a method call (#1875)
* TIKA-4290 Removed unused collections and a method call
* remove unused import
* Remove unused import
---------
Co-authored-by: Tilman Hausherr <ti...@snafu.de>
---
tika-core/src/main/java/org/apache/tika/config/Param.java | 7 +------
.../src/main/java/org/apache/tika/eval/app/reports/Report.java | 4 ----
.../main/java/org/apache/tika/example/TextStatsFromTikaEval.java | 1 -
3 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/tika-core/src/main/java/org/apache/tika/config/Param.java b/tika-core/src/main/java/org/apache/tika/config/Param.java
index 25d367fe1..853abb7ec 100644
--- a/tika-core/src/main/java/org/apache/tika/config/Param.java
+++ b/tika-core/src/main/java/org/apache/tika/config/Param.java
@@ -29,7 +29,6 @@ import java.net.URI;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -90,7 +89,6 @@ public class Param<T> implements Serializable {
//one of these two is used for serialization
private final List<String> valueStrings = new ArrayList<>();
- private final Map<String, String> valueMap = new LinkedHashMap<>();
private Class<T> type;
private String name;
@@ -105,9 +103,7 @@ public class Param<T> implements Serializable {
this.actualValue = value;
if (List.class.isAssignableFrom(value.getClass())) {
this.valueStrings.addAll((List) value);
- } else if (Map.class.isAssignableFrom(value.getClass())) {
- valueMap.putAll((Map)value);
- } else {
+ } else if (!Map.class.isAssignableFrom(value.getClass())) {
this.valueStrings.add(value.toString());
}
if (this.type == null) {
@@ -251,7 +247,6 @@ public class Param<T> implements Serializable {
throw new TikaConfigException("Duplicate keys are not allowed: " + key);
}
((Map)ret.actualValue).put(key, value);
- ret.valueMap.put(key, value);
}
child = child.getNextSibling();
}
diff --git a/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/reports/Report.java b/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/reports/Report.java
index 167176354..8186ec275 100644
--- a/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/reports/Report.java
+++ b/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/reports/Report.java
@@ -27,9 +27,7 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.sql.Types;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Map;
-import java.util.Set;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellStyle;
@@ -99,14 +97,12 @@ public class Report {
int rowCount = 0;
ResultSetMetaData meta = rs.getMetaData();
- Set<String> colNames = new HashSet<>();
Row xssfRow = sheet.createRow(rowCount++);
//write headers and cache them to check against styles
for (int i = 1; i <= meta.getColumnCount(); i++) {
Cell cell = xssfRow.createCell(i - 1);
cell.setCellValue(meta.getColumnLabel(i));
- colNames.add(meta.getColumnLabel(i));
}
ResultSetMetaData resultSetMetaData = rs.getMetaData();
diff --git a/tika-example/src/main/java/org/apache/tika/example/TextStatsFromTikaEval.java b/tika-example/src/main/java/org/apache/tika/example/TextStatsFromTikaEval.java
index d12f4b08a..e2a9fbb83 100644
--- a/tika-example/src/main/java/org/apache/tika/example/TextStatsFromTikaEval.java
+++ b/tika-example/src/main/java/org/apache/tika/example/TextStatsFromTikaEval.java
@@ -56,7 +56,6 @@ public class TextStatsFromTikaEval {
*/
CommonTokenResult result = (CommonTokenResult) results.get(CommonTokens.class);
- result.getLangCode();
return result.getOOV();
}
}