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/extensions/StaticGroup.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java b/opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java
index c468a44..1bf784f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.extensions;
@@ -187,14 +187,14 @@
if (groupEntry.hasObjectClass(groupOfNamesClass))
{
Message message = ERR_STATICGROUP_INVALID_OC_COMBINATION.
- get(String.valueOf(groupEntry.getDN()), OC_GROUP_OF_ENTRIES,
+ get(String.valueOf(groupEntry.getName()), OC_GROUP_OF_ENTRIES,
OC_GROUP_OF_NAMES);
throw new DirectoryException(ResultCode.OBJECTCLASS_VIOLATION, message);
}
else if (groupEntry.hasObjectClass(groupOfUniqueNamesClass))
{
Message message = ERR_STATICGROUP_INVALID_OC_COMBINATION.
- get(String.valueOf(groupEntry.getDN()), OC_GROUP_OF_ENTRIES,
+ get(String.valueOf(groupEntry.getName()), OC_GROUP_OF_ENTRIES,
OC_GROUP_OF_UNIQUE_NAMES);
throw new DirectoryException(ResultCode.OBJECTCLASS_VIOLATION, message);
}
@@ -207,7 +207,7 @@
if (groupEntry.hasObjectClass(groupOfUniqueNamesClass))
{
Message message = ERR_STATICGROUP_INVALID_OC_COMBINATION.
- get(String.valueOf(groupEntry.getDN()), OC_GROUP_OF_NAMES,
+ get(String.valueOf(groupEntry.getName()), OC_GROUP_OF_NAMES,
OC_GROUP_OF_UNIQUE_NAMES);
throw new DirectoryException(ResultCode.OBJECTCLASS_VIOLATION, message);
}
@@ -223,7 +223,7 @@
else
{
Message message = ERR_STATICGROUP_NO_VALID_OC.
- get(String.valueOf(groupEntry.getDN()), OC_GROUP_OF_NAMES,
+ get(String.valueOf(groupEntry.getName()), OC_GROUP_OF_NAMES,
OC_GROUP_OF_UNIQUE_NAMES);
throw new DirectoryException(ResultCode.OBJECTCLASS_VIOLATION, message);
}
@@ -261,7 +261,8 @@
Message message = ERR_STATICGROUP_CANNOT_DECODE_MEMBER_VALUE_AS_DN.
get(v.getValue().toString(),
someMemberAttributeType.getNameOrOID(),
- String.valueOf(groupEntry.getDN()), de.getMessageObject());
+ String.valueOf(groupEntry.getName()),
+ de.getMessageObject());
ErrorLogger.logError(message);
}
}
@@ -269,7 +270,7 @@
}
- return new StaticGroup(groupEntry.getDN(),
+ return new StaticGroup(groupEntry.getName(),
someMemberAttributeType, someMemberDNs);
}
@@ -561,7 +562,7 @@
public boolean isMember(Entry userEntry, Set<DN> examinedGroups)
throws DirectoryException
{
- return isMember(userEntry.getDN(), examinedGroups);
+ return isMember(userEntry.getName(), examinedGroups);
}
@@ -675,7 +676,7 @@
synchronized (this)
{
- DN userDN = userEntry.getDN();
+ DN userDN = userEntry.getName();
ByteString userDNString = ByteString.valueOf(userDN.toNormalizedString());
if (memberDNs.contains(userDNString))
--
Gitblit v1.10.0