(tika) branch main updated: TIKA-4327: replace deprecated; refactor

[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 5c7e5ec04 TIKA-4327: replace deprecated; refactor
5c7e5ec04 is described below

commit 5c7e5ec04fd0526b4d19fc1b25d6963ffeffa70a
Author: Tilman Hausherr <til...@apache.org>
AuthorDate: Tue Jan 14 19:14:14 2025 +0100

    TIKA-4327: replace deprecated; refactor
---
 .../apache/tika/server/standard/MetadataResourceTest.java  | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git 
a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/MetadataResourceTest.java
 
b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/MetadataResourceTest.java
index e4bfc416c..e4bcb1f8a 100644
--- 
a/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/MetadataResourceTest.java
+++ 
b/tika-server/tika-server-standard/src/test/java/org/apache/tika/server/standard/MetadataResourceTest.java
@@ -82,7 +82,7 @@ public class MetadataResourceTest extends CXFTestBase {
 
         Reader reader = new InputStreamReader((InputStream) 
response.getEntity(), UTF_8);
 
-        CSVParser csvReader = new CSVParser(reader, CSVFormat.EXCEL);
+        CSVParser csvReader = 
CSVParser.builder().setReader(reader).setFormat(CSVFormat.EXCEL).get();
 
         Map<String, String> metadata = new HashMap<>();
 
@@ -129,15 +129,13 @@ public class MetadataResourceTest extends CXFTestBase {
         assertEquals(200, response.getStatus());
 
         // Check results
-        Reader reader = new InputStreamReader((InputStream) 
response.getEntity(), UTF_8);
-        CSVParser csvReader = new CSVParser(reader, CSVFormat.EXCEL);
-
         Map<String, String> metadata = new HashMap<>();
-
-        for (CSVRecord r : csvReader) {
-            metadata.put(r.get(0), r.get(1));
+        try (Reader reader = new InputStreamReader((InputStream) 
response.getEntity(), UTF_8);
+                CSVParser csvReader = 
CSVParser.builder().setReader(reader).setFormat(CSVFormat.EXCEL).get()) {
+            for (CSVRecord r : csvReader) {
+                metadata.put(r.get(0), r.get(1));
+            }
         }
-        csvReader.close();
 
         assertNotNull(metadata.get(TikaCoreProperties.CREATOR.getName()));
         assertEquals("pavel", 
metadata.get(TikaCoreProperties.CREATOR.getName()));