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/UniqueAttributePlugin.java |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/plugins/UniqueAttributePlugin.java b/opendj3-server-dev/src/server/org/opends/server/plugins/UniqueAttributePlugin.java
index 3040fa6..3ca37d7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/plugins/UniqueAttributePlugin.java
+++ b/opendj3-server-dev/src/server/org/opends/server/plugins/UniqueAttributePlugin.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2013 ForgeRock AS
+ *      Portions Copyright 2011-2014 ForgeRock AS
  */
 package org.opends.server.plugins;
 
@@ -183,14 +183,14 @@
     UniqueAttributePluginCfg config = currentConfiguration;
     Entry entry = addOperation.getEntryToAdd();
 
-    Set<DN> baseDNs = getBaseDNs(config, entry.getDN());
+    Set<DN> baseDNs = getBaseDNs(config, entry.getName());
     if (baseDNs == null)
     {
       // The entry is outside the scope of this plugin.
       return PluginResult.PreOperation.continueOperationProcessing();
     }
 
-    DN entryDN = entry.getDN();
+    DN entryDN = entry.getName();
     List<AttributeValue> recordedValues = new LinkedList<AttributeValue>();
     for (AttributeType t : config.getType())
     {
@@ -366,7 +366,7 @@
     UniqueAttributePluginCfg config = currentConfiguration;
 
     Set<DN> baseDNs = getBaseDNs(config,
-                                 modifyDNOperation.getUpdatedEntry().getDN());
+                                 modifyDNOperation.getUpdatedEntry().getName());
     if (baseDNs == null)
     {
       // The entry is outside the scope of this plugin.
@@ -409,14 +409,14 @@
     UniqueAttributePluginCfg config = currentConfiguration;
     Entry entry = addOperation.getEntryToAdd();
 
-    Set<DN> baseDNs = getBaseDNs(config, entry.getDN());
+    Set<DN> baseDNs = getBaseDNs(config, entry.getName());
     if (baseDNs == null)
     {
       // The entry is outside the scope of this plugin.
       return;
     }
 
-    DN entryDN = entry.getDN();
+    DN entryDN = entry.getName();
     for (AttributeType t : config.getType())
     {
       List<Attribute> attrList = entry.getAttribute(t);
@@ -518,7 +518,7 @@
     UniqueAttributePluginCfg config = currentConfiguration;
 
     Set<DN> baseDNs = getBaseDNs(config,
-                                 modifyDNOperation.getUpdatedEntry().getDN());
+                                 modifyDNOperation.getUpdatedEntry().getName());
     if (baseDNs == null)
     {
       // The entry is outside the scope of this plugin.
@@ -526,7 +526,7 @@
     }
 
     DN entryDN = modifyDNOperation.getEntryDN();
-    DN updatedEntryDN = modifyDNOperation.getUpdatedEntry().getDN();
+    DN updatedEntryDN = modifyDNOperation.getUpdatedEntry().getName();
     RDN newRDN = modifyDNOperation.getNewRDN();
     for (int i=0; i < newRDN.getNumValues(); i++)
     {
@@ -673,9 +673,9 @@
                               false, filter, SEARCH_ATTRS);
       for (SearchResultEntry e : searchOperation.getSearchEntries())
       {
-        if (! e.getDN().equals(targetDN))
+        if (! e.getName().equals(targetDN))
         {
-          return e.getDN();
+          return e.getName();
         }
       }
 
@@ -837,7 +837,7 @@
     UniqueAttributePluginCfg config = currentConfiguration;
     Entry entry = addOperation.getEntryToAdd();
 
-    Set<DN> baseDNs = getBaseDNs(config, entry.getDN());
+    Set<DN> baseDNs = getBaseDNs(config, entry.getName());
     if (baseDNs == null)
     {
       // The entry is outside the scope of this plugin.
@@ -947,7 +947,7 @@
   {
     UniqueAttributePluginCfg config = currentConfiguration;
     Set<DN> baseDNs = getBaseDNs(config,
-                                 modifyDNOperation.getUpdatedEntry().getDN());
+                                 modifyDNOperation.getUpdatedEntry().getName());
     if (baseDNs == null)
     {
       // The entry is outside the scope of this plugin.

--
Gitblit v1.10.0