OPENDJ-1308 Migrate schema support

Jean-Noel Rouvignac

14.19.2014 04c1aca24a2cc5dc8d9a4f22ba05ac74de607f06

OPENDJ-1308 Migrate schema support

MatchingRule.java:
Renamed normalizeValue() to normalizeAttributeValue() to match the SDK.

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

@@ -60,7 +60,7 @@
      throws DirectoryException
  {
    // Default implementation is to use attribute value normalization.
    return normalizeValue(value);
    return normalizeAttributeValue(value);
  }


@@ -102,17 +102,6 @@
    return false;
  }



  /**
   * {@inheritDoc}
   */
  @Override
  public abstract ByteString normalizeValue(ByteSequence value)
      throws DirectoryException;



  /**
   * {@inheritDoc}
   */

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

@@ -139,7 +139,7 @@
   *           If the provided value is invalid according to the
   *           associated attribute syntax.
   */
  ByteString normalizeValue(ByteSequence value)
  ByteString normalizeAttributeValue(ByteSequence value)
      throws DirectoryException;



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

@@ -556,7 +556,7 @@
    ByteString normalizedValue;
    try
    {
      normalizedValue = matchingRule.normalizeValue(value.getValue());
      normalizedValue = matchingRule.normalizeAttributeValue(value.getValue());
    }
    catch (Exception e)
    {
@@ -572,7 +572,7 @@
    {
      try
      {
        ByteString nv = matchingRule.normalizeValue(v.getValue());
        ByteString nv = matchingRule.normalizeAttributeValue(v.getValue());
        if (matchingRule.approximatelyMatch(nv, normalizedValue))
        {
          return ConditionResult.TRUE;

 opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/PatternRDN.java

@@ -310,7 +310,7 @@
      else
      {
        ByteString thisNormValue =
            type.getEqualityMatchingRule().normalizeValue(pattern.get(0));
            type.getEqualityMatchingRule().normalizeAttributeValue(pattern.get(0));
        ByteString thatNormValue = value.getNormalizedValue();
        EqualityMatchingRule mr = type.getEqualityMatchingRule();
        return mr.areEqual(thisNormValue, thatNormValue);

 opendj3-server-dev/src/server/org/opends/server/backends/jeb/ApproximateIndexer.java

@@ -165,7 +165,7 @@
        try
        {
          byte[] keyBytes =
               approximateRule.normalizeValue(value.getValue()).toByteArray();
               approximateRule.normalizeAttributeValue(value.getValue()).toByteArray();

          keys.add(keyBytes);
        }
@@ -201,8 +201,8 @@
      {
        try
        {
          byte[] keyBytes =
              approximateRule.normalizeValue(value.getValue()).toByteArray();
          byte[] keyBytes = approximateRule
              .normalizeAttributeValue(value.getValue()).toByteArray();

          Boolean cInsert = modifiedKeys.get(keyBytes);
          if(cInsert == null)

 opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java

@@ -1095,7 +1095,7 @@
      // Use the ordering matching rule to normalize the value.
      OrderingMatchingRule orderingRule =
           filter.getAttributeType().getOrderingMatchingRule();
      byte[] lower = orderingRule.normalizeValue(
      byte[] lower = orderingRule.normalizeAttributeValue(
           filter.getAssertionValue().getValue()).toByteArray();

      // Set the upper bound to 0 to search all keys greater then the lower
@@ -1183,7 +1183,7 @@
      // Use the ordering matching rule to normalize the value.
      OrderingMatchingRule orderingRule =
           filter.getAttributeType().getOrderingMatchingRule();
      byte[] upper = orderingRule.normalizeValue(
      byte[] upper = orderingRule.normalizeAttributeValue(
           filter.getAssertionValue().getValue()).toByteArray();

      if(debugBuffer != null)
@@ -1438,11 +1438,11 @@

      // Set the lower bound for a range search.
      byte[] lower =
          orderingRule.normalizeValue(lowerValue.getValue()).toByteArray();
          orderingRule.normalizeAttributeValue(lowerValue.getValue()).toByteArray();

      // Set the upper bound for a range search.
      byte[] upper =
          orderingRule.normalizeValue(upperValue.getValue()).toByteArray();
          orderingRule.normalizeAttributeValue(upperValue.getValue()).toByteArray();

      // Read the range: lower <= keys <= upper.
      return orderingIndex.readRange(lower, upper, true, true);
@@ -1534,7 +1534,7 @@
          approximateFilter.getAttributeType().getApproximateMatchingRule();
      // Make a key from the normalized assertion value.
      byte[] keyBytes =
           approximateMatchingRule.normalizeValue(
           approximateMatchingRule.normalizeAttributeValue(
               approximateFilter.getAssertionValue().getValue()).toByteArray();
      DatabaseEntry key = new DatabaseEntry(keyBytes);


 opendj3-server-dev/src/server/org/opends/server/backends/jeb/OrderingIndexer.java

@@ -168,7 +168,7 @@
      {
        try
        {
          byte[] keyBytes = orderingRule.normalizeValue(value.getValue())
          byte[] keyBytes = orderingRule.normalizeAttributeValue(value.getValue())
              .toByteArray();

          keys.add(keyBytes);
@@ -207,7 +207,7 @@
        try
        {
          byte[] keyBytes =
               orderingRule.normalizeValue(value.getValue()).toByteArray();
               orderingRule.normalizeAttributeValue(value.getValue()).toByteArray();

          Boolean cInsert = modifiedKeys.get(keyBytes);
          if(cInsert == null)

 opendj3-server-dev/src/server/org/opends/server/backends/jeb/SubstringIndexer.java

@@ -170,7 +170,7 @@
      {
        try
        {
          byte[] normalizedBytes = rule.normalizeValue(value.getValue()).
          byte[] normalizedBytes = rule.normalizeAttributeValue(value.getValue()).
                  toByteArray();

          substringKeys(normalizedBytes, keys);
@@ -253,7 +253,7 @@
      {
        try
        {
          byte[] normalizedBytes = rule.normalizeValue(value.getValue())
          byte[] normalizedBytes = rule.normalizeAttributeValue(value.getValue())
                  .toByteArray();

          substringKeys(normalizedBytes, modifiedKeys, insert);

 opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java

@@ -1766,7 +1766,7 @@
                 attr.getAttributeType().getOrderingMatchingRule();

            normalizedBytes =
                 orderingRule.normalizeValue(value.getValue()).toByteArray();
                 orderingRule.normalizeAttributeValue(value.getValue()).toByteArray();

            DatabaseEntry key = new DatabaseEntry(normalizedBytes);
            try
@@ -1809,7 +1809,7 @@
                attr.getAttributeType().getApproximateMatchingRule();

            normalizedBytes =
                approximateRule.normalizeValue(value.getValue()).toByteArray();
                approximateRule.normalizeAttributeValue(value.getValue()).toByteArray();

            DatabaseEntry key = new DatabaseEntry(normalizedBytes);
            try

 opendj3-server-dev/src/server/org/opends/server/controls/MatchedValuesFilter.java

@@ -1328,7 +1328,7 @@
                 new ArrayList<ByteSequence>(normalizedSubAny);

            return substringMatchingRule.valueMatchesSubstring(
                 substringMatchingRule.normalizeValue(value.getValue()),
                 substringMatchingRule.normalizeAttributeValue(value.getValue()),
                 normalizedSubInitial,
                 normalizedSubAnyBS, normalizedSubFinal);
          }
@@ -1354,7 +1354,7 @@
          {
            return (orderingMatchingRule.compareValues(
                         assertionValue.getNormalizedValue(),
                         orderingMatchingRule.normalizeValue(
                         orderingMatchingRule.normalizeAttributeValue(
                         value.getValue())) >= 0);
          }
          catch (Exception e)
@@ -1379,7 +1379,7 @@
          {
            return (orderingMatchingRule.compareValues(
                         assertionValue.getNormalizedValue(),
                         orderingMatchingRule.normalizeValue(
                         orderingMatchingRule.normalizeAttributeValue(
                         value.getValue())) <= 0);
          }
          catch (Exception e)
@@ -1407,10 +1407,10 @@
        {
          try
          {
            ByteString nv1 =  approximateMatchingRule.normalizeValue(
            ByteString nv1 =  approximateMatchingRule.normalizeAttributeValue(
                    assertionValue.getNormalizedValue());
            ByteString nv2 =  approximateMatchingRule.normalizeValue(
                    approximateMatchingRule.normalizeValue(value.getValue()));
            ByteString nv2 =  approximateMatchingRule.normalizeAttributeValue(
                    value.getValue());

            return approximateMatchingRule.approximatelyMatch(nv1, nv2);
          }
@@ -1443,9 +1443,9 @@
          try
          {
            ByteString nv1 =
                 matchingRule.normalizeValue(value.getValue());
                 matchingRule.normalizeAttributeValue(value.getValue());
            ByteString nv2 =
                 matchingRule.normalizeValue(assertionValue.getValue());
                 matchingRule.normalizeAttributeValue(assertionValue.getValue());

            return (matchingRule.valuesMatch(nv1, nv2) == ConditionResult.TRUE);
          }

 opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyFactory.java

@@ -343,7 +343,7 @@
          }
          else
          {
            valueString = syntax.getEqualityMatchingRule().normalizeValue(
            valueString = syntax.getEqualityMatchingRule().normalizeAttributeValue(
                valueString);
            requireChangeByTime = GeneralizedTimeSyntax
                .decodeGeneralizedTimeValue(valueString);

 opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPFilter.java

@@ -1954,7 +1954,7 @@
        }
        else
        {
          ByteString normalizedValue = mr.normalizeValue(assertionValue);
          ByteString normalizedValue = mr.normalizeAttributeValue(assertionValue);
          value = AttributeValues.create(assertionValue,
              normalizedValue);
        }

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

@@ -119,7 +119,7 @@
   * {@inheritDoc}
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
      throws DirectoryException
  {
    /*

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

@@ -130,7 +130,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    // We will not alter the value in any way.

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

@@ -127,7 +127,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    try

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

@@ -128,7 +128,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    String valueString = value.toString().toUpperCase();

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

@@ -129,7 +129,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    String valueString = value.toString().toUpperCase();

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

@@ -122,7 +122,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    StringBuilder buffer = new StringBuilder();

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

@@ -132,7 +132,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    StringBuilder buffer = new StringBuilder();

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

@@ -132,7 +132,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    StringBuilder buffer = new StringBuilder();

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

@@ -136,7 +136,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    StringBuilder buffer = new StringBuilder();

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

@@ -123,7 +123,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    StringBuilder buffer = new StringBuilder();

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

@@ -123,7 +123,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    StringBuilder buffer = new StringBuilder();

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

@@ -131,7 +131,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    StringBuilder buffer = new StringBuilder();

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

@@ -131,7 +131,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    StringBuilder buffer = new StringBuilder();

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

@@ -123,7 +123,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    StringBuilder buffer = new StringBuilder();

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

@@ -123,7 +123,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    StringBuilder buffer = new StringBuilder();

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

@@ -136,7 +136,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    StringBuilder buffer = new StringBuilder();

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

@@ -123,7 +123,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    StringBuilder buffer = new StringBuilder();

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

@@ -163,7 +163,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    // The normalized form of this value is the GSER encoded ....
@@ -260,7 +260,7 @@
      // Assume the assertion value is a certificate and parse issuer and serial
      // number. If the value is not even a certificate then the raw bytes will
      // be returned.
      return normalizeValue(value);
      return normalizeAttributeValue(value);
    }

    try

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

@@ -863,7 +863,7 @@
     * {@inheritDoc}
     */
    @Override
    public ByteString normalizeValue(ByteSequence value)
    public ByteString normalizeAttributeValue(ByteSequence value)
        throws DirectoryException
    {
      CollationKey key = collator.getCollationKey(value.toString());
@@ -900,7 +900,7 @@
    {
      // Normalize the assertion value.
      return factory.createExactMatchQuery(indexer
          .getExtensibleIndexID(), normalizeValue(assertionValue));
          .getExtensibleIndexID(), normalizeAttributeValue(assertionValue));
    }


@@ -959,7 +959,7 @@
     * {@inheritDoc}
     */
    @Override
    public ByteString normalizeValue(ByteSequence value)
    public ByteString normalizeAttributeValue(ByteSequence value)
        throws DirectoryException
    {
      CollationKey key = collator.getCollationKey(value.toString());
@@ -1711,7 +1711,7 @@
     * {@inheritDoc}
     */
    @Override
    public ByteString normalizeValue(ByteSequence value)
    public ByteString normalizeAttributeValue(ByteSequence value)
        throws DirectoryException
    {
      CollationKey key = collator.getCollationKey(value.toString());
@@ -1805,7 +1805,7 @@
    {
      return factory.createRangeMatchQuery(indexer
          .getExtensibleIndexID(), ByteString.empty(),
          normalizeValue(assertionValue), false, false);
          normalizeAttributeValue(assertionValue), false, false);
    }
  }

@@ -1874,7 +1874,7 @@
      // Read the range: lower < keys <= upper.
      return factory.createRangeMatchQuery(indexer
          .getExtensibleIndexID(), ByteString.empty(),
          normalizeValue(assertionValue), false, true);
          normalizeAttributeValue(assertionValue), false, true);
    }
  }

@@ -1941,7 +1941,7 @@
        IndexQueryFactory<T> factory) throws DirectoryException
    {
      return factory.createRangeMatchQuery(indexer
          .getExtensibleIndexID(), normalizeValue(assertionValue),
          .getExtensibleIndexID(), normalizeAttributeValue(assertionValue),
          ByteString.empty(), false, false);
    }
  }
@@ -2010,7 +2010,7 @@
    {
      // Read the range: lower <= keys < upper.
      return factory.createRangeMatchQuery(indexer
          .getExtensibleIndexID(), normalizeValue(assertionValue),
          .getExtensibleIndexID(), normalizeAttributeValue(assertionValue),
          ByteString.empty(), true, false);
    }
  }
@@ -2065,7 +2065,7 @@
      ByteString key;
      try
      {
        key = matchingRule.normalizeValue(value.getValue());
        key = matchingRule.normalizeAttributeValue(value.getValue());
        keys.add(key.toByteArray());
      }
      catch (DirectoryException de)

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

@@ -128,7 +128,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    StringBuilder buffer = new StringBuilder();

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

@@ -129,7 +129,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    // Since the normalization for DNs is so complex, it will be handled

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

@@ -143,7 +143,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    String valueString = value.toString();

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

@@ -127,7 +127,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    try

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

@@ -139,7 +139,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    try

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

@@ -129,7 +129,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    int length = value.length();

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

@@ -132,7 +132,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    StringBuilder buffer = new StringBuilder();

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

@@ -141,7 +141,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    int length = value.length();

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

@@ -1605,7 +1605,7 @@
       * {@inheritDoc}
       */
      @Override
      public ByteString normalizeValue(ByteSequence value)
      public ByteString normalizeAttributeValue(ByteSequence value)
              throws DirectoryException
      {
        StringBuilder buffer = new StringBuilder();

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

@@ -132,7 +132,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    StringBuilder buffer = new StringBuilder();

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

@@ -144,7 +144,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    StringBuilder buffer = new StringBuilder();

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

@@ -131,7 +131,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    StringBuilder buffer = new StringBuilder();
@@ -193,7 +193,7 @@
  public ByteString normalizeSubstring(ByteSequence substring)
         throws DirectoryException
  {
    return normalizeValue(substring);
    return normalizeAttributeValue(substring);
  }
}


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

@@ -127,7 +127,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    StringBuilder buffer = new StringBuilder();

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

@@ -133,7 +133,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    StringBuilder buffer = new StringBuilder();

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

@@ -122,7 +122,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    return value.toByteString();

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

@@ -135,7 +135,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    return value.toByteString();

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

@@ -122,7 +122,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    return value.toByteString();

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

@@ -125,7 +125,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    StringBuilder buffer = new StringBuilder();

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

@@ -125,7 +125,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    StringBuilder buffer = new StringBuilder();

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

@@ -124,7 +124,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    String valueString = value.toString();

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

@@ -127,7 +127,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    String valueString = value.toString();
@@ -169,7 +169,7 @@
  {
    // In this case, the logic used to normalize a substring is identical to the
    // logic used to normalize a full value.
    ByteString value = normalizeValue(substring);
    ByteString value = normalizeAttributeValue(substring);
    if (value.length() == 0)
    {
      throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,

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

@@ -162,7 +162,7 @@
      * {@inheritDoc}
      */
    @Override
    public ByteString normalizeValue(ByteSequence value)
    public ByteString normalizeAttributeValue(ByteSequence value)
            throws DirectoryException
    {
      try
@@ -636,7 +636,7 @@
      ByteString key;
      try
      {
        key = matchingRule.normalizeValue(value.getValue());
        key = matchingRule.normalizeAttributeValue(value.getValue());
        keys.add(key.toByteArray());
      }
      catch (DirectoryException de)

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

@@ -129,7 +129,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    if (value.length() != 36)

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

@@ -142,7 +142,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    if (value.length() != 36)

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

@@ -134,7 +134,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    String valueString = value.toString().trim();

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

@@ -129,7 +129,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    // We will not alter the value in any way

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

@@ -123,7 +123,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    // The normalized form of this matching rule is exactly equal to the

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

@@ -139,7 +139,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    StringBuilder buffer = new StringBuilder();

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

@@ -168,7 +168,7 @@
      try
      {
        normalizedValue =
          matchingRule.normalizeValue(value.getValue());
          matchingRule.normalizeAttributeValue(value.getValue());
      }
      catch (Exception e)
      {
@@ -184,7 +184,7 @@
      {
        try
        {
          ByteString nv = matchingRule.normalizeValue(v.getValue());
          ByteString nv = matchingRule.normalizeAttributeValue(v.getValue());
          if (matchingRule.approximatelyMatch(nv, normalizedValue))
          {
            return ConditionResult.TRUE;
@@ -268,8 +268,7 @@
      ByteString normalizedValue;
      try
      {
        normalizedValue =
                matchingRule.normalizeValue(value.getValue());
        normalizedValue = matchingRule.normalizeAttributeValue(value.getValue());
      }
      catch (Exception e)
      {
@@ -285,8 +284,7 @@
      {
        try
        {
          ByteString nv =
                  matchingRule.normalizeValue(v.getValue());
          ByteString nv = matchingRule.normalizeAttributeValue(v.getValue());
          int comparisonResult = matchingRule
              .compareValues(nv, normalizedValue);
          if (comparisonResult >= 0)
@@ -349,8 +347,7 @@
      ByteString normalizedValue;
      try
      {
        normalizedValue =
                matchingRule.normalizeValue(value.getValue());
        normalizedValue = matchingRule.normalizeAttributeValue(value.getValue());
      }
      catch (Exception e)
      {
@@ -366,7 +363,7 @@
      {
        try
        {
          ByteString nv = matchingRule.normalizeValue(v.getValue());
          ByteString nv = matchingRule.normalizeAttributeValue(v.getValue());
          int comparisonResult = matchingRule
              .compareValues(nv, normalizedValue);
          if (comparisonResult <= 0)
@@ -482,7 +479,7 @@
        {
          if (matchingRule.valueMatchesSubstring(
              attributeType.getSubstringMatchingRule().
                    normalizeValue(value.getValue()),
                    normalizeAttributeValue(value.getValue()),
              normalizedSubInitial,
              normalizedSubAny,
              normalizedSubFinal))

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

@@ -180,7 +180,7 @@
              ResultCode.INAPPROPRIATE_MATCHING, message);
        }

        normalizedValue = equalityMatchingRule.normalizeValue(value);
        normalizedValue = equalityMatchingRule.normalizeAttributeValue(value);
      }

      return normalizedValue;

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

@@ -445,7 +445,7 @@
      String valueString = attributeType.getDefinition();
      ByteString rawValue = ByteString.valueOf(valueString);
      ByteString normValue =
          normalizationMatchingRule.normalizeValue(rawValue);
          normalizationMatchingRule.normalizeAttributeValue(rawValue);
      attributeTypeSet.add(AttributeValues.create(rawValue,
          normValue));
    }
@@ -492,7 +492,7 @@
        String valueString = attributeType.getDefinition();
        ByteString rawValue = ByteString.valueOf(valueString);
        ByteString normValue =
             normalizationMatchingRule.normalizeValue(rawValue);
             normalizationMatchingRule.normalizeAttributeValue(rawValue);
        attributeTypeSet.remove(AttributeValues.create(rawValue,
                                                   normValue));
      }
@@ -737,7 +737,7 @@
      String valueString = objectClass.getDefinition();
      ByteString rawValue = ByteString.valueOf(valueString);
      ByteString normValue =
          normalizationMatchingRule.normalizeValue(rawValue);
          normalizationMatchingRule.normalizeAttributeValue(rawValue);
      objectClassSet.add(AttributeValues.create(rawValue, normValue));
    }
  }
@@ -776,7 +776,7 @@
        String valueString = objectClass.getDefinition();
        ByteString rawValue = ByteString.valueOf(valueString);
        ByteString normValue =
             normalizationMatchingRule.normalizeValue(rawValue);
             normalizationMatchingRule.normalizeAttributeValue(rawValue);
        objectClassSet.remove(AttributeValues.create(rawValue,
                                                 normValue));
      }
@@ -901,7 +901,7 @@
      String valueString = syntax.toString();
      ByteString rawValue = ByteString.valueOf(valueString);
      ByteString normValue =
          normalizationMatchingRule.normalizeValue(rawValue);
          normalizationMatchingRule.normalizeAttributeValue(rawValue);
      syntaxSet.add(AttributeValues.create(rawValue, normValue));
    }
  }
@@ -930,7 +930,7 @@
        String valueString = syntax.toString();
        ByteString rawValue = ByteString.valueOf(valueString);
        ByteString normValue =
             normalizationMatchingRule.normalizeValue(rawValue);
             normalizationMatchingRule.normalizeAttributeValue(rawValue);
        syntaxSet.remove(AttributeValues.create(rawValue, normValue));
      }
      catch (Exception e)
@@ -1251,7 +1251,7 @@
        String valueString = matchingRule.toString();
        ByteString rawValue = ByteString.valueOf(valueString);
        ByteString normValue =
             normalizationMatchingRule.normalizeValue(rawValue);
             normalizationMatchingRule.normalizeAttributeValue(rawValue);
        matchingRuleSet.add(
            AttributeValues.create(rawValue, normValue));
      }
@@ -1313,7 +1313,7 @@
          String valueString = matchingRule.toString();
          ByteString rawValue = ByteString.valueOf(valueString);
          ByteString normValue =
              normalizationMatchingRule.normalizeValue(rawValue);
              normalizationMatchingRule.normalizeAttributeValue(rawValue);
          matchingRuleSet.remove(AttributeValues.create(rawValue,
              normValue));
        }
@@ -1446,7 +1446,7 @@
      String valueString = matchingRule.toString();
      ByteString rawValue = ByteString.valueOf(valueString);
      ByteString normValue =
          normalizationMatchingRule.normalizeValue(rawValue);
          normalizationMatchingRule.normalizeAttributeValue(rawValue);
      matchingRuleSet.add(AttributeValues.create(rawValue,
          normValue));
    }
@@ -1488,7 +1488,7 @@
        String valueString = matchingRule.toString();
        ByteString rawValue = ByteString.valueOf(valueString);
        ByteString normValue =
             normalizationMatchingRule.normalizeValue(rawValue);
             normalizationMatchingRule.normalizeAttributeValue(rawValue);
        matchingRuleSet.remove(AttributeValues.create(rawValue,
                                                  normValue));
      }
@@ -1620,7 +1620,7 @@
      String valueString = matchingRule.toString();
      ByteString rawValue = ByteString.valueOf(valueString);
      ByteString normValue =
          normalizationMatchingRule.normalizeValue(rawValue);
          normalizationMatchingRule.normalizeAttributeValue(rawValue);
      matchingRuleSet.add(AttributeValues.create(rawValue,
          normValue));
    }
@@ -1663,7 +1663,7 @@
        String valueString = matchingRule.toString();
        ByteString rawValue = ByteString.valueOf(valueString);
        ByteString normValue =
             normalizationMatchingRule.normalizeValue(rawValue);
             normalizationMatchingRule.normalizeAttributeValue(rawValue);
        matchingRuleSet.remove(AttributeValues.create(rawValue,
                                                  normValue));
      }
@@ -1794,7 +1794,7 @@
      String valueString = matchingRule.toString();
        ByteString rawValue = ByteString.valueOf(valueString);
        ByteString normValue =
             normalizationMatchingRule.normalizeValue(rawValue);
             normalizationMatchingRule.normalizeAttributeValue(rawValue);
      matchingRuleSet.add(AttributeValues.create(rawValue,
          normValue));
    }
@@ -1836,7 +1836,7 @@
        String valueString = matchingRule.toString();
        ByteString rawValue = ByteString.valueOf(valueString);
        ByteString normValue =
             normalizationMatchingRule.normalizeValue(rawValue);
             normalizationMatchingRule.normalizeAttributeValue(rawValue);
        matchingRuleSet.remove(AttributeValues.create(rawValue,
                                                  normValue));
      }
@@ -1967,7 +1967,7 @@
      String valueString = matchingRule.toString();
        ByteString rawValue = ByteString.valueOf(valueString);
        ByteString normValue =
             normalizationMatchingRule.normalizeValue(rawValue);
             normalizationMatchingRule.normalizeAttributeValue(rawValue);
      matchingRuleSet.add(AttributeValues.create(rawValue,
          normValue));
    }
@@ -2009,7 +2009,7 @@
        String valueString = matchingRule.toString();
        ByteString rawValue = ByteString.valueOf(valueString);
        ByteString normValue =
             normalizationMatchingRule.normalizeValue(rawValue);
             normalizationMatchingRule.normalizeAttributeValue(rawValue);
        matchingRuleSet.remove(AttributeValues.create(rawValue,
                                                  normValue));
      }
@@ -2145,7 +2145,7 @@
      // that would kill performance.
      String valueString = matchingRule.toString();
      ByteString rawValue  = ByteString.valueOf(valueString);
      ByteString normValue = normalizationMatchingRule.normalizeValue(
      ByteString normValue = normalizationMatchingRule.normalizeAttributeValue(
                                  rawValue);
      matchingRuleSet.add(
          AttributeValues.create(rawValue, normValue));
@@ -2188,7 +2188,7 @@
        String valueString = matchingRule.toString();
        ByteString rawValue = ByteString.valueOf(valueString);
        ByteString normValue =
            normalizationMatchingRule.normalizeValue(rawValue);
            normalizationMatchingRule.normalizeAttributeValue(rawValue);
        matchingRuleSet.remove(AttributeValues.create(rawValue,
            normValue));
      }
@@ -2318,7 +2318,7 @@
      String valueString = matchingRuleUse.getDefinition();
      ByteString rawValue = ByteString.valueOf(valueString);
      ByteString normValue =
          normalizationMatchingRule.normalizeValue(rawValue);
          normalizationMatchingRule.normalizeAttributeValue(rawValue);
      matchingRuleUseSet.add(AttributeValues.create(rawValue,
          normValue));
    }
@@ -2350,7 +2350,7 @@
        String valueString = matchingRuleUse.getDefinition();
        ByteString rawValue = ByteString.valueOf(valueString);
        ByteString normValue =
             normalizationMatchingRule.normalizeValue(rawValue);
             normalizationMatchingRule.normalizeAttributeValue(rawValue);
        matchingRuleUseSet.remove(AttributeValues.create(rawValue,
                                                     normValue));
      }
@@ -2479,7 +2479,7 @@
      String valueString = ditContentRule.getDefinition();
      ByteString rawValue = ByteString.valueOf(valueString);
      ByteString normValue =
          normalizationMatchingRule.normalizeValue(rawValue);
          normalizationMatchingRule.normalizeAttributeValue(rawValue);
      ditContentRuleSet.add(AttributeValues.create(rawValue,
          normValue));
    }
@@ -2510,7 +2510,7 @@
        String valueString = ditContentRule.getDefinition();
        ByteString rawValue = ByteString.valueOf(valueString);
        ByteString normValue =
             normalizationMatchingRule.normalizeValue(rawValue);
             normalizationMatchingRule.normalizeAttributeValue(rawValue);
        ditContentRuleSet.remove(AttributeValues.create(rawValue,
                                                    normValue));
      }
@@ -2708,7 +2708,7 @@
      String valueString = ditStructureRule.getDefinition();
      ByteString rawValue = ByteString.valueOf(valueString);
      ByteString normValue =
          normalizationMatchingRule.normalizeValue(rawValue);
          normalizationMatchingRule.normalizeAttributeValue(rawValue);
      ditStructureRuleSet.add(AttributeValues.create(rawValue,
                                                 normValue));
    }
@@ -2742,7 +2742,7 @@
        String valueString = ditStructureRule.getDefinition();
        ByteString rawValue = ByteString.valueOf(valueString);
        ByteString normValue =
             normalizationMatchingRule.normalizeValue(rawValue);
             normalizationMatchingRule.normalizeAttributeValue(rawValue);
        ditStructureRuleSet.remove(AttributeValues.create(rawValue,
                                                      normValue));
      }
@@ -2961,7 +2961,7 @@
      String valueString = nameForm.getDefinition();
      ByteString rawValue = ByteString.valueOf(valueString);
      ByteString normValue =
          normalizationMatchingRule.normalizeValue(rawValue);
          normalizationMatchingRule.normalizeAttributeValue(rawValue);
      nameFormSet.add(AttributeValues.create(rawValue, normValue));
    }
  }
