From 19004a003b3e4387de43f8c399971187156f3d54 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 30 May 2016 10:43:11 +0000
Subject: [PATCH] OPENDJ-2987 Remove object class parsing in ObjectClassSyntax class - now responsability of Schema class

---
 opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectClassSyntax.java | 1184 -----------------------------------------------------------
 1 files changed, 4 insertions(+), 1,180 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectClassSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectClassSyntax.java
index 57b50fd..83d20e1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectClassSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectClassSyntax.java
@@ -16,33 +16,12 @@
  */
 package org.opends.server.schema;
 
-import static org.opends.messages.SchemaMessages.*;
-import static org.opends.server.config.ConfigConstants.*;
 import static org.opends.server.schema.SchemaConstants.*;
-import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.util.StaticUtils.*;
 
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.i18n.LocalizableMessageDescriptor.Arg2;
-import org.forgerock.opendj.ldap.ByteSequence;
-import org.forgerock.opendj.ldap.ResultCode;
-import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.forgerock.opendj.ldap.schema.ObjectClassType;
+import org.forgerock.opendj.ldap.schema.Schema;
 import org.forgerock.opendj.ldap.schema.Syntax;
 import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
 import org.opends.server.api.AttributeSyntax;
-import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.CommonSchemaElements;
-import org.opends.server.types.DirectoryException;
-import org.forgerock.opendj.ldap.schema.ObjectClass;
-import org.opends.server.types.Schema;
 
 /**
  * This class implements the object class description syntax, which is used to
@@ -52,1191 +31,36 @@
 public class ObjectClassSyntax
        extends AttributeSyntax<AttributeSyntaxCfg>
 {
-
   /**
    * Creates a new instance of this syntax.  Note that the only thing that
-   * should be done here is to invoke the default constructor for the
-   * superclass.  All initialization should be performed in the
-   * <CODE>initializeSyntax</CODE> method.
+   * should be done here is to invoke the default constructor for the superclass.
    */
   public ObjectClassSyntax()
   {
     super();
   }
 
-  /** {@inheritDoc} */
   @Override
-  public Syntax getSDKSyntax(org.forgerock.opendj.ldap.schema.Schema schema)
+  public Syntax getSDKSyntax(Schema schema)
   {
     return schema.getSyntax(SchemaConstants.SYNTAX_OBJECTCLASS_OID);
   }
 
-  /** {@inheritDoc} */
   @Override
   public String getName()
   {
     return SYNTAX_OBJECTCLASS_NAME;
   }
 
-  /** {@inheritDoc} */
   @Override
   public String getOID()
   {
     return SYNTAX_OBJECTCLASS_OID;
   }
 
-  /** {@inheritDoc} */
   @Override
   public String getDescription()
   {
     return SYNTAX_OBJECTCLASS_DESCRIPTION;
   }
