fix modernizer waarschuwingen in bgt-loader module

B3Partners · Jan 20, 2025 · 48c8aca · 48c8aca
1 parent f3f7bb9
commit 48c8aca
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/bgt-loader/pom.xml b/bgt-loader/pom.xml
@@ -95,6 +95,11 @@ SPDX-License-Identifier: MIT
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.gaul</groupId>
+            <artifactId>modernizer-maven-annotations</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>

diff --git a/bgt-loader/src/main/java/nl/b3p/brmo/bgt/loader/cli/BGTLoaderMain.java b/bgt-loader/src/main/java/nl/b3p/brmo/bgt/loader/cli/BGTLoaderMain.java
@@ -18,6 +18,8 @@
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.sql.SQLException;
 import java.time.Instant;
 import java.util.ArrayList;
@@ -153,9 +155,9 @@ public int load(
       if (file.endsWith(".zip") && (file.startsWith("http://") || file.startsWith("https://"))) {
         loadZipFromURI(new URI(file), writer, featureTypeSelectionOptions, loadOptions, true);
       } else if (file.endsWith(".zip")) {
-        loadZip(new File(file), writer, featureTypeSelectionOptions);
+        loadZip(Path.of(file).toFile(), writer, featureTypeSelectionOptions);
       } else if (file.matches(".*\\.[xg]ml")) {
-        loadXml(new File(file), writer);
+        loadXml(Path.of(file).toFile(), writer);
       } else {
         log.error(getMessageFormattedString("load.invalid_extension", file));
         return ExitCode.USAGE;
@@ -396,7 +398,7 @@ public void loadZip(
   }
 
   public void loadXml(File file, BGTObjectTableWriter writer) throws Exception {
-    try (FileInputStream in = new FileInputStream(file)) {
+    try (FileInputStream in = (FileInputStream) Files.newInputStream(file.toPath())) {
       loadInputStream(file.getName(), in, file.length(), writer);
     }
   }

diff --git a/bgt-loader/src/test/java/nl/b3p/brmo/bgt/loader/BGTTestFiles.java b/bgt-loader/src/test/java/nl/b3p/brmo/bgt/loader/BGTTestFiles.java
@@ -15,6 +15,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import org.gaul.modernizer_maven_annotations.SuppressModernizer;
 
 public class BGTTestFiles {
   public static InputStream getTestInputStream(String name) {
@@ -23,6 +24,7 @@ public static InputStream getTestInputStream(String name) {
     return input;
   }
 
+  @SuppressModernizer
   public static File getTestFile(String name) {
     URL url = BGTTestFiles.class.getResource("/" + name);
     assertNotNull(url, name);