OPENDJ-1308 Migrate schema support

Jean-Noel Rouvignac

13.48.2014 3f8b5e8ec5ddba3499bc47eec0895dc5322ccf0f

OPENDJ-1308 Migrate schema support

MatchingRule.java:
Renamed getAllNames() to getNames() to match SDK.

 opendj3-server-dev/src/server/org/opends/server/api/AbstractMatchingRule.java

@@ -59,7 +59,7 @@
  /**
   * {@inheritDoc}
   */
  public abstract Collection<String> getAllNames();
  public abstract Collection<String> getNames();



@@ -225,7 +225,7 @@
    buffer.append("( ");
    buffer.append(getOID());
    buffer.append(" NAME ");
    Collection<String> names = getAllNames();
    Collection<String> names = getNames();
    if(names.size()>1)
    {
      buffer.append("(");

 opendj3-server-dev/src/server/org/opends/server/api/MatchingRule.java

@@ -63,7 +63,7 @@
   *
   * @return All names for this matching rule.
   */
  Collection<String> getAllNames();
  Collection<String> getNames();




 opendj3-server-dev/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRule.java

@@ -80,7 +80,7 @@
  /**
   * {@inheritDoc}
   */
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java

@@ -70,7 +70,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java

@@ -68,7 +68,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java

@@ -68,7 +68,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/BooleanEqualityMatchingRule.java

@@ -69,7 +69,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/CaseExactEqualityMatchingRule.java

@@ -73,7 +73,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java

@@ -85,7 +85,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRule.java

@@ -72,7 +72,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/CaseExactOrderingMatchingRule.java

@@ -76,7 +76,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/CaseExactSubstringMatchingRule.java

@@ -63,7 +63,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRule.java

@@ -63,7 +63,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java

@@ -71,7 +71,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java

@@ -71,7 +71,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListEqualityMatchingRule.java

@@ -63,7 +63,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListSubstringMatchingRule.java

@@ -63,7 +63,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRule.java

@@ -76,7 +76,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRule.java

@@ -63,7 +63,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactMatchingRule.java

@@ -101,7 +101,7 @@
  /**
   * {@inheritDoc}
   */
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java

@@ -440,7 +440,7 @@
    MatchingRule matchingRule = getMatchingRule(oid);
    if (matchingRule != null)
    {
      for (String name : matchingRule.getAllNames())
      for (String name : matchingRule.getNames())
      {
        names.add(name);
      }
@@ -476,7 +476,7 @@
    MatchingRule matchingRule = getMatchingRule(oid);
    if (matchingRule != null)
    {
      for (String name : matchingRule.getAllNames())
      for (String name : matchingRule.getNames())
      {
        names.add(name);
      }
@@ -516,7 +516,7 @@
    Collection<String> defaultNames = new HashSet<String>();
    if (matchingRule != null)
    {
      for (String name : matchingRule.getAllNames())
      for (String name : matchingRule.getNames())
      {
        defaultNames.add(name);
      }
@@ -534,7 +534,7 @@
    MatchingRule equalityMatchingRule = getMatchingRule(OID);
    if (equalityMatchingRule != null)
    {
      for (String name : equalityMatchingRule.getAllNames())
      for (String name : equalityMatchingRule.getNames())
      {
        names.add(name);
      }
@@ -570,7 +570,7 @@
    MatchingRule matchingRule = getMatchingRule(oid);
    if (matchingRule != null)
    {
      for (String name : matchingRule.getAllNames())
      for (String name : matchingRule.getNames())
      {
        names.add(name);
      }
@@ -606,7 +606,7 @@
    MatchingRule matchingRule = getMatchingRule(oid);
    if (matchingRule != null)
    {
      for (String name : matchingRule.getAllNames())
      for (String name : matchingRule.getNames())
      {
        names.add(name);
      }
@@ -641,7 +641,7 @@
    MatchingRule matchingRule = getMatchingRule(oid);
    if (matchingRule != null)
    {
      for (String name : matchingRule.getAllNames())
      for (String name : matchingRule.getNames())
      {
        names.add(name);
      }
@@ -763,7 +763,7 @@
     * {@inheritDoc}
     */
    @Override
    public Collection<String> getAllNames()
    public Collection<String> getNames()
    {
      return Collections.unmodifiableCollection(names);
    }

 opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRule.java

@@ -68,7 +68,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRule.java

@@ -69,7 +69,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRule.java

@@ -81,7 +81,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java

@@ -67,7 +67,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java

@@ -79,7 +79,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/IntegerEqualityMatchingRule.java

@@ -69,7 +69,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRule.java

@@ -76,7 +76,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/IntegerOrderingMatchingRule.java

@@ -81,7 +81,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/KeywordEqualityMatchingRule.java

@@ -54,7 +54,7 @@
  /**
   * {@inheritDoc}
   */
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java

@@ -1582,7 +1582,7 @@
       * {@inheritDoc}
       */
      @Override
      public Collection<String> getAllNames()
      public Collection<String> getNames()
      {
        return Collections.singleton(getName());
      }

 opendj3-server-dev/src/server/org/opends/server/schema/NumericStringEqualityMatchingRule.java

@@ -72,7 +72,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java

@@ -84,7 +84,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java

@@ -71,7 +71,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java

@@ -71,7 +71,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRule.java

@@ -73,7 +73,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/OctetStringEqualityMatchingRule.java

@@ -62,7 +62,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/OctetStringOrderingMatchingRule.java

@@ -75,7 +75,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSubstringMatchingRule.java

@@ -62,7 +62,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRule.java

@@ -65,7 +65,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRule.java

@@ -65,7 +65,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberEqualityMatchingRule.java

@@ -64,7 +64,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSubstringMatchingRule.java

@@ -67,7 +67,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/TimeBasedMatchingRuleFactory.java

@@ -473,7 +473,7 @@
      * {@inheritDoc}
      */
    @Override
    public Collection<String> getAllNames()
    public Collection<String> getNames()
    {
      return Collections.unmodifiableList(names);
    }
@@ -572,7 +572,7 @@
     * {@inheritDoc}
     */
    @Override
    public Collection<String> getAllNames()
    public Collection<String> getNames()
    {
      return Collections.unmodifiableList(names);
    }
@@ -761,7 +761,7 @@
     * {@inheritDoc}
     */
    @Override
    public Collection<String> getAllNames()
    public Collection<String> getNames()
    {
      return Collections.singleton(getName());
    }

 opendj3-server-dev/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java

@@ -69,7 +69,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/UUIDOrderingMatchingRule.java

@@ -82,7 +82,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java

@@ -74,7 +74,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java

@@ -69,7 +69,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordExactEqualityMatchingRule.java

@@ -63,7 +63,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/schema/WordEqualityMatchingRule.java

@@ -79,7 +79,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/src/server/org/opends/server/types/Schema.java

@@ -1214,7 +1214,7 @@
                           ResultCode.CONSTRAINT_VIOLATION, message);
          }

          for(String name:matchingRule.getAllNames())
          for(String name:matchingRule.getNames())
          {
            if (name != null)
            {
@@ -1237,7 +1237,7 @@
        matchingRules.put(toLowerCase(matchingRule.getOID()),
                          matchingRule);

        for(String name:matchingRule.getAllNames())
        for(String name:matchingRule.getNames())
        {
          if (name != null)
          {
@@ -1296,7 +1296,7 @@
        matchingRules.remove(toLowerCase(matchingRule.getOID()),
                             matchingRule);

        for(String name:matchingRule.getAllNames())
        for(String name:matchingRule.getNames())
        {
          if (name != null)
          {
@@ -1407,7 +1407,7 @@
                         ResultCode.CONSTRAINT_VIOLATION, message);
        }

       for(String name:matchingRule.getAllNames())
       for(String name:matchingRule.getNames())
       {
        if (name != null)
        {
@@ -1430,7 +1430,7 @@
      approximateMatchingRules.put(oid, matchingRule);
      matchingRules.put(oid, matchingRule);

      for(String name:matchingRule.getAllNames())
      for(String name:matchingRule.getNames())
      {
        if (name != null)
        {
@@ -1470,7 +1470,7 @@
      approximateMatchingRules.remove(oid, matchingRule);
      matchingRules.remove(oid, matchingRule);

      for(String name:matchingRule.getAllNames())
      for(String name:matchingRule.getNames())
      {
        if (name != null)
        {
@@ -1579,7 +1579,7 @@
                         ResultCode.CONSTRAINT_VIOLATION, message);
        }

        for(String name:matchingRule.getAllNames())
        for(String name:matchingRule.getNames())
        {
           if (name != null)
           {
@@ -1604,7 +1604,7 @@
      equalityMatchingRules.put(oid, matchingRule);
      matchingRules.put(oid, matchingRule);

      for(String name:matchingRule.getAllNames())
      for(String name:matchingRule.getNames())
      {
        if (name != null)
        {
@@ -1644,7 +1644,7 @@
      equalityMatchingRules.remove(oid, matchingRule);
      matchingRules.remove(oid, matchingRule);

      for(String name:matchingRule.getAllNames())
      for(String name:matchingRule.getNames())
      {
        if (name != null)
        {
@@ -1754,7 +1754,7 @@
                         ResultCode.CONSTRAINT_VIOLATION, message);
        }

        for(String name:matchingRule.getAllNames())
        for(String name:matchingRule.getNames())
        {
          if (name != null)
          {
@@ -1778,7 +1778,7 @@
      orderingMatchingRules.put(oid, matchingRule);
      matchingRules.put(oid, matchingRule);

      for(String name:matchingRule.getAllNames())
      for(String name:matchingRule.getNames())
      {
        if (name != null)
        {
@@ -1818,7 +1818,7 @@
      orderingMatchingRules.remove(oid, matchingRule);
      matchingRules.remove(oid, matchingRule);

      for(String name:matchingRule.getAllNames())
      for(String name:matchingRule.getNames())
      {
        if (name != null)
        {
@@ -1927,7 +1927,7 @@
                         ResultCode.CONSTRAINT_VIOLATION, message);
        }

        for(String name:matchingRule.getAllNames())
        for(String name:matchingRule.getNames())
        {
          if (name != null)
          {
@@ -1951,7 +1951,7 @@
      substringMatchingRules.put(oid, matchingRule);
      matchingRules.put(oid, matchingRule);

      for(String name:matchingRule.getAllNames())
      for(String name:matchingRule.getNames())
      {
        if (name != null)
        {
@@ -1991,7 +1991,7 @@
      substringMatchingRules.remove(oid, matchingRule);
      matchingRules.remove(oid, matchingRule);

      for(String name:matchingRule.getAllNames())
      for(String name:matchingRule.getNames())
      {
        if (name != null)
        {
@@ -2107,7 +2107,7 @@
                         ResultCode.CONSTRAINT_VIOLATION, message);
        }

       for(String name:matchingRule.getAllNames())
       for(String name:matchingRule.getNames())
       {
        if (name != null)
        {
@@ -2130,7 +2130,7 @@
      extensibleMatchingRules.put(oid, matchingRule);
      matchingRules.put(oid, matchingRule);

      for(String name:matchingRule.getAllNames())
      for(String name:matchingRule.getNames())
      {
        if (name != null)
        {
@@ -2170,7 +2170,7 @@
      extensibleMatchingRules.remove(oid, matchingRule);
      matchingRules.remove(oid, matchingRule);

      for(String name:matchingRule.getAllNames())
      for(String name:matchingRule.getNames())
      {
        if (name != null)
        {

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaTestMatchingRule.java

@@ -119,7 +119,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualLengthApproximateMatchingRule.java

@@ -62,7 +62,7 @@
   * {@inheritDoc}
   */
  @Override
  public Collection<String> getAllNames()
  public Collection<String> getNames()
  {
    return Collections.singleton(getName());
  }