From 9cfc08902f5d1a22f4f5436b0facc8c047d45ed6 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 Factor out DN template support into separate class
---
opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SubResource.java | 49 ++++---------------------------------------------
1 files changed, 4 insertions(+), 45 deletions(-)
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SubResource.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SubResource.java
index 8d8acbc..1cb250a 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SubResource.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SubResource.java
@@ -16,16 +16,8 @@
*/
package org.forgerock.opendj.rest2ldap;
-import static org.forgerock.opendj.rest2ldap.Rest2Ldap.DECODE_OPTIONS;
import static org.forgerock.opendj.rest2ldap.Rest2ldapMessages.ERR_UNRECOGNIZED_SUB_RESOURCE_TYPE;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.forgerock.http.routing.UriRouterContext;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizedIllegalArgumentException;
import org.forgerock.json.resource.BadRequestException;
@@ -34,7 +26,6 @@
import org.forgerock.json.resource.ResourceException;
import org.forgerock.json.resource.Router;
import org.forgerock.opendj.ldap.DN;
-import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.services.context.Context;
import org.forgerock.util.Function;
@@ -49,14 +40,11 @@
* </ul>
*/
public abstract class SubResource {
- private static final Pattern TEMPLATE_KEY_RE = Pattern.compile("\\{([^}]+)\\}");
-
private final String resourceId;
- private final List<String> dnTemplateVariables = new ArrayList<>();
- private String dnTemplateFormatString;
+ private DnTemplate dnTemplate;
String urlTemplate = "";
- String dnTemplate = "";
+ String dnTemplateString = "";
boolean isReadOnly = false;
Rest2Ldap rest2Ldap;
Resource resource;
@@ -90,19 +78,7 @@
if (resource == null) {
throw new LocalizedIllegalArgumentException(ERR_UNRECOGNIZED_SUB_RESOURCE_TYPE.get(parent, resourceId));
}
- this.dnTemplateFormatString = formatTemplate(dnTemplate, dnTemplateVariables);
- }
-
- // Parse the template keys and replace them with %s for formatting.
- private String formatTemplate(final String template, final List<String> templateVariables) {
- final Matcher matcher = TEMPLATE_KEY_RE.matcher(template);
- final StringBuffer buffer = new StringBuffer(template.length());
- while (matcher.find()) {
- matcher.appendReplacement(buffer, "%s");
- templateVariables.add(matcher.group(1));
- }
- matcher.appendTail(buffer);
- return buffer.toString();
+ this.dnTemplate = DnTemplate.compileRelative(dnTemplateString);
}
abstract Router addRoutes(Router router);
@@ -125,24 +101,7 @@
}
final DN dnFrom(final Context context) {
- final DN baseDn = context.containsContext(RoutingContext.class)
- ? context.asContext(RoutingContext.class).getDn() : DN.rootDN();
-
- final Schema schema = rest2Ldap.getOptions().get(DECODE_OPTIONS).getSchemaResolver().resolveSchema(dnTemplate);
- if (dnTemplateVariables.isEmpty()) {
- final DN relativeDn = DN.valueOf(dnTemplate, schema);
- return baseDn.child(relativeDn);
- } else {
- final UriRouterContext uriRouterContext = context.asContext(UriRouterContext.class);
- final Map<String, String> uriTemplateVariables = uriRouterContext.getUriTemplateVariables();
- final String[] values = new String[dnTemplateVariables.size()];
- for (int i = 0; i < values.length; i++) {
- final String key = dnTemplateVariables.get(i);
- values[i] = uriTemplateVariables.get(key);
- }
- final DN relativeDn = DN.format(dnTemplateFormatString, schema, (Object[]) values);
- return baseDn.child(relativeDn);
- }
+ return dnTemplate.format(context);
}
final RequestHandler subResourceRouterFrom(final RoutingContext context) {
--
Gitblit v1.10.0