Replace collect(Collectors.toList()) with toList()

diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index 81c2eeb7f2b381e07d1bf2ba8f2fa735b28e6772..6e9c86ad41c8c6e4c4f13b198d4077f07e703a9c 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -40,7 +40,6 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;

-import java.util.stream.Collectors;

 
 public interface Manager extends Closeable {
 
 
 public interface Manager extends Closeable {
 


@@ -90,7 +89,7 @@ public interface Manager extends Closeable {
                 .filter(File::isFile)
                 .map(File::getName)
                 .filter(file -> PhoneNumberFormatter.isValidNumber(file, null))
                 .filter(File::isFile)
                 .map(File::getName)
                 .filter(file -> PhoneNumberFormatter.isValidNumber(file, null))

-                .collect(Collectors.toList());
+                .toList();

     }
 
     String getSelfNumber();
     }
 
     String getSelfNumber();

diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
index b2dbe60af5d65d2a83d816e1e991ec5f2abb950b..df757a8b92e26f4862d25b13688a7424a90b83de 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
@@ -445,7 +445,7 @@ public class ManagerImpl implements Manager {
                     d.getCreated(),
                     d.getLastSeen(),
                     d.getId() == account.getDeviceId());
                     d.getCreated(),
                     d.getLastSeen(),
                     d.getId() == account.getDeviceId());

-        }).collect(Collectors.toList());
+        }).toList();

     }
 
     @Override
     }
 
     @Override


@@ -517,7 +517,7 @@ public class ManagerImpl implements Manager {
 
     @Override
     public List<Group> getGroups() {
 
     @Override
     public List<Group> getGroups() {

-        return account.getGroupStore().getGroups().stream().map(this::toGroup).collect(Collectors.toList());
+        return account.getGroupStore().getGroups().stream().map(this::toGroup).toList();

     }
 
     private Group toGroup(final GroupInfo groupInfo) {
     }
 
     private Group toGroup(final GroupInfo groupInfo) {


@@ -628,7 +628,7 @@ public class ManagerImpl implements Manager {
                                 .map(sendMessageResult -> SendMessageResult.from(sendMessageResult,
                                         account.getRecipientStore(),
                                         account.getRecipientStore()::resolveRecipientAddress))
                                 .map(sendMessageResult -> SendMessageResult.from(sendMessageResult,
                                         account.getRecipientStore(),
                                         account.getRecipientStore()::resolveRecipientAddress))

-                                .collect(Collectors.toList()));
+                                .toList());

             }
         }
         return new SendMessageResults(timestamp, results);
             }
         }
         return new SendMessageResults(timestamp, results);


@@ -657,7 +657,7 @@ public class ManagerImpl implements Manager {
                                 .map(r -> SendMessageResult.from(r,
                                         account.getRecipientStore(),
                                         account.getRecipientStore()::resolveRecipientAddress))
                                 .map(r -> SendMessageResult.from(r,
                                         account.getRecipientStore(),
                                         account.getRecipientStore()::resolveRecipientAddress))

-                                .collect(Collectors.toList()));
+                                .toList());

             }
         }
         return new SendMessageResults(timestamp, results);
             }
         }
         return new SendMessageResults(timestamp, results);


@@ -1283,7 +1283,7 @@ public class ManagerImpl implements Manager {
                 .getContacts()
                 .stream()
                 .map(p -> new Pair<>(account.getRecipientStore().resolveRecipientAddress(p.first()), p.second()))
                 .getContacts()
                 .stream()
                 .map(p -> new Pair<>(account.getRecipientStore().resolveRecipientAddress(p.first()), p.second()))

-                .collect(Collectors.toList());
+                .toList();

     }
 
     @Override
     }
 
     @Override


@@ -1319,11 +1319,7 @@ public class ManagerImpl implements Manager {
 
     @Override
     public List<Identity> getIdentities() {
 
     @Override
     public List<Identity> getIdentities() {

-        return account.getIdentityKeyStore()
-                .getIdentities()
-                .stream()
-                .map(this::toIdentity)
-                .collect(Collectors.toList());
+        return account.getIdentityKeyStore().getIdentities().stream().map(this::toIdentity).toList();

     }
 
     private Identity toIdentity(final IdentityInfo identityInfo) {
     }
 
     private Identity toIdentity(final IdentityInfo identityInfo) {

diff --git a/lib/src/main/java/org/asamk/signal/manager/MultiAccountManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/MultiAccountManagerImpl.java
index 74c4c20ac5f57646157f73230a4c64c2399c1ea4..1a5ea266484b0d1bd90aa91b1a9a0da85da67786 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/MultiAccountManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/MultiAccountManagerImpl.java
@@ -16,7 +16,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeoutException;
 import java.util.function.Consumer;
 import java.util.Set;
 import java.util.concurrent.TimeoutException;
 import java.util.function.Consumer;

-import java.util.stream.Collectors;

 
 public class MultiAccountManagerImpl implements MultiAccountManager {
 
 
 public class MultiAccountManagerImpl implements MultiAccountManager {
 


@@ -46,7 +45,7 @@ public class MultiAccountManagerImpl implements MultiAccountManager {
     @Override
     public List<String> getAccountNumbers() {
         synchronized (managers) {
     @Override
     public List<String> getAccountNumbers() {
         synchronized (managers) {

-            return managers.stream().map(Manager::getSelfNumber).collect(Collectors.toList());
+            return managers.stream().map(Manager::getSelfNumber).toList();

         }
     }
 
         }
     }
 

diff --git a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
index f9484a011ba21c2039fd692250f5118e4100c4aa..2e386d7f67fdbbb8a905b29c855c17b5e3f7781d 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
@@ -135,9 +135,7 @@ public record MessageEnvelope(
                             .transform(p -> p.getPaymentNotification().isPresent() ? Payment.from(p) : null)
                             .orNull()),
                     dataMessage.getAttachments()
                             .transform(p -> p.getPaymentNotification().isPresent() ? Payment.from(p) : null)
                             .orNull()),
                     dataMessage.getAttachments()

-                            .transform(a -> a.stream()
-                                    .map(as -> Attachment.from(as, fileProvider))
-                                    .collect(Collectors.toList()))
+                            .transform(a -> a.stream().map(as -> Attachment.from(as, fileProvider)).toList())

                             .or(List.of()),
                     Optional.ofNullable(dataMessage.getRemoteDelete()
                             .transform(SignalServiceDataMessage.RemoteDelete::getTargetSentTimestamp)
                             .or(List.of()),
                     Optional.ofNullable(dataMessage.getRemoteDelete()
                             .transform(SignalServiceDataMessage.RemoteDelete::getTargetSentTimestamp)


@@ -146,17 +144,15 @@ public record MessageEnvelope(
                     dataMessage.getSharedContacts()
                             .transform(a -> a.stream()
                                     .map(sharedContact -> SharedContact.from(sharedContact, fileProvider))
                     dataMessage.getSharedContacts()
                             .transform(a -> a.stream()
                                     .map(sharedContact -> SharedContact.from(sharedContact, fileProvider))

-                                    .collect(Collectors.toList()))
+                                    .toList())

                             .or(List.of()),
                     dataMessage.getMentions()
                             .transform(a -> a.stream()
                                     .map(m -> Mention.from(m, recipientResolver, addressResolver))
                             .or(List.of()),
                     dataMessage.getMentions()
                             .transform(a -> a.stream()
                                     .map(m -> Mention.from(m, recipientResolver, addressResolver))

-                                    .collect(Collectors.toList()))
+                                    .toList())

                             .or(List.of()),
                     dataMessage.getPreviews()
                             .or(List.of()),
                     dataMessage.getPreviews()

-                            .transform(a -> a.stream()
-                                    .map(preview -> Preview.from(preview, fileProvider))
-                                    .collect(Collectors.toList()))
+                            .transform(a -> a.stream().map(preview -> Preview.from(preview, fileProvider)).toList())

                             .or(List.of()));
         }
 
                             .or(List.of()));
         }
 


@@ -223,19 +219,18 @@ public record MessageEnvelope(
                                 : quote.getMentions()
                                         .stream()
                                         .map(m -> Mention.from(m, recipientResolver, addressResolver))
                                 : quote.getMentions()
                                         .stream()
                                         .map(m -> Mention.from(m, recipientResolver, addressResolver))

-                                        .collect(Collectors.toList()),
+                                        .toList(),

                         quote.getAttachments() == null
                                 ? List.of()
                         quote.getAttachments() == null
                                 ? List.of()

-                                : quote.getAttachments()
-                                        .stream()
-                                        .map(a -> Attachment.from(a, fileProvider))
-                                        .collect(Collectors.toList()));
+                                : quote.getAttachments().stream().map(a -> Attachment.from(a, fileProvider)).toList());

             }
         }
 
         public record Payment(String note, byte[] receipt) {
             }
         }
 
         public record Payment(String note, byte[] receipt) {

+

             static Payment from(SignalServiceDataMessage.Payment payment) {
             static Payment from(SignalServiceDataMessage.Payment payment) {

-                return new Payment(payment.getPaymentNotification().get().getNote(), payment.getPaymentNotification().get().getReceipt());
+                return new Payment(payment.getPaymentNotification().get().getNote(),
+                        payment.getPaymentNotification().get().getReceipt());

             }
         }
 
             }
         }
 


