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 b4954bf3226d6075b907d9696f0df157d1b855bf..63717ec031b9071ea669e8c2dd3e3191a34a7c8d 100644 (file)
--- a/src/main/java/org/asamk/signal/util/Util.java
+++ b/src/main/java/org/asamk/signal/util/Util.java
@@ -5,21 +5,28 @@ import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.ObjectMapper;
 

-import org.whispersystems.libsignal.util.guava.Optional;
-import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 
 

+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;

 import java.util.Arrays;
 import java.util.Arrays;

+import java.util.HashMap;

 import java.util.List;
 import java.util.Locale;
 import java.util.List;
 import java.util.Locale;

+import java.util.Map;
+import java.util.Optional;

 import java.util.stream.Collectors;
 
 public class Util {
 
 import java.util.stream.Collectors;
 
 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;
         }
         if (string == null || string.isBlank()) {
             return null;
         }


@@ -32,12 +39,12 @@ public class Util {
     }
 
     private static String toCamelCaseString(List<String> strings) {
     }
 
     private static String toCamelCaseString(List<String> strings) {

-        if (strings.size() == 0) {
+        if (strings.isEmpty()) {

             return "";
         }
         return strings.get(0) + strings.stream()
                 .skip(1)
             return "";
         }
         return strings.get(0) + strings.stream()
                 .skip(1)

-                .filter(s -> s.length() > 0)
+                .filter(s -> !s.isEmpty())

                 .map(s -> Character.toUpperCase(s.charAt(0)) + s.substring(1).toLowerCase(Locale.ROOT))
                 .collect(Collectors.joining());
     }
                 .map(s -> Character.toUpperCase(s.charAt(0)) + s.substring(1).toLowerCase(Locale.ROOT))
                 .collect(Collectors.joining());
     }


@@ -59,14 +66,22 @@ public class Util {
         return f.toString();
     }
 
         return f.toString();
     }
 

-    public static String getLegacyIdentifier(final SignalServiceAddress address) {
-        return address.getNumber().or(() -> address.getUuid().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;
     }
     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 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;
+    }

 }
 }