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/extensions/DiskSpaceMonitor.java | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DiskSpaceMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DiskSpaceMonitor.java
index 9b8a0e8..50ccd56 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DiskSpaceMonitor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DiskSpaceMonitor.java
@@ -17,7 +17,6 @@
package org.opends.server.extensions;
import static org.opends.messages.CoreMessages.*;
-import static org.opends.server.core.DirectoryServer.*;
import static org.opends.server.util.CollectionUtils.*;
import static org.opends.server.util.ServerConstants.*;
@@ -45,6 +44,7 @@
import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.api.AlertGenerator;
import org.opends.server.api.DiskSpaceMonitorHandler;
+import org.opends.server.api.MonitorData;
import org.opends.server.api.MonitorProvider;
import org.opends.server.api.ServerShutdownListener;
import org.opends.server.core.DirectoryServer;
@@ -96,13 +96,13 @@
throws ConfigException, InitializationException {
}
- /** {@inheritDoc} */
@Override
- public List<Attribute> getMonitorData() {
- final List<Attribute> monitorAttrs = new ArrayList<>();
- monitorAttrs.add(attr("disk-dir", getDefaultStringSyntax(), directory.getPath()));
- monitorAttrs.add(attr("disk-free", getDefaultIntegerSyntax(), getFreeSpace()));
- monitorAttrs.add(attr("disk-state", getDefaultStringSyntax(), getState()));
+ public MonitorData getMonitorData()
+ {
+ final MonitorData monitorAttrs = new MonitorData(3);
+ monitorAttrs.add("disk-dir", directory.getPath());
+ monitorAttrs.add("disk-free", getFreeSpace());
+ monitorAttrs.add("disk-state", getState());
return monitorAttrs;
}
@@ -353,19 +353,17 @@
// Not used...
}
- /** {@inheritDoc} */
@Override
public String getMonitorInstanceName() {
return INSTANCENAME;
}
- /** {@inheritDoc} */
@Override
- public List<Attribute> getMonitorData() {
- return new ArrayList<>();
+ public MonitorData getMonitorData()
+ {
+ return new MonitorData(0);
}
- /** {@inheritDoc} */
@Override
public void run()
{
--
Gitblit v1.10.0