@@ -351,15 +346,9 @@ public record MessageEnvelope(
                         Optional.ofNullable(sharedContact.getAvatar()
                                 .transform(avatar1 -> Avatar.from(avatar1, fileProvider))
                                 .orNull()),
                         Optional.ofNullable(sharedContact.getAvatar()
                                 .transform(avatar1 -> Avatar.from(avatar1, fileProvider))
                                 .orNull()),

-                        sharedContact.getPhone()
-                                .transform(p -> p.stream().map(Phone::from).collect(Collectors.toList()))
-                                .or(List.of()),
-                        sharedContact.getEmail()
-                                .transform(p -> p.stream().map(Email::from).collect(Collectors.toList()))
-                                .or(List.of()),
-                        sharedContact.getAddress()
-                                .transform(p -> p.stream().map(Address::from).collect(Collectors.toList()))
-                                .or(List.of()),
+                        sharedContact.getPhone().transform(p -> p.stream().map(Phone::from).toList()).or(List.of()),
+                        sharedContact.getEmail().transform(p -> p.stream().map(Email::from).toList()).or(List.of()),
+                        sharedContact.getAddress().transform(p -> p.stream().map(Address::from).toList()).or(List.of()),

                         Optional.ofNullable(sharedContact.getOrganization().orNull()));
             }
 
                         Optional.ofNullable(sharedContact.getOrganization().orNull()));
             }
 


@@ -528,12 +517,12 @@ public record MessageEnvelope(
                     syncMessage.getRead()
                             .transform(r -> r.stream()
                                     .map(rm -> Read.from(rm, recipientResolver, addressResolver))
                     syncMessage.getRead()
                             .transform(r -> r.stream()
                                     .map(rm -> Read.from(rm, recipientResolver, addressResolver))

-                                    .collect(Collectors.toList()))
+                                    .toList())

                             .or(List.of()),
                     syncMessage.getViewed()
                             .transform(r -> r.stream()
                                     .map(rm -> Viewed.from(rm, recipientResolver, addressResolver))
                             .or(List.of()),
                     syncMessage.getViewed()
                             .transform(r -> r.stream()
                                     .map(rm -> Viewed.from(rm, recipientResolver, addressResolver))

-                                    .collect(Collectors.toList()))
+                                    .toList())

                             .or(List.of()),
                     Optional.ofNullable(syncMessage.getViewOnceOpen()
                             .transform(rm -> ViewOnceOpen.from(rm, recipientResolver, addressResolver))
                             .or(List.of()),
                     Optional.ofNullable(syncMessage.getViewOnceOpen()
                             .transform(rm -> ViewOnceOpen.from(rm, recipientResolver, addressResolver))


@@ -583,11 +572,7 @@ public record MessageEnvelope(
                 return new Blocked(blockedListMessage.getAddresses()
                         .stream()
                         .map(d -> addressResolver.resolveRecipientAddress(recipientResolver.resolveRecipient(d)))
                 return new Blocked(blockedListMessage.getAddresses()
                         .stream()
                         .map(d -> addressResolver.resolveRecipientAddress(recipientResolver.resolveRecipient(d)))

-                        .collect(Collectors.toList()),
-                        blockedListMessage.getGroupIds()
-                                .stream()
-                                .map(GroupId::unknownVersion)
-                                .collect(Collectors.toList()));
+                        .toList(), blockedListMessage.getGroupIds().stream().map(GroupId::unknownVersion).toList());

             }
         }
 
             }
         }
 


@@ -701,7 +686,7 @@ public record MessageEnvelope(
                     Optional.ofNullable(callMessage.getHangupMessage().transform(Hangup::from).orNull()),
                     Optional.ofNullable(callMessage.getBusyMessage().transform(Busy::from).orNull()),
                     callMessage.getIceUpdateMessages()
                     Optional.ofNullable(callMessage.getHangupMessage().transform(Hangup::from).orNull()),
                     Optional.ofNullable(callMessage.getBusyMessage().transform(Busy::from).orNull()),
                     callMessage.getIceUpdateMessages()

-                            .transform(m -> m.stream().map(IceUpdate::from).collect(Collectors.toList()))
+                            .transform(m -> m.stream().map(IceUpdate::from).toList())

                             .or(List.of()),
                     Optional.ofNullable(callMessage.getOpaqueMessage().transform(Opaque::from).orNull()));
         }
                             .or(List.of()),
                     Optional.ofNullable(callMessage.getOpaqueMessage().transform(Opaque::from).orNull()));
         }

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
index 7ef262c70d855ba0f3f340db0b85976d860b458d..a0f6c89b7769f0b51e0d61d54d60f18bf6b1b092 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
@@ -55,7 +55,6 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;

