preparation for release 1.0.0

logchange · Feb 21, 2024 · 6584f88 · 6584f88
1 parent 05f8554
commit 6584f88
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 5 deletions.
diff --git a/hofund-core/src/main/java/dev/logchange/hofund/StringUtils.java b/hofund-core/src/main/java/dev/logchange/hofund/StringUtils.java
@@ -0,0 +1,13 @@
+package dev.logchange.hofund;
+
+public class StringUtils {
+
+    public static String emptyIfNull(String val) {
+        if (val == null) {
+            return "";
+        } else {
+            return val;
+        }
+    }
+
+}
diff --git a/hofund-core/src/main/java/dev/logchange/hofund/java/HofundJavaInfo.java b/hofund-core/src/main/java/dev/logchange/hofund/java/HofundJavaInfo.java
@@ -5,6 +5,8 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
+import static dev.logchange.hofund.StringUtils.emptyIfNull;
+
 @Getter
 @Builder(access = AccessLevel.PRIVATE)
 @RequiredArgsConstructor(access = AccessLevel.PRIVATE)
@@ -27,9 +29,6 @@ public static HofundJavaInfo get() {
     }
 
 
-
-
-    @Getter
     public static class JavaVendorInfo {
 
         private final String name;
@@ -40,9 +39,17 @@ public JavaVendorInfo() {
             this.name = System.getProperty("java.vendor");
             this.version = System.getProperty("java.vendor.version");
         }
+
+        public String getName() {
+            return emptyIfNull(name);
+        }
+
+        public String getVersion() {
+            return emptyIfNull(version);
+        }
     }
 
-    @Getter
+
     public static class JavaRuntimeEnvironmentInfo {
 
         private final String name;
@@ -53,9 +60,16 @@ public JavaRuntimeEnvironmentInfo() {
             this.name = System.getProperty("java.runtime.name");
             this.version = System.getProperty("java.runtime.version");
         }
+
+        public String getName() {
+            return emptyIfNull(name);
+        }
+
+        public String getVersion() {
+            return emptyIfNull(version);
+        }
     }
 
-    @Getter
     public static class JavaVirtualMachineInfo {
 
         private final String name;
@@ -69,6 +83,18 @@ public JavaVirtualMachineInfo() {
             this.vendor = System.getProperty("java.vm.vendor");
             this.version = System.getProperty("java.vm.version");
         }
+
+        public String getName() {
+            return emptyIfNull(name);
+        }
+
+        public String getVendor() {
+            return emptyIfNull(vendor);
+        }
+
+        public String getVersion() {
+            return emptyIfNull(version);
+        }
     }
 
 }