From 04c1aca24a2cc5dc8d9a4f22ba05ac74de607f06 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 14 Feb 2014 10:19:01 +0000
Subject: [PATCH] OPENDJ-1308 Migrate schema support
---
opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberEqualityMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java | 18 +-
opendj3-server-dev/src/server/org/opends/server/schema/IntegerEqualityMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/WordEqualityMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/types/Schema.java | 52 ++++----
opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/UUIDOrderingMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java | 4
opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSubstringMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/api/AbstractMatchingRule.java | 13 --
opendj3-server-dev/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/types/SearchFilter.java | 16 +-
opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/api/MatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java | 4
opendj3-server-dev/src/server/org/opends/server/backends/jeb/SubstringIndexer.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/SubstringMatchingRuleTest.java | 10
opendj3-server-dev/src/server/org/opends/server/schema/OctetStringEqualityMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/CertificateExactMatchingRuleTest.java | 2
opendj3-server-dev/src/server/org/opends/server/controls/MatchedValuesFilter.java | 16 +-
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/OrderingMatchingRuleTest.java | 8
opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordExactEqualityMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/api/VirtualAttributeProvider.java | 4
opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java | 10
opendj3-server-dev/src/server/org/opends/server/schema/CaseExactEqualityMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/backends/jeb/ApproximateIndexer.java | 6
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/PatternRDN.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/BooleanEqualityMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPFilter.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRule.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualLengthApproximateMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSubstringMatchingRule.java | 4
opendj3-server-dev/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/NumericStringEqualityMatchingRule.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/ApproximatematchingRule.java | 4
opendj3-server-dev/src/server/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRule.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualityMatchingRuleTest.java | 10
opendj3-server-dev/src/server/org/opends/server/schema/TimeBasedMatchingRuleFactory.java | 4
opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyFactory.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/OctetStringOrderingMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/IntegerOrderingMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java | 2
opendj3-server-dev/src/server/org/opends/server/types/AttributeBuilder.java | 17 +-
opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/CaseExactOrderingMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/types/AttributeValues.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactMatchingRule.java | 4
opendj3-server-dev/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/StringPrepProfileTestCase.java | 8
opendj3-server-dev/src/server/org/opends/server/backends/jeb/OrderingIndexer.java | 4
opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRule.java | 2
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaTestMatchingRule.java | 4
opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListEqualityMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/types/SortKey.java | 8
opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/CaseExactSubstringMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java | 2
opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListSubstringMatchingRule.java | 2
72 files changed, 158 insertions(+), 172 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/AbstractMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/api/AbstractMatchingRule.java
index 51bdc54..fe1f38f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/AbstractMatchingRule.java
+++ b/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}
*/
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/MatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/api/MatchingRule.java
index 5439bad..2cf9d36 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/MatchingRule.java
+++ b/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;
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/VirtualAttributeProvider.java b/opendj3-server-dev/src/server/org/opends/server/api/VirtualAttributeProvider.java
index 7e3c8bd..4bfe8a6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/VirtualAttributeProvider.java
+++ b/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;
diff --git a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/PatternRDN.java b/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/PatternRDN.java
index 83cd9a5..b412d23 100644
--- a/opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/PatternRDN.java
+++ b/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);
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/ApproximateIndexer.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/ApproximateIndexer.java
index 0b99cef..98a5cad 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/ApproximateIndexer.java
+++ b/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)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java
index 6fb376b..196f147 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java
+++ b/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);
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/OrderingIndexer.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/OrderingIndexer.java
index 4e0f7b9..025813a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/OrderingIndexer.java
+++ b/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)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/SubstringIndexer.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/SubstringIndexer.java
index e8eee13..640d6dd 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/SubstringIndexer.java
+++ b/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);
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java
index 5d4ea3f..5d1b1c1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java
+++ b/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
diff --git a/opendj3-server-dev/src/server/org/opends/server/controls/MatchedValuesFilter.java b/opendj3-server-dev/src/server/org/opends/server/controls/MatchedValuesFilter.java
index 6b10e9c..78a5998 100644
--- a/opendj3-server-dev/src/server/org/opends/server/controls/MatchedValuesFilter.java
+++ b/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);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyFactory.java b/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyFactory.java
index 2ab859e..e33dd3a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyFactory.java
+++ b/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);
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPFilter.java b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPFilter.java
index 757818a..76216e1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPFilter.java
+++ b/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);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRule.java
index 406f422..2f0e6c3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRule.java
+++ b/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
{
/*
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java
index 949dabd..66c831e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java
+++ b/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.
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java
index afe4576..25c97b0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java
+++ b/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
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java
index 0b7557d..0ba0816 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java
+++ b/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();
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/BooleanEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/BooleanEqualityMatchingRule.java
index d8abea8..dc20dae 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/BooleanEqualityMatchingRule.java
+++ b/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();
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactEqualityMatchingRule.java
index ca700fc..0b294f7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactEqualityMatchingRule.java
+++ b/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();
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java
index 480c770..1ee30e2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java
+++ b/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();
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRule.java
index 7307853..41ad145 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRule.java
+++ b/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();
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactOrderingMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactOrderingMatchingRule.java
index 492dc52..dac533e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactOrderingMatchingRule.java
+++ b/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();
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactSubstringMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactSubstringMatchingRule.java
index be0710e..2971873 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseExactSubstringMatchingRule.java
+++ b/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();
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRule.java
index c398f90..ca6d28c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRule.java
+++ b/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();
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java
index 40acc26..a7ebff5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java
+++ b/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();
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java
index ed7a0e9..489a253 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java
+++ b/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();
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListEqualityMatchingRule.java
index d2c3a7a..e50d61c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListEqualityMatchingRule.java
+++ b/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();
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListSubstringMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListSubstringMatchingRule.java
index b4f0035..bccb820 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreListSubstringMatchingRule.java
+++ b/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();
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRule.java
index b49f002..f739211 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRule.java
+++ b/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();
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRule.java
index 4fef932..c2c3e00 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRule.java
+++ b/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();
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactMatchingRule.java
index a37c58d..7226ef3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactMatchingRule.java
+++ b/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
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java b/opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java
index 08f6eb7..49a76c4 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java
+++ b/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)
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRule.java
index 2546eac..6b7f00f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRule.java
+++ b/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();
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRule.java
index ebf7280..bbf96ba 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRule.java
+++ b/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
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRule.java
index 12acd8a..611d924 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRule.java
+++ b/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();
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java
index db8bfc1..0908273 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java
+++ b/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
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java
index 8e0031d..e532a53 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java
+++ b/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
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/IntegerEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/IntegerEqualityMatchingRule.java
index b0eb0d8..3351a73 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/IntegerEqualityMatchingRule.java
+++ b/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();
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRule.java
index 4c3fb8a..482e18e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRule.java
+++ b/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();
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/IntegerOrderingMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/IntegerOrderingMatchingRule.java
index 5762764..dfa7be5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/IntegerOrderingMatchingRule.java
+++ b/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();
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java b/opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
index d64bd11..ef01ba5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
+++ b/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();
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringEqualityMatchingRule.java
index 5bee12a..2e41352 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringEqualityMatchingRule.java
+++ b/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();
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java
index 52e08fc..047034e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java
+++ b/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();
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java
index a229be2..7139752 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java
+++ b/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);
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java
index f473d9d..8bd00c0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java
+++ b/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();
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRule.java
index 3fbd815..4f14222 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRule.java
+++ b/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();
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringEqualityMatchingRule.java
index 1cf22f8..869e925 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringEqualityMatchingRule.java
+++ b/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();
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringOrderingMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringOrderingMatchingRule.java
index 113417c..c3d54d7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringOrderingMatchingRule.java
+++ b/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();
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSubstringMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSubstringMatchingRule.java
index 7678d8d..ba5bfd3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSubstringMatchingRule.java
+++ b/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();
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRule.java
index cd3ab09..9996f24 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRule.java
+++ b/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();
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRule.java
index 4e42123..4736b53 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRule.java
+++ b/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();
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberEqualityMatchingRule.java
index 8440945..dc18078 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberEqualityMatchingRule.java
+++ b/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();
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSubstringMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSubstringMatchingRule.java
index cb28dd2..f318fee 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSubstringMatchingRule.java
+++ b/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,
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/TimeBasedMatchingRuleFactory.java b/opendj3-server-dev/src/server/org/opends/server/schema/TimeBasedMatchingRuleFactory.java
index 214c24c..dfc2870 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/TimeBasedMatchingRuleFactory.java
+++ b/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)
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java
index 795254e..f4f9c67 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java
+++ b/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)
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/UUIDOrderingMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/UUIDOrderingMatchingRule.java
index d1dcf8f..71b9a18 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/UUIDOrderingMatchingRule.java
+++ b/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)
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java
index 609a125..34bc131 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java
+++ b/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();
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java
index a324e84..4a47355 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java
+++ b/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
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordExactEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordExactEqualityMatchingRule.java
index 7ec963a..1837fd9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordExactEqualityMatchingRule.java
+++ b/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
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/WordEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/WordEqualityMatchingRule.java
index 48e3a3d..0ebf86f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/WordEqualityMatchingRule.java
+++ b/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();
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/AttributeBuilder.java b/opendj3-server-dev/src/server/org/opends/server/types/AttributeBuilder.java
index f78f257..05107bc 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/AttributeBuilder.java
+++ b/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))
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/AttributeValues.java b/opendj3-server-dev/src/server/org/opends/server/types/AttributeValues.java
index 36a5293..89772cc 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/AttributeValues.java
+++ b/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;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/Schema.java b/opendj3-server-dev/src/server/org/opends/server/types/Schema.java
index efd26f7..0ec1745 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/Schema.java
+++ b/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));
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/SearchFilter.java b/opendj3-server-dev/src/server/org/opends/server/types/SearchFilter.java
index de1d4c5..003b574 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/SearchFilter.java
+++ b/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;
diff --git a/opendj3-server-dev/src/server/org/opends/server/types/SortKey.java b/opendj3-server-dev/src/server/org/opends/server/types/SortKey.java
index d4f20e8..bc99163 100644
--- a/opendj3-server-dev/src/server/org/opends/server/types/SortKey.java
+++ b/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)
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaTestMatchingRule.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaTestMatchingRule.java
index 80a932c..476f4f9 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaTestMatchingRule.java
+++ b/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);
}
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/ApproximatematchingRule.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/ApproximatematchingRule.java
index ef1f78b..5186814 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/ApproximatematchingRule.java
+++ b/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,
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/CertificateExactMatchingRuleTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/CertificateExactMatchingRuleTest.java
index 0a56796..23f9663 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/CertificateExactMatchingRuleTest.java
+++ b/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);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualLengthApproximateMatchingRule.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualLengthApproximateMatchingRule.java
index 3bce731..7833554 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualLengthApproximateMatchingRule.java
+++ b/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
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualityMatchingRuleTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualityMatchingRuleTest.java
index 1faf7f4..d293313 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualityMatchingRuleTest.java
+++ b/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);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/OrderingMatchingRuleTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/OrderingMatchingRuleTest.java
index 1aeb8b3..62833f7 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/OrderingMatchingRuleTest.java
+++ b/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);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/StringPrepProfileTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/StringPrepProfileTestCase.java
index 948dd99..053000c 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/StringPrepProfileTestCase.java
+++ b/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);
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/SubstringMatchingRuleTest.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/SubstringMatchingRuleTest.java
index be61b53..8c28ce1 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/SubstringMatchingRuleTest.java
+++ b/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)
--
Gitblit v1.10.0