Extract SignalAccount from Manager

[signal-cli] / src / main / java / org / asamk / signal / util / Util.java

diff --git a/src/main/java/org/asamk/signal/util/Util.java b/src/main/java/org/asamk/signal/util/Util.java
index eec7d2f782fdb95846400fdc603fdbc310520cac..93a595d1e73865e1d59b43e36e088437f0708028 100644 (file)
--- a/src/main/java/org/asamk/signal/util/Util.java
+++ b/src/main/java/org/asamk/signal/util/Util.java
@@ -1,5 +1,8 @@
 package org.asamk.signal.util;
 
 package org.asamk.signal.util;
 

+import com.fasterxml.jackson.databind.JsonNode;
+
+import java.io.InvalidObjectException;

 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.HashMap;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.HashMap;


@@ -53,4 +56,13 @@ public class Util {
 
         return buf.toString();
     }
 
         return buf.toString();
     }

+
+    public static JsonNode getNotNullNode(JsonNode parent, String name) throws InvalidObjectException {
+        JsonNode node = parent.get(name);
+        if (node == null) {
+            throw new InvalidObjectException(String.format("Incorrect file format: expected parameter %s not found ", name));
+        }
+
+        return node;
+    }

 }
 }