You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by vl...@apache.org on 2023/05/19 08:32:11 UTC

[jmeter] 02/03: style: remove use of deprecated API in FileServer

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

vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git

commit c69730cfe78cd855eb37ce31bcfd2198c9388788
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Fri May 19 11:19:11 2023 +0300

    style: remove use of deprecated API in FileServer
---
 src/core/src/main/java/org/apache/jmeter/services/FileServer.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/services/FileServer.java b/src/core/src/main/java/org/apache/jmeter/services/FileServer.java
index 3b7e94326d..1f9b836a28 100644
--- a/src/core/src/main/java/org/apache/jmeter/services/FileServer.java
+++ b/src/core/src/main/java/org/apache/jmeter/services/FileServer.java
@@ -423,10 +423,8 @@ public class FileServer {
         if (!fileEntry.file.canRead() || !fileEntry.file.isFile()) {
             throw new IllegalArgumentException("File "+ fileEntry.file.getName()+ " must exist and be readable");
         }
-        // TODO: figure out the proper way to use BOMInputStream.builder()
-        //   See https://issues.apache.org/jira/browse/IO-792
-        @SuppressWarnings("deprecation")
-        BOMInputStream fis = new BOMInputStream(Files.newInputStream(fileEntry.file.toPath())); //NOSONAR
+
+        BOMInputStream fis = BOMInputStream.builder().setFile(fileEntry.file).get();
         InputStreamReader isr = null;
         // If file encoding is specified, read using that encoding, otherwise use default platform encoding
         String charsetName = fileEntry.charSetEncoding;