From 09484dd10bba52e2bc2c7bc2ce742e4a8e58a8be Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 10 Mar 2016 08:40:41 +0000
Subject: [PATCH] Added MonitorData class to simplify writing monitored objects
---
opendj-server-legacy/src/main/java/org/opends/server/replication/server/MessageHandler.java | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/MessageHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/MessageHandler.java
index e5de9fe..04004d1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/MessageHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/MessageHandler.java
@@ -17,10 +17,7 @@
package org.opends.server.replication.server;
import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.types.Attributes.*;
-import java.util.ArrayList;
-import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
import org.forgerock.i18n.LocalizableMessage;
@@ -28,6 +25,7 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.admin.std.server.MonitorProviderCfg;
+import org.opends.server.api.MonitorData;
import org.opends.server.api.MonitorProvider;
import org.opends.server.core.DirectoryServer;
import org.opends.server.replication.common.CSN;
@@ -35,7 +33,6 @@
import org.opends.server.replication.protocol.UpdateMsg;
import org.opends.server.replication.server.changelog.api.ChangelogException;
import org.opends.server.replication.server.changelog.api.DBCursor;
-import org.opends.server.types.Attribute;
import org.forgerock.opendj.ldap.DN;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
@@ -198,15 +195,14 @@
return inCount;
}
- /** {@inheritDoc} */
@Override
- public List<Attribute> getMonitorData()
+ public MonitorData getMonitorData()
{
- List<Attribute> attributes = new ArrayList<>();
- attributes.add(create("handler", getMonitorInstanceName()));
- attributes.add(create("queue-size", String.valueOf(msgQueue.count())));
- attributes.add(create("queue-size-bytes", String.valueOf(msgQueue.bytesCount())));
- attributes.add(create("following", String.valueOf(following)));
+ MonitorData attributes = new MonitorData(4);
+ attributes.add("handler", getMonitorInstanceName());
+ attributes.add("queue-size", msgQueue.count());
+ attributes.add("queue-size-bytes", msgQueue.bytesCount());
+ attributes.add("following", following);
return attributes;
}
--
Gitblit v1.10.0