From 99f488d48f37cdba0f8e42c5344b2da5708ec720 Mon Sep 17 00:00:00 2001 From: Jon Chambers Date: Tue, 22 Sep 2020 10:33:44 -0400 Subject: [PATCH] Drop websocket connection names (unused for a while now). --- .../AuthenticatedConnectListener.java | 5 +---- .../websocket/WebSocketConnection.java | 5 +---- .../WebSocketConnectionIntegrationTest.java | 3 +-- .../websocket/WebSocketConnectionTest.java | 18 +++++++++--------- 4 files changed, 12 insertions(+), 19 deletions(-) diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/websocket/AuthenticatedConnectListener.java b/service/src/main/java/org/whispersystems/textsecuregcm/websocket/AuthenticatedConnectListener.java index 1331c23eb..25bce383b 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/websocket/AuthenticatedConnectListener.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/websocket/AuthenticatedConnectListener.java @@ -15,8 +15,6 @@ import org.whispersystems.textsecuregcm.util.Constants; import org.whispersystems.websocket.session.WebSocketSessionContext; import org.whispersystems.websocket.setup.WebSocketConnectListener; -import java.security.SecureRandom; - import static com.codahale.metrics.MetricRegistry.name; public class AuthenticatedConnectListener implements WebSocketConnectListener { @@ -47,11 +45,10 @@ public class AuthenticatedConnectListener implements WebSocketConnectListener { if (context.getAuthenticated() != null) { final Account account = context.getAuthenticated(Account.class); final Device device = account.getAuthenticatedDevice().get(); - final String connectionId = String.valueOf(new SecureRandom().nextLong()); final Timer.Context timer = durationTimer.time(); final WebSocketConnection connection = new WebSocketConnection(receiptSender, messagesManager, account, device, - context.getClient(), connectionId); + context.getClient()); openWebsocketCounter.inc(); RedisOperation.unchecked(() -> apnFallbackManager.cancel(account, device)); diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java b/service/src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java index 7d5d021bc..69f1ac3d3 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java @@ -57,7 +57,6 @@ public class WebSocketConnection implements MessageAvailabilityListener, Displac private final Account account; private final Device device; private final WebSocketClient client; - private final String connectionId; private final Semaphore processStoredMessagesSemaphore = new Semaphore(1); private final AtomicReference storedMessageState = new AtomicReference<>(StoredMessageState.PERSISTED_NEW_MESSAGES_AVAILABLE); @@ -73,15 +72,13 @@ public class WebSocketConnection implements MessageAvailabilityListener, Displac MessagesManager messagesManager, Account account, Device device, - WebSocketClient client, - String connectionId) + WebSocketClient client) { this.receiptSender = receiptSender; this.messagesManager = messagesManager; this.account = account; this.device = device; this.client = client; - this.connectionId = connectionId; } public void start() { diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnectionIntegrationTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnectionIntegrationTest.java index 4081101d2..284706cf7 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnectionIntegrationTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnectionIntegrationTest.java @@ -90,8 +90,7 @@ public class WebSocketConnectionIntegrationTest extends AbstractRedisClusterTest new MessagesManager(messages, messagesCache, mock(PushLatencyManager.class)), account, device, - webSocketClient, - "connection-id"); + webSocketClient); } @After diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnectionTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnectionTest.java index d0728d37f..e19c24e89 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnectionTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnectionTest.java @@ -160,7 +160,7 @@ public class WebSocketConnectionTest { }); WebSocketConnection connection = new WebSocketConnection(receiptSender, storedMessages, - account, device, client, "someid"); + account, device, client); connection.start(); verify(client, times(3)).sendRequest(eq("PUT"), eq("/api/v1/message"), ArgumentMatchers.nullable(List.class), ArgumentMatchers.>any()); @@ -185,7 +185,7 @@ public class WebSocketConnectionTest { public void testOnlineSend() throws Exception { final MessagesManager messagesManager = mock(MessagesManager.class); final WebSocketClient client = mock(WebSocketClient.class); - final WebSocketConnection connection = new WebSocketConnection(receiptSender, messagesManager, account, device, client, "concurrency"); + final WebSocketConnection connection = new WebSocketConnection(receiptSender, messagesManager, account, device, client); final UUID accountUuid = UUID.randomUUID(); @@ -313,7 +313,7 @@ public class WebSocketConnectionTest { }); WebSocketConnection connection = new WebSocketConnection(receiptSender, storedMessages, - account, device, client, "onemoreid"); + account, device, client); connection.start(); @@ -336,7 +336,7 @@ public class WebSocketConnectionTest { public void testProcessStoredMessageConcurrency() throws InterruptedException { final MessagesManager messagesManager = mock(MessagesManager.class); final WebSocketClient client = mock(WebSocketClient.class); - final WebSocketConnection connection = new WebSocketConnection(receiptSender, messagesManager, account, device, client, "concurrency"); + final WebSocketConnection connection = new WebSocketConnection(receiptSender, messagesManager, account, device, client); when(account.getNumber()).thenReturn("+18005551234"); when(account.getUuid()).thenReturn(UUID.randomUUID()); @@ -397,7 +397,7 @@ public class WebSocketConnectionTest { public void testProcessStoredMessagesMultiplePages() throws InterruptedException { final MessagesManager messagesManager = mock(MessagesManager.class); final WebSocketClient client = mock(WebSocketClient.class); - final WebSocketConnection connection = new WebSocketConnection(receiptSender, messagesManager, account, device, client, "concurrency"); + final WebSocketConnection connection = new WebSocketConnection(receiptSender, messagesManager, account, device, client); when(account.getNumber()).thenReturn("+18005551234"); when(account.getUuid()).thenReturn(UUID.randomUUID()); @@ -440,7 +440,7 @@ public class WebSocketConnectionTest { public void testProcessStoredMessagesSingleEmptyCall() { final MessagesManager messagesManager = mock(MessagesManager.class); final WebSocketClient client = mock(WebSocketClient.class); - final WebSocketConnection connection = new WebSocketConnection(receiptSender, messagesManager, account, device, client, "concurrency"); + final WebSocketConnection connection = new WebSocketConnection(receiptSender, messagesManager, account, device, client); final UUID accountUuid = UUID.randomUUID(); @@ -469,7 +469,7 @@ public class WebSocketConnectionTest { public void testRequeryOnStateMismatch() throws InterruptedException { final MessagesManager messagesManager = mock(MessagesManager.class); final WebSocketClient client = mock(WebSocketClient.class); - final WebSocketConnection connection = new WebSocketConnection(receiptSender, messagesManager, account, device, client, "concurrency"); + final WebSocketConnection connection = new WebSocketConnection(receiptSender, messagesManager, account, device, client); final UUID accountUuid = UUID.randomUUID(); when(account.getNumber()).thenReturn("+18005551234"); @@ -516,7 +516,7 @@ public class WebSocketConnectionTest { public void testProcessCachedMessagesOnly() { final MessagesManager messagesManager = mock(MessagesManager.class); final WebSocketClient client = mock(WebSocketClient.class); - final WebSocketConnection connection = new WebSocketConnection(receiptSender, messagesManager, account, device, client, "concurrency"); + final WebSocketConnection connection = new WebSocketConnection(receiptSender, messagesManager, account, device, client); final UUID accountUuid = UUID.randomUUID(); @@ -548,7 +548,7 @@ public class WebSocketConnectionTest { public void testProcessDatabaseMessagesAfterPersist() { final MessagesManager messagesManager = mock(MessagesManager.class); final WebSocketClient client = mock(WebSocketClient.class); - final WebSocketConnection connection = new WebSocketConnection(receiptSender, messagesManager, account, device, client, "concurrency"); + final WebSocketConnection connection = new WebSocketConnection(receiptSender, messagesManager, account, device, client); final UUID accountUuid = UUID.randomUUID();