OPENDJ-3037 inlined DirectoryServer.getAttributeType(String)

Jean-Noël Rouvignac

07.03.2016 3d4c0acccda6e62b23f248d75c1cc6721fc20bdf

 opendj-server-legacy/src/main/java/org/opends/server/extensions/StaticGroup.java

@@ -35,9 +35,9 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.util.Reject;
import org.forgerock.opendj.server.config.server.GroupImplementationCfg;
import org.forgerock.opendj.server.config.server.StaticGroupImplementationCfg;
import org.forgerock.util.Reject;
import org.opends.server.api.Group;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperation;
@@ -56,6 +56,7 @@
import org.opends.server.types.Modification;
import org.opends.server.types.SearchFilter;

import static org.forgerock.opendj.ldap.schema.CoreSchema.*;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.core.DirectoryServer.*;
import static org.opends.server.protocols.internal.InternalClientConnection.*;
@@ -164,7 +165,7 @@
        throw new DirectoryException(ResultCode.OBJECTCLASS_VIOLATION, message);
      }

      someMemberAttributeType = DirectoryServer.getAttributeType(ATTR_MEMBER);
      someMemberAttributeType = getMemberAttributeType();
    }
    else if (hasGroupOfNamesClass)
    {
@@ -175,11 +176,11 @@
        throw new DirectoryException(ResultCode.OBJECTCLASS_VIOLATION, message);
      }

      someMemberAttributeType = DirectoryServer.getAttributeType(ATTR_MEMBER);
      someMemberAttributeType = getMemberAttributeType();
    }
    else if (hasGroupOfUniqueNamesClass)
    {
      someMemberAttributeType = DirectoryServer.getAttributeType(ATTR_UNIQUE_MEMBER_LC);
      someMemberAttributeType = getUniqueMemberAttributeType();
    }
    else
    {