Drop websocket connection names (unused for a while now).
This commit is contained in:
parent
05929871c9
commit
99f488d48f
|
@ -15,8 +15,6 @@ import org.whispersystems.textsecuregcm.util.Constants;
|
||||||
import org.whispersystems.websocket.session.WebSocketSessionContext;
|
import org.whispersystems.websocket.session.WebSocketSessionContext;
|
||||||
import org.whispersystems.websocket.setup.WebSocketConnectListener;
|
import org.whispersystems.websocket.setup.WebSocketConnectListener;
|
||||||
|
|
||||||
import java.security.SecureRandom;
|
|
||||||
|
|
||||||
import static com.codahale.metrics.MetricRegistry.name;
|
import static com.codahale.metrics.MetricRegistry.name;
|
||||||
|
|
||||||
public class AuthenticatedConnectListener implements WebSocketConnectListener {
|
public class AuthenticatedConnectListener implements WebSocketConnectListener {
|
||||||
|
@ -47,11 +45,10 @@ public class AuthenticatedConnectListener implements WebSocketConnectListener {
|
||||||
if (context.getAuthenticated() != null) {
|
if (context.getAuthenticated() != null) {
|
||||||
final Account account = context.getAuthenticated(Account.class);
|
final Account account = context.getAuthenticated(Account.class);
|
||||||
final Device device = account.getAuthenticatedDevice().get();
|
final Device device = account.getAuthenticatedDevice().get();
|
||||||
final String connectionId = String.valueOf(new SecureRandom().nextLong());
|
|
||||||
final Timer.Context timer = durationTimer.time();
|
final Timer.Context timer = durationTimer.time();
|
||||||
final WebSocketConnection connection = new WebSocketConnection(receiptSender,
|
final WebSocketConnection connection = new WebSocketConnection(receiptSender,
|
||||||
messagesManager, account, device,
|
messagesManager, account, device,
|
||||||
context.getClient(), connectionId);
|
context.getClient());
|
||||||
|
|
||||||
openWebsocketCounter.inc();
|
openWebsocketCounter.inc();
|
||||||
RedisOperation.unchecked(() -> apnFallbackManager.cancel(account, device));
|
RedisOperation.unchecked(() -> apnFallbackManager.cancel(account, device));
|
||||||
|
|
|
@ -57,7 +57,6 @@ public class WebSocketConnection implements MessageAvailabilityListener, Displac
|
||||||
private final Account account;
|
private final Account account;
|
||||||
private final Device device;
|
private final Device device;
|
||||||
private final WebSocketClient client;
|
private final WebSocketClient client;
|
||||||
private final String connectionId;
|
|
||||||
|
|
||||||
private final Semaphore processStoredMessagesSemaphore = new Semaphore(1);
|
private final Semaphore processStoredMessagesSemaphore = new Semaphore(1);
|
||||||
private final AtomicReference<StoredMessageState> storedMessageState = new AtomicReference<>(StoredMessageState.PERSISTED_NEW_MESSAGES_AVAILABLE);
|
private final AtomicReference<StoredMessageState> storedMessageState = new AtomicReference<>(StoredMessageState.PERSISTED_NEW_MESSAGES_AVAILABLE);
|
||||||
|
@ -73,15 +72,13 @@ public class WebSocketConnection implements MessageAvailabilityListener, Displac
|
||||||
MessagesManager messagesManager,
|
MessagesManager messagesManager,
|
||||||
Account account,
|
Account account,
|
||||||
Device device,
|
Device device,
|
||||||
WebSocketClient client,
|
WebSocketClient client)
|
||||||
String connectionId)
|
|
||||||
{
|
{
|
||||||
this.receiptSender = receiptSender;
|
this.receiptSender = receiptSender;
|
||||||
this.messagesManager = messagesManager;
|
this.messagesManager = messagesManager;
|
||||||
this.account = account;
|
this.account = account;
|
||||||
this.device = device;
|
this.device = device;
|
||||||
this.client = client;
|
this.client = client;
|
||||||
this.connectionId = connectionId;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void start() {
|
public void start() {
|
||||||
|
|
|
@ -90,8 +90,7 @@ public class WebSocketConnectionIntegrationTest extends AbstractRedisClusterTest
|
||||||
new MessagesManager(messages, messagesCache, mock(PushLatencyManager.class)),
|
new MessagesManager(messages, messagesCache, mock(PushLatencyManager.class)),
|
||||||
account,
|
account,
|
||||||
device,
|
device,
|
||||||
webSocketClient,
|
webSocketClient);
|
||||||
"connection-id");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@After
|
@After
|
||||||
|
|
|
@ -160,7 +160,7 @@ public class WebSocketConnectionTest {
|
||||||
});
|
});
|
||||||
|
|
||||||
WebSocketConnection connection = new WebSocketConnection(receiptSender, storedMessages,
|
WebSocketConnection connection = new WebSocketConnection(receiptSender, storedMessages,
|
||||||
account, device, client, "someid");
|
account, device, client);
|
||||||
|
|
||||||
connection.start();
|
connection.start();
|
||||||
verify(client, times(3)).sendRequest(eq("PUT"), eq("/api/v1/message"), ArgumentMatchers.nullable(List.class), ArgumentMatchers.<Optional<byte[]>>any());
|
verify(client, times(3)).sendRequest(eq("PUT"), eq("/api/v1/message"), ArgumentMatchers.nullable(List.class), ArgumentMatchers.<Optional<byte[]>>any());
|
||||||
|
@ -185,7 +185,7 @@ public class WebSocketConnectionTest {
|
||||||
public void testOnlineSend() throws Exception {
|
public void testOnlineSend() throws Exception {
|
||||||
final MessagesManager messagesManager = mock(MessagesManager.class);
|
final MessagesManager messagesManager = mock(MessagesManager.class);
|
||||||
final WebSocketClient client = mock(WebSocketClient.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();
|
final UUID accountUuid = UUID.randomUUID();
|
||||||
|
|
||||||
|
@ -313,7 +313,7 @@ public class WebSocketConnectionTest {
|
||||||
});
|
});
|
||||||
|
|
||||||
WebSocketConnection connection = new WebSocketConnection(receiptSender, storedMessages,
|
WebSocketConnection connection = new WebSocketConnection(receiptSender, storedMessages,
|
||||||
account, device, client, "onemoreid");
|
account, device, client);
|
||||||
|
|
||||||
connection.start();
|
connection.start();
|
||||||
|
|
||||||
|
@ -336,7 +336,7 @@ public class WebSocketConnectionTest {
|
||||||
public void testProcessStoredMessageConcurrency() throws InterruptedException {
|
public void testProcessStoredMessageConcurrency() throws InterruptedException {
|
||||||
final MessagesManager messagesManager = mock(MessagesManager.class);
|
final MessagesManager messagesManager = mock(MessagesManager.class);
|
||||||
final WebSocketClient client = mock(WebSocketClient.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.getNumber()).thenReturn("+18005551234");
|
||||||
when(account.getUuid()).thenReturn(UUID.randomUUID());
|
when(account.getUuid()).thenReturn(UUID.randomUUID());
|
||||||
|
@ -397,7 +397,7 @@ public class WebSocketConnectionTest {
|
||||||
public void testProcessStoredMessagesMultiplePages() throws InterruptedException {
|
public void testProcessStoredMessagesMultiplePages() throws InterruptedException {
|
||||||
final MessagesManager messagesManager = mock(MessagesManager.class);
|
final MessagesManager messagesManager = mock(MessagesManager.class);
|
||||||
final WebSocketClient client = mock(WebSocketClient.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.getNumber()).thenReturn("+18005551234");
|
||||||
when(account.getUuid()).thenReturn(UUID.randomUUID());
|
when(account.getUuid()).thenReturn(UUID.randomUUID());
|
||||||
|
@ -440,7 +440,7 @@ public class WebSocketConnectionTest {
|
||||||
public void testProcessStoredMessagesSingleEmptyCall() {
|
public void testProcessStoredMessagesSingleEmptyCall() {
|
||||||
final MessagesManager messagesManager = mock(MessagesManager.class);
|
final MessagesManager messagesManager = mock(MessagesManager.class);
|
||||||
final WebSocketClient client = mock(WebSocketClient.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();
|
final UUID accountUuid = UUID.randomUUID();
|
||||||
|
|
||||||
|
@ -469,7 +469,7 @@ public class WebSocketConnectionTest {
|
||||||
public void testRequeryOnStateMismatch() throws InterruptedException {
|
public void testRequeryOnStateMismatch() throws InterruptedException {
|
||||||
final MessagesManager messagesManager = mock(MessagesManager.class);
|
final MessagesManager messagesManager = mock(MessagesManager.class);
|
||||||
final WebSocketClient client = mock(WebSocketClient.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();
|
final UUID accountUuid = UUID.randomUUID();
|
||||||
|
|
||||||
when(account.getNumber()).thenReturn("+18005551234");
|
when(account.getNumber()).thenReturn("+18005551234");
|
||||||
|
@ -516,7 +516,7 @@ public class WebSocketConnectionTest {
|
||||||
public void testProcessCachedMessagesOnly() {
|
public void testProcessCachedMessagesOnly() {
|
||||||
final MessagesManager messagesManager = mock(MessagesManager.class);
|
final MessagesManager messagesManager = mock(MessagesManager.class);
|
||||||
final WebSocketClient client = mock(WebSocketClient.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();
|
final UUID accountUuid = UUID.randomUUID();
|
||||||
|
|
||||||
|
@ -548,7 +548,7 @@ public class WebSocketConnectionTest {
|
||||||
public void testProcessDatabaseMessagesAfterPersist() {
|
public void testProcessDatabaseMessagesAfterPersist() {
|
||||||
final MessagesManager messagesManager = mock(MessagesManager.class);
|
final MessagesManager messagesManager = mock(MessagesManager.class);
|
||||||
final WebSocketClient client = mock(WebSocketClient.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();
|
final UUID accountUuid = UUID.randomUUID();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue