Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 59B3416F1 for ; Tue, 26 Apr 2011 11:52:55 +0000 (UTC) Received: (qmail 78656 invoked by uid 500); 26 Apr 2011 11:52:55 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 78593 invoked by uid 500); 26 Apr 2011 11:52:55 -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 78586 invoked by uid 99); 26 Apr 2011 11:52:55 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Apr 2011 11:52:55 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Apr 2011 11:52:53 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CF06A2388900; Tue, 26 Apr 2011 11:52:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1096732 - in /directory: apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/ apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/ apacheds/trunk/core/src/main/java/org/apache/d... Date: Tue, 26 Apr 2011 11:52:32 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110426115232.CF06A2388900@eris.apache.org> Author: elecharny Date: Tue Apr 26 11:52:31 2011 New Revision: 1096732 URL: http://svn.apache.org/viewvc?rev=1096732&view=rev Log: o Renamed some methods in LdifEntry Modified: directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifEntry.java directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifReader.java directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertor.java directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifUtils.java directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifEntryTest.java directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifReaderTest.java directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertorTest.java Modified: directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java?rev=1096732&r1=1096731&r2=1096732&view=diff ============================================================================== --- directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java (original) +++ directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java Tue Apr 26 11:52:31 2011 @@ -299,7 +299,7 @@ public class DSAnnotationProcessor else if ( entry.isChangeModify() ) { service.getAdminSession().modify( entry.getDn(), - entry.getModificationItems() ); + entry.getModifications() ); } else { Modified: directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java?rev=1096732&r1=1096731&r2=1096732&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java (original) +++ directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java Tue Apr 26 11:52:31 2011 @@ -120,7 +120,7 @@ public class IntegrationUtils else if ( entry.isChangeModify() ) { service.getAdminSession().modify( - entry.getDn(), entry.getModificationItems() ); + entry.getDn(), entry.getModifications() ); } else { @@ -253,7 +253,7 @@ public class IntegrationUtils break; case( ChangeType.MODIFY_ORDINAL ): - session.modify( dn, entry.getModificationItems() ); + session.modify( dn, entry.getModifications() ); break; default: Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=1096732&r1=1096731&r2=1096732&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Tue Apr 26 11:52:31 2011 @@ -877,7 +877,7 @@ public class DefaultDirectoryService imp break; case ChangeType.MODIFY_ORDINAL : - List mods = reverse.getModificationItems(); + List mods = reverse.getModifications(); adminSession.modify( reverse.getDn(), mods, true ); break; Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java?rev=1096732&r1=1096731&r2=1096732&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java Tue Apr 26 11:52:31 2011 @@ -266,7 +266,7 @@ public class ChangeLogInterceptor extend // TODO: handle correctly http://issues.apache.org/jira/browse/DIRSERVER-1198 mods.add( modItem ); - forward.addModificationItem( modItem ); + forward.addModification( modItem ); } Entry clientEntry = new DefaultEntry( serverEntry.getDn() ); Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java?rev=1096732&r1=1096731&r2=1096732&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java Tue Apr 26 11:52:31 2011 @@ -208,7 +208,7 @@ public class JournalInterceptor extends // Store the modifications for ( Modification modification:modifyContext.getModItems() ) { - ldif.addModificationItem( modification ); + ldif.addModification( modification ); } journal.log( getPrincipal(), opRevision, ldif ); Modified: directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java?rev=1096732&r1=1096731&r2=1096732&view=diff ============================================================================== --- directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java (original) +++ directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java Tue Apr 26 11:52:31 2011 @@ -211,7 +211,7 @@ public class LdifFileLoader } else { //modify - List items = ldifEntry.getModificationItems(); + List items = ldifEntry.getModifications(); try { Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifEntry.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifEntry.java?rev=1096732&r1=1096731&r2=1096732&view=diff ============================================================================== --- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifEntry.java (original) +++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifEntry.java Tue Apr 26 11:52:31 2011 @@ -77,7 +77,7 @@ public class LdifEntry implements Clonea private List modificationList; /** The map containing all the modifications */ - private Map modificationItems; + private Map modifications; /** The new superior */ private String newSuperior; @@ -105,7 +105,7 @@ public class LdifEntry implements Clonea { changeType = ChangeType.None; // Default LDIF content modificationList = new LinkedList(); - modificationItems = new HashMap(); + modifications = new HashMap(); entry = new DefaultEntry( (Dn) null ); entryDn = null; controls = null; @@ -119,7 +119,7 @@ public class LdifEntry implements Clonea { changeType = ChangeType.None; // Default LDIF content modificationList = new LinkedList(); - modificationItems = new HashMap(); + modifications = new HashMap(); this.entry = entry; entryDn = entry.getDn(); controls = null; @@ -242,12 +242,12 @@ public class LdifEntry implements Clonea break; case Modify : - modificationList = ldifEntry.getModificationItems(); - modificationItems = new HashMap(); + modificationList = ldifEntry.getModifications(); + modifications = new HashMap(); for ( Modification modification : modificationList ) { - modificationItems.put( modification.getAttribute().getId(), modification ); + modifications.put( modification.getAttribute().getId(), modification ); } break; } @@ -344,12 +344,12 @@ public class LdifEntry implements Clonea * * @param modification The modification to be added */ - public void addModificationItem( Modification modification ) + public void addModification( Modification modification ) { if ( changeType == ChangeType.Modify ) { modificationList.add( modification ); - modificationItems.put( modification.getAttribute().getId(), modification ); + modifications.put( modification.getAttribute().getId(), modification ); } } @@ -366,19 +366,19 @@ public class LdifEntry implements Clonea * * @param attr The attribute to be added */ - public void addModificationItem( ModificationOperation modOp, Attribute attr ) + public void addModification( ModificationOperation modOp, Attribute attr ) { if ( changeType == ChangeType.Modify ) { Modification item = new DefaultModification( modOp, attr ); modificationList.add( item ); - modificationItems.put( attr.getId(), item ); + modifications.put( attr.getId(), item ); } } /** - * Add a modification item + * Add a modification * * @param modOp The modification operation value. One of : *
    @@ -390,7 +390,7 @@ public class LdifEntry implements Clonea * @param id The attribute's ID * @param value The attribute's value */ - public void addModificationItem( ModificationOperation modOp, String id, Object value ) + public void addModification( ModificationOperation modOp, String id, Object value ) { if ( changeType == ChangeType.Modify ) { @@ -408,7 +408,7 @@ public class LdifEntry implements Clonea Modification item = new DefaultModification( modOp, attr ); modificationList.add( item ); - modificationItems.put( id, item ); + modifications.put( id, item ); } } @@ -518,7 +518,7 @@ public class LdifEntry implements Clonea /** * @return The list of modification items */ - public List getModificationItems() + public List getModifications() { return modificationList; } @@ -529,7 +529,7 @@ public class LdifEntry implements Clonea * * @return modification items as an array. */ - public Modification[] getModificationItemsArray() + public Modification[] getModificationArray() { return modificationList.toArray( EMPTY_MODS ); } @@ -556,8 +556,7 @@ public class LdifEntry implements Clonea /** * Returns a attribute given it's id * - * @param attributeId - * The attribute Id + * @param attributeId The attribute Id * @return The attribute if it exists */ public Attribute get( String attributeId ) @@ -650,7 +649,7 @@ public class LdifEntry implements Clonea /** - * @return True if there is this is a content ldif + * @return True if this is a content ldif */ public boolean isLdifContent() { @@ -813,14 +812,14 @@ public class LdifEntry implements Clonea } } - if ( modificationItems != null ) + if ( modifications != null ) { - for ( String key : modificationItems.keySet() ) + for ( String key : modifications.keySet() ) { - Modification modif = modificationItems.get( key ); + Modification modif = modifications.get( key ); Modification modifClone = new DefaultModification( modif.getOperation(), modif.getAttribute().clone() ); - clone.modificationItems.put( key, modifClone ); + clone.modifications.put( key, modifClone ); } } @@ -1199,7 +1198,7 @@ public class LdifEntry implements Clonea Modification modification = new DefaultModification(); modification.readExternal( in ); - addModificationItem( modification ); + addModification( modification ); } break; Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifReader.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifReader.java?rev=1096732&r1=1096731&r2=1096732&view=diff ============================================================================== --- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifReader.java (original) +++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifReader.java Tue Apr 26 11:52:31 2011 @@ -1024,12 +1024,12 @@ public class LdifReader implements Itera if ( isEmptyValue ) { // Update the entry - entry.addModificationItem( modificationType, modified, null ); + entry.addModification( modificationType, modified, null ); } else { // Update the entry with the attribute - entry.addModificationItem( modificationType, attribute ); + entry.addModification( modificationType, attribute ); } state = MOD_SPEC; Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertor.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertor.java?rev=1096732&r1=1096731&r2=1096732&view=diff ============================================================================== --- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertor.java (original) +++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertor.java Tue Apr 26 11:52:31 2011 @@ -243,7 +243,7 @@ public final class LdifRevertor // Now, push the reversed list into the entry for ( Modification modification : reverseModifications ) { - entry.addModificationItem( modification ); + entry.addModification( modification ); } // Return the reverted entry @@ -366,7 +366,7 @@ public final class LdifRevertor Modification modification = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, new DefaultAttribute( ava.getUpType(), ava.getUpValue().getString() ) ); - restored.addModificationItem( modification ); + restored.addModification( modification ); } } Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifUtils.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifUtils.java?rev=1096732&r1=1096731&r2=1096732&view=diff ============================================================================== --- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifUtils.java (original) +++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifUtils.java Tue Apr 26 11:52:31 2011 @@ -465,7 +465,7 @@ public final class LdifUtils break; case Modify: - for ( Modification modification : entry.getModificationItems() ) + for ( Modification modification : entry.getModifications() ) { switch ( modification.getOperation() ) { Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifEntryTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifEntryTest.java?rev=1096732&r1=1096731&r2=1096732&view=diff ============================================================================== --- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifEntryTest.java (original) +++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifEntryTest.java Tue Apr 26 11:52:31 2011 @@ -528,9 +528,9 @@ public class LdifEntryTest assertTrue( ldifEntry.isLdifChange() ); // Check the modification - assertNotNull( ldifEntry.getModificationItems() ); + assertNotNull( ldifEntry.getModifications() ); - for ( Modification modification : ldifEntry.getModificationItems() ) + for ( Modification modification : ldifEntry.getModifications() ) { assertEquals( ModificationOperation.ADD_ATTRIBUTE, modification.getOperation() ); Attribute attribute = modification.getAttribute(); @@ -596,9 +596,9 @@ public class LdifEntryTest assertTrue( ldifEntry.isLdifChange() ); // Check the modification - assertNotNull( ldifEntry.getModificationItems() ); + assertNotNull( ldifEntry.getModifications() ); - for ( Modification modification : ldifEntry.getModificationItems() ) + for ( Modification modification : ldifEntry.getModifications() ) { assertEquals( ModificationOperation.ADD_ATTRIBUTE, modification.getOperation() ); Attribute attribute = modification.getAttribute(); @@ -667,9 +667,9 @@ public class LdifEntryTest assertTrue( ldifEntry.isLdifChange() ); // Check the modification - assertNotNull( ldifEntry.getModificationItems() ); + assertNotNull( ldifEntry.getModifications() ); - for ( Modification modification : ldifEntry.getModificationItems() ) + for ( Modification modification : ldifEntry.getModifications() ) { assertEquals( ModificationOperation.ADD_ATTRIBUTE, modification.getOperation() ); Attribute attribute = modification.getAttribute(); Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifReaderTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifReaderTest.java?rev=1096732&r1=1096731&r2=1096732&view=diff ============================================================================== --- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifReaderTest.java (original) +++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifReaderTest.java Tue Apr 26 11:52:31 2011 @@ -315,7 +315,7 @@ public class LdifReaderTest assertEquals( "dc=example,dc=com", entry.getDn().getName() ); - List mods = entry.getModificationItems(); + List mods = entry.getModifications(); assertTrue( mods.size() == 1 ); Attribute attr = mods.get( 0 ).getAttribute(); assertTrue( attr.getId().equals( "administrativerole" ) ); @@ -1389,7 +1389,7 @@ public class LdifReaderTest // Fifth entry entry = entries.get( 4 ); - List modifs = entry.getModificationItems(); + List modifs = entry.getModifications(); assertTrue( entry.isChangeModify() ); assertEquals( values[4][0][1], entry.getDn().getName() ); @@ -1426,7 +1426,7 @@ public class LdifReaderTest // Sixth entry entry = entries.get( 5 ); - modifs = entry.getModificationItems(); + modifs = entry.getModifications(); assertTrue( entry.isChangeModify() ); assertEquals( values[5][0][1], entry.getDn().getName() ); Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertorTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertorTest.java?rev=1096732&r1=1096731&r2=1096732&view=diff ============================================================================== --- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertorTest.java (original) +++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertorTest.java Tue Apr 26 11:52:31 2011 @@ -147,7 +147,7 @@ public class LdifRevertorTest assertEquals( ChangeType.Modify, reversed.getChangeType() ); assertNull( reversed.getEntry() ); - List mods = reversed.getModificationItems(); + List mods = reversed.getModifications(); assertNotNull( mods ); assertEquals( 1, mods.size() ); @@ -192,7 +192,7 @@ public class LdifRevertorTest assertEquals( ChangeType.Modify, reversed.getChangeType() ); assertNull( reversed.getEntry() ); - List mods = reversed.getModificationItems(); + List mods = reversed.getModifications(); assertNotNull( mods ); assertEquals( 1, mods.size() ); @@ -235,7 +235,7 @@ public class LdifRevertorTest assertEquals( ChangeType.Modify, reversed.getChangeType() ); assertNull( reversed.getEntry() ); - List mods = reversed.getModificationItems(); + List mods = reversed.getModifications(); assertNotNull( mods ); assertEquals( 1, mods.size() ); @@ -284,7 +284,7 @@ public class LdifRevertorTest assertEquals( ChangeType.Modify, reversed.getChangeType() ); assertNull( reversed.getEntry() ); - List mods = reversed.getModificationItems(); + List mods = reversed.getModifications(); assertNotNull( mods ); assertEquals( 1, mods.size() ); @@ -326,7 +326,7 @@ public class LdifRevertorTest assertEquals( ChangeType.Modify, reversed.getChangeType() ); assertNull( reversed.getEntry() ); - List mods = reversed.getModificationItems(); + List mods = reversed.getModifications(); assertNotNull( mods ); assertEquals( 1, mods.size() ); @@ -370,7 +370,7 @@ public class LdifRevertorTest assertEquals( ChangeType.Modify, reversed.getChangeType() ); assertNull( reversed.getEntry() ); - List mods = reversed.getModificationItems(); + List mods = reversed.getModifications(); assertNotNull( mods ); assertEquals( 1, mods.size() ); @@ -572,7 +572,7 @@ public class LdifRevertorTest assertEquals( dn.getName(), reversed.getDn().getName() ); assertEquals( ChangeType.Modify, reversed.getChangeType() ); assertNull( reversed.getEntry() ); - List mods = reversed.getModificationItems(); + List mods = reversed.getModifications(); assertNotNull( mods ); assertEquals( 1, mods.size() ); @@ -609,7 +609,7 @@ public class LdifRevertorTest assertEquals( dn.getName(), reversed.getDn().getName() ); assertEquals( ChangeType.Modify, reversed.getChangeType() ); assertNull( reversed.getEntry() ); - List mods = reversed.getModificationItems(); + List mods = reversed.getModifications(); assertNotNull( mods ); assertEquals( 1, mods.size() ); @@ -1211,7 +1211,7 @@ public class LdifRevertorTest assertEquals( "cn=test,ou=system", reversed.getDn().getName() ); assertEquals( ChangeType.Modify, reversed.getChangeType() ); - Modification[] mods = reversed.getModificationItemsArray(); + Modification[] mods = reversed.getModificationArray(); assertNotNull( mods ); assertEquals( 1, mods.length ); @@ -1314,7 +1314,7 @@ public class LdifRevertorTest assertEquals( "cn=test,ou=system", reversed.getDn().getName() ); assertEquals( ChangeType.Modify, reversed.getChangeType() ); - Modification[] mods = reversed.getModificationItemsArray(); + Modification[] mods = reversed.getModificationArray(); assertNotNull( mods ); assertEquals( 1, mods.length ); @@ -1419,7 +1419,7 @@ public class LdifRevertorTest assertEquals( "cn=test,ou=system", reversed.getDn().getName() ); assertEquals( ChangeType.Modify, reversed.getChangeType() ); - Modification[] mods = reversed.getModificationItemsArray(); + Modification[] mods = reversed.getModificationArray(); assertNotNull( mods ); assertEquals( 1, mods.length ); @@ -1522,7 +1522,7 @@ public class LdifRevertorTest assertEquals( "cn=test,ou=system", reversed.getDn().getName() ); assertEquals( ChangeType.Modify, reversed.getChangeType() ); - Modification[] mods = reversed.getModificationItemsArray(); + Modification[] mods = reversed.getModificationArray(); assertNotNull( mods ); assertEquals( 1, mods.length ); @@ -1627,7 +1627,7 @@ public class LdifRevertorTest assertEquals( "cn=small+cn=test,ou=system", reversed.getDn().getName() ); assertEquals( ChangeType.Modify, reversed.getChangeType() ); - Modification[] mods = reversed.getModificationItemsArray(); + Modification[] mods = reversed.getModificationArray(); assertNotNull( mods ); assertEquals( 1, mods.length ); @@ -1732,7 +1732,7 @@ public class LdifRevertorTest assertEquals( "cn=small+cn=test,ou=system", reversed.getDn().getName() ); assertEquals( ChangeType.Modify, reversed.getChangeType() ); - Modification[] mods = reversed.getModificationItemsArray(); + Modification[] mods = reversed.getModificationArray(); assertNotNull( mods ); assertEquals( 1, mods.length );