Fixing unit tests

faucetsdn · Jan 17, 2025 · 9cb6f65 · 9cb6f65
1 parent 1351cd4
commit 9cb6f65
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/common/src/main/java/com/google/udmi/util/GeneralUtils.java b/common/src/main/java/com/google/udmi/util/GeneralUtils.java
@@ -514,6 +514,10 @@ public static boolean catchToFalse(Supplier<Boolean> provider) {
     return catchToElse(provider, false);
   }
 
+  public static boolean catchToTrue(Supplier<Boolean> provider) {
+    return catchToElse(provider, true);
+  }
+
   public static <T> T catchToNull(Supplier<T> provider) {
     return catchToElse(provider, (T) null);
   }

diff --git a/common/src/main/java/com/google/udmi/util/SiteModel.java b/common/src/main/java/com/google/udmi/util/SiteModel.java
@@ -11,6 +11,7 @@
 import static com.google.udmi.util.Common.UDMI_VERSION_ENV;
 import static com.google.udmi.util.Common.getNamespacePrefix;
 import static com.google.udmi.util.GeneralUtils.OBJECT_MAPPER_RAW;
+import static com.google.udmi.util.GeneralUtils.catchToTrue;
 import static com.google.udmi.util.GeneralUtils.friendlyStackTrace;
 import static com.google.udmi.util.GeneralUtils.getFileBytes;
 import static com.google.udmi.util.GeneralUtils.ifNotNullGet;
@@ -377,7 +378,7 @@ public Metadata loadDeviceMetadata(String deviceId, boolean safeLoading,
 
       // Missing arrays are automatically parsed to an empty list, which is not what
       // we want, so hacky go through and convert an empty list to null.
-      if (metadata.gateway != null && metadata.gateway.proxy_ids.isEmpty()) {
+      if (metadata.gateway != null && catchToTrue(() -> metadata.gateway.proxy_ids.isEmpty())) {
         metadata.gateway.proxy_ids = null;
       }