From c3ddd7489abd06155b872cc23cef3575e2ee1b9a Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 08 Jan 2014 09:55:13 +0000
Subject: [PATCH] Align server types API with SDK types API

---
 opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java b/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java
index 659e675..46672b6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java
+++ b/opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java
@@ -432,8 +432,8 @@
       modDNmap=new LinkedHashMap<DN,DN>();
       modifyDNOperation.setAttachment(MODIFYDN_DNS, modDNmap);
     }
-    DN oldEntryDN=modifyDNOperation.getOriginalEntry().getDN();
-    DN newEntryDN=modifyDNOperation.getUpdatedEntry().getDN();
+    DN oldEntryDN=modifyDNOperation.getOriginalEntry().getName();
+    DN newEntryDN=modifyDNOperation.getUpdatedEntry().getName();
     modDNmap.put(oldEntryDN, newEntryDN);
 
     processModifyDN(modDNmap, (interval != 0));
@@ -491,7 +491,7 @@
       modDNmap=new LinkedHashMap<DN,DN>();
       modifyDNOperation.setAttachment(MODIFYDN_DNS, modDNmap);
     }
-    modDNmap.put(oldEntry.getDN(), newEntry.getDN());
+    modDNmap.put(oldEntry.getName(), newEntry.getName());
     return PluginResult.SubordinateModifyDN.continueOperationProcessing();
   }
 
@@ -514,7 +514,7 @@
       deleteDNset = new HashSet<DN>();
       deleteOperation.setAttachment(DELETE_DNS, deleteDNset);
     }
-    deleteDNset.add(entry.getDN());
+    deleteDNset.add(entry.getName());
     return PluginResult.SubordinateDelete.continueOperationProcessing();
   }
 
@@ -793,7 +793,7 @@
   private void deleteAddAttributesEntry(Entry e, DN oldEntryDN, DN newEntryDN)
   {
     LinkedList<Modification> mods = new LinkedList<Modification>();
-    DN entryDN=e.getDN();
+    DN entryDN=e.getName();
     for(AttributeType type : attributeTypes)
     {
       if(e.hasAttribute(type))
@@ -1133,7 +1133,7 @@
     /* Make sure the entry belongs to one of the configured naming
      * contexts.
      */
-    DN entryDN = entry.getDN();
+    DN entryDN = entry.getName();
     DN entryBaseDN = getEntryBaseDN(entryDN);
     if (entryBaseDN == null)
     {
@@ -1192,7 +1192,7 @@
     /* Make sure the entry belongs to one of the configured naming
      * contexts.
      */
-    DN entryDN = entry.getDN();
+    DN entryDN = entry.getName();
     DN entryBaseDN = getEntryBaseDN(entryDN);
     if (entryBaseDN == null)
     {
@@ -1316,7 +1316,7 @@
           return PluginResult.PreOperation.stopProcessing(
             ResultCode.CONSTRAINT_VIOLATION,
             ERR_PLUGIN_REFERENT_FILTER_MISMATCH.get(
-              valueEntry.getDN().toString(),
+              valueEntry.getName().toString(),
               attr.getName(),
               entryDN.toString(),
               filter.toString())

--
Gitblit v1.10.0