Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 35358 invoked from network); 2 Feb 2008 17:16:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Feb 2008 17:16:37 -0000 Received: (qmail 48637 invoked by uid 500); 2 Feb 2008 17:16:29 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 48571 invoked by uid 500); 2 Feb 2008 17:16:29 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 48560 invoked by uid 99); 2 Feb 2008 17:16:29 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 Feb 2008 09:16:29 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 Feb 2008 17:16:21 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 78D421A9832; Sat, 2 Feb 2008 09:16:13 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r617838 - in /directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/name: AtavSerializer.java DnSerializer.java RdnSerializer.java Date: Sat, 02 Feb 2008 17:16:12 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080202171613.78D421A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Sat Feb 2 09:16:11 2008 New Revision: 617838 URL: http://svn.apache.org/viewvc?rev=617838&view=rev Log: Cleaned up the javadoc. Removed some useless test. Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/name/AtavSerializer.java directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/name/DnSerializer.java directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/name/RdnSerializer.java Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/name/AtavSerializer.java URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/name/AtavSerializer.java?rev=617838&r1=617837&r2=617838&view=diff ============================================================================== --- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/name/AtavSerializer.java (original) +++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/name/AtavSerializer.java Sat Feb 2 09:16:11 2008 @@ -19,19 +19,16 @@ */ package org.apache.directory.shared.ldap.name; -import java.io.Externalizable; import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; -import javax.naming.InvalidNameException; - import org.apache.directory.shared.ldap.util.StringTools; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * A helper class which serialize and deserialize a AttributeTypeAndValue + * A helper class which serialize and deserialize an AttributeTypeAndValue * * @author Apache Directory Project * @version $Rev$, $Date$ @@ -137,7 +134,7 @@ /** - * @see Externalizable#readExternal(ObjectInput) + * Deserialize an AttributeTypeAndValue object * * We read back the data to create a new ATAV. The structure * read is exposed in the {@link AttributeTypeAndValue#writeExternal(ObjectOutput)} Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/name/DnSerializer.java URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/name/DnSerializer.java?rev=617838&r1=617837&r2=617838&view=diff ============================================================================== --- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/name/DnSerializer.java (original) +++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/name/DnSerializer.java Sat Feb 2 09:16:11 2008 @@ -39,6 +39,8 @@ protected static final Logger LOG = LoggerFactory.getLogger( DnSerializer.class ); /** + * Serialize a DN + * * We have to store a DN data efficiently. Here is the structure : * *
  • upName
    • The User provided DN

    @@ -82,24 +84,14 @@ // Should we store the byte[] ??? - // Write the RDNs. Is it's null, the number will be -1. - if ( dn.getRdns() == null ) - { - out.writeInt( -1 ); - } - else if ( dn.size() == 0 ) - { - out.writeInt( 0 ); - } - else + // Write the RDNs. + // First the number of RDNs + out.writeInt( dn.size() ); + + // Loop on the RDNs + for ( Rdn rdn:dn.getRdns() ) { - out.writeInt( dn.size() ); - - // Loop on the RDNs - for ( Rdn rdn:dn.getRdns() ) - { - RdnSerializer.serialize( rdn, out ); - } + RdnSerializer.serialize( rdn, out ); } out.flush(); @@ -107,6 +99,8 @@ /** + * Deserialize a DN + * * We read back the data to create a new LdapDN. The structure * read is exposed in the {@link DnSerializer#serialize(LdapDN, ObjectOutput)} * method

    Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/name/RdnSerializer.java URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/name/RdnSerializer.java?rev=617838&r1=617837&r2=617838&view=diff ============================================================================== --- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/name/RdnSerializer.java (original) +++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/name/RdnSerializer.java Sat Feb 2 09:16:11 2008 @@ -19,7 +19,6 @@ */ package org.apache.directory.shared.ldap.name; -import java.io.Externalizable; import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; @@ -40,7 +39,7 @@ protected static final Logger LOG = LoggerFactory.getLogger( RdnSerializer.class ); /** - * @see Externalizable#readExternal(ObjectInput)

    + * Serialize a RDN instance * * A RDN is composed of on to many ATAVs (AttributeType And Value). * We should write all those ATAVs sequencially, following the @@ -88,7 +87,7 @@ } /** - * @see Externalizable#readExternal(ObjectInput) + * Deserialize a RDN instance * * We read back the data to create a new RDB. The structure * read is exposed in the {@link Rdn#writeExternal(ObjectOutput)} @@ -110,12 +109,14 @@ normName = upName; } + // Read the RDN's position and length int start = in.readInt(); int length = in.readInt(); + // Now creates the RDN Rdn rdn = new Rdn( length, start, upName, normName ); - + // Read through the Atavs switch ( nbAtavs ) { case 0 :