From 32edddb11bcc204628fbdaddf3b0d0e86530f6f8 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Wed, 08 Jun 2016 15:18:05 +0000
Subject: [PATCH] OPENDJ-2955 Use i18n in rest2ldap
---
opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SimpleAttributeMapper.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SimpleAttributeMapper.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SimpleAttributeMapper.java
index b6d3d4a..dc36f31 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SimpleAttributeMapper.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SimpleAttributeMapper.java
@@ -15,13 +15,14 @@
*/
package org.forgerock.opendj.rest2ldap;
+import static org.forgerock.opendj.rest2ldap.Rest2ldapMessages.*;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import org.forgerock.json.JsonPointer;
import org.forgerock.json.JsonValue;
-import org.forgerock.json.resource.BadRequestException;
import org.forgerock.json.resource.ResourceException;
import org.forgerock.opendj.ldap.Attribute;
import org.forgerock.opendj.ldap.AttributeDescription;
@@ -124,10 +125,8 @@
return newResultPromise(toFilter(type, ldapAttributeName.toString(), va));
} catch (final Exception e) {
// Invalid assertion value - bad request.
- return newExceptionPromise((ResourceException) new BadRequestException(i18n(
- "The request cannot be processed because it contained an "
- + "illegal filter assertion value '%s' for field '%s'",
- String.valueOf(valueAssertion), path), e));
+ return newExceptionPromise((ResourceException) newBadRequestException(
+ ERR_ILLEGAL_FILTER_ASSERTION_VALUE.get(String.valueOf(valueAssertion), path), e));
}
} else {
// This attribute mapper does not support partial filtering.
@@ -141,9 +140,8 @@
try {
return newResultPromise(jsonToAttribute(newValues, ldapAttributeName, encoder()));
} catch (final Exception ex) {
- return newExceptionPromise((ResourceException) new BadRequestException(i18n(
- "The request cannot be processed because an error occurred while "
- + "encoding the values for the field '%s': %s", path, ex.getMessage())));
+ return newExceptionPromise((ResourceException) newBadRequestException(
+ ERR_ENCODING_VALUES_FOR_FIELD.get(path, ex.getMessage())));
}
}
--
Gitblit v1.10.0