diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesCache.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesCache.java index a5420f5b6..2f891016d 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesCache.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesCache.java @@ -87,8 +87,7 @@ public class MessagesCache extends RedisClusterPubSubAdapter imp private static final String REMOVE_TIMER_NAME = name(MessagesCache.class, "remove"); private static final String REMOVE_METHOD_TAG = "method"; - private static final String REMOVE_METHOD_ID = "id"; - private static final String REMOVE_METHOD_SENDER = "sender"; + private static final String REMOVE_METHOD_SENDER = "sender"; private static final String REMOVE_METHOD_UUID = "uuid"; private static final Logger logger = LoggerFactory.getLogger(MessagesCache.class); @@ -164,25 +163,7 @@ public class MessagesCache extends RedisClusterPubSubAdapter imp }); } - public Optional remove(final UUID destinationUuid, final long destinationDevice, final long id) { - try { - final byte[] serialized = (byte[])Metrics.timer(REMOVE_TIMER_NAME, REMOVE_METHOD_TAG, REMOVE_METHOD_ID).record(() -> - removeByIdScript.executeBinary(List.of(getMessageQueueKey(destinationUuid, destinationDevice), - getMessageQueueMetadataKey(destinationUuid, destinationDevice), - getQueueIndexKey(destinationUuid, destinationDevice)), - List.of(String.valueOf(id).getBytes(StandardCharsets.UTF_8)))); - - if (serialized != null) { - return Optional.of(constructEntityFromEnvelope(id, MessageProtos.Envelope.parseFrom(serialized))); - } - } catch (final InvalidProtocolBufferException e) { - logger.warn("Failed to parse envelope", e); - } - - return Optional.empty(); - } - - public Optional remove(final UUID destinationUuid, final long destinationDevice, final String sender, final long timestamp) { + public Optional remove(final UUID destinationUuid, final long destinationDevice, final String sender, final long timestamp) { try { final byte[] serialized = (byte[])Metrics.timer(REMOVE_TIMER_NAME, REMOVE_METHOD_TAG, REMOVE_METHOD_SENDER).record(() -> removeBySenderScript.executeBinary(List.of(getMessageQueueKey(destinationUuid, destinationDevice), diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/storage/MessagesCacheTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/MessagesCacheTest.java index 702873d5c..66345ac75 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/MessagesCacheTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/MessagesCacheTest.java @@ -87,20 +87,6 @@ public class MessagesCacheTest extends AbstractRedisClusterTest { assertEquals(firstId, secondId); } - @Test - @Parameters({"true", "false"}) - public void testRemoveById(final boolean sealedSender) { - final UUID messageGuid = UUID.randomUUID(); - final MessageProtos.Envelope message = generateRandomMessage(messageGuid, sealedSender); - - final long messageId = messagesCache.insert(messageGuid, DESTINATION_UUID, DESTINATION_DEVICE_ID, message); - final Optional maybeRemovedMessage = messagesCache.remove(DESTINATION_UUID, DESTINATION_DEVICE_ID, messageId); - - assertTrue(maybeRemovedMessage.isPresent()); - assertEquals(MessagesCache.constructEntityFromEnvelope(messageId, message), maybeRemovedMessage.get()); - assertEquals(Optional.empty(), messagesCache.remove(DESTINATION_UUID, DESTINATION_DEVICE_ID, messageId)); - } - @Test public void testRemoveBySender() { final UUID messageGuid = UUID.randomUUID();