-
-  /**
-   * Decodes the contents of the provided ASN.1 octet string as an objectclass
-   * definition according to the rules of this syntax.  Note that the provided
-   * octet string value does not need to be normalized (and in fact, it should
-   * not be in order to allow the desired capitalization to be preserved).
-   *
-   * @param  value                 The ASN.1 octet string containing the value
-   *                               to decode (it does not need to be
-   *                               normalized).
-   * @param  schema                The schema to use to resolve references to
-   *                               other schema elements.
-   * @param  allowUnknownElements  Indicates whether to allow values that
-   *                               reference a superior class or required or
-   *                               optional attribute types which are not
-   *                               defined in the server schema.  This should
-   *                               only be true when called by
-   *                               {@code valueIsAcceptable}.
-   *
-   * @return  The decoded objectclass definition.
-   *
-   * @throws  DirectoryException  If the provided value cannot be decoded as an
-   *                              objectclass definition.
-   */
-  public static ObjectClass decodeObjectClass(ByteSequence value, Schema schema,
-                                              boolean allowUnknownElements)
-         throws DirectoryException
-  {
-    // Get string representations of the provided value using the provided form
-    // and with all lowercase characters.
-    String valueStr = value.toString();
-    String lowerStr = toLowerCase(valueStr);
-    boolean allowExceptions = DirectoryServer.isRunning()?
-                        DirectoryServer.allowAttributeNameExceptions():true;
-    // We'll do this a character at a time.  First, skip over any leading
-    // whitespace.
-    int pos    = 0;
-    int length = valueStr.length();
-    while (pos < length && valueStr.charAt(pos) == ' ')
-    {
-      pos++;
-    }
-
-    if (pos >= length)
-    {
-      // This means that the value was empty or contained only whitespace.  That
-      // is illegal.
-      LocalizableMessage message = ERR_ATTR_SYNTAX_OBJECTCLASS_EMPTY_VALUE.get();
-      throw new DirectoryException(
-              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
-    }
-
-
-    // The next character must be an open parenthesis.  If it is not, then that
-    // is an error.
-    char c = valueStr.charAt(pos++);
-    if (c != '(')
-    {
-      LocalizableMessage message = ERR_ATTR_SYNTAX_OBJECTCLASS_EXPECTED_OPEN_PARENTHESIS.
-          get(valueStr, pos-1, c);
-      throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
-    }
-
-
-    // Skip over any spaces immediately following the opening parenthesis.
-    while (pos < length && ((c = valueStr.charAt(pos)) == ' '))
-    {
-      pos++;
-    }
-
-    if (pos >= length)
-    {
-      // This means that the end of the value was reached before we could find
-      // the OID.  Ths is illegal.
-      LocalizableMessage message =
-          ERR_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE.get(valueStr);
-      throw new DirectoryException(
-              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
-    }
-
-
-    // The next set of characters must be the OID.  Strictly speaking, this
-    // should only be a numeric OID, but we'll also allow for the
-    // "ocname-oid" case as well.  Look at the first character to figure out
-    // which we will be using.
-    int oidStartPos = pos;
-    if (isDigit(c))
-    {
-      // This must be a numeric OID.  In that case, we will accept only digits
-      // and periods, but not consecutive periods.
-      boolean lastWasPeriod = false;
-      while (pos < length && ((c = valueStr.charAt(pos++)) != ' '))
-      {
-        if (c == '.')
-        {
-          if (lastWasPeriod)
-          {
-            LocalizableMessage message =
-                ERR_ATTR_SYNTAX_OBJECTCLASS_DOUBLE_PERIOD_IN_NUMERIC_OID.
-                  get(valueStr, pos-1);
-            throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
-          }
-          lastWasPeriod = true;
-        }
-        else if (! isDigit(c))
-        {
-          // This must have been an illegal character.
-          LocalizableMessage message =
-              ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR_IN_NUMERIC_OID.
-                get(valueStr, c, pos-1);
-          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
-        }
-        else
-        {
-          lastWasPeriod = false;
-        }
-      }
-    }
-    else
-    {
-      // This must be a "fake" OID.  In this case, we will only accept
-      // alphabetic characters, numeric digits, and the hyphen.
-      while (pos < length && ((c = valueStr.charAt(pos++)) != ' '))
-      {
-        if (isAlpha(c) || isDigit(c) || c == '-' ||
-            (c == '_' && allowExceptions))
-        {
-          // This is fine.  It is an acceptable character.
-        }
-        else
-        {
-          // This must have been an illegal character.
-          LocalizableMessage message =
-              ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR_IN_STRING_OID.
-                get(valueStr, c, pos-1);
-          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
-                                       message);
-        }
-      }
-    }
-
-
-    // If we're at the end of the value, then it isn't a valid objectclass
-    // description.  Otherwise, parse out the OID.
-    if (pos >= length)
-    {
-      LocalizableMessage message =
-          ERR_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE.get(valueStr);
-      throw new DirectoryException(
-              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
-    }
-
-    String oid = lowerStr.substring(oidStartPos, pos-1);
-
-    // Skip over the space(s) after the OID.
-    while (pos < length && ((c = valueStr.charAt(pos)) == ' '))
-    {
-      pos++;
-    }
-
-    if (pos >= length)
-    {
-      // This means that the end of the value was reached before we could find
-      // the OID.  Ths is illegal.
-      LocalizableMessage message =
-          ERR_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE.get(valueStr);
-      throw new DirectoryException(
-              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
-    }
-
-
-    // At this point, we should have a pretty specific syntax that describes
-    // what may come next, but some of the components are optional and it would
-    // be pretty easy to put something in the wrong order, so we will be very
-    // flexible about what we can accept.  Just look at the next token, figure
-    // out what it is and how to treat what comes after it, then repeat until
-    // we get to the end of the value.  But before we start, set default values
-    // for everything else we might need to know.
-    String primaryName = oid;
-    List<String> names = new LinkedList<>();
-    String description = null;
-    boolean isObsolete = false;
-    Set<AttributeType> requiredAttributes = new LinkedHashSet<>();
-    Set<AttributeType> optionalAttributes = new LinkedHashSet<>();
-    Set<ObjectClass> superiorClasses = new LinkedHashSet<>();
-    //Default OC Type is STRUCTURAL ( RFC 4512 4.1.1)
-    ObjectClassType objectClassType = ObjectClassType.STRUCTURAL;
-    Map<String, List<String>> extraProperties = new LinkedHashMap<>();
-
-
-    while (true)
-    {
-      StringBuilder tokenNameBuffer = new StringBuilder();
-      pos = readTokenName(valueStr, tokenNameBuffer, pos);
-      String tokenName = tokenNameBuffer.toString();
-      String lowerTokenName = toLowerCase(tokenName);
-      if (tokenName.equals(")"))
-      {
-        // We must be at the end of the value.  If not, then that's a problem.
-        if (pos < length)
-        {
-          LocalizableMessage message =
-              ERR_ATTR_SYNTAX_OBJECTCLASS_UNEXPECTED_CLOSE_PARENTHESIS.
-                get(valueStr, pos-1);
-          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
-                                       message);
-        }
-
-        break;
-      }
-      else if (lowerTokenName.equals("name"))
-      {
-        // This specifies the set of names for the objectclass.  It may be a
-        // single name in single quotes, or it may be an open parenthesis
-        // followed by one or more names in single quotes separated by spaces.
-        c = valueStr.charAt(pos++);
-        if (c == '\'')
-        {
-          StringBuilder userBuffer  = new StringBuilder();
-          StringBuilder lowerBuffer = new StringBuilder();
-          pos = readQuotedString(valueStr, lowerStr, userBuffer, lowerBuffer, pos-1);
-          primaryName = userBuffer.toString();
-          names.add(primaryName);
-        }
-        else if (c == '(')
-        {
-          StringBuilder userBuffer  = new StringBuilder();
-          StringBuilder lowerBuffer = new StringBuilder();
-          pos = readQuotedString(valueStr, lowerStr, userBuffer, lowerBuffer,
-                                 pos);
-          primaryName = userBuffer.toString();
-          names.add(primaryName);
-
-
-          while (true)
-          {
-            if (valueStr.charAt(pos) == ')')
-            {
-              // Skip over any spaces after the parenthesis.
-              pos++;
-              while (pos < length && ((c = valueStr.charAt(pos)) == ' '))
-              {
-                pos++;
-              }
-
-              break;
-            }
-            else
-            {
-              userBuffer  = new StringBuilder();
-              lowerBuffer = new StringBuilder();
-
-              pos = readQuotedString(valueStr, lowerStr, userBuffer,
-                                     lowerBuffer, pos);
-              names.add(userBuffer.toString());
-            }
-          }
-        }
-        else
-        {
-          // This is an illegal character.
-          LocalizableMessage message = ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR.get(valueStr, c, pos-1);
-          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
-                                       message);
-        }
-        //RFC 2251: A specification may also assign one or more textual names
-        //for an attribute type.  These names MUST begin with a letter, and
-        //only contain ASCII letters, digit characters and hyphens.
-        //Iterate over all the names and throw an exception if it is invalid.
-        for(String name : names)
-        {
-          for(int index=0; index < name.length(); index++)
-          {
-            char ch = name.charAt(index);
-            switch(ch)
-            {
-              case '-':
-              //hyphen is allowed but not as the first byte.
-                if (index==0)
-                {
-                  throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
-                      ERR_OC_SYNTAX_ATTR_ILLEGAL_INITIAL_DASH.get(value));
-                }
-                break;
-              case '_':
-              // This will never be allowed as the first character.  It
-              // may be allowed for subsequent characters if the attribute
-              // name exceptions option is enabled.
-                if (index==0)
-                {
-                  LocalizableMessage msg = ERR_OC_SYNTAX_ATTR_ILLEGAL_INITIAL_UNDERSCORE
-                      .get(value, ATTR_ALLOW_ATTRIBUTE_NAME_EXCEPTIONS);
-                  throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, msg);
-                }
-                else if (!allowExceptions)
-                {
-                  LocalizableMessage msg = ERR_OC_SYNTAX_ATTR_ILLEGAL_UNDERSCORE_CHAR.
-                        get(value, ATTR_ALLOW_ATTRIBUTE_NAME_EXCEPTIONS);
-                  throw new DirectoryException(
-                          ResultCode.INVALID_ATTRIBUTE_SYNTAX, msg);
-                }
-                break;
-
-              default:
-              //Only digits and ascii letters are allowed but the first byte
-              //can not be a digit.
-                if(index ==0 && isDigit(ch) && !allowExceptions)
-                {
-                  LocalizableMessage message = ERR_OC_SYNTAX_ATTR_ILLEGAL_INITIAL_DIGIT.
-                    get(value, ch, ATTR_ALLOW_ATTRIBUTE_NAME_EXCEPTIONS);
-                  throw new DirectoryException(
-                          ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
-                }
-                else if (!(('0'<=ch && ch<='9')
-                    || ('A'<=ch && ch<='Z')
-                    || ('a'<=ch && ch<='z')))
-                {
-                  throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
-                      ERR_OC_SYNTAX_ATTR_ILLEGAL_CHAR.get(value, ch, index));
-                }
-                break;
-            }
-          }
-
-        }
-      }
-      else if (lowerTokenName.equals("desc"))
-      {
-        // This specifies the description for the objectclass.  It is an
-        // arbitrary string of characters enclosed in single quotes.
-        StringBuilder descriptionBuffer = new StringBuilder();
-        pos = readQuotedString(valueStr, descriptionBuffer, pos);
-        description = descriptionBuffer.toString();
-      }
-      else if (lowerTokenName.equals("obsolete"))
-      {
-        // This indicates whether the objectclass should be considered obsolete.
-        // We do not need to do any more parsing for this token.
-        isObsolete = true;
-      }
-      else if (lowerTokenName.equals("sup"))
-      {
-        // This specifies the name or OID of the superior objectclass from
-        //  which this objectclass should inherit its properties. As per
-        //  RFC 4512 (4.1.1), expect an oidlist here. It may be a single name
-        //  or OID (not in quotes) , or it may be an open parenthesis followed
-        // by one or more names separated by spaces  and the dollar sign
-        //  character, followed by a closing parenthesis.
-        c = valueStr.charAt(pos++);
-        LinkedList<ObjectClass> listSupOCs = new LinkedList<>();
-        if(c == '(')
-        {
-          while(true)
-          {
-            StringBuilder woidBuffer = new StringBuilder();
-            pos = readWOID(lowerStr, woidBuffer, pos);
-            String oidStr = woidBuffer.toString();
-            ObjectClass supOC = schema.getObjectClass(oidStr);
-            if (supOC == null)
-            {
-              if (allowUnknownElements)
-              {
-                supOC =
-                  DirectoryServer.getDefaultObjectClass(woidBuffer.toString());
-              }
-              else
-              {
-                // This is bad because we don't know what the superior oc
-                // is so we can't base this objectclass on it.
-                LocalizableMessage message =
-                    WARN_ATTR_SYNTAX_OBJECTCLASS_UNKNOWN_SUPERIOR_CLASS.get(oid, woidBuffer);
-                throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
-              }
-            }
-
-            listSupOCs.add(supOC);
-            // The next character must be either a dollar sign or a closing
-            // parenthesis.
-            c = valueStr.charAt(pos++);
-            if (c == ')')
-            {
-              // This denotes the end of the list.
-              break;
-            }
-            else if (c != '$')
-            {
-              LocalizableMessage message = ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR.get(valueStr, c, pos-1);
-              throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
-                                           message);
-            }
-          }
-        }
-        else
-        {
-          StringBuilder woidBuffer = new StringBuilder();
-          pos = readWOID(lowerStr, woidBuffer, pos-1);
-          ObjectClass superiorClass =
-                  schema.getObjectClass(woidBuffer.toString());
-          if (superiorClass == null)
-          {
-            if (allowUnknownElements)
-            {
-              superiorClass =
-                DirectoryServer.getDefaultObjectClass(woidBuffer.toString());
-            }
-            else
-            {
-              // This is bad because we don't know what the superior oc
-              // is so we can't base this objectclass on it.
-              LocalizableMessage message =
-                  WARN_ATTR_SYNTAX_OBJECTCLASS_UNKNOWN_SUPERIOR_CLASS.get(oid, woidBuffer);
-              throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
-            }
-          }
-          listSupOCs.add(superiorClass);
-        }
-        superiorClasses.addAll(listSupOCs);
-      }
-      else if (lowerTokenName.equals("abstract"))
-      {
-        // This indicates that entries must not include this objectclass unless
-        // they also include a non-abstract objectclass that inherits from this
-        // class.  We do not need any more parsing for this token.
-        objectClassType = ObjectClassType.ABSTRACT;
-      }
-      else if (lowerTokenName.equals("structural"))
-      {
-        // This indicates that this is a structural objectclass.  We do not need
-        // any more parsing for this token.
-        objectClassType = ObjectClassType.STRUCTURAL;
-      }
-      else if (lowerTokenName.equals("auxiliary"))
-      {
-        // This indicates that this is an auxiliary objectclass.  We do not need
-        // any more parsing for this token.
-        objectClassType = ObjectClassType.AUXILIARY;
-      }
-      else if (lowerTokenName.equals("must"))
-      {
-        LinkedList<AttributeType> attrs = new LinkedList<>();
-
-        // This specifies the set of required attributes for the objectclass.
-        // It may be a single name or OID (not in quotes), or it may be an
-        // open parenthesis followed by one or more names separated by spaces
-        // and the dollar sign character, followed by a closing parenthesis.
-        c = valueStr.charAt(pos++);
-        if (c == '(')
-        {
-          while (true)
-          {
-            StringBuilder woidBuffer = new StringBuilder();
-            pos = readWOID(lowerStr, woidBuffer, pos);
-            attrs.add(getAttributeType(schema, allowUnknownElements, oid, woidBuffer,
-                WARN_ATTR_SYNTAX_OBJECTCLASS_UNKNOWN_REQUIRED_ATTR));
-
-            // The next character must be either a dollar sign or a closing parenthesis.
-            c = valueStr.charAt(pos++);
-            if (c == ')')
-            {
-              // This denotes the end of the list.
-              break;
-            }
-            else if (c != '$')
-            {
-              LocalizableMessage message = ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR.get(valueStr, c, pos-1);
-              throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
-                                           message);
-            }
-          }
-        }
-        else
-        {
-          StringBuilder woidBuffer = new StringBuilder();
-          pos = readWOID(lowerStr, woidBuffer, pos-1);
-          attrs.add(getAttributeType(schema, allowUnknownElements, oid, woidBuffer,
-              WARN_ATTR_SYNTAX_OBJECTCLASS_UNKNOWN_REQUIRED_ATTR));
-        }
-
-        requiredAttributes.addAll(attrs);
-      }
-      else if (lowerTokenName.equals("may"))
-      {
-        LinkedList<AttributeType> attrs = new LinkedList<>();
-
-        // This specifies the set of optional attributes for the objectclass.
-        // It may be a single name or OID (not in quotes), or it may be an
-        // open parenthesis followed by one or more names separated by spaces
-        // and the dollar sign character, followed by a closing parenthesis.
-        c = valueStr.charAt(pos++);
-        if (c == '(')
-        {
-          while (true)
-          {
-            StringBuilder woidBuffer = new StringBuilder();
-            pos = readWOID(lowerStr, woidBuffer, pos);
-            attrs.add(getAttributeType(schema, allowUnknownElements, oid, woidBuffer,
-                WARN_ATTR_SYNTAX_OBJECTCLASS_UNKNOWN_OPTIONAL_ATTR));
-
-            // The next character must be either a dollar sign or a closing parenthesis.
-            c = valueStr.charAt(pos++);
-            if (c == ')')
-            {
-              // This denotes the end of the list.
-              break;
-            }
-            else if (c != '$')
-            {
-              LocalizableMessage message = ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR.get(valueStr, c, pos-1);
-              throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
-                                           message);
-            }
-          }
-        }
-        else
-        {
-          StringBuilder woidBuffer = new StringBuilder();
-          pos = readWOID(lowerStr, woidBuffer, pos-1);
-          attrs.add(getAttributeType(schema, allowUnknownElements, oid, woidBuffer,
-              WARN_ATTR_SYNTAX_OBJECTCLASS_UNKNOWN_OPTIONAL_ATTR));
-        }
-
-        optionalAttributes.addAll(attrs);
-      }
-      else
-      {
-        // This must be a non-standard property and it must be followed by
-        // either a single value in single quotes or an open parenthesis
-        // followed by one or more values in single quotes separated by spaces
-        // followed by a close parenthesis.
-        List<String> valueList = new LinkedList<>();
-        pos = readExtraParameterValues(valueStr, valueList, pos);
-        extraProperties.put(tokenName, valueList);
-      }
-    }
-
-    //If SUP is not specified, use TOP.
-    ObjectClass top = DirectoryServer.getTopObjectClass();
-    if(superiorClasses.isEmpty() && !top.getOID().equals(oid))
-    {
-      superiorClasses.add(top);
-    }
-    else
-    {
-      for(ObjectClass superiorClass : superiorClasses)
-      {
-        // Make sure that the inheritance configuration is acceptable.
-        ObjectClassType superiorType = superiorClass.getObjectClassType();
-        switch (objectClassType)
-        {
-          case ABSTRACT:
-            // Abstract classes may only inherit from other abstract classes.
-            if (superiorType != ObjectClassType.ABSTRACT)
-            {
-              LocalizableMessage message =
-                WARN_ATTR_SYNTAX_OBJECTCLASS_INVALID_SUPERIOR_TYPE.
-                  get(oid, objectClassType, superiorType, superiorClass.getNameOrOID());
-              throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
-                                           message);
-            }
-            break;
-
-          case AUXILIARY:
-            // Auxiliary classes may only inherit from abstract classes or other
-            // auxiliary classes.
-            if (superiorType != ObjectClassType.ABSTRACT &&
-                superiorType != ObjectClassType.AUXILIARY)
-            {
-              LocalizableMessage message =
-                WARN_ATTR_SYNTAX_OBJECTCLASS_INVALID_SUPERIOR_TYPE.
-                  get(oid, objectClassType, superiorType,
-                        superiorClass.getNameOrOID());
-              throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
-                                           message);
-            }
-            break;
-
-          case STRUCTURAL:
-            // Structural classes may only inherit from abstract classes or
-            // other structural classes.
-            if (superiorType != ObjectClassType.ABSTRACT &&
-                superiorType != ObjectClassType.STRUCTURAL)
-            {
-              LocalizableMessage message =
-                WARN_ATTR_SYNTAX_OBJECTCLASS_INVALID_SUPERIOR_TYPE.
-                  get(oid, objectClassType, superiorType,
-                        superiorClass.getNameOrOID());
-              throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
-                                           message);
-            }
-
-            // Structural classes must have the "top" objectclass somewhere in
-            // the superior chain.
-            if (! superiorChainIncludesTop(superiorClass))
-            {
-              LocalizableMessage message =
-                WARN_ATTR_SYNTAX_OBJECTCLASS_STRUCTURAL_SUPERIOR_NOT_TOP.
-                    get(oid);
-              throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
-                                           message);
-            }
-            break;
-        }
-      }
-    }
-
-    CommonSchemaElements.checkSafeProperties(extraProperties);
-
-    return new ObjectClass(value.toString(), primaryName, names, oid,
-                           description, superiorClasses, requiredAttributes,
-                           optionalAttributes, objectClassType, isObsolete,
-                           extraProperties);
-  }
-
-  private static AttributeType getAttributeType(Schema schema, boolean allowUnknownElements, String oid,
-      StringBuilder woidBuffer, Arg2<Object, Object> msg) throws DirectoryException
-  {
-    String woidString = woidBuffer.toString();
-    AttributeType attr = schema.getAttributeType(woidString);
-    if (attr.isPlaceHolder() && !allowUnknownElements)
-    {
-      LocalizableMessage message = msg.get(oid, woidString);
-      throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
-    }
-    return attr;
-  }
-
-  /**
-   * Reads the next token name from the objectclass definition, skipping over
-   * any leading or trailing spaces, and appends it to the provided buffer.
-   *
-   * @param  valueStr   The string representation of the objectclass definition.
-   * @param  tokenName  The buffer into which the token name will be written.
-   * @param  startPos   The position in the provided string at which to start
-   *                    reading the token name.
-   *
-   * @return  The position of the first character that is not part of the token
-   *          name or one of the trailing spaces after it.
-   *
-   * @throws  DirectoryException  If a problem is encountered while reading the
-   *                              token name.
-   */
-  private static int readTokenName(String valueStr, StringBuilder tokenName,
-                                   int startPos)
-          throws DirectoryException
-  {
-    // Skip over any spaces at the beginning of the value.
-    char c = '\u0000';
-    int  length = valueStr.length();
-    while (startPos < length && ((c = valueStr.charAt(startPos)) == ' '))
-    {
-      startPos++;
-    }
-
-    if (startPos >= length)
-    {
-      LocalizableMessage message =
-          ERR_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE.get(valueStr);
-      throw new DirectoryException(
-              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
-    }
-
-
-    // Read until we find the next space.
-    while (startPos < length && ((c = valueStr.charAt(startPos++)) != ' '))
-    {
-      tokenName.append(c);
-    }
-
-
-    // Skip over any trailing spaces after the value.
-    while (startPos < length && ((c = valueStr.charAt(startPos)) == ' '))
-    {
-      startPos++;
-    }
-
-
-    // Return the position of the first non-space character after the token.
-    return startPos;
-  }
-
-  /**
-   * Reads the value of a string enclosed in single quotes, skipping over the
-   * quotes and any leading or trailing spaces, and appending the string to the
-   * provided buffer.
-   *
-   * @param  valueStr     The user-provided representation of the objectclass
-   *                      definition.
-   * @param  valueBuffer  The buffer into which the user-provided representation
-   *                      of the value will be placed.
-   * @param  startPos     The position in the provided string at which to start
-   *                      reading the quoted string.
-   *
-   * @return  The position of the first character that is not part of the quoted
-   *          string or one of the trailing spaces after it.
-   *
-   * @throws  DirectoryException  If a problem is encountered while reading the
-   *                              quoted string.
-   */
-  private static int readQuotedString(String valueStr,
-                                      StringBuilder valueBuffer, int startPos)
-          throws DirectoryException
-  {
-    // Skip over any spaces at the beginning of the value.
-    char c = '\u0000';
-    int  length = valueStr.length();
-    while (startPos < length && ((c = valueStr.charAt(startPos)) == ' '))
-    {
-      startPos++;
-    }
-
-    if (startPos >= length)
-    {
-      LocalizableMessage message =
-          ERR_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE.get(valueStr);
-      throw new DirectoryException(
-              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
-    }
-
-
-    // The next character must be a single quote.
-    if (c != '\'')
-    {
-      LocalizableMessage message = WARN_ATTR_SYNTAX_OBJECTCLASS_EXPECTED_QUOTE_AT_POS.get(
-          valueStr,startPos, c);
-      throw new DirectoryException(
-              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
-    }
-
-
-    // Read until we find the closing quote.
-    startPos++;
-    while (startPos < length && ((c = valueStr.charAt(startPos)) != '\''))
-    {
-      valueBuffer.append(c);
-      startPos++;
-    }
-
-
-    // Skip over any trailing spaces after the value.
-    startPos++;
-    while (startPos < length && ((c = valueStr.charAt(startPos)) == ' '))
-    {
-      startPos++;
-    }
-
-
-    // If we're at the end of the value, then that's illegal.
-    if (startPos >= length)
-    {
-      LocalizableMessage message =
-          ERR_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE.get(valueStr);
-      throw new DirectoryException(
-              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
-    }
-
-
-    // Return the position of the first non-space character after the token.
-    return startPos;
-  }
-
-  /**
-   * Reads the value of a string enclosed in single quotes, skipping over the
-   * quotes and any leading or trailing spaces, and appending the string to the
-   * provided buffer.
-   *
-   * @param  valueStr     The user-provided representation of the objectclass
-   *                      definition.
-   * @param  lowerStr     The all-lowercase representation of the objectclass
-   *                      definition.
-   * @param  userBuffer   The buffer into which the user-provided representation
-   *                      of the value will be placed.
-   * @param  lowerBuffer  The buffer into which the all-lowercase representation
-   *                      of the value will be placed.
-   * @param  startPos     The position in the provided string at which to start
-   *                      reading the quoted string.
-   *
-   * @return  The position of the first character that is not part of the quoted
-   *          string or one of the trailing spaces after it.
-   *
-   * @throws  DirectoryException  If a problem is encountered while reading the
-   *                              quoted string.
-   */
-  private static int readQuotedString(String valueStr, String lowerStr,
-                                      StringBuilder userBuffer,
-                                      StringBuilder lowerBuffer, int startPos)
-          throws DirectoryException
-  {
-    // Skip over any spaces at the beginning of the value.
-    char c = '\u0000';
-    int  length = lowerStr.length();
-    while (startPos < length && ((c = lowerStr.charAt(startPos)) == ' '))
-    {
-      startPos++;
-    }
-
-    if (startPos >= length)
-    {
-      LocalizableMessage message =
-          ERR_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE.get(lowerStr);
-      throw new DirectoryException(
-              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
-    }
-
-
-    // The next character must be a single quote.
-    if (c != '\'')
-    {
-      LocalizableMessage message = WARN_ATTR_SYNTAX_OBJECTCLASS_EXPECTED_QUOTE_AT_POS.get(
-          valueStr,startPos, c);
-      throw new DirectoryException(
-              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
-    }
-
-
-    // Read until we find the closing quote.
-    startPos++;
-    while (startPos < length && ((c = lowerStr.charAt(startPos)) != '\''))
-    {
-      lowerBuffer.append(c);
-      userBuffer.append(valueStr.charAt(startPos));
-      startPos++;
-    }
-
-
-    // Skip over any trailing spaces after the value.
-    startPos++;
-    while (startPos < length && ((c = lowerStr.charAt(startPos)) == ' '))
-    {
-      startPos++;
-    }
-
-
-    // If we're at the end of the value, then that's illegal.
-    if (startPos >= length)
-    {
-      LocalizableMessage message =
-          ERR_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE.get(lowerStr);
-      throw new DirectoryException(
-              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
-    }
-
-
-    // Return the position of the first non-space character after the token.
-    return startPos;
-  }
-
-  /**
-   * Reads the attribute type/objectclass description or numeric OID from the
-   * provided string, skipping over any leading or trailing spaces, and
-   * appending the value to the provided buffer.
-   *
-   * @param  lowerStr    The string from which the name or OID is to be read.
-   * @param  woidBuffer  The buffer into which the name or OID should be
-   *                     appended.
-   * @param  startPos    The position at which to start reading.
-   *
-   * @return  The position of the first character after the name or OID that is
-   *          not a space.
-   *
-   * @throws  DirectoryException  If a problem is encountered while reading the
-   *                              name or OID.
-   */
-  private static int readWOID(String lowerStr, StringBuilder woidBuffer,
-                              int startPos)
-          throws DirectoryException
-  {
-    // Skip over any spaces at the beginning of the value.
-    char c = '\u0000';
-    int  length = lowerStr.length();
-    boolean allowExceptions = DirectoryServer.isRunning()?
-                        DirectoryServer.allowAttributeNameExceptions():true;
-    while (startPos < length && ((c = lowerStr.charAt(startPos)) == ' '))
-    {
-      startPos++;
-    }
-
-    if (startPos >= length)
-    {
-      LocalizableMessage message =
-          ERR_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE.get(lowerStr);
-      throw new DirectoryException(
-              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
-    }
-
-
-    // The next character must be either numeric (for an OID) or alphabetic (for
-    // an objectclass description).
-    if (isDigit(c))
-    {
-      // This must be a numeric OID.  In that case, we will accept only digits
-      // and periods, but not consecutive periods.
-      boolean lastWasPeriod = false;
-      while (startPos < length && ((c = lowerStr.charAt(startPos++)) != ' '))
-      {
-        if (c == '.')
-        {
-          if (lastWasPeriod)
-          {
-            LocalizableMessage message =
-              ERR_ATTR_SYNTAX_OBJECTCLASS_DOUBLE_PERIOD_IN_NUMERIC_OID.
-                  get(lowerStr, startPos-1);
-            throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
-          }
-          woidBuffer.append(c);
-          lastWasPeriod = true;
-        }
-        else if (!isDigit(c) && (!allowExceptions || (!isAlpha(c) && c != '-' && c != '_')))
-        {
-          // Technically, this must be an illegal character.  However, it is
-          // possible that someone just got sloppy and did not include a space
-          // between the name/OID and a closing parenthesis.  In that case,
-          // we'll assume it's the end of the value.  What's more, we'll have
-          // to prematurely return to nasty side effects from stripping off
-          // additional characters.
-          if (c == ')')
-          {
-            return startPos-1;
-          }
-
-          // This must have been an illegal character.
-          LocalizableMessage message =
-            ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR_IN_NUMERIC_OID.
-                get(lowerStr, c, startPos-1);
-          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
-        }
-        else
-        {
-          woidBuffer.append(c);
-          lastWasPeriod = false;
-        }
-      }
-    }
-    else if (isAlpha(c))
-    {
-      // This must be an objectclass description.  In this case, we will only
-      // accept alphabetic characters, numeric digits, and the hyphen.
-      while (startPos < length && ((c = lowerStr.charAt(startPos++)) != ' '))
-      {
-        if (isAlpha(c) || isDigit(c) || c == '-' ||
-            (c == '_' && allowExceptions))
-        {
-          woidBuffer.append(c);
-        }
-        else
-        {
-          // Technically, this must be an illegal character.  However, it is
-          // possible that someone just got sloppy and did not include a space
-          // between the name/OID and a closing parenthesis.  In that case,
-          // we'll assume it's the end of the value.  What's more, we'll have
-          // to prematurely return to nasty side effects from stripping off
-          // additional characters.
-          if (c == ')')
-          {
-            return startPos-1;
-          }
-
-          // This must have been an illegal character.
-          LocalizableMessage message =
-            ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR_IN_STRING_OID.
-                get(lowerStr, c, startPos-1);
-          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
-        }
-      }
-    }
-    else
-    {
-      LocalizableMessage message =
-          ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR.get(lowerStr, c, startPos);
-      throw new DirectoryException(
-              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
-    }
-
-
-    // Skip over any trailing spaces after the value.
-    while (startPos < length && ((c = lowerStr.charAt(startPos)) == ' '))
-    {
-      startPos++;
-    }
-
-
-    // If we're at the end of the value, then that's illegal.
-    if (startPos >= length)
-    {
-      LocalizableMessage message =
-          ERR_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE.get(lowerStr);
-      throw new DirectoryException(
-              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
-    }
-
-
-    // Return the position of the first non-space character after the token.
-    return startPos;
-  }
-
-  /**
-   * Reads the value for an "extra" parameter.  It will handle a single unquoted
-   * word (which is technically illegal, but we'll allow it), a single quoted
-   * string, or an open parenthesis followed by a space-delimited set of quoted
-   * strings or unquoted words followed by a close parenthesis.
-   *
-   * @param  valueStr   The string containing the information to be read.
-   * @param  valueList  The list of "extra" parameter values read so far.
-   * @param  startPos   The position in the value string at which to start
-   *                    reading.
-   *
-   * @return  The "extra" parameter value that was read.
-   *
-   * @throws  DirectoryException  If a problem occurs while attempting to read
-   *                              the value.
-   */
-  private static int readExtraParameterValues(String valueStr,
-                          List<String> valueList, int startPos)
-          throws DirectoryException
-  {
-    // Skip over any leading spaces.
-    int length = valueStr.length();
-    char c = valueStr.charAt(startPos++);
-    while (startPos < length && c == ' ')
-    {
-      c = valueStr.charAt(startPos++);
-    }
-
-    if (startPos >= length)
-    {
-      LocalizableMessage message =
-          ERR_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE.get(valueStr);
-      throw new DirectoryException(
-              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
-    }
-
-
-    // Look at the next character.  If it is a quote, then parse until the next
-    // quote and end.  If it is an open parenthesis, then parse individual
-    // values until the close parenthesis and end.  Otherwise, parse until the
-    // next space and end.
-    if (c == '\'')
-    {
-      // Parse until the closing quote.
-      StringBuilder valueBuffer = new StringBuilder();
-      while (startPos < length && ((c = valueStr.charAt(startPos++)) != '\''))
-      {
-        valueBuffer.append(c);
-      }
-
-      valueList.add(valueBuffer.toString());
-    }
-    else if (c == '(')
-    {
-      startPos++;
-      while (true)
-      {
-        // Skip over any leading spaces;
-        while (startPos < length && ((c = valueStr.charAt(startPos)) == ' '))
-        {
-          startPos++;
-        }
-
-        if (startPos >= length)
-        {
-          LocalizableMessage message =
-              ERR_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE.get(valueStr);
-          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
-                                       message);
-        }
-
-
-        if (c == ')')
-        {
-          // This is the end of the list.
-          startPos++;
-          break;
-        }
-        else if (c == '(')
-        {
-          // This is an illegal character.
-          LocalizableMessage message = ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR.get(valueStr, c, startPos);
-          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
-                                       message);
-        }
-        else
-        {
-          // We'll recursively call this method to deal with this.
-          startPos = readExtraParameterValues(valueStr, valueList, startPos);
-        }
-      }
-    }
-    else
-    {
-      // Parse until the next space.
-      StringBuilder valueBuffer = new StringBuilder();
-      while (startPos < length && ((c = valueStr.charAt(startPos++)) != ' '))
-      {
-        valueBuffer.append(c);
-      }
-
-      valueList.add(valueBuffer.toString());
-    }
-
-    // Skip over any trailing spaces.
-    while (startPos < length && valueStr.charAt(startPos) == ' ')
-    {
-      startPos++;
-    }
-
-    if (startPos >= length)
-    {
-      LocalizableMessage message =
-          ERR_ATTR_SYNTAX_OBJECTCLASS_TRUNCATED_VALUE.get(valueStr);
-      throw new DirectoryException(
-              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
-    }
-
-
-    return startPos;
-  }
-
-  /**
-   * Indicates whether the provided objectclass or any of its superiors is equal
-   * to the "top" objectclass.
-   *
-   * @param  superiorClass  The objectclass for which to make the determination.
-   *
-   * @return  {@code true} if the provided class or any of its superiors is
-   *          equal to the "top" objectclass, or {@code false} if not.
-   */
-  private static boolean superiorChainIncludesTop(ObjectClass superiorClass)
-  {
-    if (superiorClass == null)
-    {
-      return false;
-    }
-    else if (superiorClass.hasName(OC_TOP))
-    {
-      return true;
-    }
-    else
-    {
-      for(ObjectClass oc : superiorClass.getSuperiorClasses())
-      {
-        if(superiorChainIncludesTop(oc))
-        {
-          return true;
-        }
-      }
-    }
-    return false;
-  }
-}
-
+}
\ No newline at end of file

--
Gitblit v1.10.0