Refactor Context to create helpers lazily

[signal-cli] / lib / src / main / java / org / asamk / signal / manager / jobs / RetrieveStickerPackJob.java

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 20042451e5e76a2d8fb7f09c104c93db57bccc77..0e45eecb8ed9f3b7842fc3df53eeecf63f5aa45a 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
@@ -1,6 +1,7 @@
 package org.asamk.signal.manager.jobs;
 
 import org.asamk.signal.manager.JsonStickerPack;
+import org.asamk.signal.manager.helper.Context;
 import org.asamk.signal.manager.storage.stickers.StickerPackId;
 import org.asamk.signal.manager.util.IOUtils;
 import org.slf4j.Logger;
@@ -10,7 +11,6 @@ import org.whispersystems.signalservice.internal.util.Hex;
 
 import java.io.IOException;
 import java.util.HashSet;
-import java.util.stream.Collectors;
 
 public class RetrieveStickerPackJob implements Job {
 
@@ -32,7 +32,9 @@ public class RetrieveStickerPackJob implements Job {
         }
         logger.debug("Retrieving sticker pack {}.", Hex.toStringCondensed(packId.serialize()));
         try {
-            final var manifest = context.getMessageReceiver().retrieveStickerManifest(packId.serialize(), packKey);
+            final var manifest = context.getDependencies()
+                    .getMessageReceiver()
+                    .retrieveStickerManifest(packId.serialize(), packKey);
 
             final var stickerIds = new HashSet<Integer>();
             if (manifest.getCover().isPresent()) {
@@ -43,7 +45,9 @@ public class RetrieveStickerPackJob implements Job {
             }
 
             for (var id : stickerIds) {
-                final var inputStream = context.getMessageReceiver().retrieveSticker(packId.serialize(), packKey, id);
+                final var inputStream = context.getDependencies()
+                        .getMessageReceiver()
+                        .retrieveSticker(packId.serialize(), packKey, id);
                 context.getStickerPackStore().storeSticker(packId, id, o -> IOUtils.copyStream(inputStream, o));
             }
 
@@ -59,7 +63,7 @@ public class RetrieveStickerPackJob implements Job {
                             .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 {}: {}",