Use new threads API

[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 a9d2bb8fa14533b6c34bcab2c6c006f68ba53efe..63717ec031b9071ea669e8c2dd3e3191a34a7c8d 100644 (file)
--- a/src/main/java/org/asamk/signal/util/Util.java
+++ b/src/main/java/org/asamk/signal/util/Util.java
@@ -1,38 +1,87 @@
 package org.asamk.signal.util;
 
 package org.asamk.signal.util;
 

-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 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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;

 
 public class Util {
 
 
 public class Util {
 

+    private final static Logger logger = LoggerFactory.getLogger(Util.class);
+

     private Util() {
     }
 
     public static String getStringIfNotBlank(Optional<String> value) {
     private Util() {
     }
 
     public static String getStringIfNotBlank(Optional<String> value) {

-        var string = value.orNull();
+        var string = value.orElse(null);

         if (string == null || string.isBlank()) {
             return null;
         }
         return string;
     }
 
         if (string == null || string.isBlank()) {
             return null;
         }
         return string;
     }
 

+    public static String dashSeparatedToCamelCaseString(String s) {
+        var parts = s.split("-");
+        return toCamelCaseString(Arrays.asList(parts));
+    }
+
+    private static String toCamelCaseString(List<String> strings) {
+        if (strings.isEmpty()) {
+            return "";
+        }
+        return strings.get(0) + strings.stream()
+                .skip(1)
+                .filter(s -> !s.isEmpty())
+                .map(s -> Character.toUpperCase(s.charAt(0)) + s.substring(1).toLowerCase(Locale.ROOT))
+                .collect(Collectors.joining());
+    }
+

     public static String formatSafetyNumber(String digits) {
     public static String formatSafetyNumber(String digits) {

+        if (digits == null) {
+            return null;
+        }
+

         final var partCount = 12;
         var partSize = digits.length() / partCount;
         var f = new StringBuilder(digits.length() + partCount);
         for (var i = 0; i < partCount; i++) {
         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(" ");
+            f.append(digits, i * partSize, (i * partSize) + partSize);
+            if (i != partCount - 1) {
+                f.append(" ");
+            }

         }
         return f.toString();
     }
 
         }
         return f.toString();
     }
 

-    public static GroupId decodeGroupId(String groupId) throws GroupIdFormatException {
-        return GroupId.fromBase64(groupId);
+    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;

     }
 
     }
 

-    public static String getLegacyIdentifier(final SignalServiceAddress address) {
-        return address.getNumber().or(() -> address.getUuid().get().toString());
+    public static Map<String, String> getQueryMap(String query) {
+        var params = query.split("&");
+        var map = new HashMap<String, String>();
+        for (var param : params) {
+            final var paramParts = param.split("=");
+            var name = URLDecoder.decode(paramParts[0], StandardCharsets.UTF_8);
+            var value = paramParts.length == 1 ? null : URLDecoder.decode(paramParts[1], StandardCharsets.UTF_8);
+            map.put(name, value);
+        }
+        return map;

     }
 }
     }
 }