directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1085097 - in /directory/shared/trunk/ldap/model/src: main/java/org/apache/directory/shared/ldap/model/name/ test/java/org/apache/directory/shared/ldap/model/ldif/
Date Thu, 24 Mar 2011 19:47:08 GMT
Author: elecharny
Date: Thu Mar 24 19:47:08 2011
New Revision: 1085097

URL: http://svn.apache.org/viewvc?rev=1085097&view=rev
Log:
o Updated the Javadoc
o Removed the Dn.normalizeInternal() method
o Removed the Dn.toNormName() method
o Fixed the getParent() method


Modified:
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Dn.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java
    directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifUtilsTest.java

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Dn.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Dn.java?rev=1085097&r1=1085096&r2=1085097&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Dn.java
(original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Dn.java
Thu Mar 24 19:47:08 2011
@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
  * A Dn is formed of RDNs, in a specific order :<br/>
  *  Rdn[n], Rdn[n-1], ... Rdn[1], Rdn[0]<br/>
  *
- * It represents a tree, in which the root is the last Rdn (Rdn[0]) and the leaf
+ * It represents a position in a hierarchy, in which the root is the last Rdn (Rdn[0]) and
the leaf
  * is the first Rdn (Rdn[n]).
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
@@ -87,14 +87,16 @@ public class Dn implements Iterable<Rdn>
     private boolean normalized;
 
     /**
-     *  The RDNs that are elements of the Dn
-     * NOTE THAT THESE ARE IN THE OPPOSITE ORDER FROM THAT IMPLIED BY THE JAVADOC!
+     *  The RDNs that are elements of the Dn<br/>
+     * NOTE THAT THESE ARE IN THE OPPOSITE ORDER FROM THAT IMPLIED BY THE JAVADOC!<br/>
      * Rdn[0] is rdns.get(n) and Rdn[n] is rdns.get(0)
      * <br>
      * For instance,if the Dn is "dc=c, dc=b, dc=a", then the RDNs are stored as :
-     * [0] : dc=c
-     * [1] : dc=b
-     * [2] : dc=a
+     * <ul>
+     * <li>[0] : dc=c</li>
+     * <li>[1] : dc=b</li>
+     * <li>[2] : dc=a</li>
+     * </ul>
      */
     protected List<Rdn> rdns = new ArrayList<Rdn>( 5 );
 
@@ -115,6 +117,9 @@ public class Dn implements Iterable<Rdn>
 
     /** the schema manager */
     private SchemaManager schemaManager;
+    
+    /** The computed hashcode */
+    private volatile int h;
 
     /**
      * An iterator over RDNs
@@ -124,7 +129,6 @@ public class Dn implements Iterable<Rdn>
         // The current index
         int index;
 
-
         private RdnIterator()
         {
             index = rdns != null ? rdns.size() - 1 : -1;
@@ -179,6 +183,7 @@ public class Dn implements Iterable<Rdn>
         upName = "";
         normName = "";
         normalized = true;
+        hashCode();
     }
 
 
@@ -200,9 +205,10 @@ public class Dn implements Iterable<Rdn>
      *     "ou", exampleName,
      *     baseDn);
      * </pre>
+     * 
      * @param schemaManager the schema manager
-     * @param upRdns
-     * @throws LdapInvalidDnException
+     * @param upRdns The list of String composing the Dn
+     * @throws LdapInvalidDnException If the resulting Dn is invalid
      */
     public Dn(String... upRdns) throws LdapInvalidDnException
     {
@@ -211,7 +217,7 @@ public class Dn implements Iterable<Rdn>
 
 
     /**
-     * Creates a new instance of Dn, using varargs to declare the RDNs. Each
+     * Creates a new instance of schema aware Dn, using varargs to declare the RDNs. Each
      * String is either a full Rdn, or a couple of AttributeType DI and a value.
      * If the String contains a '=' symbol, the the constructor will assume that
      * the String arg contains afull Rdn, otherwise, it will consider that the
@@ -228,9 +234,10 @@ public class Dn implements Iterable<Rdn>
      *     "ou", exampleName,
      *     baseDn);
      * </pre>
+     * 
      * @param schemaManager the schema manager
-     * @param upRdns
-     * @throws LdapInvalidDnException
+     * @param upRdns The list of String composing the Dn
+     * @throws LdapInvalidDnException If the resulting Dn is invalid
      */
     public Dn( SchemaManager schemaManager, String... upRdns ) throws LdapInvalidDnException
     {
@@ -282,16 +289,20 @@ public class Dn implements Iterable<Rdn>
         parseInternal( upName, rdns );
 
         applySchemaManager( schemaManager );
+        
+        hashCode();
     }
 
 
     /**
-     * Create a Dn while deserializing it.
-     *
+     * Create a schema aware Dn while deserializing it.
+     * <br/>
      * Note : this constructor is used only by the deserialization method.
+     * 
+     * @param schemaManager the schema manager
      * @param upName The user provided name
      * @param normName the normalized name
-     * @param bytes the name as a byte[]
+     * @param rdns the list of RDNs for this Dn
      */
     /* No protection */ Dn( SchemaManager schemaManager, String upName, String normName,
Rdn... rdns )
     {
@@ -310,6 +321,7 @@ public class Dn implements Iterable<Rdn>
      * Creates a Dn from a list of Rdns.
      *
      * @param rdns the list of Rdns to be used for the Dn
+     * @throws LdapInvalidDnException If the resulting Dn is invalid
      */
     public Dn( Rdn... rdns ) throws LdapInvalidDnException
     {
@@ -326,13 +338,16 @@ public class Dn implements Iterable<Rdn>
         applySchemaManager( null );
         toUpName();
         normalized = false;
+        hashCode();
     }
 
 
     /**
      * Creates a Dn concatenating a Rdn and a Dn.
      *
-     * @param rdns the list of Rdns to be used for the Dn
+     * @param rdn the Rdn to add to the Dn
+     * @param dn the Dn 
+     * @throws LdapInvalidDnException If the resulting Dn is invalid
      */
     public Dn( Rdn rdn, Dn dn ) throws LdapInvalidDnException
     {
@@ -350,13 +365,16 @@ public class Dn implements Iterable<Rdn>
 
         applySchemaManager( dn.schemaManager );
         toUpName();
+        hashCode();
     }
 
 
     /**
-     * Creates a Dn concatenating a Rdn and a Dn.
+     * Creates a schema aware Dn copying an existing Dn
      *
-     * @param rdns the list of Rdns to be used for the Dn
+     * @param schemaManager the schema manager
+     * @param dn the Dn to copy
+     * @throws LdapInvalidDnException If the resulting Dn is invalid
      */
     public Dn( SchemaManager schemaManager, Dn dn ) throws LdapInvalidDnException
     {
@@ -372,14 +390,16 @@ public class Dn implements Iterable<Rdn>
         
         applySchemaManager( schemaManager );
         toUpName();
+        hashCode();
     }
 
 
     /**
      * Creates a Schema aware Dn from a list of Rdns.
      *
-     *  @param schemaManager The SchemaManager to use
+     * @param schemaManager The SchemaManager to use
      * @param rdns the list of Rdns to be used for the Dn
+     * @throws LdapInvalidDnException If the resulting Dn is invalid
      */
     public Dn( SchemaManager schemaManager, Rdn... rdns ) throws LdapInvalidDnException
     {
@@ -394,63 +414,11 @@ public class Dn implements Iterable<Rdn>
         }
 
         applySchemaManager( schemaManager );
+        hashCode();
     }
 
 
     /**
-     * Normalize the Dn by triming useless spaces and lowercasing names.
-     *
-    void normalizeInternal()
-    {
-        normName = toNormName();
-    }
-
-
-    /**
-     * Build the normalized Dn as a String,
-     *
-     * @return A String representing the normalized Dn
-     *
-    private String toNormName()
-    {
-        if ( rdns.size() == 0 )
-        {
-            bytes = null;
-            return "";
-        }
-        else
-        {
-            StringBuffer sb = new StringBuffer();
-            boolean isFirst = true;
-
-            for ( Rdn rdn : rdns )
-            {
-                if ( isFirst )
-                {
-                    isFirst = false;
-                }
-                else
-                {
-                    sb.append( ',' );
-                }
-
-                sb.append( rdn.getNormName() );
-            }
-
-            String newNormName = sb.toString();
-
-            if ( ( normName == null ) || !normName.equals( newNormName ) )
-            {
-                bytes = Strings.getBytesUtf8(newNormName);
-                normName = newNormName;
-            }
-
-            return normName;
-        }
-    }
-    
-    
-    /**
      * Get the associated SchemaManager if any.
      * 
      * @return The SchemaManager
@@ -500,23 +468,24 @@ public class Dn implements Iterable<Rdn>
 
     /**
      * Return the User Provided prefix representation of the Dn starting at the
-     * posn position.
-     *
-     * If posn = 0, return an empty string.
-     *
+     * posn position.<br/>
+     * <br/>
+     * If posn = 0, return an empty string.<br/>
+     * <br/>
      * for Dn : sn=smith, dc=apache, dc=org
-     * getUpname(0) -> ""
-     * getUpName(1) -> "dc=org"
-     * getUpname(3) -> "sn=smith, dc=apache, dc=org"
-     * getUpName(4) -> ArrayOutOfBoundException
-     *
+     * <ul>
+     * <li>getUpname(0) -> ""</li>
+     * <li>getUpName(1) -> "dc=org"</li>
+     * <li>getUpname(3) -> "sn=smith, dc=apache, dc=org"</li>
+     * <li>getUpName(4) -> ArrayOutOfBoundException</li>
+     * </ul>
+     *<br/>
      * Warning ! The returned String is not exactly the
      * user provided Dn, as spaces before and after each RDNs have been trimmed.
      *
-     * @param posn
-     *            The starting position
+     * @param posn The starting position
      * @return The truncated Dn
-     */
+     *
     private String getUpNamePrefix( int posn )
     {
         if ( posn == 0 )
@@ -778,8 +747,7 @@ public class Dn implements Iterable<Rdn>
     /**
      * Retrieves a component of this name.
      *
-     * @param posn
-     *            the 0-based index of the component to retrieve. Must be in the
+     * @param posn the 0-based index of the component to retrieve. Must be in the
      *            range [0,size()).
      * @return the component at index posn
      * @throws ArrayIndexOutOfBoundsException
@@ -1120,8 +1088,7 @@ public class Dn implements Iterable<Rdn>
             LOG.error( e.getMessage(), e );
         }
 
-        newDn.upName = getUpNamePrefix( posn );
-        newDn.normalized = normalized;
+        newDn.toUpName();
 
         return newDn;
     }

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java?rev=1085097&r1=1085096&r2=1085097&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java
(original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java
Thu Mar 24 19:47:08 2011
@@ -1381,7 +1381,7 @@ public class Rdn implements Cloneable, E
     {
         try
         {
-            FastDnParser.INSTANCE.parseRdn( dn, rdn );
+            FastDnParser.parseRdn( dn, rdn );
         }
         catch ( TooComplexException e )
         {

Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifUtilsTest.java?rev=1085097&r1=1085096&r2=1085097&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifUtilsTest.java
(original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifUtilsTest.java
Thu Mar 24 19:47:08 2011
@@ -20,8 +20,21 @@
 package org.apache.directory.shared.ldap.model.ldif;
 
 
-import com.mycila.junit.concurrent.Concurrency;
-import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.List;
+
+import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.BasicAttribute;
+import javax.naming.directory.BasicAttributes;
+
 import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
@@ -33,19 +46,8 @@ import org.apache.directory.shared.util.
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.Attributes;
-import javax.naming.directory.BasicAttribute;
-import javax.naming.directory.BasicAttributes;
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
 
 
 /**
@@ -409,7 +411,7 @@ public class LdifUtilsTest
         assertEquals( ChangeType.ModRdn, reversed.getChangeType() );
         assertFalse( reversed.isDeleteOldRdn() );
         assertEquals( "cn=john doe", reversed.getNewRdn() );
-        assertEquals( "dc=example, dc=com", Strings.trim(reversed.getNewSuperior()) );
+        assertEquals( "dc=example, dc=com", Strings.trim( reversed.getNewSuperior() ) );
         assertNull( reversed.getEntry() );
     }
 



Mime
View raw message