From 6b41484b811fdb343e6dcccb8dddfa223800a138 Mon Sep 17 00:00:00 2001
From: Yannick Lecaillez <yannick.lecaillez@forgerock.com>
Date: Tue, 19 May 2015 13:32:55 +0000
Subject: [PATCH] Minor cleanup (use diamond & interface)
---
opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryCacheCommon.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryCacheCommon.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryCacheCommon.java
index c121663..a96250a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryCacheCommon.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryCacheCommon.java
@@ -33,6 +33,7 @@
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import java.util.SortedSet;
import org.forgerock.i18n.LocalizableMessage;
@@ -92,7 +93,7 @@
private List<LocalizableMessage> _unacceptableReasons;
/** Error messages. Used when _configPhase is PHASE_APPLY. */
- private ArrayList<LocalizableMessage> _errorMessages;
+ private List<LocalizableMessage> _errorMessages;
/** Result code. Used when _configPhase is PHASE_APPLY. */
private ResultCode _resultCode;
@@ -122,7 +123,7 @@
public ConfigErrorHandler (
EntryCacheCommon.ConfigPhase configPhase,
List<LocalizableMessage> unacceptableReasons,
- ArrayList<LocalizableMessage> errorMessages
+ List<LocalizableMessage> errorMessages
)
{
_configPhase = configPhase;
@@ -255,7 +256,7 @@
*
* @return the list of error messages
*/
- public ArrayList<LocalizableMessage> getErrorMessages()
+ public List<LocalizableMessage> getErrorMessages()
{
return _errorMessages;
}
@@ -296,12 +297,12 @@
*
* @return the set of search filters
*/
- public static HashSet<SearchFilter> getFilters(SortedSet<String> filters,
+ public static Set<SearchFilter> getFilters(SortedSet<String> filters,
LocalizableMessageDescriptor.Arg3<Object, Object, Object> decodeErrorMsg,
ConfigErrorHandler errorHandler, DN configEntryDN)
{
// Returned value
- HashSet<SearchFilter> searchFilters = new HashSet<SearchFilter>();
+ Set<SearchFilter> searchFilters = new HashSet<>();
// Convert the string filters to search filters.
if ((filters != null) && (! filters.isEmpty()))
@@ -344,7 +345,7 @@
public static ConfigErrorHandler getConfigErrorHandler (
EntryCacheCommon.ConfigPhase configPhase,
List<LocalizableMessage> unacceptableReasons,
- ArrayList<LocalizableMessage> errorMessages
+ List<LocalizableMessage> errorMessages
)
{
EntryCacheCommon ec = new EntryCacheCommon();
@@ -369,7 +370,7 @@
*
* @return A set of generic attributes containing monitor data.
*/
- public static ArrayList<Attribute> getGenericMonitorData(
+ public static List<Attribute> getGenericMonitorData(
Long cacheHits,
Long cacheMisses,
Long cacheSize,
@@ -377,7 +378,7 @@
Long cacheCount,
Long maxCacheCount)
{
- ArrayList<Attribute> attrs = new ArrayList<Attribute>();
+ List<Attribute> attrs = new ArrayList<>();
if (cacheHits != null)
{
--
Gitblit v1.10.0