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/CollationMatchingRuleFactory.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
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)
--
Gitblit v1.10.0