From 9dea9b99c7ee9acd02ad2e15dfa7a7dd8fc97c80 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 13 May 2015 12:33:54 +0000
Subject: [PATCH] More code simplifications.
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Suffix.java | 24 +++++++++---------------
1 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Suffix.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Suffix.java
index 8f72334..2108691 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Suffix.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Suffix.java
@@ -49,7 +49,6 @@
*/
class Suffix
{
-
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
private final List<DN> includeBranches, excludeBranches;
@@ -58,9 +57,13 @@
private final EntryContainer entryContainer;
private final Object synchObject = new Object();
private static final int PARENT_ID_SET_SIZE = 16 * 1024;
- private final ConcurrentHashMap<DN, CountDownLatch> pendingMap =
- new ConcurrentHashMap<DN, CountDownLatch>();
- private final Set<DN> parentSet = new HashSet<DN>(PARENT_ID_SET_SIZE);
+ private final ConcurrentHashMap<DN, CountDownLatch> pendingMap = new ConcurrentHashMap<>();
+ private final Set<DN> parentSet = new HashSet<>(PARENT_ID_SET_SIZE);
+
+ Suffix(EntryContainer entryContainer)
+ {
+ this(entryContainer, null, null, null);
+ }
/**
* Creates a suffix instance using the specified parameters.
@@ -82,7 +85,7 @@
}
else
{
- this.includeBranches = new ArrayList<DN>(0);
+ this.includeBranches = new ArrayList<>(0);
}
if (excludeBranches != null)
{
@@ -90,7 +93,7 @@
}
else
{
- this.excludeBranches = new ArrayList<DN>(0);
+ this.excludeBranches = new ArrayList<>(0);
}
}
@@ -104,7 +107,6 @@
return entryContainer.getDN2ID();
}
-
/**
* Returns the ID2Entry instance pertaining to a suffix instance.
*
@@ -115,7 +117,6 @@
return entryContainer.getID2Entry();
}
-
/**
* Returns the DN2URI instance pertaining to a suffix instance.
*
@@ -126,7 +127,6 @@
return entryContainer.getDN2URI();
}
-
/**
* Returns the entry container pertaining to a suffix instance.
*
@@ -137,7 +137,6 @@
return entryContainer;
}
-
/**
* Return the Attribute Type - Index map used to map an attribute type to an
* index instance.
@@ -149,7 +148,6 @@
return entryContainer.getAttributeIndexMap();
}
-
/**
* Make sure the specified parent DN is not in the pending map.
*
@@ -164,7 +162,6 @@
}
}
-
/**
* Add specified DN to the pending map.
*
@@ -175,7 +172,6 @@
pendingMap.putIfAbsent(dn, new CountDownLatch(1));
}
-
/**
* Remove the specified DN from the pending map, it may not exist if the
* entries are being migrated so just return.
@@ -191,7 +187,6 @@
}
}
-
/**
* Return {@code true} if the specified dn is contained in the parent set, or
* in the specified DN cache. This would indicate that the parent has already
@@ -242,7 +237,6 @@
return parentThere;
}
-
/**
* Sets the trusted status of all of the indexes and vlvIndexes.
*
--
Gitblit v1.10.0