From e28f1e8ceba26df0b27b6b2f5154e705a12210dc Mon Sep 17 00:00:00 2001 From: Jon Chambers Date: Wed, 27 Jul 2022 14:02:59 -0400 Subject: [PATCH] Remove the unused `destination` property from `IncomingMessage` --- .../textsecuregcm/entities/IncomingMessage.java | 2 +- .../textsecuregcm/controllers/MessageControllerTest.java | 2 +- .../textsecuregcm/storage/ChangeNumberManagerTest.java | 8 ++++---- .../tests/controllers/AccountControllerTest.java | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/entities/IncomingMessage.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/IncomingMessage.java index 527332d9a..31abd9764 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/IncomingMessage.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/IncomingMessage.java @@ -4,6 +4,6 @@ */ package org.whispersystems.textsecuregcm.entities; -public record IncomingMessage(int type, String destination, long destinationDeviceId, int destinationRegistrationId, +public record IncomingMessage(int type, long destinationDeviceId, int destinationRegistrationId, String content) { } diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/controllers/MessageControllerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/MessageControllerTest.java index 821d67036..43b550406 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/controllers/MessageControllerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/controllers/MessageControllerTest.java @@ -585,7 +585,7 @@ class MessageControllerTest { .request() .header(OptionalAccess.UNIDENTIFIED, Base64.getEncoder().encodeToString("1234".getBytes())) .put(Entity.entity(new IncomingMessageList( - List.of(new IncomingMessage(1, null, 1L, 1, new String(contentBytes))), false, + List.of(new IncomingMessage(1, 1L, 1, new String(contentBytes))), false, System.currentTimeMillis()), MediaType.APPLICATION_JSON_TYPE)); diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/storage/ChangeNumberManagerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/ChangeNumberManagerTest.java index e9ba152ab..8c0ceb5fc 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/ChangeNumberManagerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/ChangeNumberManagerTest.java @@ -155,8 +155,8 @@ public class ChangeNumberManagerTest { when(account.getDevices()).thenReturn(devices); final List messages = List.of( - new IncomingMessage(1, null, 2, 1, "foo"), - new IncomingMessage(1, null, 3, 1, "foo")); + new IncomingMessage(1, 2, 1, "foo"), + new IncomingMessage(1, 3, 1, "foo")); final Map preKeys = Map.of(1L, new SignedPreKey(), 2L, new SignedPreKey(), 3L, new SignedPreKey()); final Map registrationIds = Map.of(1L, 17, 2L, 47, 3L, 89); @@ -185,8 +185,8 @@ public class ChangeNumberManagerTest { when(account.getDevices()).thenReturn(devices); final List messages = List.of( - new IncomingMessage(1, null, 2, 2, "foo"), - new IncomingMessage(1, null, 3, 3, "foo")); + new IncomingMessage(1, 2, 2, "foo"), + new IncomingMessage(1, 3, 3, "foo")); final Map registrationIds = Map.of(1L, 17, 2L, 47, 3L, 89); diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/AccountControllerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/AccountControllerTest.java index bb39937bf..f3bb64983 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/AccountControllerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/AccountControllerTest.java @@ -1551,8 +1551,8 @@ class AccountControllerTest { new StoredVerificationCode(code, System.currentTimeMillis(), "push", null))); var deviceMessages = List.of( - new IncomingMessage(1, null, 2, 2, "content2"), - new IncomingMessage(1, null, 3, 3, "content3")); + new IncomingMessage(1, 2, 2, "content2"), + new IncomingMessage(1, 3, 3, "content3")); var deviceKeys = Map.of(1L, new SignedPreKey(), 2L, new SignedPreKey(), 3L, new SignedPreKey()); final Map registrationIds = Map.of(1L, 17, 2L, 47, 3L, 89);