-import java.util.stream.Collectors;

 
 public class GroupHelper {
 
 
 public class GroupHelper {
 


@@ -630,10 +629,7 @@ public class GroupHelper {
         var group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.UPDATE)
                 .withId(g.getGroupId().serialize())
                 .withName(g.name)
         var group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.UPDATE)
                 .withId(g.getGroupId().serialize())
                 .withName(g.name)

-                .withMembers(g.getMembers()
-                        .stream()
-                        .map(addressResolver::resolveSignalServiceAddress)
-                        .collect(Collectors.toList()));
+                .withMembers(g.getMembers().stream().map(addressResolver::resolveSignalServiceAddress).toList());

 
         try {
             final var attachment = createGroupAvatarAttachment(g.getGroupId());
 
         try {
             final var attachment = createGroupAvatarAttachment(g.getGroupId());


@@ -682,6 +678,6 @@ public class GroupHelper {
                         .map(sendMessageResult -> SendMessageResult.from(sendMessageResult,
                                 recipientResolver,
                                 account.getRecipientStore()::resolveRecipientAddress))
                         .map(sendMessageResult -> SendMessageResult.from(sendMessageResult,
                                 recipientResolver,
                                 account.getRecipientStore()::resolveRecipientAddress))

-                        .collect(Collectors.toList()));
+                        .toList());

     }
 }
     }
 }

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
index 67fc8048a2a67c7a4661db4deb34aa6ce8a2eaf3..4f56034cf34a2305a3864dd404f59c40c10bd907 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
@@ -249,7 +249,7 @@ public class GroupV2Helper {
                 .map(addressResolver::resolveSignalServiceAddress)
                 .map(SignalServiceAddress::getAci)
                 .map(ACI::uuid)
                 .map(addressResolver::resolveSignalServiceAddress)
                 .map(SignalServiceAddress::getAci)
                 .map(ACI::uuid)

-                .collect(Collectors.toList());
+                .toList();

         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
         return commitChange(groupInfoV2,
                 groupOperations.createLeaveAndPromoteMembersToAdmin(selfAci.uuid(), adminUuids));
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
         return commitChange(groupInfoV2,
                 groupOperations.createLeaveAndPromoteMembersToAdmin(selfAci.uuid(), adminUuids));

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
index 237f813d36f9e5d04a477bfbcb5852d62ab59178..c8d8bbb767aa9e6d62c48acd9c9cb2ed4ca09d61 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
@@ -33,7 +33,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;

-import java.util.stream.Collectors;

 
 public class SendHelper {
 
 
 public class SendHelper {
 


@@ -227,9 +226,7 @@ public class SendHelper {
         }
         final var messageSender = dependencies.getMessageSender();
         final var recipientIdList = new ArrayList<>(g.getMembersWithout(account.getSelfRecipientId()));
         }
         final var messageSender = dependencies.getMessageSender();
         final var recipientIdList = new ArrayList<>(g.getMembersWithout(account.getSelfRecipientId()));

-        final var addresses = recipientIdList.stream()
-                .map(addressResolver::resolveSignalServiceAddress)
-                .collect(Collectors.toList());
+        final var addresses = recipientIdList.stream().map(addressResolver::resolveSignalServiceAddress).toList();

         return messageSender.sendTyping(addresses,
                 unidentifiedAccessHelper.getAccessFor(recipientIdList),
                 message,
         return messageSender.sendTyping(addresses,
                 unidentifiedAccessHelper.getAccessFor(recipientIdList),
                 message,


@@ -255,9 +252,7 @@ public class SendHelper {
             // isRecipientUpdate is true if we've already sent this message to some recipients in the past, otherwise false.
             final var isRecipientUpdate = false;
             final var recipientIdList = new ArrayList<>(recipientIds);
             // isRecipientUpdate is true if we've already sent this message to some recipients in the past, otherwise false.
             final var isRecipientUpdate = false;
             final var recipientIdList = new ArrayList<>(recipientIds);

-            final var addresses = recipientIdList.stream()
-                    .map(addressResolver::resolveSignalServiceAddress)
-                    .collect(Collectors.toList());
+            final var addresses = recipientIdList.stream().map(addressResolver::resolveSignalServiceAddress).toList();

             return messageSender.sendDataMessage(addresses,
                     unidentifiedAccessHelper.getAccessFor(recipientIdList),
                     isRecipientUpdate,
             return messageSender.sendDataMessage(addresses,
                     unidentifiedAccessHelper.getAccessFor(recipientIdList),
                     isRecipientUpdate,

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
index 4548b420556989093f25e85a234a401311e7aa47..78ceafccaea9351284a963f8746c9acd8e5d092a 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
@@ -25,7 +25,6 @@ import java.io.IOException;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;

-import java.util.stream.Collectors;

 
 public class StorageHelper {
 
 
 public class StorageHelper {
 


@@ -72,7 +71,7 @@ public class StorageHelper {
                 .getStorageIds()
                 .stream()
                 .filter(id -> !id.isUnknown() && id.getType() != ManifestRecord.Identifier.Type.ACCOUNT_VALUE)
                 .getStorageIds()
                 .stream()
                 .filter(id -> !id.isUnknown() && id.getType() != ManifestRecord.Identifier.Type.ACCOUNT_VALUE)

-                .collect(Collectors.toList());
+                .toList();

 
         for (final var record : getSignalStorageRecords(storageIds)) {
             if (record.getType() == ManifestRecord.Identifier.Type.GROUPV2_VALUE) {
 
         for (final var record : getSignalStorageRecords(storageIds)) {
             if (record.getType() == ManifestRecord.Identifier.Type.GROUPV2_VALUE) {

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
index 6fe04dce12483bd92f7210747659589ab6220a2c..a55455b5a269fd4cfc6676b2ca1948a5d59102f6 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
@@ -35,7 +35,6 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.file.Files;
 import java.util.ArrayList;
 import java.io.OutputStream;
 import java.nio.file.Files;
 import java.util.ArrayList;

-import java.util.stream.Collectors;

 
 public class SyncHelper {
 
 
 public class SyncHelper {
 


@@ -89,7 +88,7 @@ public class SyncHelper {
                                 groupInfo.getMembers()
                                         .stream()
                                         .map(addressResolver::resolveSignalServiceAddress)
                                 groupInfo.getMembers()
                                         .stream()
                                         .map(addressResolver::resolveSignalServiceAddress)

-                                        .collect(Collectors.toList()),
+                                        .toList(),

                                 groupHelper.createGroupAvatarAttachment(groupInfo.getGroupId()),
                                 groupInfo.isMember(account.getSelfRecipientId()),
                                 Optional.of(groupInfo.messageExpirationTime),
                                 groupHelper.createGroupAvatarAttachment(groupInfo.getGroupId()),
                                 groupInfo.isMember(account.getSelfRecipientId()),
                                 Optional.of(groupInfo.messageExpirationTime),

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
index 4bfead1305a6725088500a4da5578d7c786de9f0..0fc91ae12814f9ea0562396b0e41c675cfd976e9 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
@@ -15,7 +15,6 @@ import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair;
 import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.TimeUnit;

-import java.util.stream.Collectors;

 
 import static org.whispersystems.signalservice.internal.util.Util.getSecretBytes;
 
 
 import static org.whispersystems.signalservice.internal.util.Util.getSecretBytes;
 


@@ -133,7 +132,7 @@ public class UnidentifiedAccessHelper {
     }
 
     public List<Optional<UnidentifiedAccessPair>> getAccessFor(List<RecipientId> recipients) {
     }
 
     public List<Optional<UnidentifiedAccessPair>> getAccessFor(List<RecipientId> recipients) {

-        return recipients.stream().map(this::getAccessFor).collect(Collectors.toList());
+        return recipients.stream().map(this::getAccessFor).toList();

     }
 
     public Optional<UnidentifiedAccessPair> getAccessFor(RecipientId recipient) {
     }
 
     public Optional<UnidentifiedAccessPair> getAccessFor(RecipientId recipient) {

diff --git a/lib/src/main/java/org/asamk/signal/manager/jobs/RetrieveStickerPackJob.java b/lib/src/main/java/org/asamk/signal/manager/jobs/RetrieveStickerPackJob.java
index c27bcafcb745f9612be848cf277df548f17a75d5..5541304fd522bc30f97e4d4e9cab8b122e8adc7d 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/jobs/RetrieveStickerPackJob.java
+++ b/lib/src/main/java/org/asamk/signal/manager/jobs/RetrieveStickerPackJob.java
@@ -10,7 +10,6 @@ import org.whispersystems.signalservice.internal.util.Hex;
 
 import java.io.IOException;
 import java.util.HashSet;
 
 import java.io.IOException;
 import java.util.HashSet;

-import java.util.stream.Collectors;

 
 public class RetrieveStickerPackJob implements Job {
 
 
 public class RetrieveStickerPackJob implements Job {
 


@@ -63,7 +62,7 @@ public class RetrieveStickerPackJob implements Job {
                             .map(c -> new JsonStickerPack.JsonSticker(c.getEmoji(),
                                     String.valueOf(c.getId()),
                                     c.getContentType()))
                             .map(c -> new JsonStickerPack.JsonSticker(c.getEmoji(),
                                     String.valueOf(c.getId()),
                                     c.getContentType()))

-                            .collect(Collectors.toList()));
+                            .toList());

             context.getStickerPackStore().storeManifest(packId, jsonManifest);
         } catch (IOException e) {
             logger.warn("Failed to retrieve sticker pack {}: {}",
             context.getStickerPackStore().storeManifest(packId, jsonManifest);
         } catch (IOException e) {
             logger.warn("Failed to retrieve sticker pack {}: {}",

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
index 5d8bf2c1b9be6102c6a79e24658bfe81a6cebdb3..d77c99188d36017a117faead27b012c69305912a 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
@@ -262,9 +262,7 @@ public class GroupStore {
                         g1.messageExpirationTime,
                         g1.blocked,
                         g1.archived,
                         g1.messageExpirationTime,
                         g1.blocked,
                         g1.archived,

-                        g1.members.stream()
-                                .map(m -> new Storage.GroupV1.Member(m.id(), null, null))
-                                .collect(Collectors.toList()));
+                        g1.members.stream().map(m -> new Storage.GroupV1.Member(m.id(), null, null)).toList());

             }
 
             final var g2 = (GroupInfoV2) g;
             }
 
             final var g2 = (GroupInfoV2) g;


@@ -272,10 +270,10 @@ public class GroupStore {
                     Base64.getEncoder().encodeToString(g2.getMasterKey().serialize()),
                     g2.isBlocked(),
                     g2.isPermissionDenied());
                     Base64.getEncoder().encodeToString(g2.getMasterKey().serialize()),
                     g2.isBlocked(),
                     g2.isPermissionDenied());

-        }).collect(Collectors.toList()));
+        }).toList());

     }
 
     }
 

-    public record Storage(@JsonDeserialize(using = GroupsDeserializer.class) List<Object> groups) {
+    public record Storage(@JsonDeserialize(using = GroupsDeserializer.class) List<Record> groups) {

 
         private record GroupV1(
                 String groupId,
 
         private record GroupV1(
                 String groupId,

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java
index fef06c5bf067973920e0205ed1d3bf1619292bf9..0330b3b80f930aba5808bb7b78b530bff221ec67 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java
@@ -28,7 +28,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.regex.Pattern;
 import java.util.Map;
 import java.util.Objects;
 import java.util.regex.Pattern;

-import java.util.stream.Collectors;

 
 public class IdentityKeyStore implements org.whispersystems.libsignal.state.IdentityKeyStore {
 
 
 public class IdentityKeyStore implements org.whispersystems.libsignal.state.IdentityKeyStore {
 


@@ -165,7 +164,7 @@ public class IdentityKeyStore implements org.whispersystems.libsignal.state.Iden
                 .map(f -> resolver.resolveRecipient(Long.parseLong(f.getName())))
                 .filter(Objects::nonNull)
                 .map(this::loadIdentityLocked)
                 .map(f -> resolver.resolveRecipient(Long.parseLong(f.getName())))
                 .filter(Objects::nonNull)
                 .map(this::loadIdentityLocked)

-                .collect(Collectors.toList());
+                .toList();

     }
 
     public void mergeRecipients(final RecipientId recipientId, final RecipientId toBeMergedRecipientId) {
     }
 
     public void mergeRecipients(final RecipientId recipientId, final RecipientId toBeMergedRecipientId) {

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java b/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java
index dde9e1ccb3624ec97dcc7cb1856e278123b5a908..4853b2231de9909682c162e88dd1e57c611521ce 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java
@@ -13,7 +13,6 @@ import java.nio.file.Files;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Objects;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Objects;

-import java.util.stream.Collectors;

 import java.util.stream.Stream;
 
 public class MessageCache {
 import java.util.stream.Stream;
 
 public class MessageCache {


@@ -46,7 +45,7 @@ public class MessageCache {
                 return Stream.empty();
             }
             return Arrays.stream(files).filter(File::isFile);
                 return Stream.empty();
             }
             return Arrays.stream(files).filter(File::isFile);

-        }).map(CachedMessage::new).collect(Collectors.toList());
+        }).map(CachedMessage::new).toList();

     }
 
     public CachedMessage cacheMessage(SignalServiceEnvelope envelope, RecipientId recipientId) {
     }
 
     public CachedMessage cacheMessage(SignalServiceEnvelope envelope, RecipientId recipientId) {

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/SignedPreKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/SignedPreKeyStore.java
index bc85e3e8273f983a26aef83127931f8298f7ec9b..074e581123f21b3e538060442fc81ff03b59b037 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/SignedPreKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/SignedPreKeyStore.java
@@ -14,7 +14,6 @@ import java.nio.file.Files;
 import java.util.Arrays;
 import java.util.List;
 import java.util.regex.Pattern;
 import java.util.Arrays;
 import java.util.List;
 import java.util.regex.Pattern;

-import java.util.stream.Collectors;

 
 public class SignedPreKeyStore implements org.whispersystems.libsignal.state.SignedPreKeyStore {
 
 
 public class SignedPreKeyStore implements org.whispersystems.libsignal.state.SignedPreKeyStore {
 


@@ -47,7 +46,7 @@ public class SignedPreKeyStore implements org.whispersystems.libsignal.state.Sig
         return Arrays.stream(files)
                 .filter(f -> signedPreKeyFileNamePattern.matcher(f.getName()).matches())
                 .map(this::loadSignedPreKeyRecord)
         return Arrays.stream(files)
                 .filter(f -> signedPreKeyFileNamePattern.matcher(f.getName()).matches())
                 .map(this::loadSignedPreKeyRecord)

-                .collect(Collectors.toList());
+                .toList();

     }
 
     @Override
     }
 
     @Override

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonIdentityKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonIdentityKeyStore.java
index 5e11ab7af5b201147395059e55dd4015da925b31..12f7d59aae784e1ebcc759713d5e80968928be09 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonIdentityKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonIdentityKeyStore.java
@@ -44,7 +44,7 @@ public class LegacyJsonIdentityKeyStore {
                 .collect(Collectors.toSet())
                 .stream()
                 .map(this::getIdentity)
                 .collect(Collectors.toSet())
                 .stream()
                 .map(this::getIdentity)

-                .collect(Collectors.toList());
+                .toList();

     }
 
     public IdentityKeyPair getIdentityKeyPair() {
     }
 
     public IdentityKeyPair getIdentityKeyPair() {

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 706110db43cac7febbe67bad33d953ca5b7fe087..64b8e0450252eaef65f0c4f4129ddcb92adf6a8b 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -203,7 +203,7 @@ public class RecipientStore implements RecipientResolver, ContactsStore, Profile
                     toBeMerged.add(new Pair<>(pair.first(), pair.second().get()));
                 }
                 return pair.first();
                     toBeMerged.add(new Pair<>(pair.first(), pair.second().get()));
                 }
                 return pair.first();

-            }).collect(Collectors.toList());
+            }).toList();

         }
         for (var pair : toBeMerged) {
             recipientMergeHandler.mergeRecipients(pair.first(), pair.second());
         }
         for (var pair : toBeMerged) {
             recipientMergeHandler.mergeRecipients(pair.first(), pair.second());


@@ -231,7 +231,7 @@ public class RecipientStore implements RecipientResolver, ContactsStore, Profile
                 .stream()
                 .filter(e -> e.getValue().getContact() != null)
                 .map(e -> new Pair<>(e.getKey(), e.getValue().getContact()))
                 .stream()
                 .filter(e -> e.getValue().getContact() != null)
                 .map(e -> new Pair<>(e.getKey(), e.getValue().getContact()))

-                .collect(Collectors.toList());
+                .toList();

     }
 
     @Override
     }
 
     @Override


@@ -518,7 +518,7 @@ public class RecipientStore implements RecipientResolver, ContactsStore, Profile
                             : base64.encodeToString(recipient.getProfileKeyCredential().serialize()),
                     contact,
                     profile);
                             : base64.encodeToString(recipient.getProfileKeyCredential().serialize()),
                     contact,
                     profile);

-        }).collect(Collectors.toList()), lastId);
+        }).toList(), lastId);

 
         // Write to memory first to prevent corrupting the file in case of serialization errors
         try (var inMemoryOutput = new ByteArrayOutputStream()) {
 
         // Write to memory first to prevent corrupting the file in case of serialization errors
         try (var inMemoryOutput = new ByteArrayOutputStream()) {

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyRecordStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyRecordStore.java
index caddebcc62528e07b05fa226b3b9eaad1d970ef3..9b012e905edc9c75b027d18f4e1a4a583751c397 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyRecordStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyRecordStore.java
@@ -21,7 +21,6 @@ import java.util.Objects;
 import java.util.UUID;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.UUID;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

-import java.util.stream.Collectors;

 
 public class SenderKeyRecordStore implements org.whispersystems.libsignal.groups.state.SenderKeyStore {
 
 
 public class SenderKeyRecordStore implements org.whispersystems.libsignal.groups.state.SenderKeyStore {
 


@@ -148,7 +147,7 @@ public class SenderKeyRecordStore implements org.whispersystems.libsignal.groups
                     return new Key(recipientId, Integer.parseInt(matcher.group(2)), UUID.fromString(matcher.group(3)));
                 })
                 .filter(Objects::nonNull)
                     return new Key(recipientId, Integer.parseInt(matcher.group(2)), UUID.fromString(matcher.group(3)));
                 })
                 .filter(Objects::nonNull)

