From 2d7aad2c25507ea427980b54848c26594c607ae2 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 20 Feb 2014 11:20:22 +0000
Subject: [PATCH] OPENDJ-1308 Migrate schema support
---
opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java | 31 +++++++++----------------------
1 files changed, 9 insertions(+), 22 deletions(-)
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 16b2487..ead6475 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
@@ -35,10 +35,9 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.DecodeException;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.DirectoryException;
-import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.ServerConstants;
import static org.opends.messages.SchemaMessages.*;
@@ -127,12 +126,12 @@
*
* @return The normalized version of the provided value.
*
- * @throws DirectoryException If the provided value is invalid according to
+ * @throws DecodeException If the provided value is invalid according to
* the associated attribute syntax.
*/
@Override
public ByteString normalizeAttributeValue(ByteSequence value)
- throws DirectoryException
+ throws DecodeException
{
StringBuilder buffer = new StringBuilder();
prepareUnicode(buffer, value, TRIM, CASE_FOLD);
@@ -177,22 +176,16 @@
switch (DirectoryServer.getSyntaxEnforcementPolicy())
{
case REJECT:
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
- message);
+ throw DecodeException.error(message);
case WARN:
if (! logged)
{
logger.error(message);
logged = true;
}
-
- buffer.delete(pos, pos+1);
- break;
-
- default:
- buffer.delete(pos, pos+1);
break;
}
+ buffer.delete(pos, pos + 1);
}
}
@@ -209,12 +202,12 @@
*
* @return The normalized form of the value fragment.
*
- * @throws DirectoryException If the provided value fragment is not
+ * @throws DecodeException If the provided value fragment is not
* acceptable according to the associated syntax.
*/
@Override
public ByteString normalizeSubstring(ByteSequence substring)
- throws DirectoryException
+ throws DecodeException
{
// In this case, the process for normalizing a substring is the same as
// normalizing a full value with the exception that it may include an
@@ -262,22 +255,16 @@
switch (DirectoryServer.getSyntaxEnforcementPolicy())
{
case REJECT:
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
- message);
+ throw DecodeException.error(message);
case WARN:
if (! logged)
{
logger.error(message);
logged = true;
}
-
- buffer.delete(pos, pos+1);
- break;
-
- default:
- buffer.delete(pos, pos+1);
break;
}
+ buffer.delete(pos, pos+1);
}
}
--
Gitblit v1.10.0