(tika) branch branch_2x updated: TIKA-4239: replace deprecated; refactor

[tilman]

This is an automated email from the ASF dual-hosted git repository.

tilman pushed a commit to branch branch_2x
in repository https://gitbox.apache.org/repos/asf/tika.git


The following commit(s) were added to refs/heads/branch_2x by this push:
     new 21d4887c8 TIKA-4239: replace deprecated; refactor
21d4887c8 is described below

commit 21d4887c8dd93efc1dbb629401144f22572cf52e
Author: Tilman Hausherr <til...@apache.org>
AuthorDate: Tue Jan 14 19:13:12 2025 +0100

    TIKA-4239: replace deprecated; refactor
---
 .../apache/tika/server/standard/MetadataResourceTest.java   | 13 +++++--------
 1 file changed, 5 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 0d25ba319..ef1c12a80 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
@@ -80,16 +80,13 @@ public class MetadataResourceTest extends CXFTestBase {
                 WebClient.create(endPoint + 
META_PATH).type("application/msword").accept("text/csv")
                         
.put(ClassLoader.getSystemResourceAsStream(TikaResourceTest.TEST_DOC));
 
-        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("Maxim Valyanskiy", 
metadata.get(TikaCoreProperties.CREATOR.getName()));