make resource handling spotbugs friendly

xzel23 · Nov 2, 2024 · 9200412 · 9200412
1 parent 4d9462a
commit 9200412
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 24 deletions.
diff --git a/utility-db/src/main/java/com/dua3/utility/db/DbUtil.java b/utility-db/src/main/java/com/dua3/utility/db/DbUtil.java
@@ -19,6 +19,7 @@
 import javax.sql.DataSource;
 import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.StringReader;
 import java.io.UncheckedIOException;
 import java.lang.reflect.InvocationTargetException;
@@ -63,11 +64,10 @@ public final class DbUtil {
     static {
         try {
             // load properties
-            String resource = "jdbc_drivers.properties";
-            Map<Object, Object> p = LangUtil.loadProperties(
-                    Objects.requireNonNull(DbUtil.class.getResourceAsStream(resource),
-                            () -> "could not load resource " + resource)
-            );
+            Map<Object, Object> p;
+            try (InputStream in = DbUtil.class.getResourceAsStream("jdbc_drivers.properties")) {
+                p = LangUtil.loadProperties(in);
+            }
 
             // parse entries
             p.forEach((key1, value) -> {

diff --git a/utility/src/main/java/com/dua3/utility/lang/BuildInfo.java b/utility/src/main/java/com/dua3/utility/lang/BuildInfo.java
@@ -6,7 +6,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.time.ZonedDateTime;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.Properties;
 import java.util.regex.Matcher;
@@ -71,22 +70,6 @@ public static BuildInfo create(Properties properties) {
         return create(version, buildTime);
     }
 
-    /**
-     * Load properties from stream and return BuildInfo.
-     *
-     * @param in {@link InputStream} to read the build info properties from
-     * @return BuildInfo instance
-     * @throws IllegalStateException if buildinfo could not be loaded
-     */
-    public static BuildInfo create(InputStream in) {
-        try (in) {
-            return create(LangUtil.loadProperties(in));
-        } catch (Exception e) {
-            LOG.warn("could not load build properties", e);
-            throw new IllegalStateException("could not load build properties", e);
-        }
-    }
-
     /**
      * Load properties from resource and return BuildInfo.
      *
@@ -96,8 +79,8 @@ public static BuildInfo create(InputStream in) {
      * @throws IllegalStateException if buildinfo could not be loaded
      */
     public static BuildInfo create(Class<?> cls, String resource) throws IOException {
-        try (InputStream in = Objects.requireNonNull(cls.getResourceAsStream(resource), () -> "could not load resource: " + resource)) {
-            return create(in);
+        try (InputStream in = cls.getResourceAsStream(resource)) {
+            return create(LangUtil.loadProperties(in));
         }
     }