MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove the unused `destination` property from `IncomingMessage`

This commit is contained in:
Jon Chambers 2022-07-27 14:02:59 -04:00 committed by Jon Chambers
parent 3d875f1ce5
commit e28f1e8ceb
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
service/src/main/java/org/whispersystems/textsecuregcm/entities/IncomingMessage.java
View File

@ -4,6 +4,6 @@
*/ */
package org.whispersystems.textsecuregcm.entities; 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) { String content) {
} }

2
service/src/test/java/org/whispersystems/textsecuregcm/controllers/MessageControllerTest.java
View File

@ -585,7 +585,7 @@ class MessageControllerTest {
.request() .request()
.header(OptionalAccess.UNIDENTIFIED, Base64.getEncoder().encodeToString("1234".getBytes())) .header(OptionalAccess.UNIDENTIFIED, Base64.getEncoder().encodeToString("1234".getBytes()))
.put(Entity.entity(new IncomingMessageList( .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()), System.currentTimeMillis()),
MediaType.APPLICATION_JSON_TYPE)); MediaType.APPLICATION_JSON_TYPE));

8
service/src/test/java/org/whispersystems/textsecuregcm/storage/ChangeNumberManagerTest.java
View File

@ -155,8 +155,8 @@ public class ChangeNumberManagerTest {
when(account.getDevices()).thenReturn(devices); when(account.getDevices()).thenReturn(devices);
final List<IncomingMessage> messages = List.of( final List<IncomingMessage> messages = List.of(
new IncomingMessage(1, null, 2, 1, "foo"), new IncomingMessage(1, 2, 1, "foo"),
new IncomingMessage(1, null, 3, 1, "foo")); new IncomingMessage(1, 3, 1, "foo"));
final Map<Long, SignedPreKey> preKeys = Map.of(1L, new SignedPreKey(), 2L, new SignedPreKey(), 3L, new SignedPreKey()); final Map<Long, SignedPreKey> preKeys = Map.of(1L, new SignedPreKey(), 2L, new SignedPreKey(), 3L, new SignedPreKey());
final Map<Long, Integer> registrationIds = Map.of(1L, 17, 2L, 47, 3L, 89); final Map<Long, Integer> registrationIds = Map.of(1L, 17, 2L, 47, 3L, 89);
@ -185,8 +185,8 @@ public class ChangeNumberManagerTest {
when(account.getDevices()).thenReturn(devices); when(account.getDevices()).thenReturn(devices);
final List<IncomingMessage> messages = List.of( final List<IncomingMessage> messages = List.of(
new IncomingMessage(1, null, 2, 2, "foo"), new IncomingMessage(1, 2, 2, "foo"),
new IncomingMessage(1, null, 3, 3, "foo")); new IncomingMessage(1, 3, 3, "foo"));
final Map<Long, Integer> registrationIds = Map.of(1L, 17, 2L, 47, 3L, 89); final Map<Long, Integer> registrationIds = Map.of(1L, 17, 2L, 47, 3L, 89);

4
service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/AccountControllerTest.java
View File

@ -1551,8 +1551,8 @@ class AccountControllerTest {
new StoredVerificationCode(code, System.currentTimeMillis(), "push", null))); new StoredVerificationCode(code, System.currentTimeMillis(), "push", null)));
var deviceMessages = List.of( var deviceMessages = List.of(
new IncomingMessage(1, null, 2, 2, "content2"), new IncomingMessage(1, 2, 2, "content2"),
new IncomingMessage(1, null, 3, 3, "content3")); new IncomingMessage(1, 3, 3, "content3"));
var deviceKeys = Map.of(1L, new SignedPreKey(), 2L, new SignedPreKey(), 3L, new SignedPreKey()); var deviceKeys = Map.of(1L, new SignedPreKey(), 2L, new SignedPreKey(), 3L, new SignedPreKey());
final Map<Long, Integer> registrationIds = Map.of(1L, 17, 2L, 47, 3L, 89); final Map<Long, Integer> registrationIds = Map.of(1L, 17, 2L, 47, 3L, 89);