From eec7ba4411d0535c8229d08f0cdad60d04da7ca6 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Thu, 25 Aug 2016 14:28:39 +0000
Subject: [PATCH] OPENDJ-3160 Pass Context through to PropertyMapper methods
---
opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/JsonConstantPropertyMapper.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/JsonConstantPropertyMapper.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/JsonConstantPropertyMapper.java
index f171ad8..01525ff 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/JsonConstantPropertyMapper.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/JsonConstantPropertyMapper.java
@@ -33,10 +33,10 @@
import org.forgerock.json.resource.PatchOperation;
import org.forgerock.json.resource.ResourceException;
import org.forgerock.opendj.ldap.Attribute;
-import org.forgerock.opendj.ldap.Connection;
import org.forgerock.opendj.ldap.Entry;
import org.forgerock.opendj.ldap.Filter;
import org.forgerock.opendj.ldap.Modification;
+import org.forgerock.services.context.Context;
import org.forgerock.util.promise.Promise;
/**
@@ -55,7 +55,7 @@
}
@Override
- Promise<List<Attribute>, ResourceException> create(final Connection connection,
+ Promise<List<Attribute>, ResourceException> create(final Context context,
final Resource resource, final JsonPointer path,
final JsonValue v) {
if (!isNullOrEmpty(v) && !v.getObject().equals(value.getObject())) {
@@ -71,7 +71,7 @@
}
@Override
- Promise<Filter, ResourceException> getLdapFilter(final Connection connection, final Resource resource,
+ Promise<Filter, ResourceException> getLdapFilter(final Context context, final Resource resource,
final JsonPointer path, final JsonPointer subPath,
final FilterType type, final String operator,
final Object valueAssertion) {
@@ -111,19 +111,19 @@
}
@Override
- Promise<List<Modification>, ResourceException> patch(final Connection connection, final Resource resource,
+ Promise<List<Modification>, ResourceException> patch(final Context context, final Resource resource,
final JsonPointer path, final PatchOperation operation) {
return newBadRequestException(ERR_PATCH_READ_ONLY_FIELD.get(path)).asPromise();
}
@Override
- Promise<JsonValue, ResourceException> read(final Connection connection, final Resource resource,
+ Promise<JsonValue, ResourceException> read(final Context context, final Resource resource,
final JsonPointer path, final Entry e) {
return newResultPromise(value.copy());
}
@Override
- Promise<List<Modification>, ResourceException> update(final Connection connection, final Resource resource,
+ Promise<List<Modification>, ResourceException> update(final Context context, final Resource resource,
final JsonPointer path, final Entry e, final JsonValue v) {
if (!isNullOrEmpty(v) && !v.getObject().equals(value.getObject())) {
return newBadRequestException(ERR_MODIFY_READ_ONLY_FIELD.get("update", path)).asPromise();
--
Gitblit v1.10.0