OPENDJ-3179: Migrate LDAP Connection Handler to SDK Grizzly transport

Yannick Lecaillez

03.42.2016 e1c98add6311fc7dee25c8c57628c69c30f61014

OPENDJ-3179: Migrate LDAP Connection Handler to SDK Grizzly transport

LdapRawMessage: change type of DN from String to ByteString

 opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapMessages.java

@@ -16,6 +16,7 @@
package org.forgerock.opendj.ldap.spi;

import org.forgerock.opendj.io.ASN1Reader;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.responses.Response;

@@ -44,7 +45,7 @@
     * @return A new {@link LdapRawMessage}
     */
    public static LdapRawMessage newRawMessage(final byte messageType, final int messageId, final int protocolVersion,
            final String rawDn, final ASN1Reader reader) {
            final ByteString rawDn, final ASN1Reader reader) {
        return new LdapRawMessage(messageType, messageId, protocolVersion, rawDn, reader);
    }

@@ -69,10 +70,10 @@
     * Represents an encoded LDAP message with it's envelope.
     */
    public static final class LdapRawMessage extends LdapMessageEnvelope<ASN1Reader> {
        private final String rawDn;
        private final ByteString rawDn;
        private final int version;

        private LdapRawMessage(final byte messageType, final int messageId, final int version, final String rawDn,
        private LdapRawMessage(final byte messageType, final int messageId, final int version, final ByteString rawDn,
                final ASN1Reader content) {
            super(messageType, messageId, content);
            this.version = version;
@@ -93,7 +94,7 @@
         *
         * @return The {@link DN} contained in request, or null if the message doesn't contains a DN.
         */
        public String getRawDn() {
        public ByteString getRawDn() {
            return rawDn;
        }
    }

 opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LdapCodec.java

@@ -20,6 +20,7 @@
import java.io.IOException;

import org.forgerock.opendj.io.LDAPWriter;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.DecodeOptions;
import org.forgerock.opendj.ldap.responses.BindResult;
import org.forgerock.opendj.ldap.responses.CompareResult;
@@ -112,17 +113,17 @@
            final int messageId = (int) reader.readInteger();
            final byte messageType = reader.peekType();

            final String rawDn;
            final ByteString rawDn;
            final int protocolVersion;
            switch (messageType) {
            case OP_TYPE_BIND_REQUEST:
                reader.readStartSequence(messageType);
                protocolVersion = (int) reader.readInteger();
                rawDn = reader.readOctetStringAsString();
                rawDn = reader.readOctetString();
                IS_LDAP_V2_PENDING.set(attributeStorage, protocolVersion == 2);
                break;
            case OP_TYPE_DELETE_REQUEST:
                rawDn = reader.readOctetStringAsString(messageType);
                rawDn = reader.readOctetString(messageType);
                protocolVersion = -1;
                break;
            case OP_TYPE_ADD_REQUEST:
@@ -131,7 +132,7 @@
            case OP_TYPE_MODIFY_REQUEST:
            case OP_TYPE_SEARCH_REQUEST:
                reader.readStartSequence(messageType);
                rawDn = reader.readOctetStringAsString();
                rawDn = reader.readOctetString();
                protocolVersion = -1;
                break;
            default: