From 827a3af4193583c8d67691f53aa76b7cf3cc5679 Mon Sep 17 00:00:00 2001
From: Ehren Kret <ehren@signal.org>
Date: Tue, 8 Jun 2021 17:22:45 -0500
Subject: [PATCH] Code cleanup
---
.../dispatch/DispatchChannel.java | 6 +--
.../dispatch/DispatchManager.java | 44 +++++--------------
.../io/RedisPubSubConnectionFactory.java | 2 +-
3 files changed, 16 insertions(+), 36 deletions(-)
diff --git a/redis-dispatch/src/main/java/org/whispersystems/dispatch/DispatchChannel.java b/redis-dispatch/src/main/java/org/whispersystems/dispatch/DispatchChannel.java
index 5458693da..761c59619 100644
--- a/redis-dispatch/src/main/java/org/whispersystems/dispatch/DispatchChannel.java
+++ b/redis-dispatch/src/main/java/org/whispersystems/dispatch/DispatchChannel.java
@@ -5,7 +5,7 @@
package org.whispersystems.dispatch;
public interface DispatchChannel {
- public void onDispatchMessage(String channel, byte[] message);
- public void onDispatchSubscribed(String channel);
- public void onDispatchUnsubscribed(String channel);
+ void onDispatchMessage(String channel, byte[] message);
+ void onDispatchSubscribed(String channel);
+ void onDispatchUnsubscribed(String channel);
}
diff --git a/redis-dispatch/src/main/java/org/whispersystems/dispatch/DispatchManager.java b/redis-dispatch/src/main/java/org/whispersystems/dispatch/DispatchManager.java
index d568e45b7..2dbf4de2a 100644
--- a/redis-dispatch/src/main/java/org/whispersystems/dispatch/DispatchManager.java
+++ b/redis-dispatch/src/main/java/org/whispersystems/dispatch/DispatchManager.java
@@ -59,9 +59,7 @@ public class DispatchManager extends Thread {
logger.warn("Subscription error", e);
}
- if (previous.isPresent()) {
- dispatchUnsubscription(name, previous.get());
- }
+ previous.ifPresent(channel -> dispatchUnsubscription(name, channel));
}
public synchronized void unsubscribe(String name, DispatchChannel channel) {
@@ -132,46 +130,28 @@ public class DispatchManager extends Thread {
}
private void resubscribeAll() {
- new Thread() {
- @Override
- public void run() {
- synchronized (DispatchManager.this) {
- try {
- for (String name : subscriptions.keySet()) {
- pubSubConnection.subscribe(name);
- }
- } catch (IOException e) {
- logger.warn("***** RESUBSCRIPTION ERROR *****", e);
+ new Thread(() -> {
+ synchronized (DispatchManager.this) {
+ try {
+ for (String name : subscriptions.keySet()) {
+ pubSubConnection.subscribe(name);
}
+ } catch (IOException e) {
+ logger.warn("***** RESUBSCRIPTION ERROR *****", e);
}
}
- }.start();
+ }).start();
}
private void dispatchMessage(final String name, final DispatchChannel channel, final byte[] message) {
- executor.execute(new Runnable() {
- @Override
- public void run() {
- channel.onDispatchMessage(name, message);
- }
- });
+ executor.execute(() -> channel.onDispatchMessage(name, message));
}
private void dispatchSubscription(final String name, final DispatchChannel channel) {
- executor.execute(new Runnable() {
- @Override
- public void run() {
- channel.onDispatchSubscribed(name);
- }
- });
+ executor.execute(() -> channel.onDispatchSubscribed(name));
}
private void dispatchUnsubscription(final String name, final DispatchChannel channel) {
- executor.execute(new Runnable() {
- @Override
- public void run() {
- channel.onDispatchUnsubscribed(name);
- }
- });
+ executor.execute(() -> channel.onDispatchUnsubscribed(name));
}
}
diff --git a/redis-dispatch/src/main/java/org/whispersystems/dispatch/io/RedisPubSubConnectionFactory.java b/redis-dispatch/src/main/java/org/whispersystems/dispatch/io/RedisPubSubConnectionFactory.java
index ad84d6103..898f9f6da 100644
--- a/redis-dispatch/src/main/java/org/whispersystems/dispatch/io/RedisPubSubConnectionFactory.java
+++ b/redis-dispatch/src/main/java/org/whispersystems/dispatch/io/RedisPubSubConnectionFactory.java
@@ -8,6 +8,6 @@ import org.whispersystems.dispatch.redis.PubSubConnection;
public interface RedisPubSubConnectionFactory {
- public PubSubConnection connect();
+ PubSubConnection connect();
}
--
GitLab