You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2004/08/23 22:10:13 UTC
svn commit: rev 36779 - in incubator/directory/ldap/trunk/common/src: java/org/apache/ldap/common/message test/org/apache/ldap/common/message
Author: akarasulu
Date: Mon Aug 23 13:10:12 2004
New Revision: 36779
Added:
incubator/directory/ldap/trunk/common/src/test/org/apache/ldap/common/message/LockableAttributeImplTest.java
Modified:
incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/message/LockableAttributeImpl.java
Log:
Commit changes ...
o overrided eqauls() method to take into account id and values
o formatting: removed m_, a_ and space before ;
o added test cases for equals()
WARNING: the equals implementation still needs to take into account the
attribute's syntaxes. It currently does not do that.
Modified: incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/message/LockableAttributeImpl.java
==============================================================================
--- incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/message/LockableAttributeImpl.java (original)
+++ incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/message/LockableAttributeImpl.java Mon Aug 23 13:10:12 2004
@@ -1,207 +1,207 @@
-/*
- * Apache License
- * Version 2.0, January 2004
- * http://www.apache.org/licenses/
- *
- * TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
- *
- * 1. Definitions.
- *
- * "License" shall mean the terms and conditions for use, reproduction,
- * and distribution as defined by Sections 1 through 9 of this document.
- *
- * "Licensor" shall mean the copyright owner or entity authorized by
- * the copyright owner that is granting the License.
- *
- * "Legal Entity" shall mean the union of the acting entity and all
- * other entities that control, are controlled by, or are under common
- * control with that entity. For the purposes of this definition,
- * "control" means (i) the power, direct or indirect, to cause the
- * direction or management of such entity, whether by contract or
- * otherwise, or (ii) ownership of fifty percent (50%) or more of the
- * outstanding shares, or (iii) beneficial ownership of such entity.
- *
- * "You" (or "Your") shall mean an individual or Legal Entity
- * exercising permissions granted by this License.
- *
- * "Source" form shall mean the preferred form for making modifications,
- * including but not limited to software source code, documentation
- * source, and configuration files.
- *
- * "Object" form shall mean any form resulting from mechanical
- * transformation or translation of a Source form, including but
- * not limited to compiled object code, generated documentation,
- * and conversions to other media types.
- *
- * "Work" shall mean the work of authorship, whether in Source or
- * Object form, made available under the License, as indicated by a
- * copyright notice that is included in or attached to the work
- * (an example is provided in the Appendix below).
- *
- * "Derivative Works" shall mean any work, whether in Source or Object
- * form, that is based on (or derived from) the Work and for which the
- * editorial revisions, annotations, elaborations, or other modifications
- * represent, as a whole, an original work of authorship. For the purposes
- * of this License, Derivative Works shall not include works that remain
- * separable from, or merely link (or bind by name) to the interfaces of,
- * the Work and Derivative Works thereof.
- *
- * "Contribution" shall mean any work of authorship, including
- * the original version of the Work and any modifications or additions
- * to that Work or Derivative Works thereof, that is intentionally
- * submitted to Licensor for inclusion in the Work by the copyright owner
- * or by an individual or Legal Entity authorized to submit on behalf of
- * the copyright owner. For the purposes of this definition, "submitted"
- * means any form of electronic, verbal, or written communication sent
- * to the Licensor or its representatives, including but not limited to
- * communication on electronic mailing lists, source code control systems,
- * and issue tracking systems that are managed by, or on behalf of, the
- * Licensor for the purpose of discussing and improving the Work, but
- * excluding communication that is conspicuously marked or otherwise
- * designated in writing by the copyright owner as "Not a Contribution."
- *
- * "Contributor" shall mean Licensor and any individual or Legal Entity
- * on behalf of whom a Contribution has been received by Licensor and
- * subsequently incorporated within the Work.
- *
- * 2. Grant of Copyright License. Subject to the terms and conditions of
- * this License, each Contributor hereby grants to You a perpetual,
- * worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- * copyright license to reproduce, prepare Derivative Works of,
- * publicly display, publicly perform, sublicense, and distribute the
- * Work and such Derivative Works in Source or Object form.
- *
- * 3. Grant of Patent License. Subject to the terms and conditions of
- * this License, each Contributor hereby grants to You a perpetual,
- * worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- * (except as stated in this section) patent license to make, have made,
- * use, offer to sell, sell, import, and otherwise transfer the Work,
- * where such license applies only to those patent claims licensable
- * by such Contributor that are necessarily infringed by their
- * Contribution(s) alone or by combination of their Contribution(s)
- * with the Work to which such Contribution(s) was submitted. If You
- * institute patent litigation against any entity (including a
- * cross-claim or counterclaim in a lawsuit) alleging that the Work
- * or a Contribution incorporated within the Work constitutes direct
- * or contributory patent infringement, then any patent licenses
- * granted to You under this License for that Work shall terminate
- * as of the date such litigation is filed.
- *
- * 4. Redistribution. You may reproduce and distribute copies of the
- * Work or Derivative Works thereof in any medium, with or without
- * modifications, and in Source or Object form, provided that You
- * meet the following conditions:
- *
- * (a) You must give any other recipients of the Work or
- * Derivative Works a copy of this License; and
- *
- * (b) You must cause any modified files to carry prominent notices
- * stating that You changed the files; and
- *
- * (c) You must retain, in the Source form of any Derivative Works
- * that You distribute, all copyright, patent, trademark, and
- * attribution notices from the Source form of the Work,
- * excluding those notices that do not pertain to any part of
- * the Derivative Works; and
- *
- * (d) If the Work includes a "NOTICE" text file as part of its
- * distribution, then any Derivative Works that You distribute must
- * include a readable copy of the attribution notices contained
- * within such NOTICE file, excluding those notices that do not
- * pertain to any part of the Derivative Works, in at least one
- * of the following places: within a NOTICE text file distributed
- * as part of the Derivative Works; within the Source form or
- * documentation, if provided along with the Derivative Works; or,
- * within a display generated by the Derivative Works, if and
- * wherever such third-party notices normally appear. The contents
- * of the NOTICE file are for informational purposes only and
- * do not modify the License. You may add Your own attribution
- * notices within Derivative Works that You distribute, alongside
- * or as an addendum to the NOTICE text from the Work, provided
- * that such additional attribution notices cannot be construed
- * as modifying the License.
- *
- * You may add Your own copyright statement to Your modifications and
- * may provide additional or different license terms and conditions
- * for use, reproduction, or distribution of Your modifications, or
- * for any such Derivative Works as a whole, provided Your use,
- * reproduction, and distribution of the Work otherwise complies with
- * the conditions stated in this License.
- *
- * 5. Submission of Contributions. Unless You explicitly state otherwise,
- * any Contribution intentionally submitted for inclusion in the Work
- * by You to the Licensor shall be under the terms and conditions of
- * this License, without any additional terms or conditions.
- * Notwithstanding the above, nothing herein shall supersede or modify
- * the terms of any separate license agreement you may have executed
- * with Licensor regarding such Contributions.
- *
- * 6. Trademarks. This License does not grant permission to use the trade
- * names, trademarks, service marks, or product names of the Licensor,
- * except as required for reasonable and customary use in describing the
- * origin of the Work and reproducing the content of the NOTICE file.
- *
- * 7. Disclaimer of Warranty. Unless required by applicable law or
- * agreed to in writing, Licensor provides the Work (and each
- * Contributor provides its Contributions) on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied, including, without limitation, any warranties or conditions
- * of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- * PARTICULAR PURPOSE. You are solely responsible for determining the
- * appropriateness of using or redistributing the Work and assume any
- * risks associated with Your exercise of permissions under this License.
- *
- * 8. Limitation of Liability. In no event and under no legal theory,
- * whether in tort (including negligence), contract, or otherwise,
- * unless required by applicable law (such as deliberate and grossly
- * negligent acts) or agreed to in writing, shall any Contributor be
- * liable to You for damages, including any direct, indirect, special,
- * incidental, or consequential damages of any character arising as a
- * result of this License or out of the use or inability to use the
- * Work (including but not limited to damages for loss of goodwill,
- * work stoppage, computer failure or malfunction, or any and all
- * other commercial damages or losses), even if such Contributor
- * has been advised of the possibility of such damages.
- *
- * 9. Accepting Warranty or Additional Liability. While redistributing
- * the Work or Derivative Works thereof, You may choose to offer,
- * and charge a fee for, acceptance of support, warranty, indemnity,
- * or other liability obligations and/or rights consistent with this
- * License. However, in accepting such obligations, You may act only
- * on Your own behalf and on Your sole responsibility, not on behalf
- * of any other Contributor, and only if You agree to indemnify,
- * defend, and hold each Contributor harmless for any liability
- * incurred by, or claims asserted against, such Contributor by reason
- * of your accepting any such warranty or additional liability.
- *
- * END OF TERMS AND CONDITIONS
- *
- * APPENDIX: How to apply the Apache License to your work.
- *
- * To apply the Apache License to your work, attach the following
- * boilerplate notice, with the fields enclosed by brackets "[]"
- * replaced with your own identifying information. (Don't include
- * the brackets!) The text should be enclosed in the appropriate
- * comment syntax for the file format. We also recommend that a
- * file or class name and description of purpose be included on the
- * same "printed page" as the copyright notice for easier
- * identification within third-party archives.
- *
- * Copyright [yyyy] [name of copyright owner]
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+/*
+ * Apache License
+ * Version 2.0, January 2004
+ * http://www.apache.org/licenses/
+ *
+ * TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+ *
+ * 1. Definitions.
+ *
+ * "License" shall mean the terms and conditions for use, reproduction,
+ * and distribution as defined by Sections 1 through 9 of this document.
+ *
+ * "Licensor" shall mean the copyright owner or entity authorized by
+ * the copyright owner that is granting the License.
+ *
+ * "Legal Entity" shall mean the union of the acting entity and all
+ * other entities that control, are controlled by, or are under common
+ * control with that entity. For the purposes of this definition,
+ * "control" means (i) the power, direct or indirect, to cause the
+ * direction or management of such entity, whether by contract or
+ * otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ * outstanding shares, or (iii) beneficial ownership of such entity.
+ *
+ * "You" (or "Your") shall mean an individual or Legal Entity
+ * exercising permissions granted by this License.
+ *
+ * "Source" form shall mean the preferred form for making modifications,
+ * including but not limited to software source code, documentation
+ * source, and configuration files.
+ *
+ * "Object" form shall mean any form resulting from mechanical
+ * transformation or translation of a Source form, including but
+ * not limited to compiled object code, generated documentation,
+ * and conversions to other media types.
+ *
+ * "Work" shall mean the work of authorship, whether in Source or
+ * Object form, made available under the License, as indicated by a
+ * copyright notice that is included in or attached to the work
+ * (an example is provided in the Appendix below).
+ *
+ * "Derivative Works" shall mean any work, whether in Source or Object
+ * form, that is based on (or derived from) the Work and for which the
+ * editorial revisions, annotations, elaborations, or other modifications
+ * represent, as a whole, an original work of authorship. For the purposes
+ * of this License, Derivative Works shall not include works that remain
+ * separable from, or merely link (or bind by name) to the interfaces of,
+ * the Work and Derivative Works thereof.
+ *
+ * "Contribution" shall mean any work of authorship, including
+ * the original version of the Work and any modifications or additions
+ * to that Work or Derivative Works thereof, that is intentionally
+ * submitted to Licensor for inclusion in the Work by the copyright owner
+ * or by an individual or Legal Entity authorized to submit on behalf of
+ * the copyright owner. For the purposes of this definition, "submitted"
+ * means any form of electronic, verbal, or written communication sent
+ * to the Licensor or its representatives, including but not limited to
+ * communication on electronic mailing lists, source code control systems,
+ * and issue tracking systems that are managed by, or on behalf of, the
+ * Licensor for the purpose of discussing and improving the Work, but
+ * excluding communication that is conspicuously marked or otherwise
+ * designated in writing by the copyright owner as "Not a Contribution."
+ *
+ * "Contributor" shall mean Licensor and any individual or Legal Entity
+ * on behalf of whom a Contribution has been received by Licensor and
+ * subsequently incorporated within the Work.
+ *
+ * 2. Grant of Copyright License. Subject to the terms and conditions of
+ * this License, each Contributor hereby grants to You a perpetual,
+ * worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ * copyright license to reproduce, prepare Derivative Works of,
+ * publicly display, publicly perform, sublicense, and distribute the
+ * Work and such Derivative Works in Source or Object form.
+ *
+ * 3. Grant of Patent License. Subject to the terms and conditions of
+ * this License, each Contributor hereby grants to You a perpetual,
+ * worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ * (except as stated in this section) patent license to make, have made,
+ * use, offer to sell, sell, import, and otherwise transfer the Work,
+ * where such license applies only to those patent claims licensable
+ * by such Contributor that are necessarily infringed by their
+ * Contribution(s) alone or by combination of their Contribution(s)
+ * with the Work to which such Contribution(s) was submitted. If You
+ * institute patent litigation against any entity (including a
+ * cross-claim or counterclaim in a lawsuit) alleging that the Work
+ * or a Contribution incorporated within the Work constitutes direct
+ * or contributory patent infringement, then any patent licenses
+ * granted to You under this License for that Work shall terminate
+ * as of the date such litigation is filed.
+ *
+ * 4. Redistribution. You may reproduce and distribute copies of the
+ * Work or Derivative Works thereof in any medium, with or without
+ * modifications, and in Source or Object form, provided that You
+ * meet the following conditions:
+ *
+ * (a) You must give any other recipients of the Work or
+ * Derivative Works a copy of this License; and
+ *
+ * (b) You must cause any modified files to carry prominent notices
+ * stating that You changed the files; and
+ *
+ * (c) You must retain, in the Source form of any Derivative Works
+ * that You distribute, all copyright, patent, trademark, and
+ * attribution notices from the Source form of the Work,
+ * excluding those notices that do not pertain to any part of
+ * the Derivative Works; and
+ *
+ * (d) If the Work includes a "NOTICE" text file as part of its
+ * distribution, then any Derivative Works that You distribute must
+ * include a readable copy of the attribution notices contained
+ * within such NOTICE file, excluding those notices that do not
+ * pertain to any part of the Derivative Works, in at least one
+ * of the following places: within a NOTICE text file distributed
+ * as part of the Derivative Works; within the Source form or
+ * documentation, if provided along with the Derivative Works; or,
+ * within a display generated by the Derivative Works, if and
+ * wherever such third-party notices normally appear. The contents
+ * of the NOTICE file are for informational purposes only and
+ * do not modify the License. You may add Your own attribution
+ * notices within Derivative Works that You distribute, alongside
+ * or as an addendum to the NOTICE text from the Work, provided
+ * that such additional attribution notices cannot be construed
+ * as modifying the License.
+ *
+ * You may add Your own copyright statement to Your modifications and
+ * may provide additional or different license terms and conditions
+ * for use, reproduction, or distribution of Your modifications, or
+ * for any such Derivative Works as a whole, provided Your use,
+ * reproduction, and distribution of the Work otherwise complies with
+ * the conditions stated in this License.
+ *
+ * 5. Submission of Contributions. Unless You explicitly state otherwise,
+ * any Contribution intentionally submitted for inclusion in the Work
+ * by You to the Licensor shall be under the terms and conditions of
+ * this License, without any additional terms or conditions.
+ * Notwithstanding the above, nothing herein shall supersede or modify
+ * the terms of any separate license agreement you may have executed
+ * with Licensor regarding such Contributions.
+ *
+ * 6. Trademarks. This License does not grant permission to use the trade
+ * names, trademarks, service marks, or product names of the Licensor,
+ * except as required for reasonable and customary use in describing the
+ * origin of the Work and reproducing the content of the NOTICE file.
+ *
+ * 7. Disclaimer of Warranty. Unless required by applicable law or
+ * agreed to in writing, Licensor provides the Work (and each
+ * Contributor provides its Contributions) on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied, including, without limitation, any warranties or conditions
+ * of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ * PARTICULAR PURPOSE. You are solely responsible for determining the
+ * appropriateness of using or redistributing the Work and assume any
+ * risks associated with Your exercise of permissions under this License.
+ *
+ * 8. Limitation of Liability. In no event and under no legal theory,
+ * whether in tort (including negligence), contract, or otherwise,
+ * unless required by applicable law (such as deliberate and grossly
+ * negligent acts) or agreed to in writing, shall any Contributor be
+ * liable to You for damages, including any direct, indirect, special,
+ * incidental, or consequential damages of any character arising as a
+ * result of this License or out of the use or inability to use the
+ * Work (including but not limited to damages for loss of goodwill,
+ * work stoppage, computer failure or malfunction, or any and all
+ * other commercial damages or losses), even if such Contributor
+ * has been advised of the possibility of such damages.
+ *
+ * 9. Accepting Warranty or Additional Liability. While redistributing
+ * the Work or Derivative Works thereof, You may choose to offer,
+ * and charge a fee for, acceptance of support, warranty, indemnity,
+ * or other liability obligations and/or rights consistent with this
+ * License. However, in accepting such obligations, You may act only
+ * on Your own behalf and on Your sole responsibility, not on behalf
+ * of any other Contributor, and only if You agree to indemnify,
+ * defend, and hold each Contributor harmless for any liability
+ * incurred by, or claims asserted against, such Contributor by reason
+ * of your accepting any such warranty or additional liability.
+ *
+ * END OF TERMS AND CONDITIONS
+ *
+ * APPENDIX: How to apply the Apache License to your work.
+ *
+ * To apply the Apache License to your work, attach the following
+ * boilerplate notice, with the fields enclosed by brackets "[]"
+ * replaced with your own identifying information. (Don't include
+ * the brackets!) The text should be enclosed in the appropriate
+ * comment syntax for the file format. We also recommend that a
+ * file or class name and description of purpose be included on the
+ * same "printed page" as the copyright notice for easier
+ * identification within third-party archives.
+ *
+ * Copyright [yyyy] [name of copyright owner]
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
/*
* $Id: LockableAttributeImpl.java,v 1.5 2003/10/17 03:54:27 akarasulu Exp $
@@ -220,6 +220,7 @@
import javax.naming.NamingException ;
import javax.naming.NamingEnumeration ;
import javax.naming.directory.DirContext ;
+import javax.naming.directory.Attribute;
import javax.naming.OperationNotSupportedException ;
import org.apache.ldap.common.Lockable ;
@@ -238,9 +239,9 @@
extends AbstractLockable implements LockableAttribute
{
/** the name of the attribute */
- private final String m_id ;
+ private final String id ;
/** the list of attribute values */
- private final ArrayList m_list ;
+ private final ArrayList list ;
// ------------------------------------------------------------------------
@@ -249,66 +250,66 @@
/**
- * Creates a permanently LockableAttribute on a_id whose locking behavoir
- * is dicatated by a_parent.
+ * Creates a permanently LockableAttribute on id whose locking behavoir
+ * is dicatated by parent.
*
- * @param a_parent the parent of this Lockable.
- * @param a_id the id or name of this attribute.
+ * @param parent the parent of this Lockable.
+ * @param id the id or name of this attribute.
*/
- public LockableAttributeImpl( final Lockable a_parent, final String a_id )
+ public LockableAttributeImpl( final Lockable parent, final String id )
{
- super( a_parent , false ) ;
+ super( parent , false ) ;
- m_id = a_id ;
- m_list = new ArrayList() ;
+ this.id = id ;
+ list = new ArrayList() ;
}
/**
- * Creates a permanently LockableAttribute on a_id.
+ * Creates a permanently LockableAttribute on id.
*
- * @param a_id the id or name of this attribute.
+ * @param id the id or name of this attribute.
*/
- public LockableAttributeImpl( final String a_id )
+ public LockableAttributeImpl( final String id )
{
super( false ) ;
- m_id = a_id ;
- m_list = new ArrayList() ;
+ this.id = id ;
+ list = new ArrayList() ;
}
/**
- * Creates a permanently LockableAttribute on a_id whose locking behavoir
- * is dicatated by a_parent. Used for the clone method.
+ * Creates a permanently LockableAttribute on id whose locking behavoir
+ * is dicatated by parent. Used for the clone method.
*
- * @param a_parent the parent of this Lockable
- * @param a_id the id or name of this attribute
- * @param a_list the list of values to start with
+ * @param parent the parent of this Lockable
+ * @param id the id or name of this attribute
+ * @param list the list of values to start with
*/
- private LockableAttributeImpl( final Lockable a_parent,
- final String a_id, final ArrayList a_list )
+ private LockableAttributeImpl( final Lockable parent,
+ final String id, final ArrayList list )
{
- super( a_parent , false ) ;
+ super( parent , false ) ;
- m_id = a_id ;
- m_list = a_list ;
+ this.id = id ;
+ this.list = list ;
}
/**
- * Creates a permanently LockableAttribute on a_id. Used for the clone
+ * Creates a permanently LockableAttribute on id. Used for the clone
* method.
*
- * @param a_id the id or name of this attribute
- * @param a_list the list of values to start with
+ * @param id the id or name of this attribute
+ * @param list the list of values to start with
*/
- private LockableAttributeImpl( final String a_id, final ArrayList a_list )
+ private LockableAttributeImpl( final String id, final ArrayList list )
{
super( false ) ;
- m_id = a_id ;
- m_list = a_list ;
+ this.id = id ;
+ this.list = list ;
}
@@ -324,7 +325,7 @@
*/
public NamingEnumeration getAll()
{
- return new IteratorNamingEnumeration( m_list.iterator() ) ;
+ return new IteratorNamingEnumeration( list.iterator() ) ;
}
@@ -335,12 +336,12 @@
*/
public Object get()
{
- if ( m_list.isEmpty() )
+ if ( list.isEmpty() )
{
return null ;
}
- return m_list.get( 0 ) ;
+ return list.get( 0 ) ;
}
@@ -351,7 +352,7 @@
*/
public int size()
{
- return m_list.size() ;
+ return list.size() ;
}
@@ -362,48 +363,48 @@
*/
public String getID()
{
- return m_id ;
+ return id ;
}
/**
- * Checks to see if this Attribute contains a_attrVal in the list.
+ * Checks to see if this Attribute contains attrVal in the list.
*
- * @param a_attrVal the value to test for
- * @return true if a_attrVal is in the list backing store, false otherwise
+ * @param attrVal the value to test for
+ * @return true if attrVal is in the list backing store, false otherwise
*/
- public boolean contains( Object a_attrVal )
+ public boolean contains( Object attrVal )
{
- return m_list.contains( a_attrVal ) ;
+ return list.contains( attrVal ) ;
}
/**
- * Adds a_attrVal into the list of this Attribute's values at the end of the
+ * Adds attrVal into the list of this Attribute's values at the end of the
* list.
*
- * @param a_attrVal the value to add to the end of the list.
- * @return true if a_attrVal is added to the list backing store, false if it
+ * @param attrVal the value to add to the end of the list.
+ * @return true if attrVal is added to the list backing store, false if it
* already existed there.
*/
- public boolean add( Object a_attrVal )
+ public boolean add( Object attrVal )
{
super.lockCheck( "Attempt to add value to locked Attribute!" ) ;
- return m_list.add( a_attrVal ) ;
+ return list.add( attrVal ) ;
}
/**
- * Removes a_attrVal from the list of this Attribute's values.
+ * Removes attrVal from the list of this Attribute's values.
*
- * @param a_attrVal the value to remove
- * @return true if a_attrVal is remove from the list backing store, false if
+ * @param attrVal the value to remove
+ * @return true if attrVal is remove from the list backing store, false if
* never existed there.
*/
- public boolean remove( Object a_attrVal )
+ public boolean remove( Object attrVal )
{
super.lockCheck( "Attempt to remove value from locked Attribute!" ) ;
- return m_list.remove( a_attrVal ) ;
+ return list.remove( attrVal ) ;
}
@@ -413,7 +414,7 @@
public void clear()
{
super.lockCheck( "Attempt to clear values from locked Attribute!" ) ;
- m_list.clear() ;
+ list.clear() ;
}
@@ -449,13 +450,13 @@
*/
public Object clone()
{
- ArrayList l_list = ( ArrayList ) m_list.clone() ;
+ ArrayList l_list = ( ArrayList ) list.clone() ;
if ( getParent() != null )
{
- return new LockableAttributeImpl( getParent(), m_id, l_list ) ;
+ return new LockableAttributeImpl( getParent(), id, l_list ) ;
}
- return new LockableAttributeImpl( m_id, l_list ) ;
+ return new LockableAttributeImpl( id, l_list ) ;
}
@@ -473,55 +474,132 @@
/**
* Gets the value at an index.
*
- * @param a_index the index of the value in the ordered list of attribute
+ * @param index the index of the value in the ordered list of attribute
* values. 0 <= ix < size().
* @return this Attribute's value at the index null if no values exist.
*/
- public Object get( int a_index )
+ public Object get( int index )
{
- return m_list.get( a_index ) ;
+ return list.get( index ) ;
}
/**
* Removes the value at an index.
*
- * @param a_index the index of the value in the ordered list of attribute
+ * @param index the index of the value in the ordered list of attribute
* values. 0 <= ix < size().
* @return this Attribute's value removed at the index
*/
- public Object remove( int a_index )
+ public Object remove( int index )
{
super.lockCheck( "Attempt to remove value from locked Attribute!" ) ;
- return m_list.remove( a_index ) ;
+ return list.remove( index ) ;
}
/**
- * Inserts a_attrVal into the list of this Attribute's values at the
+ * Inserts attrVal into the list of this Attribute's values at the
* specified index in the list.
*
- * @param a_index the index to add the value at.
- * @param a_attrVal the value to add to the end of the list.
+ * @param index the index to add the value at.
+ * @param attrVal the value to add to the end of the list.
*/
- public void add( int a_index, Object a_attrVal )
+ public void add( int index, Object attrVal )
{
super.lockCheck( "Attempt to add value to locked Attribute!" ) ;
- m_list.add( a_index, a_attrVal ) ;
+ list.add( index, attrVal ) ;
}
/**
* Sets an attribute value in the ordered list of attribute values.
*
- * @param a_index the index to set the value to.
- * @param a_attrVal the value to set at the index.
+ * @param index the index to set the value to.
+ * @param attrVal the value to set at the index.
* @return the old value at the specified index.
*/
- public Object set( int a_index, Object a_attrVal )
+ public Object set( int index, Object attrVal )
{
super.lockCheck( "Attempt to set value in locked Attribute!" ) ;
- return m_list.set( a_index, a_attrVal ) ;
+ return list.set( index, attrVal ) ;
+ }
+
+
+ /**
+ * Checks for equality between this Attribute instance and another. The
+ * lockable properties are not factored into the equality semantics and
+ * neither is the Attribute implementation. The Attribute ID's are
+ * compared with regard to case and value order is only considered if
+ * the Attribute arguement is ordered itself.
+ *
+ * @todo start looking at comparing syntaxes to determine if attributes are
+ * really equal
+ * @param obj the Attribute to test for equality
+ * @return true if the obj is an Attribute and equals this Attribute false
+ * otherwise
+ */
+ public boolean equals( Object obj )
+ {
+ if ( obj == this )
+ {
+ return true;
+ }
+
+ if ( ! ( obj instanceof Attribute ) )
+ {
+ return false;
+ }
+
+ Attribute attr = ( Attribute ) obj;
+ if ( ! id.equals( attr.getID() ) )
+ {
+ return false;
+ }
+
+ if ( attr.size() != list.size() )
+ {
+ return false;
+ }
+
+ if ( attr.isOrdered() )
+ {
+ for ( int ii = 0; ii < attr.size(); ii++ )
+ {
+ try
+ {
+ if ( ! list.get( ii).equals( attr.get( ii ) ) )
+ {
+ return false;
+ }
+ }
+ catch ( NamingException e )
+ {
+ e.printStackTrace();
+ return false;
+ }
+ }
+ }
+ else
+ {
+ for ( int ii = 0; ii < attr.size(); ii++ )
+ {
+ try
+ {
+ if ( ! list.contains( attr.get( ii ) ) )
+ {
+ return false;
+ }
+ }
+ catch ( NamingException e )
+ {
+ e.printStackTrace();
+ return false;
+ }
+ }
+ }
+
+ return true;
}
}
Added: incubator/directory/ldap/trunk/common/src/test/org/apache/ldap/common/message/LockableAttributeImplTest.java
==============================================================================
--- (empty file)
+++ incubator/directory/ldap/trunk/common/src/test/org/apache/ldap/common/message/LockableAttributeImplTest.java Mon Aug 23 13:10:12 2004
@@ -0,0 +1,190 @@
+/*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.ldap.common.message;
+
+
+import junit.framework.TestCase;
+
+import javax.naming.directory.Attribute;
+import javax.naming.directory.BasicAttribute;
+
+
+/**
+ * Test cases for the methods of the LockableAttributeImpl class.
+ *
+ * @author <a href="mailto:directory-dev@incubator.apache.org"> Apache Directory
+ * Project</a> $Rev$
+ */
+public class LockableAttributeImplTest extends TestCase
+{
+ /**
+ * Creates and populates a LockableAttributeImpl instance for tests.
+ */
+ private LockableAttributeImpl getAttribute()
+ {
+ LockableAttributeImpl attr = new LockableAttributeImpl( "test-attr1" );
+ attr.add( "value0" );
+ attr.add( "value1" );
+ attr.add( "value2" );
+ return attr;
+ }
+
+
+ /**
+ * Tests to see the same reference returns true on equals.
+ */
+ public void testEqualsSameObj()
+ {
+ LockableAttributeImpl attr = getAttribute();
+ assertTrue( "same object should be equal", attr.equals( attr ) );
+ }
+
+
+ /**
+ * Tests to see if two exact copies are equal.
+ */
+ public void testEqualsExactCopy()
+ {
+ LockableAttributeImpl attr0 = getAttribute();
+ LockableAttributeImpl attr1 = getAttribute();
+ assertTrue( "exact copies should be equal", attr0.equals( attr1 ) );
+ assertTrue( "exact copies should be equal", attr1.equals( attr0 ) );
+ }
+
+
+ /**
+ * Tests for inequality with different id.
+ */
+ public void testNotEqualDiffId()
+ {
+ LockableAttributeImpl attr0 = getAttribute();
+ LockableAttributeImpl attr1 = new LockableAttributeImpl( "test-attr2" );
+ attr1.add( "value0" );
+ attr1.add( "value1" );
+ attr1.add( "value2" );
+ assertFalse( "Attributes with different ids should not be equal",
+ attr0.equals( attr1 ) );
+ assertFalse( "Attributes with different ids should not be equal",
+ attr1.equals( attr0 ) );
+ }
+
+
+ /**
+ * Tests for inequality with different id with only case differences.
+ */
+ public void testNotEqualDiffCasedId()
+ {
+ LockableAttributeImpl attr0 = getAttribute();
+ LockableAttributeImpl attr1 = new LockableAttributeImpl( "TEST-attr1" );
+ attr1.add( "value0" );
+ attr1.add( "value1" );
+ attr1.add( "value2" );
+ assertFalse( "Attributes with different id case should not be equal",
+ attr0.equals( attr1 ) );
+ assertFalse( "Attributes with different id case should not be equal",
+ attr1.equals( attr0 ) );
+ }
+
+
+ /**
+ * Tests for inequality with different values.
+ */
+ public void testNotEqualDiffValues()
+ {
+ LockableAttributeImpl attr0 = getAttribute();
+ LockableAttributeImpl attr1 = new LockableAttributeImpl( "test-attr1" );
+ attr1.add( "value0" );
+ attr1.add( "value1" );
+ assertFalse( "Attributes with different values should not be equal",
+ attr0.equals( attr1 ) );
+ assertFalse( "Attributes with different values should not be equal",
+ attr1.equals( attr0 ) );
+
+ attr1.add( "value2" );
+ assertTrue( "Attributes with same values should be equal",
+ attr0.equals( attr1 ) );
+ assertTrue( "Attributes with same values should be equal",
+ attr1.equals( attr0 ) );
+
+ attr1.add( "value3" );
+ assertFalse( "Attributes with different values should not be equal",
+ attr0.equals( attr1 ) );
+ assertFalse( "Attributes with different values should not be equal",
+ attr1.equals( attr0 ) );
+ }
+
+
+ /**
+ * Tests for inequality with same values but different number of replicated
+ * values.
+ */
+ public void testNotEqualWithReplicatedValues()
+ {
+ LockableAttributeImpl attr0 = getAttribute();
+ LockableAttributeImpl attr1 = new LockableAttributeImpl( "test-attr1" );
+ attr1.add( "value0" );
+ attr1.add( "value1" );
+ assertFalse( "Attributes with different values should not be equal",
+ attr0.equals( attr1 ) );
+ assertFalse( "Attributes with different values should not be equal",
+ attr1.equals( attr0 ) );
+
+ attr1.add( "value2" );
+ assertTrue( "Attributes with same values should be equal",
+ attr0.equals( attr1 ) );
+ assertTrue( "Attributes with same values should be equal",
+ attr1.equals( attr0 ) );
+
+ attr1.add( "value2" );
+ assertFalse( "Attributes with different values should not be equal",
+ attr0.equals( attr1 ) );
+ assertFalse( "Attributes with different values should not be equal",
+ attr1.equals( attr0 ) );
+ }
+
+
+ /**
+ * Tests for inequality with different implementations.
+ *
+ * @todo start looking at comparing syntaxes to determine if attributes are
+ * really equal
+ */
+ public void testNotEqualDiffImpl()
+ {
+ LockableAttributeImpl attr0 = getAttribute();
+ Attribute attr1 = new BasicAttribute( "test-attr1" );
+ attr1.add( "value0" );
+ attr1.add( "value1" );
+ assertFalse( "Attributes with different values should not be equal",
+ attr0.equals( attr1 ) );
+ assertFalse( "Attributes with different values should not be equal",
+ attr1.equals( attr0 ) );
+
+ attr1.add( "value2" );
+ assertTrue( "Attributes with same values diff impl should be equal",
+ attr0.equals( attr1 ) );
+
+// assertTrue( "Attributes with same values diff impl should be equal",
+// attr1.equals( attr0 ) );
+
+ attr1.add( "value3" );
+ assertFalse( "Attributes with different values should not be equal",
+ attr0.equals( attr1 ) );
+ assertFalse( "Attributes with different values should not be equal",
+ attr1.equals( attr0 ) );
+ }
+}