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/JSONConstantAttributeMapper.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/JSONConstantAttributeMapper.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/JSONConstantAttributeMapper.java
index 7d1f0a5..53fdd62 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/JSONConstantAttributeMapper.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/JSONConstantAttributeMapper.java
@@ -15,10 +15,11 @@
*/
package org.forgerock.opendj.rest2ldap;
+import static org.forgerock.opendj.rest2ldap.Rest2ldapMessages.*;
import static org.forgerock.opendj.ldap.Filter.alwaysFalse;
import static org.forgerock.opendj.ldap.Filter.alwaysTrue;
-import static org.forgerock.opendj.rest2ldap.Utils.i18n;
import static org.forgerock.opendj.rest2ldap.Utils.isNullOrEmpty;
+import static org.forgerock.opendj.rest2ldap.Utils.newBadRequestException;
import static org.forgerock.opendj.rest2ldap.Utils.toFilter;
import static org.forgerock.opendj.rest2ldap.Utils.toLowerCase;
@@ -28,7 +29,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;
@@ -58,8 +58,8 @@
Promise<List<Attribute>, ResourceException> create(final Connection connection, final JsonPointer path,
final JsonValue v) {
if (!isNullOrEmpty(v) && !v.getObject().equals(value.getObject())) {
- return Promises.<List<Attribute>, ResourceException> newExceptionPromise(new BadRequestException(i18n(
- "The request cannot be processed because it attempts to create the read-only field '%s'", path)));
+ return Promises.<List<Attribute>, ResourceException> newExceptionPromise(
+ newBadRequestException(ERR_CREATION_READ_ONLY_FIELD.get(path)));
} else {
return Promises.newResultPromise(Collections.<Attribute> emptyList());
}
@@ -112,8 +112,8 @@
@Override
Promise<List<Modification>, ResourceException> patch(final Connection connection, final JsonPointer path,
final PatchOperation operation) {
- return Promises.<List<Modification>, ResourceException> newExceptionPromise(new BadRequestException(i18n(
- "The request cannot be processed because it attempts to patch the read-only field '%s'", path)));
+ return Promises.<List<Modification>, ResourceException> newExceptionPromise(
+ newBadRequestException(ERR_PATCH_READ_ONLY_FIELD.get(path)));
}
@Override
@@ -125,8 +125,8 @@
Promise<List<Modification>, ResourceException> update(
final Connection connection, final JsonPointer path, final Entry e, final JsonValue v) {
if (!isNullOrEmpty(v) && !v.getObject().equals(value.getObject())) {
- return Promises.<List<Modification>, ResourceException> newExceptionPromise(new BadRequestException(i18n(
- "The request cannot be processed because it attempts to modify the read-only field '%s'", path)));
+ return Promises.<List<Modification>, ResourceException> newExceptionPromise(
+ newBadRequestException(ERR_MODIFY_READ_ONLY_FIELD.get("update", path)));
} else {
return Promises.newResultPromise(Collections.<Modification> emptyList());
}
--
Gitblit v1.10.0