-                .collect(Collectors.toList());
+                .toList();

     }
 
     private File getSenderKeyFile(Key key) {
     }
 
     private File getSenderKeyFile(Key key) {

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeySharedStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeySharedStore.java
index ba85233816954f27ea647d481cde81eb688bf007..c2447d48c99f10f59b8a60050f6477b5a5f92c37 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeySharedStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeySharedStore.java
@@ -188,7 +188,7 @@ public class SenderKeySharedStore {
                     .map(entry -> new Storage.SharedSenderKey(entry.recipientId().id(),
                             entry.deviceId(),
                             pair.getKey().asUuid().toString()));
                     .map(entry -> new Storage.SharedSenderKey(entry.recipientId().id(),
                             entry.deviceId(),
                             pair.getKey().asUuid().toString()));

-        }).collect(Collectors.toList()));
+        }).toList());

 
         // Write to memory first to prevent corrupting the file in case of serialization errors
         try (var inMemoryOutput = new ByteArrayOutputStream()) {
 
         // Write to memory first to prevent corrupting the file in case of serialization errors
         try (var inMemoryOutput = new ByteArrayOutputStream()) {

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
index 8011a69d5ce4e1e9c4d3aa3361cdbc3c5ace9a1f..9b3e21dbcd6ce7ff8f506283e1ef034f596b224c 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
@@ -59,13 +59,10 @@ public class SessionStore implements SignalServiceSessionStore {
 
     @Override
     public List<SessionRecord> loadExistingSessions(final List<SignalProtocolAddress> addresses) throws NoSessionException {
 
     @Override
     public List<SessionRecord> loadExistingSessions(final List<SignalProtocolAddress> addresses) throws NoSessionException {

-        final var keys = addresses.stream().map(this::getKey).collect(Collectors.toList());
+        final var keys = addresses.stream().map(this::getKey).toList();

 
         synchronized (cachedSessions) {
 
         synchronized (cachedSessions) {

-            final var sessions = keys.stream()
-                    .map(this::loadSessionLocked)
-                    .filter(Objects::nonNull)
-                    .collect(Collectors.toList());
+            final var sessions = keys.stream().map(this::loadSessionLocked).filter(Objects::nonNull).toList();

 
             if (sessions.size() != addresses.size()) {
                 String message = "Mismatch! Asked for "
 
             if (sessions.size() != addresses.size()) {
                 String message = "Mismatch! Asked for "


@@ -90,7 +87,7 @@ public class SessionStore implements SignalServiceSessionStore {
                     // get all sessions for recipient except main device session
                     .filter(key -> key.deviceId() != 1 && key.recipientId().equals(recipientId))
                     .map(Key::deviceId)
                     // get all sessions for recipient except main device session
                     .filter(key -> key.deviceId() != 1 && key.recipientId().equals(recipientId))
                     .map(Key::deviceId)

-                    .collect(Collectors.toList());
+                    .toList();

         }
     }
 
         }
     }
 


@@ -246,7 +243,7 @@ public class SessionStore implements SignalServiceSessionStore {
                     return new Key(recipientId, Integer.parseInt(matcher.group(2)));
                 })
                 .filter(Objects::nonNull)
                     return new Key(recipientId, Integer.parseInt(matcher.group(2)));
                 })
                 .filter(Objects::nonNull)

-                .collect(Collectors.toList());
+                .toList();

     }
 
     private File getSessionFile(Key key) {
     }
 
     private File getSessionFile(Key key) {

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/stickers/StickerStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/stickers/StickerStore.java
index d0c9c5bc15831b72f60657204ce3c51590edeaca..4b045ac108c504b11bc5ebf6091a46c88050937c 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/stickers/StickerStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/stickers/StickerStore.java
@@ -62,7 +62,7 @@ public class StickerStore {
                 .map(s -> new Storage.Sticker(Base64.getEncoder().encodeToString(s.getPackId().serialize()),
                         Base64.getEncoder().encodeToString(s.getPackKey()),
                         s.isInstalled()))
                 .map(s -> new Storage.Sticker(Base64.getEncoder().encodeToString(s.getPackId().serialize()),
                         Base64.getEncoder().encodeToString(s.getPackKey()),
                         s.isInstalled()))

-                .collect(Collectors.toList()));
+                .toList());

     }
 
     public record Storage(List<Storage.Sticker> stickers) {
     }
 
     public record Storage(List<Storage.Sticker> stickers) {

diff --git a/src/main/java/org/asamk/signal/commands/DaemonCommand.java b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
index 1e5bdca1d95449fdab4acc806cd5e82841ac431a..020c91c1cd9d29d391a979f5def9bd288fbac9cd 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
@@ -37,7 +37,6 @@ import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Consumer;

-import java.util.stream.Collectors;

 
 public class DaemonCommand implements MultiLocalCommand, LocalCommand {
 
 
 public class DaemonCommand implements MultiLocalCommand, LocalCommand {
 


@@ -317,7 +316,7 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
                     .filter(Objects::nonNull)
                     .map(m -> exportMultiAccountManager(connection, m, noReceiveOnStart))
                     .filter(Objects::nonNull)
                     .filter(Objects::nonNull)
                     .map(m -> exportMultiAccountManager(connection, m, noReceiveOnStart))
                     .filter(Objects::nonNull)

-                    .collect(Collectors.toList());
+                    .toList();

 
             for (var t : initThreads) {
                 try {
 
             for (var t : initThreads) {
                 try {

diff --git a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
index 97e4af340a1c091cb6dbaab87fa454161c7c34b8..50e9b17f136a19ae3cdf07e06498519132ca590e 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
+++ b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
@@ -17,7 +17,6 @@ import java.io.IOException;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.UUID;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.UUID;

-import java.util.stream.Collectors;

 
 public class GetUserStatusCommand implements JsonRpcLocalCommand {
 
 
 public class GetUserStatusCommand implements JsonRpcLocalCommand {
 


@@ -53,7 +52,7 @@ public class GetUserStatusCommand implements JsonRpcLocalCommand {
                 final var number = entry.getValue().first();
                 final var uuid = entry.getValue().second();
                 return new JsonUserStatus(entry.getKey(), number, uuid == null ? null : uuid.toString(), uuid != null);
                 final var number = entry.getValue().first();
                 final var uuid = entry.getValue().second();
                 return new JsonUserStatus(entry.getKey(), number, uuid == null ? null : uuid.toString(), uuid != null);

-            }).collect(Collectors.toList());
+            }).toList();

 
             jsonWriter.write(jsonUserStatuses);
         } else {
 
             jsonWriter.write(jsonUserStatuses);
         } else {

diff --git a/src/main/java/org/asamk/signal/commands/ListAccountsCommand.java b/src/main/java/org/asamk/signal/commands/ListAccountsCommand.java
index ad4e1f81d342cf6a9a1fbb523520ccc9ba96295c..68b56f290491e7dc00d36a7a2fbd792b50c0e3ce 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ListAccountsCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListAccountsCommand.java
@@ -9,8 +9,6 @@ import org.asamk.signal.output.JsonWriter;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.output.PlainTextWriter;
 
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.output.PlainTextWriter;
 

-import java.util.stream.Collectors;
-

 public class ListAccountsCommand implements JsonRpcMultiLocalCommand {
 
     @Override
 public class ListAccountsCommand implements JsonRpcMultiLocalCommand {
 
     @Override


@@ -29,7 +27,7 @@ public class ListAccountsCommand implements JsonRpcMultiLocalCommand {
     ) throws CommandException {
         final var accountNumbers = c.getAccountNumbers();
         if (outputWriter instanceof JsonWriter jsonWriter) {
     ) throws CommandException {
         final var accountNumbers = c.getAccountNumbers();
         if (outputWriter instanceof JsonWriter jsonWriter) {

-            final var jsonAccounts = accountNumbers.stream().map(JsonAccount::new).collect(Collectors.toList());
+            final var jsonAccounts = accountNumbers.stream().map(JsonAccount::new).toList();

             jsonWriter.write(jsonAccounts);
         } else if (outputWriter instanceof PlainTextWriter plainTextWriter) {
             for (final var number : accountNumbers) {
             jsonWriter.write(jsonAccounts);
         } else if (outputWriter instanceof PlainTextWriter plainTextWriter) {
             for (final var number : accountNumbers) {

diff --git a/src/main/java/org/asamk/signal/commands/ListContactsCommand.java b/src/main/java/org/asamk/signal/commands/ListContactsCommand.java
index 308044dc2f2783be7b3b4b3ebe621846e5c37c55..b83440ec61377f338a2cab1fe663185cc422d1ba 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ListContactsCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListContactsCommand.java
@@ -9,7 +9,6 @@ import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.output.PlainTextWriter;
 
 import java.util.UUID;
 import org.asamk.signal.output.PlainTextWriter;
 
 import java.util.UUID;

-import java.util.stream.Collectors;

 
 public class ListContactsCommand implements JsonRpcLocalCommand {
 
 
 public class ListContactsCommand implements JsonRpcLocalCommand {
 


@@ -48,7 +47,7 @@ public class ListContactsCommand implements JsonRpcLocalCommand {
                         contact.getName(),
                         contact.isBlocked(),
                         contact.getMessageExpirationTime());
                         contact.getName(),
                         contact.isBlocked(),
                         contact.getMessageExpirationTime());

-            }).collect(Collectors.toList());
+            }).toList();

 
             writer.write(jsonContacts);
         }
 
             writer.write(jsonContacts);
         }

diff --git a/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java b/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java
index 877096e2dfa2603f3be3b372d5ca6af3e66a9aec..7920243e3c9113990b787c16188b79bce9f0a9e0 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java
@@ -16,7 +16,6 @@ import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.util.List;
 
 import java.io.IOException;
 import java.util.List;

-import java.util.stream.Collectors;

 
 public class ListDevicesCommand implements JsonRpcLocalCommand {
 
 
 public class ListDevicesCommand implements JsonRpcLocalCommand {
 


@@ -56,7 +55,7 @@ public class ListDevicesCommand implements JsonRpcLocalCommand {
             final var writer = (JsonWriter) outputWriter;
             final var jsonDevices = devices.stream()
                     .map(d -> new JsonDevice(d.id(), d.name(), d.created(), d.lastSeen()))
             final var writer = (JsonWriter) outputWriter;
             final var jsonDevices = devices.stream()
                     .map(d -> new JsonDevice(d.id(), d.name(), d.created(), d.lastSeen()))

-                    .collect(Collectors.toList());
+                    .toList();

             writer.write(jsonDevices);
         }
     }
             writer.write(jsonDevices);
         }
     }

diff --git a/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java b/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
index e5a273f5bb5b73850f6da522b454932cd7717f24..84e458b3ab71172ed4db98696eb4f9b751f54aac 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
@@ -99,7 +99,7 @@ public class ListGroupsCommand implements JsonRpcLocalCommand {
                         group.permissionEditDetails().name(),
                         group.permissionSendMessage().name(),
                         groupInviteLink == null ? null : groupInviteLink.getUrl());
                         group.permissionEditDetails().name(),
                         group.permissionSendMessage().name(),
                         groupInviteLink == null ? null : groupInviteLink.getUrl());

-            }).collect(Collectors.toList());
+            }).toList();

 
             jsonWriter.write(jsonGroups);
         } else {
 
             jsonWriter.write(jsonGroups);
         } else {

diff --git a/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java b/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java
index 680df886e051459b70137ddd5adde7f5cd5ba31f..e281ff88d74bef98418b564cd8db28ee9d5a5486 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java
@@ -18,7 +18,6 @@ import org.slf4j.LoggerFactory;
 import java.util.Base64;
 import java.util.List;
 import java.util.UUID;
 import java.util.Base64;
 import java.util.List;
 import java.util.UUID;

-import java.util.stream.Collectors;

 
 public class ListIdentitiesCommand implements JsonRpcLocalCommand {
 
 
 public class ListIdentitiesCommand implements JsonRpcLocalCommand {
 


@@ -76,7 +75,7 @@ public class ListIdentitiesCommand implements JsonRpcLocalCommand {
                                 : Base64.getEncoder().encodeToString(scannableSafetyNumber),
                         id.trustLevel().name(),
                         id.dateAdded().getTime());
                                 : Base64.getEncoder().encodeToString(scannableSafetyNumber),
                         id.trustLevel().name(),
                         id.dateAdded().getTime());

-            }).collect(Collectors.toList());
+            }).toList();

 
             writer.write(jsonIdentities);
         }
 
             writer.write(jsonIdentities);
         }

