directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1001495 - in /directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name: AVA.java DN.java RDN.java
Date Sun, 26 Sep 2010 19:00:16 GMT
Author: elecharny
Date: Sun Sep 26 19:00:16 2010
New Revision: 1001495

URL: http://svn.apache.org/viewvc?rev=1001495&view=rev
Log:
Fixed some methods to make the classes a bit more immutable

Modified:
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/AVA.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/DN.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RDN.java

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/AVA.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/AVA.java?rev=1001495&r1=1001494&r2=1001495&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/AVA.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/AVA.java
Sun Sep 26 19:00:16 2010
@@ -53,7 +53,7 @@ import org.slf4j.LoggerFactory;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class AVA implements Cloneable, Comparable, Externalizable
+public class AVA implements Cloneable, Comparable<Object>, Externalizable
 {
     /**
      * Declares the Serial Version Uid.
@@ -290,7 +290,7 @@ public class AVA implements Cloneable, C
      */
     public Value<?> getNormValue()
     {
-        return normValue;
+        return normValue.clone();
     }
 
     /**
@@ -300,7 +300,7 @@ public class AVA implements Cloneable, C
      */
     public Value<?> getUpValue()
     {
-        return upValue;
+        return upValue.clone();
     }
 
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/DN.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/DN.java?rev=1001495&r1=1001494&r2=1001495&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/DN.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/DN.java
Sun Sep 26 19:00:16 2010
@@ -42,16 +42,18 @@ import org.slf4j.LoggerFactory;
 
 /**
  * The DN class contains a DN (Distinguished Name). This class is immutable.
- *
+ * <br/>
  * Its specification can be found in RFC 2253,
  * "UTF-8 String Representation of Distinguished Names".
- *
+ * <br/>
  * We will store two representation of a DN :
- * - a user Provider representation, which is the parsed String given by a user
- * - an internal representation.
+ * <ul>
+ * <li>a user Provider representation, which is the parsed String given by a user</li>
+ * <li>an internal representation.</li>
+ * </ul>
  *
- * A DN is formed of RDNs, in a specific order :
- *  RDN[n], RDN[n-1], ... RDN[1], RDN[0]
+ * 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
  * is the first RDN (RDN[n]).
@@ -194,16 +196,9 @@ public class DN implements Cloneable, Se
 
         if ( ( dn != null ) && ( dn.size() != 0 ) )
         {
-            for ( int ii = 0; ii < dn.size(); ii++ )
+            for ( RDN rdn : dn )
             {
-                String nameComponent = dn.get( ii );
-
-                if ( nameComponent.length() > 0 )
-                {
-                    RDN newRdn = new RDN( nameComponent, schemaManager );
-
-                    rdns.add( 0, newRdn );
-                }
+                rdns.add( 0, rdn.clone() );
             }
         }
 
@@ -404,9 +399,9 @@ public class DN implements Cloneable, Se
      */
     public DN( RDN rdn )
     {
-        rdns.add( rdn );
+        rdns.add( rdn.clone() );
 
-        if( rdn.isNormalized() )
+        if ( rdn.isNormalized() )
         {
             this.normName = rdn.getNormName();
             this.upName = rdn.getName();
@@ -866,7 +861,6 @@ public class DN implements Cloneable, Se
      */
     public boolean hasSuffix( DN dn )
     {
-
         if ( dn == null )
         {
             return true;
@@ -969,7 +963,7 @@ public class DN implements Cloneable, Se
         {
             RDN rdn = rdns.get( rdns.size() - posn - 1 );
 
-            return rdn;
+            return rdn.clone();
         }
     }
 
@@ -987,7 +981,7 @@ public class DN implements Cloneable, Se
         }
         else
         {
-            return rdns.get( 0 );
+            return rdns.get( 0 ).clone();
         }
     }
 
@@ -1020,18 +1014,18 @@ public class DN implements Cloneable, Se
             throw new ArrayIndexOutOfBoundsException( message );
         }
 
-        DN newDN = new DN();
+        DN newDn = new DN();
 
         for ( int i = rdns.size() - posn; i < rdns.size(); i++ )
         {
             // Don't forget to clone the rdns !
-            newDN.rdns.add( ( RDN ) rdns.get( i ).clone() );
+            newDn.rdns.add( ( RDN ) rdns.get( i ).clone() );
         }
 
-        newDN.normName = newDN.toNormName();
-        newDN.upName = getUpNamePrefix( posn );
+        newDn.normName = newDn.toNormName();
+        newDn.upName = getUpNamePrefix( posn );
 
-        return newDN;
+        return newDn;
     }
 
 
