From a73edf7ff50dd7cf2a01ae96279e8f872024633c Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 25 Feb 2016 16:29:49 +0000
Subject: [PATCH] Prep work for OPENDJ-1342: align APIs for RNs and RDNs
---
opendj-server-legacy/src/main/java/org/opends/server/backends/LDIFBackend.java | 37 ++++++++++++++++++++++++++++++++-----
opendj-server-legacy/src/main/java/org/opends/server/types/RDN.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/server/backends/task/RecurringTask.java | 5 ++---
3 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/LDIFBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/LDIFBackend.java
index a1c42ed..7363ee7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/LDIFBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/LDIFBackend.java
@@ -22,7 +22,15 @@
import static org.opends.server.util.StaticUtils.*;
import java.io.File;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.forgerock.i18n.LocalizableMessage;
@@ -32,14 +40,33 @@
import org.forgerock.opendj.ldap.ConditionResult;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
+import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.LDIFBackendCfg;
import org.opends.server.api.AlertGenerator;
import org.opends.server.api.Backend;
import org.opends.server.controls.SubtreeDeleteControl;
-import org.opends.server.core.*;
-import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.opends.server.types.*;
+import org.opends.server.core.AddOperation;
+import org.opends.server.core.DeleteOperation;
+import org.opends.server.core.DirectoryServer;
+import org.opends.server.core.ModifyDNOperation;
+import org.opends.server.core.ModifyOperation;
+import org.opends.server.core.SearchOperation;
+import org.opends.server.core.ServerContext;
+import org.opends.server.types.BackupConfig;
+import org.opends.server.types.BackupDirectory;
+import org.opends.server.types.Control;
+import org.opends.server.types.DN;
+import org.opends.server.types.DirectoryException;
+import org.opends.server.types.Entry;
+import org.opends.server.types.ExistingFileBehavior;
+import org.opends.server.types.IndexType;
+import org.opends.server.types.InitializationException;
+import org.opends.server.types.LDIFExportConfig;
+import org.opends.server.types.LDIFImportConfig;
+import org.opends.server.types.LDIFImportResult;
+import org.opends.server.types.RestoreConfig;
+import org.opends.server.types.SearchFilter;
import org.opends.server.util.LDIFException;
import org.opends.server.util.LDIFReader;
import org.opends.server.util.LDIFWriter;
@@ -838,7 +865,7 @@
private void subtreeRename(DN entryDN, DN newParentDN)
{
Set<DN> childDNSet = childDNs.remove(entryDN);
- DN newEntryDN = new DN(entryDN.rdn(), newParentDN);
+ DN newEntryDN = newParentDN.child(entryDN.rdn());
Entry oldEntry = entryMap.remove(entryDN);
if (oldEntry == null)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/task/RecurringTask.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/task/RecurringTask.java
index 4eba495..9407765 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/task/RecurringTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/task/RecurringTask.java
@@ -341,9 +341,8 @@
String nextTaskIDName = NAME_PREFIX_TASK + "id";
nextTaskEntry.replaceAttribute(Attributes.create(nextTaskIDName, nextTaskID));
- RDN nextTaskRDN = RDN.decode(nextTaskIDName + "=" + nextTaskID);
- DN nextTaskDN = new DN(nextTaskRDN,
- taskScheduler.getTaskBackend().getScheduledTasksParentDN());
+ RDN nextTaskRDN = new RDN(DirectoryServer.getAttributeType(nextTaskIDName), nextTaskID);
+ DN nextTaskDN = taskScheduler.getTaskBackend().getScheduledTasksParentDN().child(nextTaskRDN);
nextTaskEntry.setDN(nextTaskDN);
String nextTaskStartTimeName = NAME_PREFIX_TASK + "scheduled-start-time";
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/RDN.java b/opendj-server-legacy/src/main/java/org/opends/server/types/RDN.java
index 6445082..d3c54d0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/RDN.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/RDN.java
@@ -71,7 +71,7 @@
* @param attributeValue The value for this RDN. It must not be
* {@code null}.
*/
- public RDN(AttributeType attributeType, ByteString attributeValue)
+ public RDN(AttributeType attributeType, Object attributeValue)
{
Reject.ifNull(attributeType, attributeValue);
avas = new ArrayList<>(1);
--
Gitblit v1.10.0