diff --git a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
index f4f2db0bc3ed53a03269d44184e7d0510db76b5d..ede16060baa62aaf634d5e3954baf89b4376b91a 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
@@ -28,7 +28,6 @@ import org.slf4j.LoggerFactory;
 import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
 import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;

-import java.util.stream.Collectors;

 import java.util.stream.Stream;
 
 public class UpdateGroupCommand implements JsonRpcLocalCommand {
 import java.util.stream.Stream;
 
 public class UpdateGroupCommand implements JsonRpcLocalCommand {


@@ -160,8 +159,7 @@ public class UpdateGroupCommand implements JsonRpcLocalCommand {
                     groupMessageResults = results;
                 } else {
                     groupMessageResults = new SendGroupMessageResults(results.timestamp(),
                     groupMessageResults = results;
                 } else {
                     groupMessageResults = new SendGroupMessageResults(results.timestamp(),

-                            Stream.concat(groupMessageResults.results().stream(), results.results().stream())
-                                    .collect(Collectors.toList()));
+                            Stream.concat(groupMessageResults.results().stream(), results.results().stream()).toList());

                 }
             }
             outputResult(outputWriter, groupMessageResults, isNewGroup ? groupId : null);
                 }
             }
             outputResult(outputWriter, groupMessageResults, isNewGroup ? groupId : null);

diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index 5421d4ad56ce0f69c7aeb880cd62da204353981c..446a7b527db7ffa5ba6d50b8c2196afe5f8d1226 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -160,7 +160,7 @@ public class DbusManagerImpl implements Manager {
                     (long) device.get("Created").getValue(),
                     (long) device.get("LastSeen").getValue(),
                     thisDevice.equals(d.getObjectPath()));
                     (long) device.get("Created").getValue(),
                     (long) device.get("LastSeen").getValue(),
                     thisDevice.equals(d.getObjectPath()));

-        }).collect(Collectors.toList());
+        }).toList();

     }
 
     @Override
     }
 
     @Override


@@ -191,7 +191,7 @@ public class DbusManagerImpl implements Manager {
     @Override
     public List<Group> getGroups() {
         final var groups = signal.listGroups();
     @Override
     public List<Group> getGroups() {
         final var groups = signal.listGroups();

-        return groups.stream().map(Signal.StructGroup::getObjectPath).map(this::getGroup).collect(Collectors.toList());
+        return groups.stream().map(Signal.StructGroup::getObjectPath).map(this::getGroup).toList();

     }
 
     @Override
     }
 
     @Override


@@ -216,7 +216,7 @@ public class DbusManagerImpl implements Manager {
             final String name, final Set<RecipientIdentifier.Single> members, final File avatarFile
     ) throws IOException, AttachmentInvalidException {
         final var newGroupId = signal.createGroup(emptyIfNull(name),
             final String name, final Set<RecipientIdentifier.Single> members, final File avatarFile
     ) throws IOException, AttachmentInvalidException {
         final var newGroupId = signal.createGroup(emptyIfNull(name),

-                members.stream().map(RecipientIdentifier.Single::getIdentifier).collect(Collectors.toList()),
+                members.stream().map(RecipientIdentifier.Single::getIdentifier).toList(),

                 avatarFile == null ? "" : avatarFile.getPath());
         return new Pair<>(GroupId.unknownVersion(newGroupId), new SendGroupMessageResults(0, List.of()));
     }
                 avatarFile == null ? "" : avatarFile.getPath());
         return new Pair<>(GroupId.unknownVersion(newGroupId), new SendGroupMessageResults(0, List.of()));
     }


