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/ObjectAttributeMapper.java | 17 +++++------------
1 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ObjectAttributeMapper.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ObjectAttributeMapper.java
index 508d424..984dd69 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ObjectAttributeMapper.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ObjectAttributeMapper.java
@@ -15,10 +15,11 @@
*/
package org.forgerock.opendj.rest2ldap;
+import static org.forgerock.opendj.rest2ldap.Rest2ldapMessages.*;
import static org.forgerock.json.resource.PatchOperation.operation;
import static org.forgerock.opendj.ldap.Filter.alwaysFalse;
import static org.forgerock.opendj.rest2ldap.Rest2LDAP.asResourceException;
-import static org.forgerock.opendj.rest2ldap.Utils.i18n;
+import static org.forgerock.opendj.rest2ldap.Utils.newBadRequestException;
import static org.forgerock.opendj.rest2ldap.Utils.toLowerCase;
import java.util.AbstractMap.SimpleImmutableEntry;
@@ -31,7 +32,6 @@
import org.forgerock.json.JsonPointer;
import org.forgerock.json.JsonValue;
-import org.forgerock.json.resource.BadRequestException;
import org.forgerock.json.resource.PatchOperation;
import org.forgerock.json.resource.ResourceException;
import org.forgerock.opendj.ldap.Attribute;
@@ -196,9 +196,7 @@
final String fieldName = field.get(0);
final Mapping mapping = getMapping(fieldName);
if (mapping == null) {
- throw new BadRequestException(i18n(
- "The request cannot be processed because it included "
- + "an unrecognized field '%s'", path.child(fieldName)));
+ throw newBadRequestException(ERR_UNRECOGNIZED_FIELD.get(path.child(fieldName)));
}
final PatchOperation subOperation =
operation(operation.getOperation(), field.relativePointer(), v);
@@ -314,16 +312,11 @@
if (v.isMap()) {
for (final String attribute : v.asMap().keySet()) {
if (missingMappings.remove(toLowerCase(attribute)) == null) {
- throw new BadRequestException(i18n(
- "The request cannot be processed because it included "
- + "an unrecognized field '%s'", path.child(attribute)));
+ throw newBadRequestException(ERR_UNRECOGNIZED_FIELD.get(path.child(attribute)));
}
}
} else {
- throw new BadRequestException(i18n(
- "The request cannot be processed because it included "
- + "the field '%s' whose value is the wrong type: "
- + "an object is expected", path));
+ throw newBadRequestException(ERR_FIELD_WRONG_TYPE.get(path));
}
}
return missingMappings;
--
Gitblit v1.10.0