You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2019/01/23 10:41:20 UTC
[04/13] james-project git commit: MAILBOX-376 Solve various IntelliJ
warnings for RabbitMQEventBus
MAILBOX-376 Solve various IntelliJ warnings for RabbitMQEventBus
Including:
- Visibility that could be more restricted
- Lambdas that could be replaced by method reference
- Some constants duplication
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/406abf33
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/406abf33
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/406abf33
Branch: refs/heads/master
Commit: 406abf33936e5d5c45531c02d283377a94f59071
Parents: 301329f
Author: Benoit Tellier <bt...@linagora.com>
Authored: Wed Jan 23 10:50:23 2019 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Wed Jan 23 10:50:23 2019 +0700
----------------------------------------------------------------------
.../apache/james/mailbox/events/EventBusId.java | 2 -
.../james/mailbox/events/EventDispatcher.java | 2 +-
.../james/mailbox/events/GroupRegistration.java | 5 +-
.../mailbox/events/KeyRegistrationHandler.java | 6 +-
.../mailbox/events/RegistrationQueueName.java | 2 +-
.../james/mailbox/events/EventBusIdTest.java | 2 +-
.../events/MailboxListenerRegistryTest.java | 61 ++++++++------------
7 files changed, 31 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/406abf33/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/EventBusId.java
----------------------------------------------------------------------
diff --git a/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/EventBusId.java b/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/EventBusId.java
index 4e6dc52..eb6c812 100644
--- a/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/EventBusId.java
+++ b/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/EventBusId.java
@@ -26,7 +26,6 @@ import com.google.common.base.MoreObjects;
import com.google.common.base.Preconditions;
public class EventBusId {
-
public static EventBusId of(UUID uuid) {
return new EventBusId(uuid);
}
@@ -70,5 +69,4 @@ public class EventBusId {
.add("id", id)
.toString();
}
-
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/406abf33/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/EventDispatcher.java
----------------------------------------------------------------------
diff --git a/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/EventDispatcher.java b/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/EventDispatcher.java
index 16e979e..01ea139 100644
--- a/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/EventDispatcher.java
+++ b/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/EventDispatcher.java
@@ -45,7 +45,7 @@ import reactor.rabbitmq.ExchangeSpecification;
import reactor.rabbitmq.OutboundMessage;
import reactor.rabbitmq.Sender;
-public class EventDispatcher {
+class EventDispatcher {
private static final Logger LOGGER = LoggerFactory.getLogger(EventDispatcher.class);
private final EventSerializer eventSerializer;
http://git-wip-us.apache.org/repos/asf/james-project/blob/406abf33/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/GroupRegistration.java
----------------------------------------------------------------------
diff --git a/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/GroupRegistration.java b/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/GroupRegistration.java
index 2b44ab8..e5161c1 100644
--- a/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/GroupRegistration.java
+++ b/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/GroupRegistration.java
@@ -53,7 +53,6 @@ import reactor.rabbitmq.ReceiverOptions;
import reactor.rabbitmq.Sender;
class GroupRegistration implements Registration {
-
static class WorkQueueName {
static WorkQueueName of(Group group) {
return new WorkQueueName(group);
@@ -145,7 +144,7 @@ class GroupRegistration implements Registration {
.then();
}
- static int getRetryCount(AcknowledgableDelivery acknowledgableDelivery) {
+ private int getRetryCount(AcknowledgableDelivery acknowledgableDelivery) {
return Optional.ofNullable(acknowledgableDelivery.getProperties().getHeaders())
.flatMap(headers -> Optional.ofNullable(headers.get(RETRY_COUNT)))
.filter(object -> object instanceof Integer)
@@ -156,7 +155,7 @@ class GroupRegistration implements Registration {
@Override
public void unregister() {
receiverSubscriber.filter(subscriber -> !subscriber.isDisposed())
- .ifPresent(subscriber -> subscriber.dispose());
+ .ifPresent(Disposable::dispose);
receiver.close();
unregisterGroup.run();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/406abf33/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/KeyRegistrationHandler.java
----------------------------------------------------------------------
diff --git a/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/KeyRegistrationHandler.java b/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/KeyRegistrationHandler.java
index 864a234..34e5189 100644
--- a/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/KeyRegistrationHandler.java
+++ b/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/KeyRegistrationHandler.java
@@ -48,7 +48,7 @@ import reactor.rabbitmq.Receiver;
import reactor.rabbitmq.ReceiverOptions;
import reactor.rabbitmq.Sender;
-public class KeyRegistrationHandler {
+class KeyRegistrationHandler {
private static final Logger LOGGER = LoggerFactory.getLogger(KeyRegistrationHandler.class);
private final EventBusId eventBusId;
@@ -61,7 +61,7 @@ public class KeyRegistrationHandler {
private final RegistrationBinder registrationBinder;
private Optional<Disposable> receiverSubscriber;
- public KeyRegistrationHandler(EventBusId eventBusId, EventSerializer eventSerializer, Sender sender, Mono<Connection> connectionMono, RoutingKeyConverter routingKeyConverter, MailboxListenerRegistry mailboxListenerRegistry) {
+ KeyRegistrationHandler(EventBusId eventBusId, EventSerializer eventSerializer, Sender sender, Mono<Connection> connectionMono, RoutingKeyConverter routingKeyConverter, MailboxListenerRegistry mailboxListenerRegistry) {
this.eventBusId = eventBusId;
this.eventSerializer = eventSerializer;
this.sender = sender;
@@ -90,7 +90,7 @@ public class KeyRegistrationHandler {
void stop() {
receiverSubscriber.filter(subscriber -> !subscriber.isDisposed())
- .ifPresent(subscriber -> subscriber.dispose());
+ .ifPresent(Disposable::dispose);
receiver.close();
sender.delete(QueueSpecification.queue(registrationQueue.asString())).block();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/406abf33/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/RegistrationQueueName.java
----------------------------------------------------------------------
diff --git a/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/RegistrationQueueName.java b/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/RegistrationQueueName.java
index 06fad8c..0854122 100644
--- a/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/RegistrationQueueName.java
+++ b/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/RegistrationQueueName.java
@@ -23,7 +23,7 @@ import java.util.Optional;
import com.google.common.base.Preconditions;
-public class RegistrationQueueName {
+class RegistrationQueueName {
private Optional<String> queueName;
RegistrationQueueName() {
http://git-wip-us.apache.org/repos/asf/james-project/blob/406abf33/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/EventBusIdTest.java
----------------------------------------------------------------------
diff --git a/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/EventBusIdTest.java b/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/EventBusIdTest.java
index b8718df..7c6920b 100644
--- a/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/EventBusIdTest.java
+++ b/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/EventBusIdTest.java
@@ -27,7 +27,7 @@ import org.junit.jupiter.api.Test;
import nl.jqno.equalsverifier.EqualsVerifier;
-public class EventBusIdTest {
+class EventBusIdTest {
private static final UUID UUID_1 = UUID.fromString("6e0dd59d-660e-4d9b-b22f-0354479f47b4");
http://git-wip-us.apache.org/repos/asf/james-project/blob/406abf33/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/MailboxListenerRegistryTest.java
----------------------------------------------------------------------
diff --git a/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/MailboxListenerRegistryTest.java b/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/MailboxListenerRegistryTest.java
index e86dd6b..ce388f2 100644
--- a/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/MailboxListenerRegistryTest.java
+++ b/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/MailboxListenerRegistryTest.java
@@ -23,7 +23,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import java.time.Duration;
-import java.util.concurrent.ExecutionException;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
@@ -36,6 +35,8 @@ import org.junit.jupiter.api.Test;
class MailboxListenerRegistryTest {
private static final MailboxIdRegistrationKey KEY_1 = new MailboxIdRegistrationKey(TestId.of(42));
+ private static final Runnable NOOP = () -> {
+ };
private MailboxListenerRegistry testee;
@@ -53,8 +54,7 @@ class MailboxListenerRegistryTest {
@Test
void getLocalMailboxListenersShouldReturnPreviouslyAddedListener() {
MailboxListener listener = mock(MailboxListener.class);
- testee.addListener(KEY_1, listener, () -> {
- });
+ testee.addListener(KEY_1, listener, NOOP);
assertThat(testee.getLocalMailboxListeners(KEY_1).collectList().block())
.containsOnly(listener);
@@ -64,10 +64,8 @@ class MailboxListenerRegistryTest {
void getLocalMailboxListenersShouldReturnPreviouslyAddedListeners() {
MailboxListener listener1 = mock(MailboxListener.class);
MailboxListener listener2 = mock(MailboxListener.class);
- testee.addListener(KEY_1, listener1, () -> {
- });
- testee.addListener(KEY_1, listener2, () -> {
- });
+ testee.addListener(KEY_1, listener1, NOOP);
+ testee.addListener(KEY_1, listener2, NOOP);
assertThat(testee.getLocalMailboxListeners(KEY_1).collectList().block())
.containsOnly(listener1, listener2);
@@ -77,13 +75,10 @@ class MailboxListenerRegistryTest {
void getLocalMailboxListenersShouldNotReturnRemovedListeners() {
MailboxListener listener1 = mock(MailboxListener.class);
MailboxListener listener2 = mock(MailboxListener.class);
- testee.addListener(KEY_1, listener1, () -> {
- });
- testee.addListener(KEY_1, listener2, () -> {
- });
+ testee.addListener(KEY_1, listener1, NOOP);
+ testee.addListener(KEY_1, listener2, NOOP);
- testee.removeListener(KEY_1, listener2, () -> {
- });
+ testee.removeListener(KEY_1, listener2, NOOP);
assertThat(testee.getLocalMailboxListeners(KEY_1).collectList().block())
.containsOnly(listener1);
@@ -104,8 +99,7 @@ class MailboxListenerRegistryTest {
MailboxListener listener = mock(MailboxListener.class);
AtomicBoolean atomicBoolean = new AtomicBoolean(false);
- testee.addListener(KEY_1, listener, () -> {
- });
+ testee.addListener(KEY_1, listener, NOOP);
testee.addListener(KEY_1, listener, () -> atomicBoolean.set(true));
assertThat(atomicBoolean).isFalse();
@@ -127,10 +121,8 @@ class MailboxListenerRegistryTest {
MailboxListener listener2 = mock(MailboxListener.class);
AtomicBoolean atomicBoolean = new AtomicBoolean(false);
- testee.addListener(KEY_1, listener, () -> {
- });
- testee.addListener(KEY_1, listener2, () -> {
- });
+ testee.addListener(KEY_1, listener, NOOP);
+ testee.addListener(KEY_1, listener2, NOOP);
testee.removeListener(KEY_1, listener, () -> atomicBoolean.set(true));
assertThat(atomicBoolean).isFalse();
@@ -141,8 +133,7 @@ class MailboxListenerRegistryTest {
MailboxListener listener = mock(MailboxListener.class);
AtomicBoolean atomicBoolean = new AtomicBoolean(false);
- testee.addListener(KEY_1, listener, () -> {
- });
+ testee.addListener(KEY_1, listener, NOOP);
testee.removeListener(KEY_1, listener, () -> atomicBoolean.set(true));
assertThat(atomicBoolean).isTrue();
@@ -157,8 +148,7 @@ class MailboxListenerRegistryTest {
MailboxListener listener = mock(MailboxListener.class);
ConcurrentTestRunner.builder()
- .operation((threadNumber, operationNumber) -> testee.addListener(KEY_1, listener, () -> {
- }))
+ .operation((threadNumber, operationNumber) -> testee.addListener(KEY_1, listener, NOOP))
.threadCount(10)
.operationCount(10)
.runSuccessfullyWithin(ONE_SECOND);
@@ -176,14 +166,11 @@ class MailboxListenerRegistryTest {
ConcurrentTestRunner.builder()
.operation((threadNumber, operationNumber) -> {
if (threadNumber % 3 == 0) {
- testee.addListener(KEY_1, listener1, () -> {
- });
+ testee.addListener(KEY_1, listener1, NOOP);
} else if (threadNumber % 3 == 1) {
- testee.addListener(KEY_1, listener2, () -> {
- });
+ testee.addListener(KEY_1, listener2, NOOP);
} else if (threadNumber % 3 == 2) {
- testee.addListener(KEY_1, listener3, () -> {
- });
+ testee.addListener(KEY_1, listener3, NOOP);
}
})
.threadCount(6)
@@ -198,13 +185,11 @@ class MailboxListenerRegistryTest {
void getLocalMailboxListenersShouldReturnEmptyWhenRemoveAddedListener() throws Exception {
MailboxListener listener1 = mock(MailboxListener.class);
- testee.addListener(KEY_1, listener1, () -> {
- });
+ testee.addListener(KEY_1, listener1, NOOP);
ConcurrentTestRunner.builder()
.operation(((threadNumber, operationNumber) ->
- testee.removeListener(KEY_1, listener1, () -> {
- })))
+ testee.removeListener(KEY_1, listener1, NOOP)))
.threadCount(10)
.operationCount(10)
.runSuccessfullyWithin(ONE_SECOND);
@@ -224,11 +209,11 @@ class MailboxListenerRegistryTest {
ConcurrentTestRunner.builder()
.operation((threadNumber, operationNumber) -> {
if (threadNumber % 3 == 0) {
- testee.addListener(KEY_1, listener1, () -> runIfEmptyCount.incrementAndGet());
+ testee.addListener(KEY_1, listener1, runIfEmptyCount::incrementAndGet);
} else if (threadNumber % 3 == 1) {
- testee.addListener(KEY_1, listener2, () -> runIfEmptyCount.incrementAndGet());
+ testee.addListener(KEY_1, listener2, runIfEmptyCount::incrementAndGet);
} else if (threadNumber % 3 == 2) {
- testee.addListener(KEY_1, listener3, () -> runIfEmptyCount.incrementAndGet());
+ testee.addListener(KEY_1, listener3, runIfEmptyCount::incrementAndGet);
}
})
.threadCount(6)
@@ -243,9 +228,9 @@ class MailboxListenerRegistryTest {
MailboxListener listener1 = mock(MailboxListener.class);
AtomicInteger runIfEmptyCount = new AtomicInteger(0);
- testee.addListener(KEY_1, listener1, () -> {});
+ testee.addListener(KEY_1, listener1, NOOP);
ConcurrentTestRunner.builder()
- .operation(((threadNumber, operationNumber) -> testee.removeListener(KEY_1, listener1, () -> runIfEmptyCount.incrementAndGet())))
+ .operation(((threadNumber, operationNumber) -> testee.removeListener(KEY_1, listener1, runIfEmptyCount::incrementAndGet)))
.threadCount(10)
.operationCount(10)
.runSuccessfullyWithin(ONE_SECOND);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org