From 4cb8262e95fde77e6a0d2c84f1aa118e3b1ee850 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Thu, 06 Nov 2014 14:50:48 +0000
Subject: [PATCH] OPENDJ-1591 CR-5092 Switch server to SDK matching rules
---
opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 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 05b69b6..1c643cc 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
@@ -47,6 +47,7 @@
import org.opends.server.api.Group;
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.core.DirectoryServer;
+import org.opends.server.core.ServerContext;
import org.opends.server.protocols.ldap.LDAPControl;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
@@ -102,6 +103,8 @@
/** Passed to the group manager to see if the nested group list needs to be refreshed. */
private long nestedGroupRefreshToken = DirectoryServer.getGroupManager().refreshToken();
+ private ServerContext serverContext;
+
/**
* Creates an uninitialized static group. This is intended for internal use
* only, to allow {@code GroupManager} to dynamically create a group.
@@ -121,11 +124,13 @@
* @param memberDNs The set of the DNs of the members for this
* group.
*/
- private StaticGroup(DN groupEntryDN, AttributeType memberAttributeType, LinkedHashSet<CompactDn> memberDNs)
+ private StaticGroup(ServerContext serverContext, DN groupEntryDN, AttributeType memberAttributeType,
+ LinkedHashSet<CompactDn> memberDNs)
{
super();
ifNull(groupEntryDN, memberAttributeType, memberDNs);
+ this.serverContext = serverContext;
this.groupEntryDN = groupEntryDN;
this.memberAttributeType = memberAttributeType;
this.memberDNs = memberDNs;
@@ -141,7 +146,7 @@
/** {@inheritDoc} */
@Override()
- public StaticGroup newInstance(Entry groupEntry) throws DirectoryException
+ public StaticGroup newInstance(ServerContext serverContext, Entry groupEntry) throws DirectoryException
{
ifNull(groupEntry);
@@ -200,7 +205,6 @@
}
}
LinkedHashSet<CompactDn> someMemberDNs = new LinkedHashSet<CompactDn>(membersCount);
-
if (memberAttrList != null)
{
for (Attribute a : memberAttrList)
@@ -220,7 +224,7 @@
}
}
}
- return new StaticGroup(groupEntry.getName(), someMemberAttributeType, someMemberDNs);
+ return new StaticGroup(serverContext, groupEntry.getName(), someMemberAttributeType, someMemberDNs);
}
/** {@inheritDoc} */
@@ -516,8 +520,7 @@
/** {@inheritDoc} */
@Override()
- public void addMember(Entry userEntry)
- throws UnsupportedOperationException, DirectoryException
+ public void addMember(Entry userEntry) throws UnsupportedOperationException, DirectoryException
{
ifNull(userEntry);
@@ -614,7 +617,7 @@
* The DN
* @return the compact representation of the DN
*/
- static CompactDn toCompactDn(DN dn)
+ private CompactDn toCompactDn(DN dn)
{
return Converters.from(dn).compact();
}
--
Gitblit v1.10.0