@@ -1052,18 +1046,18 @@ public class DN implements Cloneable, Se
             throw new ArrayIndexOutOfBoundsException( message );
         }
 
-        DN newDN = new DN();
+        DN newDn = new DN();
 
         for ( int i = 0; i < size() - posn; i++ )
         {
             // Don't forget to clone the rdns !
-            newDN.rdns.add( ( RDN ) rdns.get( i ).clone() );
+            newDn.rdns.add( ( RDN ) rdns.get( i ).clone() );
         }
 
-        newDN.normName = newDN.toNormName();
-        newDN.upName = getUpNameSuffix( posn );
+        newDn.normName = newDn.toNormName();
+        newDn.upName = getUpNameSuffix( posn );
 
-        return newDN;
+        return newDn;
     }
 
 
@@ -1090,7 +1084,7 @@ public class DN implements Cloneable, Se
             return this;
         }
 
-        DN clonedDn = ( DN ) clone();
+        DN clonedDn = clone();
 
         // Concatenate the rdns
         clonedDn.rdns.addAll( clonedDn.size() - posn, dn.rdns );
@@ -1130,7 +1124,7 @@ public class DN implements Cloneable, Se
             return this;
         }
 
-        DN clonedDn = ( DN ) clone();
+        DN clonedDn = clone();
 
         // Concatenate the rdns
         clonedDn.rdns.addAll( clonedDn.size() - posn, dn.rdns );
@@ -1174,7 +1168,8 @@ public class DN implements Cloneable, Se
             return this;
         }
 
-        DN clonedDn = ( DN ) clone();
+        DN clonedDn = clone();
+
         // We have to parse the nameComponent which is given as an argument
         RDN newRdn = new RDN( comp, schemaManager );
 
@@ -1204,15 +1199,15 @@ public class DN implements Cloneable, Se
      */
     public DN add( RDN newRdn )
     {
-        DN clonedDn = ( DN ) clone();
+        DN clonedDn = clone();
 
-        clonedDn.rdns.add( 0, newRdn );
+        clonedDn.rdns.add( 0, newRdn.clone() );
 
         // FIXME this try-catch block shouldn't be here
         // instead this method should throw the LdapInvalidDnException
         try
         {
-            if( clonedDn.isNormalized() && newRdn.isNormalized() )
+            if ( clonedDn.isNormalized() && newRdn.isNormalized() )
             {
                 clonedDn.normalizeInternal();
             }
@@ -1255,7 +1250,7 @@ public class DN implements Cloneable, Se
         // We have to parse the nameComponent which is given as an argument
         RDN newRdn = new RDN( comp );
 
-        DN clonedDn = ( DN ) clone();
+        DN clonedDn = clone();
 
         int realPos = clonedDn.size() - posn;
         clonedDn.rdns.add( realPos, newRdn );
@@ -1293,7 +1288,7 @@ public class DN implements Cloneable, Se
             throw new ArrayIndexOutOfBoundsException( message );
         }
 
-        DN clonedDn = ( DN ) clone();
+        DN clonedDn = clone();
         clonedDn._removeChild( posn );
 
         return clonedDn;

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RDN.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RDN.java?rev=1001495&r1=1001494&r2=1001495&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RDN.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RDN.java
Sun Sep 26 19:00:16 2010
@@ -106,6 +106,8 @@ import org.slf4j.LoggerFactory;
  * The Rdn is composed of one or more AttributeTypeAndValue (atav) Those atavs
  * are ordered in the alphabetical natural order : a < b < c ... < z As the type
  * are not case sensitive, we can say that a = A
+ * <br>
+ * This class is immutable.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
@@ -664,8 +666,7 @@ public class RDN implements Cloneable, C
      * Get the Value of the AttributeTypeAndValue which type is given as an
      * argument.
      *
-     * @param type
-     *            The type of the NameArgument
+     * @param type The type of the NameArgument
      * @return The Value to be returned, or null if none found.
      * @throws LdapInvalidDnException
      */
@@ -825,7 +826,7 @@ public class RDN implements Cloneable, C
      *
      * @return A clone of the current RDN
      */
-    public Object clone()
+    public RDN clone()
     {
         try
         {



Mime
View raw message