From 70467a0277fe4ac8fdbc477f3d2756f1724dc503 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Thu, 10 Oct 2013 14:55:37 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-175: Decouple OpenDJ LDAP SDK from Grizzly
---
opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPReader.java | 57 ++++-----------------------------------------------------
1 files changed, 4 insertions(+), 53 deletions(-)
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPReader.java b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPReader.java
similarity index 95%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPReader.java
rename to opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPReader.java
index b6b1ed4..6e129f3 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPReader.java
+++ b/opendj-sdk/opendj3/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/LDAPReader.java
@@ -25,7 +25,7 @@
* Portions copyright 2011-2013 ForgeRock AS
*/
-package com.forgerock.opendj.ldap;
+package com.forgerock.opendj.grizzly;
import static com.forgerock.opendj.ldap.LDAPConstants.*;
import static com.forgerock.opendj.ldap.CoreMessages.ERR_LDAP_MODIFICATION_DECODE_INVALID_MOD_TYPE;
@@ -35,6 +35,7 @@
import static com.forgerock.opendj.util.StaticUtils.byteToHex;
import java.io.IOException;
+
import org.forgerock.i18n.LocalizedIllegalArgumentException;
import org.forgerock.opendj.asn1.ASN1;
import org.forgerock.opendj.asn1.ASN1Reader;
@@ -77,63 +78,13 @@
import org.forgerock.opendj.ldap.responses.SearchResultReference;
import org.forgerock.opendj.ldap.schema.Schema;
+import com.forgerock.opendj.ldap.LDAPUtils;
+
/**
* Static methods for decoding LDAP messages.
*/
final class LDAPReader {
- static SearchResultEntry decodeEntry(final ASN1Reader reader, final DecodeOptions options)
- throws IOException {
- Entry entry;
- reader.readStartSequence(OP_TYPE_SEARCH_RESULT_ENTRY);
- try {
- final String dnString = reader.readOctetStringAsString();
- final Schema schema = options.getSchemaResolver().resolveSchema(dnString);
- DN dn;
- try {
- dn = DN.valueOf(dnString, schema);
- } catch (final LocalizedIllegalArgumentException e) {
- throw DecodeException.error(e.getMessageObject());
- }
-
- entry = options.getEntryFactory().newEntry(dn);
- reader.readStartSequence();
- try {
- while (reader.hasNextElement()) {
- reader.readStartSequence();
- try {
- final String ads = reader.readOctetStringAsString();
- AttributeDescription ad;
- try {
- ad = AttributeDescription.valueOf(ads, schema);
- } catch (final LocalizedIllegalArgumentException e) {
- throw DecodeException.error(e.getMessageObject());
- }
-
- final Attribute attribute = options.getAttributeFactory().newAttribute(ad);
-
- reader.readStartSet();
- try {
- while (reader.hasNextElement()) {
- attribute.add(reader.readOctetString());
- }
- entry.addAttribute(attribute);
- } finally {
- reader.readEndSet();
- }
- } finally {
- reader.readEndSequence();
- }
- }
- } finally {
- reader.readEndSequence();
- }
- } finally {
- reader.readEndSequence();
- }
-
- return Responses.newSearchResultEntry(entry);
- }
private final DecodeOptions options;
--
Gitblit v1.10.0