@@ -254,28 +254,22 @@ public class DbusManagerImpl implements Manager {
                             : GroupPermission.EVERY_MEMBER.name());
         }
         if (updateGroup.getMembers() != null) {
                             : GroupPermission.EVERY_MEMBER.name());
         }
         if (updateGroup.getMembers() != null) {

-            group.addMembers(updateGroup.getMembers()
-                    .stream()
-                    .map(RecipientIdentifier.Single::getIdentifier)
-                    .collect(Collectors.toList()));
+            group.addMembers(updateGroup.getMembers().stream().map(RecipientIdentifier.Single::getIdentifier).toList());

         }
         if (updateGroup.getRemoveMembers() != null) {
             group.removeMembers(updateGroup.getRemoveMembers()
                     .stream()
                     .map(RecipientIdentifier.Single::getIdentifier)
         }
         if (updateGroup.getRemoveMembers() != null) {
             group.removeMembers(updateGroup.getRemoveMembers()
                     .stream()
                     .map(RecipientIdentifier.Single::getIdentifier)

-                    .collect(Collectors.toList()));
+                    .toList());

         }
         if (updateGroup.getAdmins() != null) {
         }
         if (updateGroup.getAdmins() != null) {

-            group.addAdmins(updateGroup.getAdmins()
-                    .stream()
-                    .map(RecipientIdentifier.Single::getIdentifier)
-                    .collect(Collectors.toList()));
+            group.addAdmins(updateGroup.getAdmins().stream().map(RecipientIdentifier.Single::getIdentifier).toList());

         }
         if (updateGroup.getRemoveAdmins() != null) {
             group.removeAdmins(updateGroup.getRemoveAdmins()
                     .stream()
                     .map(RecipientIdentifier.Single::getIdentifier)
         }
         if (updateGroup.getRemoveAdmins() != null) {
             group.removeAdmins(updateGroup.getRemoveAdmins()
                     .stream()
                     .map(RecipientIdentifier.Single::getIdentifier)

-                    .collect(Collectors.toList()));
+                    .toList());

         }
         if (updateGroup.isResetGroupLink()) {
             group.resetLink();
         }
         if (updateGroup.isResetGroupLink()) {
             group.resetLink();


@@ -375,9 +369,7 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public SendMessageResults sendEndSessionMessage(final Set<RecipientIdentifier.Single> recipients) throws IOException {
 
     @Override
     public SendMessageResults sendEndSessionMessage(final Set<RecipientIdentifier.Single> recipients) throws IOException {

-        signal.sendEndSessionMessage(recipients.stream()
-                .map(RecipientIdentifier.Single::getIdentifier)
-                .collect(Collectors.toList()));
+        signal.sendEndSessionMessage(recipients.stream().map(RecipientIdentifier.Single::getIdentifier).toList());

         return new SendMessageResults(0, Map.of());
     }
 
         return new SendMessageResults(0, Map.of());
     }
 


@@ -632,7 +624,7 @@ public class DbusManagerImpl implements Manager {
                 .filter(r -> r instanceof RecipientIdentifier.Single)
                 .map(RecipientIdentifier.Single.class::cast)
                 .map(RecipientIdentifier.Single::getIdentifier)
                 .filter(r -> r instanceof RecipientIdentifier.Single)
                 .map(RecipientIdentifier.Single.class::cast)
                 .map(RecipientIdentifier.Single::getIdentifier)

-                .collect(Collectors.toList());
+                .toList();

         if (singleRecipients.size() > 0) {
             timestamp = recipientsHandler.apply(singleRecipients);
         }
         if (singleRecipients.size() > 0) {
             timestamp = recipientsHandler.apply(singleRecipients);
         }


@@ -644,7 +636,7 @@ public class DbusManagerImpl implements Manager {
                 .filter(r -> r instanceof RecipientIdentifier.Group)
                 .map(RecipientIdentifier.Group.class::cast)
                 .map(RecipientIdentifier.Group::groupId)
                 .filter(r -> r instanceof RecipientIdentifier.Group)
                 .map(RecipientIdentifier.Group.class::cast)
                 .map(RecipientIdentifier.Group::groupId)

-                .collect(Collectors.toList());
+                .toList();

         for (final var groupId : groupRecipients) {
             timestamp = groupHandler.apply(groupId.serialize());
         }
         for (final var groupId : groupRecipients) {
             timestamp = groupHandler.apply(groupId.serialize());
         }


@@ -826,7 +818,7 @@ public class DbusManagerImpl implements Manager {
                     getValue(a, "isVoiceNote"),
                     getValue(a, "isGif"),
                     getValue(a, "isBorderless"));
                     getValue(a, "isVoiceNote"),
                     getValue(a, "isGif"),
                     getValue(a, "isBorderless"));

-        }).collect(Collectors.toList());
+        }).toList();

     }
 
     @SuppressWarnings("unchecked")
     }
 
     @SuppressWarnings("unchecked")

diff --git a/src/main/java/org/asamk/signal/dbus/DbusReceiveMessageHandler.java b/src/main/java/org/asamk/signal/dbus/DbusReceiveMessageHandler.java
index da79f5bface03b9c0fa693ec9c2dc793fcfd3367..34e7105cbd7b603407640695dc95be7f3cdc7b1a 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusReceiveMessageHandler.java
@@ -14,7 +14,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

-import java.util.stream.Collectors;

 
 public class DbusReceiveMessageHandler implements Manager.ReceiveMessageHandler {
 
 
 public class DbusReceiveMessageHandler implements Manager.ReceiveMessageHandler {
 


@@ -126,11 +125,11 @@ public class DbusReceiveMessageHandler implements Manager.ReceiveMessageHandler
                     .stream()
                     .filter(a -> a.id().isPresent())
                     .map(this::getAttachmentMap)
                     .stream()
                     .filter(a -> a.id().isPresent())
                     .map(this::getAttachmentMap)

-                    .collect(Collectors.toList());
+                    .toList();

             extras.put("attachments", new Variant<>(attachments, "aa{sv}"));
         }
         if (message.mentions().size() > 0) {
             extras.put("attachments", new Variant<>(attachments, "aa{sv}"));
         }
         if (message.mentions().size() > 0) {

-            var mentions = message.mentions().stream().map(this::getMentionMap).collect(Collectors.toList());
+            var mentions = message.mentions().stream().map(this::getMentionMap).toList();

             extras.put("mentions", new Variant<>(mentions, "aa{sv}"));
         }
         extras.put("expiresInSeconds", new Variant<>(message.expiresInSeconds()));
             extras.put("mentions", new Variant<>(mentions, "aa{sv}"));
         }
         extras.put("expiresInSeconds", new Variant<>(message.expiresInSeconds()));

diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
index dc23fed9be261818a364fac2b0f258c4cb70f409..cfd17610d33c6d88ffd2c40b3d6ed695f9b7bcff 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
@@ -18,7 +18,6 @@ import java.net.URI;
 import java.nio.channels.OverlappingFileLockException;
 import java.util.List;
 import java.util.concurrent.TimeoutException;
 import java.nio.channels.OverlappingFileLockException;
 import java.util.List;
 import java.util.concurrent.TimeoutException;

-import java.util.stream.Collectors;

 
 public class DbusSignalControlImpl implements org.asamk.SignalControl {
 
 
 public class DbusSignalControlImpl implements org.asamk.SignalControl {
 


@@ -111,9 +110,6 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
 
     @Override
     public List<DBusPath> listAccounts() {
 
     @Override
     public List<DBusPath> listAccounts() {

-        return c.getAccountNumbers()
-                .stream()
-                .map(u -> new DBusPath(DbusConfig.getObjectPath(u)))
-                .collect(Collectors.toList());
+        return c.getAccountNumbers().stream().map(u -> new DBusPath(DbusConfig.getObjectPath(u))).toList();

     }
 }
     }
 }

diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index 0c59429c9db8439c70a357b6c8642c7772447c9d..4a07e55e79a8c044836cd986d16571aaef9e1a35 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -191,9 +191,7 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public long sendMessage(final String message, final List<String> attachments, final String recipient) {
 
     @Override
     public long sendMessage(final String message, final List<String> attachments, final String recipient) {

-        var recipients = new ArrayList<String>(1);
-        recipients.add(recipient);
-        return sendMessage(message, attachments, recipients);
+        return sendMessage(message, attachments, List.of(recipient));

     }
 
     @Override
     }
 
     @Override


@@ -219,9 +217,7 @@ public class DbusSignalImpl implements Signal {
     public long sendRemoteDeleteMessage(
             final long targetSentTimestamp, final String recipient
     ) {
     public long sendRemoteDeleteMessage(
             final long targetSentTimestamp, final String recipient
     ) {

-        var recipients = new ArrayList<String>(1);
-        recipients.add(recipient);
-        return sendRemoteDeleteMessage(targetSentTimestamp, recipients);
+        return sendRemoteDeleteMessage(targetSentTimestamp, List.of(recipient));

     }
 
     @Override
     }
 
     @Override


@@ -266,9 +262,7 @@ public class DbusSignalImpl implements Signal {
             final long targetSentTimestamp,
             final String recipient
     ) {
             final long targetSentTimestamp,
             final String recipient
     ) {

-        var recipients = new ArrayList<String>(1);
-        recipients.add(recipient);
-        return sendMessageReaction(emoji, remove, targetAuthor, targetSentTimestamp, recipients);
+        return sendMessageReaction(emoji, remove, targetAuthor, targetSentTimestamp, List.of(recipient));

     }
 
     @Override
     }
 
     @Override


