From 8cf04843ce434dea1dfbc01a4bd517bad35b5df7 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 23 Jan 2020 13:56:03 +0100 Subject: [PATCH] Migrate Queue stats collection The statistics used to be a public contract, now we expose it through package-protected streamTasks(). Change-Id: Ie8afc8b0cb97ead00450b57bac500e4010300125 Signed-off-by: Robert Varga --- .../AbstractQueuedNotificationManager.java | 12 ------------ .../QueuedNotificationManagerMXBeanImpl.java | 4 +++- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/AbstractQueuedNotificationManager.java b/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/AbstractQueuedNotificationManager.java index 50f78373b0..50cabef0aa 100644 --- a/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/AbstractQueuedNotificationManager.java +++ b/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/AbstractQueuedNotificationManager.java @@ -10,9 +10,7 @@ package org.opendaylight.yangtools.util.concurrent; import static java.util.Objects.requireNonNull; import com.google.common.collect.ImmutableList; -import java.util.List; import java.util.concurrent.Executor; -import java.util.stream.Collectors; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; @@ -71,16 +69,6 @@ abstract class AbstractQueuedNotificationManager extends AbstractBatchi return mxBean; } - /** - * Returns {@link ListenerNotificationQueueStats} instances for each current listener - * notification task in progress. - */ - // FIXME: drop visibility to package-protected - public final List getListenerNotificationQueueStats() { - return streamTasks().map(t -> new ListenerNotificationQueueStats(t.key().toString(), t.size())) - .collect(Collectors.toList()); - } - @Override public final void submitNotification(final L listener, final N notification) { if (listener != null && notification != null) { diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/QueuedNotificationManagerMXBeanImpl.java b/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/QueuedNotificationManagerMXBeanImpl.java index 309a84e609..0ed76fdc69 100644 --- a/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/QueuedNotificationManagerMXBeanImpl.java +++ b/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/QueuedNotificationManagerMXBeanImpl.java @@ -10,6 +10,7 @@ package org.opendaylight.yangtools.util.concurrent; import static java.util.Objects.requireNonNull; import java.util.List; +import java.util.stream.Collectors; final class QueuedNotificationManagerMXBeanImpl implements QueuedNotificationManagerMXBean { private final AbstractQueuedNotificationManager manager; @@ -23,7 +24,8 @@ final class QueuedNotificationManagerMXBeanImpl implements QueuedNotificationMan */ @Override public List getCurrentListenerQueueStats() { - return manager.getListenerNotificationQueueStats(); + return manager.streamTasks().map(t -> new ListenerNotificationQueueStats(t.key().toString(), t.size())) + .collect(Collectors.toList()); } /** -- 2.36.6