(tika) branch main updated: TIKA-4278: more code cleanup, replace deprecated

[tilman]

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 7d86f0910 TIKA-4278: more code cleanup, replace deprecated
7d86f0910 is described below

commit 7d86f0910ec48eed4b6dc027be443b8bcd0323ff
Author: Tilman Hausherr <til...@apache.org>
AuthorDate: Mon Jul 15 09:27:46 2024 +0200

    TIKA-4278: more code cleanup, replace deprecated
---
 .../src/main/java/org/apache/tika/parser/csv/CSVSniffer.java         | 2 +-
 .../src/main/java/org/apache/tika/parser/csv/TextAndCSVParser.java   | 4 ++--
 .../src/main/java/org/apache/tika/parser/txt/TXTParser.java          | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git 
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/csv/CSVSniffer.java
 
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/csv/CSVSniffer.java
index 53c9e4cb5..24123a56b 100644
--- 
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/csv/CSVSniffer.java
+++ 
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/csv/CSVSniffer.java
@@ -86,7 +86,7 @@ class CSVSniffer {
         //TODO: take into consideration the filename.  Perhaps require
         //a higher confidence if detection contradicts filename?
         List<CSVResult> results = sniff(reader);
-        if (results == null || results.size() == 0) {
+        if (results == null || results.isEmpty()) {
             return CSVResult.TEXT;
         }
         CSVResult bestResult = results.get(0);
diff --git 
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/csv/TextAndCSVParser.java
 
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/csv/TextAndCSVParser.java
index b98bc4a45..e9b35da67 100644
--- 
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/csv/TextAndCSVParser.java
+++ 
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/csv/TextAndCSVParser.java
@@ -192,9 +192,9 @@ public class TextAndCSVParser extends 
AbstractEncodingDetectorParser {
             return;
         }
 
-        CSVFormat csvFormat = 
CSVFormat.EXCEL.withDelimiter(params.getDelimiter());
+        CSVFormat csvFormat = 
CSVFormat.EXCEL.builder().setDelimiter(params.getDelimiter()).build();
         metadata.set(DELIMITER_PROPERTY,
-                CHAR_TO_STRING_DELIMITER_MAP.get(csvFormat.getDelimiter()));
+                
CHAR_TO_STRING_DELIMITER_MAP.get(csvFormat.getDelimiterString().charAt(0)));
 
         XHTMLContentHandler xhtmlContentHandler = new 
XHTMLContentHandler(handler, metadata);
         int totalRows = 0;
diff --git 
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/TXTParser.java
 
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/TXTParser.java
index e8a1ae0a7..f39a2fe01 100644
--- 
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/TXTParser.java
+++ 
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-text-module/src/main/java/org/apache/tika/parser/txt/TXTParser.java
@@ -41,7 +41,7 @@ import org.apache.tika.sax.XHTMLContentHandler;
  * beginning of the stream and the given document metadata, most
  * notably the <code>charset</code> parameter of a
  * {@link org.apache.tika.metadata.HttpHeaders#CONTENT_TYPE} value.
- * <p/>
+ * <p>
  * This parser sets the following output metadata entries:
  * <dl>
  * <dt>{@link org.apache.tika.metadata.HttpHeaders#CONTENT_TYPE}</dt>
@@ -59,17 +59,18 @@ public class TXTParser extends 
AbstractEncodingDetectorParser {
             Collections.singleton(MediaType.TEXT_PLAIN);
 
     public TXTParser() {
-        super();
     }
 
     public TXTParser(EncodingDetector encodingDetector) {
         super(encodingDetector);
     }
 
+    @Override
     public Set<MediaType> getSupportedTypes(ParseContext context) {
         return SUPPORTED_TYPES;
     }
 
+    @Override
     public void parse(InputStream stream, ContentHandler handler, Metadata 
metadata,
                       ParseContext context) throws IOException, SAXException, 
TikaException {