From dev-return-38452-apmail-directory-dev-archive=directory.apache.org@directory.apache.org Fri Jun 24 08:01:28 2011 Return-Path: X-Original-To: apmail-directory-dev-archive@www.apache.org Delivered-To: apmail-directory-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2627960FE for ; Fri, 24 Jun 2011 08:01:28 +0000 (UTC) Received: (qmail 54703 invoked by uid 500); 24 Jun 2011 08:01:27 -0000 Delivered-To: apmail-directory-dev-archive@directory.apache.org Received: (qmail 54530 invoked by uid 500); 24 Jun 2011 08:01:19 -0000 Mailing-List: contact dev-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Apache Directory Developers List" Delivered-To: mailing list dev@directory.apache.org Received: (qmail 54521 invoked by uid 99); 24 Jun 2011 08:01:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Jun 2011 08:01:18 +0000 X-ASF-Spam-Status: No, hits=-0.7 required=5.0 tests=FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,RFC_ABUSE_POST,SPF_PASS,T_TO_NO_BRKTS_FREEMAIL X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of akarasulu@gmail.com designates 74.125.82.178 as permitted sender) Received: from [74.125.82.178] (HELO mail-wy0-f178.google.com) (74.125.82.178) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Jun 2011 08:01:12 +0000 Received: by wyf19 with SMTP id 19so77587wyf.37 for ; Fri, 24 Jun 2011 01:00:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:sender:date:x-google-sender-auth :message-id:subject:from:to:content-type:content-transfer-encoding; bh=75tZBw4CaFoRZqIcCrQsGRZ6zmX998Kc1OUkW4WKWYA=; b=VCqQgyESLwiAtzhBhLOmAPg5d7UVs9kIc4q8SZhyFZEc0Slw3IXZ7iQsZj6uv7DSWc 3GA/oIbrd9P8qfMjT7Vkxu7sNK4SWY9uRTn91pXqzkHbBPkJxxi24WpdgBq9KXn/dfCS zN3fx6ZBnLVPU9USpwGssF+bhShxDo6c7tOFE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:date:x-google-sender-auth:message-id:subject :from:to:content-type:content-transfer-encoding; b=XDckw7ZwPwgU6GtqF1TdMQpTj4bPAfPeOU7Yd5UIBxyC3uRqVeKWa1G7llH1FBcYo2 Qy7DdIUKIsauvzoH8k+TTIqe8dFVScYf1ETh8/ZT3Si4sfBcWeaAP+drCWXcYoruLwXM 3HhRcxoE5fxXx/ECig50SN14wnZR8e1x6fwRw= MIME-Version: 1.0 Received: by 10.216.61.4 with SMTP id v4mr347307wec.68.1308902450250; Fri, 24 Jun 2011 01:00:50 -0700 (PDT) Sender: akarasulu@gmail.com Received: by 10.216.13.74 with HTTP; Fri, 24 Jun 2011 01:00:50 -0700 (PDT) Date: Fri, 24 Jun 2011 11:00:50 +0300 X-Google-Sender-Auth: Zps4CZln5M1fLCxkw_Qp2NdxFRg Message-ID: Subject: Re: svn commit: r1138906 - in /directory/apacheds/trunk: jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ xdbm-partition/src/main/java/org/apache/d From: Alex Karasulu To: dev@directory.apache.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Can you explain why you did this? Sounds like a code reduction cleanup but if you can elaborate a bit more that would be great. Thanks, Alex On Thu, Jun 23, 2011 at 5:43 PM, wrote: > Author: elecharny > Date: Thu Jun 23 14:43:12 2011 > New Revision: 1138906 > > URL: http://svn.apache.org/viewvc?rev=3D1138906&view=3Drev > Log: > Removed methods from the inherited classes when those methods are already= defined in their parent. > > Modified: > =A0 =A0directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/d= irectory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java > =A0 =A0directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/d= irectory/server/xdbm/AbstractStore.java > =A0 =A0directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/d= irectory/server/xdbm/MasterTable.java > =A0 =A0directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/d= irectory/server/xdbm/impl/avl/AvlMasterTable.java > > Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apach= e/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java > URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition= /src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/J= dbmMasterTable.java?rev=3D1138906&r1=3D1138905&r2=3D1138906&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/dire= ctory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java (original) > +++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/dire= ctory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java Thu Jun 23= 14:43:12 2011 > @@ -142,45 +142,6 @@ public class JdbmMasterTable extends > =A0 =A0 =A0 =A0 } > =A0 =A0 } > > - =A0 =A0/** > - =A0 =A0 * Gets the ServerEntry from this MasterTable. > - =A0 =A0 * > - =A0 =A0 * @param id the Long id of the entry to retrieve. > - =A0 =A0 * @return the ServerEntry with operational attributes and all. > - =A0 =A0 * @throws Exception if there is a read error on the underlying = Db. > - =A0 =A0 */ > - =A0 =A0public E get( Long id ) throws Exception > - =A0 =A0{ > - =A0 =A0 =A0 =A0return super.get( id ); > - =A0 =A0} > - > - > - =A0 =A0/** > - =A0 =A0 * Puts the ServerEntry into this master table at an index > - =A0 =A0 * specified by id. =A0Used both to create new entries and updat= e existing > - =A0 =A0 * ones. > - =A0 =A0 * > - =A0 =A0 * @param entry the ServerEntry w/ operational attributes > - =A0 =A0 * @param id =A0 =A0the Long id of the entry to put > - =A0 =A0 * @throws Exception if there is a write error on the underlying= Db. > - =A0 =A0 */ > - =A0 =A0public void put( Long id, E entry ) throws Exception > - =A0 =A0{ > - =A0 =A0 =A0 =A0super.put( id, entry ); > - =A0 =A0} > - > - > - =A0 =A0/** > - =A0 =A0 * Deletes a ServerEntry from the master table at an index speci= fied by id. > - =A0 =A0 * > - =A0 =A0 * @param id the Long id of the entry to delete > - =A0 =A0 * @throws Exception if there is a write error on the underlying= Db > - =A0 =A0 */ > - =A0 =A0public void delete( Long id ) throws Exception > - =A0 =A0{ > - =A0 =A0 =A0 =A0super.remove( id ); > - =A0 =A0} > - > > =A0 =A0 /** > =A0 =A0 =A0* Get's the next value from this SequenceBDb. =A0This has the = side-effect of > > Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apach= e/directory/server/xdbm/AbstractStore.java > URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition= /src/main/java/org/apache/directory/server/xdbm/AbstractStore.java?rev=3D11= 38906&r1=3D1138905&r2=3D1138906&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/dire= ctory/server/xdbm/AbstractStore.java (original) > +++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/dire= ctory/server/xdbm/AbstractStore.java Thu Jun 23 14:43:12 2011 > @@ -1139,7 +1139,7 @@ public abstract class AbstractStore =A0 =A0 =A0 =A0 =A0 =A0 } > =A0 =A0 =A0 =A0 } > > - =A0 =A0 =A0 =A0master.delete( id ); > + =A0 =A0 =A0 =A0master.remove( id ); > > =A0 =A0 =A0 =A0 // if this is a context entry reset the master table coun= ter > =A0 =A0 =A0 =A0 if ( id.equals( getDefaultId() ) ) > > Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apach= e/directory/server/xdbm/MasterTable.java > URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition= /src/main/java/org/apache/directory/server/xdbm/MasterTable.java?rev=3D1138= 906&r1=3D1138905&r2=3D1138906&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/dire= ctory/server/xdbm/MasterTable.java (original) > +++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/dire= ctory/server/xdbm/MasterTable.java Thu Jun 23 14:43:12 2011 > @@ -35,36 +35,6 @@ public interface MasterTable exte > > > =A0 =A0 /** > - =A0 =A0 * Gets an entry from this MasterTable. > - =A0 =A0 * > - =A0 =A0 * @param id the id of the entry to retrieve. > - =A0 =A0 * @return the entry with all user and operational attributes. > - =A0 =A0 * @throws Exception if there is a read error on the underlying = Db. > - =A0 =A0 */ > - =A0 =A0E get( ID id ) throws Exception; > - > - > - =A0 =A0/** > - =A0 =A0 * Puts an entry into this MasterTable with a specified unique i= d. =A0Used > - =A0 =A0 * both to create new entries and update existing ones. > - =A0 =A0 * > - =A0 =A0 * @param entry the entry to add > - =A0 =A0 * @param id unique identifier of the entry to put > - =A0 =A0 * @throws Exception if there is a write error on the underlying= Db. > - =A0 =A0 */ > - =A0 =A0void put( ID id, E entry ) throws Exception; > - > - > - =A0 =A0/** > - =A0 =A0 * Deletes a entry from this MasterTable at an index specified b= y id. > - =A0 =A0 * > - =A0 =A0 * @param id unique identifier of the entry to delete > - =A0 =A0 * @throws Exception if there is a write error on the underlying= Db > - =A0 =A0 */ > - =A0 =A0void delete( ID id ) throws Exception; > - > - > - =A0 =A0/** > =A0 =A0 =A0* Gets the next value from the sequence of this MasterTable. = =A0This has > =A0 =A0 =A0* the side-effect of incrementing the sequence values permanen= tly. > =A0 =A0 =A0* > > Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apach= e/directory/server/xdbm/impl/avl/AvlMasterTable.java > URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition= /src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlMasterTable.jav= a?rev=3D1138906&r1=3D1138905&r2=3D1138906&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/dire= ctory/server/xdbm/impl/avl/AvlMasterTable.java (original) > +++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/dire= ctory/server/xdbm/impl/avl/AvlMasterTable.java Thu Jun 23 14:43:12 2011 > @@ -21,7 +21,6 @@ package org.apache.directory.server.xdbm > > > =A0import java.util.Comparator; > -import java.util.Properties; > =A0import java.util.concurrent.atomic.AtomicLong; > > =A0import org.apache.directory.server.xdbm.MasterTable; > @@ -35,7 +34,6 @@ import org.apache.directory.server.xdbm. > =A0*/ > =A0public class AvlMasterTable extends AvlTable implements Ma= sterTable > =A0{ > - =A0 =A0private Properties props =3D new Properties(); > =A0 =A0 private AtomicLong counter =3D new AtomicLong( 0 ); > > > @@ -45,13 +43,10 @@ public class AvlMasterTable extends A > =A0 =A0 =A0 =A0 super( name, keyComparator, valComparator, dupsEnabled ); > =A0 =A0 } > > - > - =A0 =A0public void delete( Long id ) throws Exception > - =A0 =A0{ > - =A0 =A0 =A0 =A0super.remove( id ); > - =A0 =A0} > - > > + =A0 =A0/** > + =A0 =A0 * {@inheritDoc} > + =A0 =A0 */ > =A0 =A0 public Long getNextId( E entry ) throws Exception > =A0 =A0 { > =A0 =A0 =A0 =A0 return counter.incrementAndGet(); > > >