From 65f47d9c24da91fdeac1eb6f012f44cc056ac4e4 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Thu, 25 Aug 2016 15:15:46 +0000
Subject: [PATCH] OPENDJ-3160 Support DN templates in reference property base DNs
---
opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SubResourceCollection.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SubResourceCollection.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SubResourceCollection.java
index 4dad784..3cfe97a 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SubResourceCollection.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SubResourceCollection.java
@@ -25,6 +25,7 @@
import static org.forgerock.opendj.ldap.requests.Requests.newSearchRequest;
import static org.forgerock.opendj.rest2ldap.Rest2Ldap.asResourceException;
import static org.forgerock.opendj.rest2ldap.Rest2ldapMessages.*;
+import static org.forgerock.opendj.rest2ldap.RoutingContext.newRoutingContext;
import static org.forgerock.opendj.rest2ldap.Utils.newBadRequestException;
import static org.forgerock.util.promise.Promises.newResultPromise;
@@ -234,7 +235,7 @@
final SearchRequest searchRequest = namingStrategy.createSearchRequest(dnFrom(context), idFrom(context));
if (searchRequest.getScope().equals(BASE_OBJECT) && !resource.hasSubTypesWithSubResources()) {
// There's no point in doing a search because we already know the DN and sub-resources.
- return newResultPromise(new RoutingContext(context, searchRequest.getName(), resource));
+ return newResultPromise(newRoutingContext(context, searchRequest.getName(), resource));
}
searchRequest.addAttribute("objectClass");
return conn.searchSingleEntryAsync(searchRequest)
@@ -243,7 +244,7 @@
public Promise<RoutingContext, ResourceException> apply(SearchResultEntry entry)
throws ResourceException {
final Resource subType = resource.resolveSubTypeFromObjectClasses(entry);
- return newResultPromise(new RoutingContext(context, entry.getName(), subType));
+ return newResultPromise(newRoutingContext(context, entry.getName(), subType));
}
}, new AsyncFunction<LdapException, RoutingContext, ResourceException>() {
@Override
--
Gitblit v1.10.0