@@ -3005,7 +3005,7 @@
        String valueString = nameForm.getDefinition();
        ByteString rawValue = ByteString.valueOf(valueString);
        ByteString normValue =
             normalizationMatchingRule.normalizeValue(rawValue);
             normalizationMatchingRule.normalizeAttributeValue(rawValue);
        nameFormSet.remove(AttributeValues.create(rawValue,
            normValue));
      }

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

@@ -2088,7 +2088,7 @@
        else
        {
          value = AttributeValues.create(userValue,
                                     mr.normalizeValue(userValue));
                                     mr.normalizeAttributeValue(userValue));
        }
      }
    }
@@ -3363,7 +3363,7 @@
            try
            {
              ByteString nv =
                   matchingRule.normalizeValue(v.getValue());
                   matchingRule.normalizeAttributeValue(v.getValue());
              ConditionResult r =
                   matchingRule.valuesMatch(nv, normalizedValue);
              switch (r)
@@ -3406,7 +3406,7 @@
            try
            {
              ByteString nv =
                   matchingRule.normalizeValue(v.getValue());
                   matchingRule.normalizeAttributeValue(v.getValue());
              ConditionResult r =
                   matchingRule.valuesMatch(nv, normalizedValue);
              switch (r)
@@ -3444,7 +3444,7 @@
      {
        try
        {
          ByteString nv = matchingRule.normalizeValue(v.getValue());
          ByteString nv = matchingRule.normalizeAttributeValue(v.getValue());
          ConditionResult r =
               matchingRule.valuesMatch(nv, normalizedValue);
          switch (r)
@@ -3486,7 +3486,7 @@
            try
            {
              ByteString nv =
                   matchingRule.normalizeValue(v.getValue());
                   matchingRule.normalizeAttributeValue(v.getValue());
              ConditionResult r =
                   matchingRule.valuesMatch(nv, normalizedValue);
              switch (r)
@@ -3541,7 +3541,7 @@
            {
              AttributeValue v = rdn.getAttributeValue(i);
              ByteString nv =
                   matchingRule.normalizeValue(v.getValue());
                   matchingRule.normalizeAttributeValue(v.getValue());
              ConditionResult r =
                   matchingRule.valuesMatch(nv, normalizedValue);
              switch (r)
@@ -3837,8 +3837,8 @@
              try
              {
                ConditionResult cr = mr.valuesMatch(
                     mr.normalizeValue(assertionValue.getValue()),
                     mr.normalizeValue(f.assertionValue.getValue()));
                     mr.normalizeAttributeValue(assertionValue.getValue()),
                     mr.normalizeAttributeValue(f.assertionValue.getValue()));
                if (cr != ConditionResult.TRUE)
                {
                  return false;

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

@@ -206,14 +206,14 @@
        if (ascending)
        {
          return orderingRule.compareValues(
                      orderingRule.normalizeValue(value1.getValue()),
                      orderingRule.normalizeValue(value2.getValue()));
                      orderingRule.normalizeAttributeValue(value1.getValue()),
                      orderingRule.normalizeAttributeValue(value2.getValue()));
        }
        else
        {
          return orderingRule.compareValues(
                      orderingRule.normalizeValue(value2.getValue()),
                      orderingRule.normalizeValue(value1.getValue()));
                      orderingRule.normalizeAttributeValue(value2.getValue()),
                      orderingRule.normalizeAttributeValue(value1.getValue()));
        }
      }
      catch (Exception e)

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

@@ -189,10 +189,10 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    return caseIgnoreMatchingRule.normalizeValue(value);
    return caseIgnoreMatchingRule.normalizeAttributeValue(value);
  }



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

@@ -150,9 +150,9 @@

    // normalize the 2 provided values
    ByteString normalizedValue1 =
      ruleInstance.normalizeValue(ByteString.valueOf(value1));
      ruleInstance.normalizeAttributeValue(ByteString.valueOf(value1));
    ByteString normalizedValue2 =
      ruleInstance.normalizeValue(ByteString.valueOf(value2));
      ruleInstance.normalizeAttributeValue(ByteString.valueOf(value2));

    // check that the approximatelyMatch return the expected result.
    Boolean liveResult = ruleInstance.approximatelyMatch(normalizedValue1,

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

@@ -184,7 +184,7 @@

    // normalize the 2 provided values and check that they are equals
    ByteString normalizedAttributeValue =
      rule.normalizeValue(attributeValue);
      rule.normalizeAttributeValue(attributeValue);
    ByteString normalizedAssertionValue =
      rule.normalizeAssertionValue(assertionValue);


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

@@ -121,7 +121,7 @@
   *                              the associated attribute syntax.
   */
  @Override
  public ByteString normalizeValue(ByteSequence value)
  public ByteString normalizeAttributeValue(ByteSequence value)
         throws DirectoryException
  {
    // Any value is acceptable, so we can just return a copy of the

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

@@ -77,9 +77,9 @@

    // normalize the 2 provided values and check that they are equals
    ByteString normalizedValue1 =
      rule.normalizeValue(ByteString.valueOf(value1));
      rule.normalizeAttributeValue(ByteString.valueOf(value1));
    ByteString normalizedValue2 =
      rule.normalizeValue(ByteString.valueOf(value2));
      rule.normalizeAttributeValue(ByteString.valueOf(value2));

    Boolean liveResult = rule.areEqual(normalizedValue1, normalizedValue2);
    assertEquals(result, liveResult);
@@ -129,7 +129,7 @@
    // normalize the 2 provided values
    try
    {
      rule.normalizeValue(ByteString.valueOf(value));
      rule.normalizeAttributeValue(ByteString.valueOf(value));
      fail("The matching rule : " + rule.getNameOrOID()
          + " should detect that value \"" + value + "\" is invalid");
    }
@@ -160,9 +160,9 @@

    // normalize the 2 provided values and check that they are equals
    ByteString normalizedValue1 =
      rule.normalizeValue(ByteString.valueOf(value1));
      rule.normalizeAttributeValue(ByteString.valueOf(value1));
    ByteString normalizedValue2 =
      rule.normalizeValue(ByteString.valueOf(value2));
      rule.normalizeAttributeValue(ByteString.valueOf(value2));

    ConditionResult liveResult =
      rule.valuesMatch(normalizedValue1, normalizedValue2);

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

@@ -65,9 +65,9 @@
    // ruleInstance.initializeMatchingRule(configEntry);

    ByteString normalizedValue1 =
      ruleInstance.normalizeValue(ByteString.valueOf(value1));
      ruleInstance.normalizeAttributeValue(ByteString.valueOf(value1));
    ByteString normalizedValue2 =
      ruleInstance.normalizeValue(ByteString.valueOf(value2));
      ruleInstance.normalizeAttributeValue(ByteString.valueOf(value2));
    int res = ruleInstance.compareValues(normalizedValue1, normalizedValue2);
    if (result == 0)
    {
@@ -124,7 +124,7 @@
    // normalize the 2 provided values
    try
    {
      ruleInstance.normalizeValue(ByteString.valueOf(value));
      ruleInstance.normalizeAttributeValue(ByteString.valueOf(value));
    } catch (DirectoryException e) {
      // that's the expected path : the matching rule has detected that
      // the value is incorrect.
@@ -151,7 +151,7 @@
    // normalize the 2 provided values
    try
    {
      ruleInstance.normalizeValue(ByteString.valueOf(value));
      ruleInstance.normalizeAttributeValue(ByteString.valueOf(value));
    } catch (Exception e)
    {
      fail(ruleInstance + " in warn mode should not reject value " + value + e);

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

@@ -139,9 +139,9 @@
    //Take any caseExact matching rule.
    EqualityMatchingRule rule = new CaseExactIA5EqualityMatchingRule();
    ByteString normalizedValue1 =
      rule.normalizeValue(ByteString.valueOf(value1));
      rule.normalizeAttributeValue(ByteString.valueOf(value1));
    ByteString normalizedValue2 =
      rule.normalizeValue(ByteString.valueOf(value2));
      rule.normalizeAttributeValue(ByteString.valueOf(value2));

    Boolean liveResult = rule.areEqual(normalizedValue1, normalizedValue2);
    assertEquals(result, liveResult);
@@ -175,9 +175,9 @@
    //Take any caseExact matching rule.
    EqualityMatchingRule rule = new CaseIgnoreEqualityMatchingRule();
    ByteString normalizedValue1 =
      rule.normalizeValue(ByteString.valueOf(value1));
      rule.normalizeAttributeValue(ByteString.valueOf(value1));
    ByteString normalizedValue2 =
      rule.normalizeValue(ByteString.valueOf(value2));
      rule.normalizeAttributeValue(ByteString.valueOf(value2));

    Boolean liveResult = rule.areEqual(normalizedValue1, normalizedValue2);
    assertEquals(result, liveResult);

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

@@ -86,7 +86,7 @@

    // normalize the 2 provided values and check that they are equals
    ByteString normalizedValue =
      rule.normalizeValue(ByteString.valueOf(value));
      rule.normalizeAttributeValue(ByteString.valueOf(value));

    StringBuilder printableMiddleSubs = new StringBuilder();
    List<ByteSequence> middleList =
@@ -121,10 +121,10 @@

    // normalize the 2 provided values and check that they are equals
    ByteString normalizedValue =
      rule.normalizeValue(ByteString.valueOf(value));
      rule.normalizeAttributeValue(ByteString.valueOf(value));

    ByteString normalizedInitial =
      rule.normalizeValue(ByteString.valueOf(initial));
      rule.normalizeAttributeValue(ByteString.valueOf(initial));
    Boolean liveResult = rule.valueMatchesSubstring(
        normalizedValue, normalizedInitial, null, null);
    if (result != liveResult)
@@ -147,10 +147,10 @@

    // normalize the 2 provided values and check that they are equals
    ByteString normalizedValue =
      rule.normalizeValue(ByteString.valueOf(value));
      rule.normalizeAttributeValue(ByteString.valueOf(value));

    ByteString normalizedFinal =
      rule.normalizeValue(ByteString.valueOf(finalValue));
      rule.normalizeAttributeValue(ByteString.valueOf(finalValue));
    Boolean liveResult = rule.valueMatchesSubstring(
        normalizedValue, null, null, normalizedFinal);
    if (result != liveResult)