@@ -301,10 +295,8 @@ public class DbusSignalImpl implements Signal {
             final String recipient, final boolean stop
     ) throws Error.Failure, Error.GroupNotFound, Error.UntrustedIdentity {
         try {
             final String recipient, final boolean stop
     ) throws Error.Failure, Error.GroupNotFound, Error.UntrustedIdentity {
         try {

-            var recipients = new ArrayList<String>(1);
-            recipients.add(recipient);

             final var results = m.sendTypingMessage(stop ? TypingAction.STOP : TypingAction.START,
             final var results = m.sendTypingMessage(stop ? TypingAction.STOP : TypingAction.START,

-                    getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
+                    getSingleRecipientIdentifiers(List.of(recipient), m.getSelfNumber()).stream()

                             .map(RecipientIdentifier.class::cast)
                             .collect(Collectors.toSet()));
             checkSendMessageResults(results.timestamp(), results.results());
                             .map(RecipientIdentifier.class::cast)
                             .collect(Collectors.toSet()));
             checkSendMessageResults(results.timestamp(), results.results());


@@ -499,11 +491,7 @@ public class DbusSignalImpl implements Signal {
     @Override
     public List<byte[]> getGroupIds() {
         var groups = m.getGroups();
     @Override
     public List<byte[]> getGroupIds() {
         var groups = m.getGroups();

-        var ids = new ArrayList<byte[]>(groups.size());
-        for (var group : groups) {
-            ids.add(group.groupId().serialize());
-        }
-        return ids;
+        return groups.stream().map(g -> g.groupId().serialize()).toList();

     }
 
     @Override
     }
 
     @Override


@@ -595,9 +583,8 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public List<Boolean> isRegistered(List<String> numbers) {
 
     @Override
     public List<Boolean> isRegistered(List<String> numbers) {

-        var results = new ArrayList<Boolean>();

         if (numbers.isEmpty()) {
         if (numbers.isEmpty()) {

-            return results;
+            return List.of();

         }
 
         Map<String, Pair<String, UUID>> registered;
         }
 
         Map<String, Pair<String, UUID>> registered;


@@ -610,7 +597,7 @@ public class DbusSignalImpl implements Signal {
         return numbers.stream().map(number -> {
             var uuid = registered.get(number).second();
             return uuid != null;
         return numbers.stream().map(number -> {
             var uuid = registered.get(number).second();
             return uuid != null;

-        }).collect(Collectors.toList());
+        }).toList();

     }
 
     @Override
     }
 
     @Override


@@ -682,7 +669,7 @@ public class DbusSignalImpl implements Signal {
                 .map(a -> a.number().orElse(null))
                 .filter(Objects::nonNull)
                 .distinct()
                 .map(a -> a.number().orElse(null))
                 .filter(Objects::nonNull)
                 .distinct()

-                .collect(Collectors.toList());
+                .toList();

     }
 
     @Override
     }
 
     @Override


@@ -844,7 +831,7 @@ public class DbusSignalImpl implements Signal {
     }
 
     private static List<String> getRecipientStrings(final Set<RecipientAddress> members) {
     }
 
     private static List<String> getRecipientStrings(final Set<RecipientAddress> members) {

-        return members.stream().map(RecipientAddress::getLegacyIdentifier).collect(Collectors.toList());
+        return members.stream().map(RecipientAddress::getLegacyIdentifier).toList();

     }
 
     private static Set<RecipientIdentifier.Single> getSingleRecipientIdentifiers(
     }
 
     private static Set<RecipientIdentifier.Single> getSingleRecipientIdentifiers(

diff --git a/src/main/java/org/asamk/signal/json/JsonCallMessage.java b/src/main/java/org/asamk/signal/json/JsonCallMessage.java
index a1a5d8df03c86d3df6c0a8df0273b9c05e7ea737..70b1951c98c255d3878abc8d7bb57d7a21d61503 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonCallMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonCallMessage.java
@@ -6,7 +6,6 @@ import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.Base64;
 import java.util.List;
 
 import java.util.Base64;
 import java.util.List;

-import java.util.stream.Collectors;

 
 record JsonCallMessage(
         @JsonInclude(JsonInclude.Include.NON_NULL) Offer offerMessage,
 
 record JsonCallMessage(
         @JsonInclude(JsonInclude.Include.NON_NULL) Offer offerMessage,


@@ -21,7 +20,7 @@ record JsonCallMessage(
                 callMessage.answer().map(Answer::from).orElse(null),
                 callMessage.busy().map(Busy::from).orElse(null),
                 callMessage.hangup().map(Hangup::from).orElse(null),
                 callMessage.answer().map(Answer::from).orElse(null),
                 callMessage.busy().map(Busy::from).orElse(null),
                 callMessage.hangup().map(Hangup::from).orElse(null),

-                callMessage.iceUpdate().stream().map(IceUpdate::from).collect(Collectors.toList()));
+                callMessage.iceUpdate().stream().map(IceUpdate::from).toList());

     }
 
     record Offer(long id, String sdp, String type, String opaque) {
     }
 
     record Offer(long id, String sdp, String type, String opaque) {

diff --git a/src/main/java/org/asamk/signal/json/JsonDataMessage.java b/src/main/java/org/asamk/signal/json/JsonDataMessage.java
index d89c7d0584aba19d164a885960cf0b35dbfa83d3..46328466f92b8cda9507a45894dc0efd67eed6f2 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonDataMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonDataMessage.java
@@ -5,7 +5,6 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.List;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.List;

-import java.util.stream.Collectors;

 
 record JsonDataMessage(
         long timestamp,
 
 record JsonDataMessage(
         long timestamp,


@@ -36,20 +35,20 @@ record JsonDataMessage(
         final var mentions = dataMessage.mentions().size() > 0 ? dataMessage.mentions()
                 .stream()
                 .map(JsonMention::from)
         final var mentions = dataMessage.mentions().size() > 0 ? dataMessage.mentions()
                 .stream()
                 .map(JsonMention::from)

-                .collect(Collectors.toList()) : null;
+                .toList() : null;

         final var remoteDelete = dataMessage.remoteDeleteId().isPresent()
                 ? new JsonRemoteDelete(dataMessage.remoteDeleteId().get())
                 : null;
         final var attachments = dataMessage.attachments().size() > 0 ? dataMessage.attachments()
                 .stream()
                 .map(JsonAttachment::from)
         final var remoteDelete = dataMessage.remoteDeleteId().isPresent()
                 ? new JsonRemoteDelete(dataMessage.remoteDeleteId().get())
                 : null;
         final var attachments = dataMessage.attachments().size() > 0 ? dataMessage.attachments()
                 .stream()
                 .map(JsonAttachment::from)

-                .collect(Collectors.toList()) : null;
+                .toList() : null;

         final var sticker = dataMessage.sticker().isPresent() ? JsonSticker.from(dataMessage.sticker().get()) : null;
 
         final var contacts = dataMessage.sharedContacts().size() > 0 ? dataMessage.sharedContacts()
                 .stream()
                 .map(JsonSharedContact::from)
         final var sticker = dataMessage.sticker().isPresent() ? JsonSticker.from(dataMessage.sticker().get()) : null;
 
         final var contacts = dataMessage.sharedContacts().size() > 0 ? dataMessage.sharedContacts()
                 .stream()
                 .map(JsonSharedContact::from)

-                .collect(Collectors.toList()) : null;
+                .toList() : null;

         return new JsonDataMessage(timestamp,
                 message,
                 expiresInSeconds,
         return new JsonDataMessage(timestamp,
                 message,
                 expiresInSeconds,

diff --git a/src/main/java/org/asamk/signal/json/JsonPayment.java b/src/main/java/org/asamk/signal/json/JsonPayment.java
index ee4a120d8e3b354652e01a9e5a2b89e9828cf313..d3e5c4830e408749494b610ee28373cc81e952fb 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonPayment.java
+++ b/src/main/java/org/asamk/signal/json/JsonPayment.java
@@ -3,6 +3,7 @@ package org.asamk.signal.json;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 public record JsonPayment(String note, byte[] receipt) {
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 public record JsonPayment(String note, byte[] receipt) {

+

     static JsonPayment from(MessageEnvelope.Data.Payment payment) {
         return new JsonPayment(payment.note(), payment.receipt());
     }
     static JsonPayment from(MessageEnvelope.Data.Payment payment) {
         return new JsonPayment(payment.note(), payment.receipt());
     }

diff --git a/src/main/java/org/asamk/signal/json/JsonQuote.java b/src/main/java/org/asamk/signal/json/JsonQuote.java
index d8d3c17fe623e73ab7dcec067eb7dcac4d927eca..01e35eb732ce6164cdb80a7766aed2863514e502 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonQuote.java
+++ b/src/main/java/org/asamk/signal/json/JsonQuote.java
@@ -4,10 +4,8 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 
 import org.asamk.signal.manager.api.MessageEnvelope;
 

-import java.util.ArrayList;

 import java.util.List;
 import java.util.UUID;
 import java.util.List;
 import java.util.UUID;

-import java.util.stream.Collectors;

 
 public record JsonQuote(
         long id,
 
 public record JsonQuote(
         long id,


@@ -27,15 +25,14 @@ public record JsonQuote(
         final var authorUuid = address.uuid().map(UUID::toString).orElse(null);
         final var text = quote.text().orElse(null);
 
         final var authorUuid = address.uuid().map(UUID::toString).orElse(null);
         final var text = quote.text().orElse(null);
 

-        final var mentions = quote.mentions().size() > 0 ? quote.mentions()
-                .stream()
-                .map(JsonMention::from)
-                .collect(Collectors.toList()) : null;
+        final var mentions = quote.mentions().size() > 0
+                ? quote.mentions().stream().map(JsonMention::from).toList()
+                : null;

 
         final var attachments = quote.attachments().size() > 0 ? quote.attachments()
                 .stream()
                 .map(JsonQuotedAttachment::from)
 
         final var attachments = quote.attachments().size() > 0 ? quote.attachments()
                 .stream()
                 .map(JsonQuotedAttachment::from)

-                .collect(Collectors.toList()) : new ArrayList<JsonQuotedAttachment>();
+                .toList() : List.<JsonQuotedAttachment>of();

 
         return new JsonQuote(id, author, authorNumber, authorUuid, text, mentions, attachments);
     }
 
         return new JsonQuote(id, author, authorNumber, authorUuid, text, mentions, attachments);
     }

diff --git a/src/main/java/org/asamk/signal/json/JsonSharedContact.java b/src/main/java/org/asamk/signal/json/JsonSharedContact.java
index 4c8e5eb565aa76db581e98d4c8bf2fa96555d73f..e71feda6d64b1262fbdb08e696548d741317e733 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonSharedContact.java
+++ b/src/main/java/org/asamk/signal/json/JsonSharedContact.java
@@ -5,7 +5,6 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.List;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.List;

-import java.util.stream.Collectors;

 
 public record JsonSharedContact(
         JsonContactName name,
 
 public record JsonSharedContact(
         JsonContactName name,


@@ -20,20 +19,18 @@ public record JsonSharedContact(
         final var name = JsonContactName.from(contact.name());
         final var avatar = contact.avatar().isPresent() ? JsonContactAvatar.from(contact.avatar().get()) : null;
 
         final var name = JsonContactName.from(contact.name());
         final var avatar = contact.avatar().isPresent() ? JsonContactAvatar.from(contact.avatar().get()) : null;
 

-        final var phone = contact.phone().size() > 0 ? contact.phone()
-                .stream()
-                .map(JsonContactPhone::from)
-                .collect(Collectors.toList()) : null;
+        final var phone = contact.phone().size() > 0
+                ? contact.phone().stream().map(JsonContactPhone::from).toList()
+                : null;

 
 

-        final var email = contact.email().size() > 0 ? contact.email()
-                .stream()
-                .map(JsonContactEmail::from)
-                .collect(Collectors.toList()) : null;
+        final var email = contact.email().size() > 0
+                ? contact.email().stream().map(JsonContactEmail::from).toList()
+                : null;

 
         final var address = contact.address().size() > 0 ? contact.address()
                 .stream()
                 .map(JsonContactAddress::from)
 
         final var address = contact.address().size() > 0 ? contact.address()
                 .stream()
                 .map(JsonContactAddress::from)

-                .collect(Collectors.toList()) : null;
+                .toList() : null;

 
         final var organization = contact.organization().orElse(null);
 
 
         final var organization = contact.organization().orElse(null);
 

diff --git a/src/main/java/org/asamk/signal/json/JsonSyncMessage.java b/src/main/java/org/asamk/signal/json/JsonSyncMessage.java
index 8bff73985ef4d9692e40acd2f3fb918534f49b88..6f512016ee0b0126446c679abc2edb6bad4a5cb8 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonSyncMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonSyncMessage.java
@@ -7,7 +7,6 @@ import org.asamk.signal.manager.groups.GroupId;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 
 import java.util.List;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 
 import java.util.List;

-import java.util.stream.Collectors;

 
 enum JsonSyncMessageType {
     CONTACTS_SYNC,
 
 enum JsonSyncMessageType {
     CONTACTS_SYNC,


@@ -49,13 +48,8 @@ record JsonSyncMessage(
                     .recipients()
                     .stream()
                     .map(RecipientAddress::getLegacyIdentifier)
                     .recipients()
                     .stream()
                     .map(RecipientAddress::getLegacyIdentifier)

-                    .collect(Collectors.toList());
-            blockedGroupIds = syncMessage.blocked()
-                    .get()
-                    .groupIds()
-                    .stream()
-                    .map(GroupId::toBase64)
-                    .collect(Collectors.toList());
+                    .toList();
+            blockedGroupIds = syncMessage.blocked().get().groupIds().stream().map(GroupId::toBase64).toList();

         } else {
             blockedNumbers = null;
             blockedGroupIds = null;
         } else {
             blockedNumbers = null;
             blockedGroupIds = null;


@@ -64,7 +58,7 @@ record JsonSyncMessage(
         final var readMessages = syncMessage.read().size() > 0 ? syncMessage.read()
                 .stream()
                 .map(JsonSyncReadMessage::from)
         final var readMessages = syncMessage.read().size() > 0 ? syncMessage.read()
                 .stream()
                 .map(JsonSyncReadMessage::from)

-                .collect(Collectors.toList()) : null;
+                .toList() : null;

 
         final JsonSyncMessageType type;
         if (syncMessage.contacts().isPresent()) {
 
         final JsonSyncMessageType type;
         if (syncMessage.contacts().isPresent()) {

diff --git a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
index 3bc7e701238811151441cc0f8f90cf546b8f999d..6e58b23c5f102eee049c98ca02b7cf1f5cca26b4 100644 (file)
--- a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
@@ -15,7 +15,6 @@ import java.io.IOException;
 import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.function.Supplier;

-import java.util.stream.Collectors;

 import java.util.stream.StreamSupport;
 
 public class JsonRpcReader {
 import java.util.stream.StreamSupport;
 
 public class JsonRpcReader {


@@ -57,7 +56,7 @@ public class JsonRpcReader {
                     }
 
                     return handleRequest(requestHandler, request);
                     }
 
                     return handleRequest(requestHandler, request);

-                }).filter(Objects::nonNull).collect(Collectors.toList());
+                }).filter(Objects::nonNull).toList();

 
                 jsonRpcSender.sendBatchResponses(responseList);
             }
 
                 jsonRpcSender.sendBatchResponses(responseList);
             }


@@ -128,8 +127,7 @@ public class JsonRpcReader {
                         null), null));
                 return null;
             }
                         null), null));
                 return null;
             }

-            return new JsonRpcBatchMessage(StreamSupport.stream(jsonNode.spliterator(), false)
-                    .collect(Collectors.toList()));
+            return new JsonRpcBatchMessage(StreamSupport.stream(jsonNode.spliterator(), false).toList());

         } else if (jsonNode.isObject()) {
             if (jsonNode.has("result") || jsonNode.has("error")) {
                 return parseJsonRpcResponse(jsonNode);
         } else if (jsonNode.isObject()) {
             if (jsonNode.has("result") || jsonNode.has("error")) {
                 return parseJsonRpcResponse(jsonNode);

diff --git a/src/main/java/org/asamk/signal/util/SendMessageResultUtils.java b/src/main/java/org/asamk/signal/util/SendMessageResultUtils.java
index 0e13a20091cddab85f9739f005d36f9706caf19a..bb46a89dff700f6d41ae3f0ac4925b6fbdc7e7ba 100644 (file)
--- a/src/main/java/org/asamk/signal/util/SendMessageResultUtils.java
+++ b/src/main/java/org/asamk/signal/util/SendMessageResultUtils.java
@@ -53,14 +53,14 @@ public class SendMessageResultUtils {
                         .map(SendMessageResultUtils::getErrorMessageFromSendMessageResult)
                         .filter(Objects::nonNull)
                         .map(error -> entry.getKey().getIdentifier() + ": " + error))
                         .map(SendMessageResultUtils::getErrorMessageFromSendMessageResult)
                         .filter(Objects::nonNull)
                         .map(error -> entry.getKey().getIdentifier() + ": " + error))

-                .collect(Collectors.toList());
+                .toList();

     }
 
     public static List<String> getErrorMessagesFromSendMessageResults(Collection<SendMessageResult> results) {
         return results.stream()
                 .map(SendMessageResultUtils::getErrorMessageFromSendMessageResult)
                 .filter(Objects::nonNull)
     }
 
     public static List<String> getErrorMessagesFromSendMessageResults(Collection<SendMessageResult> results) {
         return results.stream()
                 .map(SendMessageResultUtils::getErrorMessageFromSendMessageResult)
                 .filter(Objects::nonNull)

-                .collect(Collectors.toList());
+                .toList();

     }
 
     public static String getErrorMessageFromSendMessageResult(SendMessageResult result) {
     }
 
     public static String getErrorMessageFromSendMessageResult(SendMessageResult result) {


@@ -110,10 +110,10 @@ public class SendMessageResultUtils {
         return mapResults.entrySet().stream().flatMap(entry -> {
             final var groupId = entry.getKey() instanceof RecipientIdentifier.Group g ? g.groupId() : null;
             return entry.getValue().stream().map(r -> JsonSendMessageResult.from(r, groupId));
         return mapResults.entrySet().stream().flatMap(entry -> {
             final var groupId = entry.getKey() instanceof RecipientIdentifier.Group g ? g.groupId() : null;
             return entry.getValue().stream().map(r -> JsonSendMessageResult.from(r, groupId));

-        }).collect(Collectors.toList());
+        }).toList();

     }
 
     public static List<JsonSendMessageResult> getJsonSendMessageResults(Collection<SendMessageResult> results) {
     }
 
     public static List<JsonSendMessageResult> getJsonSendMessageResults(Collection<SendMessageResult> results) {

-        return results.stream().map(JsonSendMessageResult::from).collect(Collectors.toList());
+        return results.stream().map(JsonSendMessageResult::from).toList();

     }
 }
     }
 }