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/test/java/org/opends/server/replication/StressTest.java | 52 +++++++++++++++++++++++-----------------------------
1 files changed, 23 insertions(+), 29 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/StressTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/StressTest.java
index 4f41050..90f7960 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/StressTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/StressTest.java
@@ -30,6 +30,7 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.TestCaseUtils;
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.AddOperation;
import org.opends.server.core.DirectoryServer;
@@ -38,34 +39,29 @@
import org.opends.server.replication.protocol.AddMsg;
import org.opends.server.replication.protocol.ReplicationMsg;
import org.opends.server.replication.service.ReplicationBroker;
-import org.opends.server.types.*;
+import org.opends.server.types.Entry;
+import org.opends.server.types.InitializationException;
+import org.opends.server.types.Modification;
+import org.opends.server.types.Operation;
+import org.opends.server.types.OperationType;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-/**
- * Stress test for the synchronization code using the ReplicationBroker API.
- */
+/** Stress test for the synchronization code using the ReplicationBroker API. */
@SuppressWarnings("javadoc")
public class StressTest extends ReplicationTestCase
{
-
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
- private static final String REPLICATION_STRESS_TEST =
- "Replication Stress Test";
+ private static final String REPLICATION_STRESS_TEST = "Replication Stress Test";
private BrokerReader reader;
-
/** A "person" entry. */
private Entry personEntry;
-
private int replServerPort;
- /**
- * Stress test from LDAP server to client using the ReplicationBroker API.
- */
+ /** Stress test from LDAP server to client using the ReplicationBroker API. */
@Test(enabled=false, groups="slow")
public void fromServertoBroker() throws Exception
{
@@ -210,7 +206,6 @@
this.count = count;
}
- /** {@inheritDoc} */
@Override
public void run()
{
@@ -236,17 +231,14 @@
{
private ReplicationBroker broker;
private int count;
- private Boolean finished = false;
+ private boolean finished;
- /**
- * Creates a new Stress Test Reader.
- */
+ /** Creates a new Stress Test Reader. */
public BrokerReader(ReplicationBroker broker)
{
this.broker = broker;
}
- /** {@inheritDoc} */
@Override
public void run()
{
@@ -307,13 +299,19 @@
private class Monitor extends MonitorProvider<MonitorProviderCfg>
{
@Override
- public List<Attribute> getMonitorData()
+ public MonitorData getMonitorData()
{
- String value = reader != null ? String.valueOf(reader.getCurrentCount()) : "not yet started";
- List<Attribute> list = new LinkedList<>();
- list.add(Attributes.create("received-messages", value));
- list.add(Attributes.create("base-dn", "ou=People," + TEST_ROOT_DN_STRING));
- return list;
+ MonitorData attrs = new MonitorData(2);
+ if (reader != null)
+ {
+ attrs.add("received-messages", reader.getCurrentCount());
+ }
+ else
+ {
+ attrs.add("received-messages", "not yet started");
+ }
+ attrs.add("base-dn", "ou=People," + TEST_ROOT_DN_STRING);
+ return attrs;
}
@Override
@@ -327,10 +325,6 @@
throws ConfigException, InitializationException
{
// nothing to do
-
}
-
-
-
}
}
--
Gitblit v1.10.0