From 36d769dbcacdcf7e3952430ea2b178ed32a501b3 Mon Sep 17 00:00:00 2001
From: Yannick Lecaillez <yannick.lecaillez@forgerock.com>
Date: Tue, 19 May 2015 13:36:58 +0000
Subject: [PATCH] Minor cleanup (use diamond & interface)
---
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/monitors/EntryCacheMonitorProvider.java | 11 +++++------
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/api/EntryCache.java | 4 ++--
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/api/EntryCache.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/api/EntryCache.java
index f36e67b..122f63c 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/api/EntryCache.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/api/EntryCache.java
@@ -391,11 +391,11 @@
* be returned to the client if the corresponding monitor entry is
* requested.
*
- * @return A set of attributes containing monitor data that should
+ * @return A list of attributes containing monitor data that should
* be returned to the client if the corresponding monitor
* entry is requested.
*/
- public abstract ArrayList<Attribute> getMonitorData();
+ public abstract List<Attribute> getMonitorData();
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/monitors/EntryCacheMonitorProvider.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/monitors/EntryCacheMonitorProvider.java
index d4a4728..4958e10 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/monitors/EntryCacheMonitorProvider.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/monitors/EntryCacheMonitorProvider.java
@@ -27,6 +27,8 @@
package org.opends.server.monitors;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
@@ -124,17 +126,14 @@
/** {@inheritDoc} */
@Override
- public ArrayList<Attribute> getMonitorData()
+ public List<Attribute> getMonitorData()
{
- ArrayList<Attribute> attrs = new ArrayList<Attribute>();
-
if ((entryCache != null) &&
(monitorConfiguration != null) &&
(monitorConfiguration.isEnabled())) {
// Get monitor data from the cache.
- attrs = entryCache.getMonitorData();
+ return entryCache.getMonitorData();
}
-
- return attrs;
+ return Collections.emptyList();
}
}
--
Gitblit v1.10.0