Replace Collections with Set.of/Map.of/List.of

diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index d19116a4b126348e04f6e9fa1a1eb3cad0e30ad4..278fbbd4b3bec4d68336832c4c0969e9deda917e 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -16,7 +16,6 @@ import org.whispersystems.signalservice.api.util.InvalidNumberException;
 
 import java.io.IOException;
 import java.util.ArrayList;
 
 import java.io.IOException;
 import java.util.ArrayList;

-import java.util.Collections;

 import java.util.List;
 import java.util.stream.Collectors;
 
 import java.util.List;
 import java.util.stream.Collectors;
 


@@ -167,7 +166,7 @@ public class DbusSignalImpl implements Signal {
     public List<String> getGroupMembers(final byte[] groupId) {
         GroupInfo group = m.getGroup(GroupId.unknownVersion(groupId));
         if (group == null) {
     public List<String> getGroupMembers(final byte[] groupId) {
         GroupInfo group = m.getGroup(GroupId.unknownVersion(groupId));
         if (group == null) {

-            return Collections.emptyList();
+            return List.of();

         } else {
             return group.getMembers()
                     .stream()
         } else {
             return group.getMembers()
                     .stream()

diff --git a/src/main/java/org/asamk/signal/manager/Manager.java b/src/main/java/org/asamk/signal/manager/Manager.java
index 5ed8fc4e506d852fccafb4144174e69d8025402a..25b2ec54080e5e3d753c4b9c565715860ed04e10 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/src/main/java/org/asamk/signal/manager/Manager.java
@@ -164,7 +164,6 @@ import java.security.SignatureException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;

-import java.util.Collections;

 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;


@@ -211,7 +210,7 @@ public class Manager implements Closeable {
     private final ProfileHelper profileHelper;
     private final GroupHelper groupHelper;
 
     private final ProfileHelper profileHelper;
     private final GroupHelper groupHelper;
 

-    public Manager(
+    Manager(

             SignalAccount account,
             PathConfig pathConfig,
             SignalServiceConfiguration serviceConfiguration,
             SignalAccount account,
             PathConfig pathConfig,
             SignalServiceConfiguration serviceConfiguration,


@@ -810,7 +809,7 @@ public class Manager implements Closeable {
             GroupInfoV2 gv2 = groupHelper.createGroupV2(name, members, avatarFile);
             if (gv2 == null) {
                 GroupInfoV1 gv1 = new GroupInfoV1(GroupIdV1.createRandom());
             GroupInfoV2 gv2 = groupHelper.createGroupV2(name, members, avatarFile);
             if (gv2 == null) {
                 GroupInfoV1 gv1 = new GroupInfoV1(GroupIdV1.createRandom());

-                gv1.addMembers(Collections.singleton(account.getSelfAddress()));
+                gv1.addMembers(List.of(account.getSelfAddress()));

                 updateGroupV1(gv1, name, members, avatarFile);
                 messageBuilder = getGroupUpdateMessageBuilder(gv1);
                 g = gv1;
                 updateGroupV1(gv1, name, members, avatarFile);
                 messageBuilder = getGroupUpdateMessageBuilder(gv1);
                 g = gv1;


@@ -965,7 +964,7 @@ public class Manager implements Closeable {
         SignalServiceDataMessage.Builder messageBuilder = getGroupUpdateMessageBuilder(g);
 
         // Send group message only to the recipient who requested it
         SignalServiceDataMessage.Builder messageBuilder = getGroupUpdateMessageBuilder(g);
 
         // Send group message only to the recipient who requested it

-        return sendMessage(messageBuilder, Collections.singleton(recipient));
+        return sendMessage(messageBuilder, List.of(recipient));

     }
 
     private SignalServiceDataMessage.Builder getGroupUpdateMessageBuilder(GroupInfoV1 g) throws AttachmentInvalidException {
     }
 
     private SignalServiceDataMessage.Builder getGroupUpdateMessageBuilder(GroupInfoV1 g) throws AttachmentInvalidException {


@@ -1007,14 +1006,14 @@ public class Manager implements Closeable {
                 .asGroupMessage(group.build());
 
         // Send group info request message to the recipient who sent us a message with this groupId
                 .asGroupMessage(group.build());
 
         // Send group info request message to the recipient who sent us a message with this groupId

-        return sendMessage(messageBuilder, Collections.singleton(recipient));
+        return sendMessage(messageBuilder, List.of(recipient));

     }
 
     void sendReceipt(
             SignalServiceAddress remoteAddress, long messageId
     ) throws IOException, UntrustedIdentityException {
         SignalServiceReceiptMessage receiptMessage = new SignalServiceReceiptMessage(SignalServiceReceiptMessage.Type.DELIVERY,
     }
 
     void sendReceipt(
             SignalServiceAddress remoteAddress, long messageId
     ) throws IOException, UntrustedIdentityException {
         SignalServiceReceiptMessage receiptMessage = new SignalServiceReceiptMessage(SignalServiceReceiptMessage.Type.DELIVERY,

-                Collections.singletonList(messageId),
+                List.of(messageId),

                 System.currentTimeMillis());
 
         createMessageSender().sendReceipt(remoteAddress,
                 System.currentTimeMillis());
 
         createMessageSender().sendReceipt(remoteAddress,


@@ -1141,7 +1140,7 @@ public class Manager implements Closeable {
     private void sendExpirationTimerUpdate(SignalServiceAddress address) throws IOException {
         final SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder()
                 .asExpirationUpdate();
     private void sendExpirationTimerUpdate(SignalServiceAddress address) throws IOException {
         final SignalServiceDataMessage.Builder messageBuilder = SignalServiceDataMessage.newBuilder()
                 .asExpirationUpdate();

-        sendMessage(messageBuilder, Collections.singleton(address));
+        sendMessage(messageBuilder, List.of(address));

     }
 
     /**
     }
 
     /**


@@ -1434,7 +1433,7 @@ public class Manager implements Closeable {
                             .saveIdentity(resolveSignalServiceAddress(e.getIdentifier()),
                                     e.getIdentityKey(),
                                     TrustLevel.UNTRUSTED);
                             .saveIdentity(resolveSignalServiceAddress(e.getIdentifier()),
                                     e.getIdentityKey(),
                                     TrustLevel.UNTRUSTED);

-                    return new Pair<>(timestamp, Collections.emptyList());
+                    return new Pair<>(timestamp, List.of());

                 }
             } else {
                 // Send to all individually, so sync messages are sent correctly
                 }
             } else {
                 // Send to all individually, so sync messages are sent correctly


@@ -1477,7 +1476,7 @@ public class Manager implements Closeable {
                 message.getTimestamp(),
                 message,
                 message.getExpiresInSeconds(),
                 message.getTimestamp(),
                 message,
                 message.getExpiresInSeconds(),

-                Collections.singletonMap(recipient, unidentifiedAccess.isPresent()),
+                Map.of(recipient, unidentifiedAccess.isPresent()),

                 false);
         SignalServiceSyncMessage syncMessage = SignalServiceSyncMessage.forSentTranscript(transcript);
 
                 false);
         SignalServiceSyncMessage syncMessage = SignalServiceSyncMessage.forSentTranscript(transcript);
 


@@ -2085,7 +2084,7 @@ public class Manager implements Closeable {
                                         syncGroup.removeMember(account.getSelfAddress());
                                     } else {
                                         // Add ourself to the member set as it's marked as active
                                         syncGroup.removeMember(account.getSelfAddress());
                                     } else {
                                         // Add ourself to the member set as it's marked as active

-                                        syncGroup.addMembers(Collections.singleton(account.getSelfAddress()));
+                                        syncGroup.addMembers(List.of(account.getSelfAddress()));

                                     }
                                     syncGroup.blocked = g.isBlocked();
                                     if (g.getColor().isPresent()) {
                                     }
                                     syncGroup.blocked = g.isBlocked();
                                     if (g.getColor().isPresent()) {

diff --git a/src/main/java/org/asamk/signal/manager/ServiceConfig.java b/src/main/java/org/asamk/signal/manager/ServiceConfig.java
index 939d5b5b5bc279c611c9612410c954df2ee36b11..0ccd826a36662464b4174a0858ad21f7d3f50e12 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/ServiceConfig.java
+++ b/src/main/java/org/asamk/signal/manager/ServiceConfig.java
@@ -20,7 +20,6 @@ import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateException;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateException;

-import java.util.Collections;

 import java.util.List;
 import java.util.Map;
 
 import java.util.List;
 import java.util.Map;
 


@@ -77,7 +76,7 @@ public class ServiceConfig {
                 .header("User-Agent", userAgent)
                 .build());
 
                 .header("User-Agent", userAgent)
                 .build());
 

-        final List<Interceptor> interceptors = Collections.singletonList(userAgentInterceptor);
+        final List<Interceptor> interceptors = List.of(userAgentInterceptor);

 
         return new SignalServiceConfiguration(new SignalServiceUrl[]{new SignalServiceUrl(URL, TRUST_STORE)},
                 makeSignalCdnUrlMapFor(new SignalCdnUrl[]{new SignalCdnUrl(CDN_URL, TRUST_STORE)},
 
         return new SignalServiceConfiguration(new SignalServiceUrl[]{new SignalServiceUrl(URL, TRUST_STORE)},
                 makeSignalCdnUrlMapFor(new SignalCdnUrl[]{new SignalCdnUrl(CDN_URL, TRUST_STORE)},

diff --git a/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java b/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java
index 17c239251caddc4f57105e1cbea445aee0ea83f2..2092c03aa648a82de6157c4ab2d802e5092f3d92 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java
+++ b/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java
@@ -8,7 +8,6 @@ import org.signal.zkgroup.groups.GroupMasterKey;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.util.UuidUtil;
 
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.util.UuidUtil;
 

-import java.util.Collections;

 import java.util.Set;
 import java.util.stream.Collectors;
 
 import java.util.Set;
 import java.util.stream.Collectors;
 


@@ -66,7 +65,7 @@ public class GroupInfoV2 extends GroupInfo {
     @Override
     public Set<SignalServiceAddress> getMembers() {
         if (this.group == null) {
     @Override
     public Set<SignalServiceAddress> getMembers() {
         if (this.group == null) {

-            return Collections.emptySet();
+            return Set.of();

         }
         return group.getMembersList()
                 .stream()
         }
         return group.getMembersList()
                 .stream()


@@ -77,7 +76,7 @@ public class GroupInfoV2 extends GroupInfo {
     @Override
     public Set<SignalServiceAddress> getPendingMembers() {
         if (this.group == null) {
     @Override
     public Set<SignalServiceAddress> getPendingMembers() {
         if (this.group == null) {

-            return Collections.emptySet();
+            return Set.of();

         }
         return group.getPendingMembersList()
                 .stream()
         }
         return group.getPendingMembersList()
                 .stream()


@@ -88,7 +87,7 @@ public class GroupInfoV2 extends GroupInfo {
     @Override
     public Set<SignalServiceAddress> getRequestingMembers() {
         if (this.group == null) {
     @Override
     public Set<SignalServiceAddress> getRequestingMembers() {
         if (this.group == null) {

-            return Collections.emptySet();
+            return Set.of();

         }
         return group.getRequestingMembersList()
                 .stream()
         }
         return group.getRequestingMembersList()
                 .stream()