X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/b2efef4d8c3238b413fe9fe758bd6a5c428498a2..a8bbdb54d006f157a009ece0cae5bf72fb636ced:/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 f0d39601..31c6b68e 100644
--- a/src/main/java/org/asamk/signal/util/Util.java
+++ b/src/main/java/org/asamk/signal/util/Util.java
@@ -1,54 +1,71 @@
 package org.asamk.signal.util;
 
-import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
-import org.asamk.signal.GroupIdFormatException;
-import org.whispersystems.signalservice.internal.util.Base64;
+import org.asamk.signal.manager.groups.GroupId;
+import org.asamk.signal.manager.groups.GroupIdFormatException;
+import org.whispersystems.libsignal.util.guava.Optional;
+import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
-import java.io.IOException;
-import java.io.InvalidObjectException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+import java.util.stream.Collectors;
 
 public class Util {
 
     private Util() {
     }
 
-    public static String formatSafetyNumber(String digits) {
-        final int partCount = 12;
-        int partSize = digits.length() / partCount;
-        StringBuilder f = new StringBuilder(digits.length() + partCount);
-        for (int i = 0; i < partCount; i++) {
-            f.append(digits, i * partSize, (i * partSize) + partSize).append(" ");
+    public static String getStringIfNotBlank(Optional<String> value) {
+        var string = value.orNull();
+        if (string == null || string.isBlank()) {
+            return null;
         }
-        return f.toString();
+        return string;
     }
 
-    public static String join(CharSequence separator, Iterable<? extends CharSequence> list) {
-        StringBuilder buf = new StringBuilder();
-        for (CharSequence str : list) {
-            if (buf.length() > 0) {
-                buf.append(separator);
-            }
-            buf.append(str);
-        }
+    public static String dashSeparatedToCamelCaseString(String s) {
+        var parts = s.split("-");
+        return toCamelCaseString(Arrays.asList(parts));
+    }
 
-        return buf.toString();
+    private static String toCamelCaseString(List<String> strings) {
+        if (strings.size() == 0) {
+            return "";
+        }
+        return strings.get(0) + strings.stream()
+                .skip(1)
+                .filter(s -> s.length() > 0)
+                .map(s -> Character.toUpperCase(s.charAt(0)) + s.substring(1).toLowerCase(Locale.ROOT))
+                .collect(Collectors.joining());
     }
 
-    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));
+    public static String formatSafetyNumber(String digits) {
+        final var partCount = 12;
+        var partSize = digits.length() / partCount;
+        var f = new StringBuilder(digits.length() + partCount);
+        for (var i = 0; i < partCount; i++) {
+            f.append(digits, i * partSize, (i * partSize) + partSize).append(" ");
         }
+        return f.toString();
+    }
 
-        return node;
+    public static GroupId decodeGroupId(String groupId) throws GroupIdFormatException {
+        return GroupId.fromBase64(groupId);
     }
 
-    public static byte[] decodeGroupId(String groupId) throws GroupIdFormatException {
-        try {
-            return Base64.decode(groupId);
-        } catch (IOException e) {
-            throw new GroupIdFormatException(groupId, e);
-        }
+    public static String getLegacyIdentifier(final SignalServiceAddress address) {
+        return address.getNumber().or(() -> address.getUuid().get().toString());
+    }
+
+    public static ObjectMapper createJsonObjectMapper() {
+        var objectMapper = new ObjectMapper();
+        objectMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.PUBLIC_ONLY);
+        objectMapper.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
+        return objectMapper;
     }
 }