You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2012/12/18 07:29:05 UTC
svn commit: r1423287 [2/3] - in /directory/apacheds/trunk:
core-api/src/main/java/org/apache/directory/server/core/api/
core-api/src/main/java/org/apache/directory/server/core/api/filtering/
core-api/src/test/java/org/apache/directory/server/core/api/ ...
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/ReplicaJournalCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/ReplicaJournalCursor.java?rev=1423287&r1=1423286&r2=1423287&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/ReplicaJournalCursor.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/ReplicaJournalCursor.java Tue Dec 18 06:28:48 2012
@@ -21,6 +21,7 @@
package org.apache.directory.server.ldap.replication.provider;
+import java.io.IOException;
import java.util.Iterator;
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmTable;
@@ -30,6 +31,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.cursor.Cursor;
import org.apache.directory.shared.ldap.model.cursor.CursorException;
import org.apache.directory.shared.ldap.model.cursor.Tuple;
+import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.message.controls.ChangeType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -88,7 +90,7 @@ public class ReplicaJournalCursor extend
/**
* {@inheritDoc}
*/
- public void after( ReplicaEventMessage arg0 ) throws Exception
+ public void after( ReplicaEventMessage arg0 ) throws LdapException, CursorException, IOException
{
throw new UnsupportedOperationException();
}
@@ -97,7 +99,7 @@ public class ReplicaJournalCursor extend
/**
* {@inheritDoc}
*/
- public void afterLast() throws Exception
+ public void afterLast() throws LdapException, CursorException, IOException
{
throw new UnsupportedOperationException();
}
@@ -115,7 +117,7 @@ public class ReplicaJournalCursor extend
/**
* {@inheritDoc}
*/
- public void before( ReplicaEventMessage arg0 ) throws Exception
+ public void before( ReplicaEventMessage arg0 ) throws LdapException, CursorException, IOException
{
throw new UnsupportedOperationException();
}
@@ -124,7 +126,7 @@ public class ReplicaJournalCursor extend
/**
* {@inheritDoc}
*/
- public void beforeFirst() throws Exception
+ public void beforeFirst() throws LdapException, CursorException, IOException
{
}
@@ -132,7 +134,7 @@ public class ReplicaJournalCursor extend
/**
* {@inheritDoc}
*/
- public boolean first() throws Exception
+ public boolean first() throws LdapException, CursorException, IOException
{
throw new UnsupportedOperationException();
}
@@ -152,7 +154,7 @@ public class ReplicaJournalCursor extend
*
* @throws Exception
*/
- private boolean isQualified( String csn, ReplicaEventMessage evtMsg ) throws Exception
+ private boolean isQualified( String csn, ReplicaEventMessage evtMsg ) throws LdapException
{
LOG.debug( "ReplicaEventMessage: {}", evtMsg );
@@ -182,7 +184,7 @@ public class ReplicaJournalCursor extend
/**
* {@inheritDoc}
*/
- public boolean last() throws Exception
+ public boolean last() throws LdapException, CursorException, IOException
{
throw new UnsupportedOperationException();
}
@@ -191,7 +193,7 @@ public class ReplicaJournalCursor extend
/**
* {@inheritDoc}
*/
- public boolean next() throws Exception
+ public boolean next() throws LdapException, CursorException, IOException
{
while ( tupleCursor.next() )
{
@@ -228,7 +230,7 @@ public class ReplicaJournalCursor extend
/**
* {@inheritDoc}
*/
- public boolean previous() throws Exception
+ public boolean previous() throws LdapException, CursorException, IOException
{
throw new UnsupportedOperationException();
}
Modified: directory/apacheds/trunk/test-framework/src/main/java/org/apache/directory/server/core/integ/DelayInducingInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/test-framework/src/main/java/org/apache/directory/server/core/integ/DelayInducingInterceptor.java?rev=1423287&r1=1423286&r2=1423287&view=diff
==============================================================================
--- directory/apacheds/trunk/test-framework/src/main/java/org/apache/directory/server/core/integ/DelayInducingInterceptor.java (original)
+++ directory/apacheds/trunk/test-framework/src/main/java/org/apache/directory/server/core/integ/DelayInducingInterceptor.java Tue Dec 18 06:28:48 2012
@@ -27,6 +27,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.exception.LdapException;
+import org.apache.directory.shared.ldap.model.exception.LdapOperationErrorException;
/**
@@ -54,11 +55,18 @@ public class DelayInducingInterceptor ex
/**
* {@inheritDoc}
*/
- public boolean accept( SearchOperationContext operation, Entry result ) throws Exception
+ public boolean accept( SearchOperationContext operation, Entry result ) throws LdapException
{
if ( delayMillis != null )
{
- Thread.sleep( delayMillis );
+ try
+ {
+ Thread.sleep( delayMillis );
+ }
+ catch ( InterruptedException ie )
+ {
+ throw new LdapOperationErrorException( ie.getMessage() );
+ }
}
return true;
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/EntryCursorAdaptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/EntryCursorAdaptor.java?rev=1423287&r1=1423286&r2=1423287&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/EntryCursorAdaptor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/EntryCursorAdaptor.java Tue Dec 18 06:28:48 2012
@@ -20,13 +20,17 @@
package org.apache.directory.server.core.partition.impl.btree;
+import java.io.IOException;
+
import org.apache.directory.server.xdbm.IndexEntry;
import org.apache.directory.server.xdbm.search.Evaluator;
import org.apache.directory.server.xdbm.search.PartitionSearchResult;
import org.apache.directory.shared.ldap.model.cursor.AbstractCursor;
import org.apache.directory.shared.ldap.model.cursor.ClosureMonitor;
import org.apache.directory.shared.ldap.model.cursor.Cursor;
+import org.apache.directory.shared.ldap.model.cursor.CursorException;
import org.apache.directory.shared.ldap.model.entry.Entry;
+import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.filter.ExprNode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -45,7 +49,6 @@ public class EntryCursorAdaptor extends
/** Speedup for logs */
private static final boolean IS_DEBUG = LOG_CURSOR.isDebugEnabled();
- private final AbstractBTreePartition db;
private final Cursor<IndexEntry<String, String>> indexCursor;
private final Evaluator<? extends ExprNode> evaluator;
@@ -57,32 +60,31 @@ public class EntryCursorAdaptor extends
LOG_CURSOR.debug( "Creating EntryCursorAdaptor {}", this );
}
- this.db = db;
indexCursor = searchResult.getResultSet();
evaluator = searchResult.getEvaluator();
}
- /*
- * @see Cursor#after(java.lang.Object)
+ /**
+ * {@inheritDoc}
*/
- public void after( Entry element ) throws Exception
+ public void after( Entry element ) throws LdapException, CursorException, IOException
{
throw new UnsupportedOperationException();
}
- /*
- * @see Cursor#afterLast()
+ /**
+ * {@inheritDoc}
*/
- public void afterLast() throws Exception
+ public void afterLast() throws LdapException, CursorException, IOException
{
this.indexCursor.afterLast();
}
- /*
- * @see Cursor#available()
+ /**
+ * {@inheritDoc}
*/
public boolean available()
{
@@ -90,24 +92,27 @@ public class EntryCursorAdaptor extends
}
- /*
- * @see Cursor#before(java.lang.Object)
+ /**
+ * {@inheritDoc}
*/
- public void before( Entry element ) throws Exception
+ public void before( Entry element ) throws LdapException, CursorException, IOException
{
throw new UnsupportedOperationException();
}
- /*
- * @see Cursor#beforeFirst()
+ /**
+ * {@inheritDoc}
*/
- public void beforeFirst() throws Exception
+ public void beforeFirst() throws LdapException, CursorException, IOException
{
indexCursor.beforeFirst();
}
+ /**
+ * {@inheritDoc}
+ */
public final void setClosureMonitor( ClosureMonitor monitor )
{
indexCursor.setClosureMonitor( monitor );
@@ -117,7 +122,7 @@ public class EntryCursorAdaptor extends
/**
* {@inheritDoc}}
*/
- public void close() throws Exception
+ public void close()
{
if ( IS_DEBUG )
{
@@ -131,7 +136,7 @@ public class EntryCursorAdaptor extends
/**
* {@inheritDoc}
*/
- public void close( Exception cause ) throws Exception
+ public void close( Exception cause )
{
if ( IS_DEBUG )
{
@@ -142,60 +147,67 @@ public class EntryCursorAdaptor extends
}
- /*
- * @see Cursor#first()
+ /**
+ * {@inheritDoc}
*/
- public boolean first() throws Exception
+ public boolean first() throws LdapException, CursorException, IOException
{
return indexCursor.first();
}
- /*
- * @see Cursor#get()
+ /**
+ * {@inheritDoc}
*/
- public Entry get() throws Exception
+ public Entry get() throws CursorException, IOException
{
IndexEntry<String, String> indexEntry = indexCursor.get();
- if ( evaluator.evaluate( indexEntry ) )
+ try
{
- Entry entry = indexEntry.getEntry();
- indexEntry.setEntry( null );
-
- return entry;
+ if ( evaluator.evaluate( indexEntry ) )
+ {
+ Entry entry = indexEntry.getEntry();
+ indexEntry.setEntry( null );
+
+ return entry;
+ }
+ else
+ {
+ indexEntry.setEntry( null );
+ }
+
+ return null;
}
- else
+ catch ( Exception e )
{
- indexEntry.setEntry( null );
+ throw new CursorException( e.getMessage(), e );
}
-
- return null;
}
- /*
- * @see Cursor#isClosed()
+ /**
+ * {@inheritDoc}
*/
- public boolean isClosed() throws Exception
+ public boolean isClosed()
{
return indexCursor.isClosed();
}
- /*
- * @see Cursor#last()
+ /**
+ * {@inheritDoc}
*/
- public boolean last() throws Exception
+ public boolean last() throws LdapException, CursorException, IOException
{
return indexCursor.last();
}
-
- /*
- * @see Cursor#next()
+
+ /**
+ * {@inheritDoc}
*/
- public boolean next() throws Exception
+ public boolean next() throws LdapException, CursorException, IOException
{
return indexCursor.next();
}
@@ -204,7 +216,7 @@ public class EntryCursorAdaptor extends
/**
* {@inheritDoc}
*/
- public boolean previous() throws Exception
+ public boolean previous() throws LdapException, CursorException, IOException
{
return indexCursor.previous();
}
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java?rev=1423287&r1=1423286&r2=1423287&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java Tue Dec 18 06:28:48 2012
@@ -20,6 +20,7 @@
package org.apache.directory.server.core.partition.impl.btree;
+import java.io.IOException;
import java.util.Iterator;
import org.apache.directory.server.xdbm.AbstractIndexCursor;
@@ -27,8 +28,10 @@ import org.apache.directory.server.xdbm.
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.ldap.model.cursor.ClosureMonitor;
import org.apache.directory.shared.ldap.model.cursor.Cursor;
+import org.apache.directory.shared.ldap.model.cursor.CursorException;
import org.apache.directory.shared.ldap.model.cursor.CursorIterator;
import org.apache.directory.shared.ldap.model.cursor.Tuple;
+import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -74,68 +77,101 @@ public class IndexCursorAdaptor<K> exten
}
+ /**
+ * {@inheritDoc}
+ */
public boolean available()
{
return wrappedCursor.available();
}
- public void before( IndexEntry<K, String> element ) throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public void before( IndexEntry<K, String> element ) throws LdapException, CursorException, IOException
{
wrappedCursor.before( element.getTuple() );
}
- public void after( IndexEntry<K, String> element ) throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public void after( IndexEntry<K, String> element ) throws LdapException, CursorException, IOException
{
wrappedCursor.after( element.getTuple() );
}
- public void beforeFirst() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public void beforeFirst() throws LdapException, CursorException, IOException
{
wrappedCursor.beforeFirst();
}
- public void afterLast() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public void afterLast() throws LdapException, CursorException, IOException
{
wrappedCursor.afterLast();
}
- public boolean first() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public boolean first() throws LdapException, CursorException, IOException
{
return wrappedCursor.first();
}
- public boolean last() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public boolean last() throws LdapException, CursorException, IOException
{
return wrappedCursor.last();
}
- public boolean isClosed() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isClosed()
{
return wrappedCursor.isClosed();
}
- public boolean previous() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public boolean previous() throws LdapException, CursorException, IOException
{
return wrappedCursor.previous();
}
- public boolean next() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public boolean next() throws LdapException, CursorException, IOException
{
return wrappedCursor.next();
}
+ /**
+ * {@inheritDoc}
+ */
@SuppressWarnings("unchecked")
- public IndexEntry<K, String> get() throws Exception
+ public IndexEntry<K, String> get() throws CursorException, IOException
{
Tuple<K, String> tuple = wrappedCursor.get();
forwardEntry.setTuple( tuple );
@@ -150,7 +186,10 @@ public class IndexCursorAdaptor<K> exten
}
- public void close() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public void close()
{
if ( IS_DEBUG )
{
@@ -161,7 +200,10 @@ public class IndexCursorAdaptor<K> exten
}
- public void close( Exception reason ) throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public void close( Exception reason )
{
if ( IS_DEBUG )
{
@@ -181,7 +223,7 @@ public class IndexCursorAdaptor<K> exten
/**
* {@inheritDoc}
*/
- public boolean isAfterLast() throws Exception
+ public boolean isAfterLast()
{
throw new UnsupportedOperationException( I18n.err( I18n.ERR_02014_UNSUPPORTED_OPERATION, getClass().getName()
.concat( "." ).concat( "isAfterLast()" ) ) );
@@ -191,7 +233,7 @@ public class IndexCursorAdaptor<K> exten
/**
* {@inheritDoc}
*/
- public boolean isBeforeFirst() throws Exception
+ public boolean isBeforeFirst()
{
throw new UnsupportedOperationException( I18n.err( I18n.ERR_02014_UNSUPPORTED_OPERATION, getClass().getName()
.concat( "." ).concat( "isBeforeFirst()" ) ) );
@@ -201,7 +243,7 @@ public class IndexCursorAdaptor<K> exten
/**
* {@inheritDoc}
*/
- public boolean isFirst() throws Exception
+ public boolean isFirst()
{
throw new UnsupportedOperationException( I18n.err( I18n.ERR_02014_UNSUPPORTED_OPERATION, getClass().getName()
.concat( "." ).concat( "isFirst()" ) ) );
@@ -211,7 +253,7 @@ public class IndexCursorAdaptor<K> exten
/**
* {@inheritDoc}
*/
- public boolean isLast() throws Exception
+ public boolean isLast()
{
throw new UnsupportedOperationException( I18n.err( I18n.ERR_02014_UNSUPPORTED_OPERATION, getClass().getName()
.concat( "." ).concat( "isLast()" ) ) );
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java?rev=1423287&r1=1423286&r2=1423287&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java Tue Dec 18 06:28:48 2012
@@ -20,7 +20,11 @@
package org.apache.directory.server.xdbm;
+import java.io.IOException;
+
import org.apache.directory.shared.ldap.model.cursor.AbstractCursor;
+import org.apache.directory.shared.ldap.model.cursor.CursorException;
+import org.apache.directory.shared.ldap.model.exception.LdapException;
/**
@@ -57,7 +61,7 @@ public abstract class AbstractIndexCurso
/**
* {@inheritDoc}
*/
- public void after( IndexEntry<V, String> element ) throws Exception
+ public void after( IndexEntry<V, String> element ) throws LdapException, CursorException, IOException
{
throw new UnsupportedOperationException( getUnsupportedMessage() );
}
@@ -66,7 +70,7 @@ public abstract class AbstractIndexCurso
/**
* {@inheritDoc}
*/
- public void before( IndexEntry<V, String> element ) throws Exception
+ public void before( IndexEntry<V, String> element ) throws LdapException, CursorException, IOException
{
throw new UnsupportedOperationException( getUnsupportedMessage() );
}
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java?rev=1423287&r1=1423286&r2=1423287&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java Tue Dec 18 06:28:48 2012
@@ -19,8 +19,12 @@
package org.apache.directory.server.xdbm;
+import java.io.IOException;
+
import org.apache.directory.server.i18n.I18n;
+import org.apache.directory.shared.ldap.model.cursor.CursorException;
import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
+import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -50,7 +54,7 @@ public class EmptyIndexCursor<K> extends
/**
* {@inheritDoc}
*/
- public void before( IndexEntry<K, String> element ) throws Exception
+ public void before( IndexEntry<K, String> element ) throws LdapException, CursorException, IOException
{
checkNotClosed( "before()" );
}
@@ -68,53 +72,74 @@ public class EmptyIndexCursor<K> extends
/**
* {@inheritDoc}
*/
- public void after( IndexEntry<K, String> element ) throws Exception
+ public void after( IndexEntry<K, String> element ) throws LdapException, CursorException, IOException
{
checkNotClosed( "after()" );
}
- public void beforeFirst() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public void beforeFirst() throws LdapException, CursorException, IOException
{
checkNotClosed( "beforeFirst()" );
}
- public void afterLast() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public void afterLast() throws LdapException, CursorException, IOException
{
checkNotClosed( "afterLast()" );
}
- public boolean first() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public boolean first() throws LdapException, CursorException, IOException
{
checkNotClosed( "first()" );
return false;
}
- public boolean last() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public boolean last() throws LdapException, CursorException, IOException
{
checkNotClosed( "last()" );
return false;
}
- public boolean previous() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public boolean previous() throws LdapException, CursorException, IOException
{
checkNotClosed( "previous()" );
return false;
}
- public boolean next() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public boolean next() throws LdapException, CursorException, IOException
{
checkNotClosed( "next()" );
return false;
}
- public IndexEntry<K, String> get() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public IndexEntry<K, String> get() throws CursorException, IOException
{
checkNotClosed( "get()" );
throw new InvalidCursorPositionException( I18n.err( I18n.ERR_703 ) );
@@ -142,7 +167,7 @@ public class EmptyIndexCursor<K> extends
/**
* {@inheritDoc}
*/
- public void close() throws Exception
+ public void close()
{
if ( IS_DEBUG )
{
@@ -156,7 +181,7 @@ public class EmptyIndexCursor<K> extends
/**
* {@inheritDoc}
*/
- public void close( Exception cause ) throws Exception
+ public void close( Exception cause )
{
if ( IS_DEBUG )
{
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Index.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Index.java?rev=1423287&r1=1423286&r2=1423287&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Index.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Index.java Tue Dec 18 06:28:48 2012
@@ -23,6 +23,7 @@ package org.apache.directory.server.xdbm
import java.net.URI;
import org.apache.directory.shared.ldap.model.cursor.Cursor;
+import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
@@ -141,7 +142,7 @@ public interface Index<K, O, ID>
ID forwardLookup( K attrVal ) throws Exception;
- K reverseLookup( ID id ) throws Exception;
+ K reverseLookup( ID id ) throws LdapException;
/**
@@ -198,7 +199,7 @@ public interface Index<K, O, ID>
Cursor<IndexEntry<K, ID>> reverseCursor() throws Exception;
- Cursor<IndexEntry<K, ID>> forwardCursor() throws Exception;
+ Cursor<IndexEntry<K, ID>> forwardCursor() throws LdapException;
Cursor<IndexEntry<K, ID>> reverseCursor( ID id ) throws Exception;
@@ -216,7 +217,7 @@ public interface Index<K, O, ID>
boolean forward( K attrVal ) throws Exception;
- boolean forward( K attrVal, ID id ) throws Exception;
+ boolean forward( K attrVal, ID id ) throws LdapException;
boolean reverse( ID id ) throws Exception;
@@ -234,7 +235,7 @@ public interface Index<K, O, ID>
boolean reverseGreaterOrEq( ID id ) throws Exception;
- boolean reverseGreaterOrEq( ID id, K attrVal ) throws Exception;
+ boolean reverseGreaterOrEq( ID id, K attrVal ) throws LdapException;
boolean forwardLessOrEq( K attrVal ) throws Exception;
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/KeyTupleArrayCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/KeyTupleArrayCursor.java?rev=1423287&r1=1423286&r2=1423287&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/KeyTupleArrayCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/KeyTupleArrayCursor.java Tue Dec 18 06:28:48 2012
@@ -19,12 +19,16 @@
package org.apache.directory.server.xdbm;
+import java.io.IOException;
+
import org.apache.directory.server.core.avltree.ArrayTree;
import org.apache.directory.server.core.avltree.ArrayTreeCursor;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.model.cursor.AbstractCursor;
+import org.apache.directory.shared.ldap.model.cursor.CursorException;
import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
import org.apache.directory.shared.ldap.model.cursor.Tuple;
+import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -129,7 +133,7 @@ public class KeyTupleArrayCursor<K, V> e
* @param element the valueTuple who's value is used to position this Cursor
* @throws Exception if there are failures to position the Cursor
*/
- public void before( Tuple<K, V> element ) throws Exception
+ public void before( Tuple<K, V> element ) throws LdapException, CursorException, IOException
{
checkNotClosed( "before()" );
wrapped.before( element.getValue() );
@@ -137,7 +141,10 @@ public class KeyTupleArrayCursor<K, V> e
}
- public void after( Tuple<K, V> element ) throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public void after( Tuple<K, V> element ) throws LdapException, CursorException, IOException
{
checkNotClosed( "after()" );
wrapped.after( element.getValue() );
@@ -145,7 +152,10 @@ public class KeyTupleArrayCursor<K, V> e
}
- public void beforeFirst() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public void beforeFirst() throws LdapException, CursorException, IOException
{
checkNotClosed( "beforeFirst()" );
wrapped.beforeFirst();
@@ -153,7 +163,10 @@ public class KeyTupleArrayCursor<K, V> e
}
- public void afterLast() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public void afterLast() throws LdapException, CursorException, IOException
{
checkNotClosed( "afterLast()" );
wrapped.afterLast();
@@ -161,21 +174,32 @@ public class KeyTupleArrayCursor<K, V> e
}
- public boolean first() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public boolean first() throws LdapException, CursorException, IOException
{
beforeFirst();
+
return next();
}
- public boolean last() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public boolean last() throws LdapException, CursorException, IOException
{
afterLast();
+
return previous();
}
- public boolean previous() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public boolean previous() throws LdapException, CursorException, IOException
{
checkNotClosed( "previous()" );
if ( wrapped.previous() )
@@ -192,7 +216,10 @@ public class KeyTupleArrayCursor<K, V> e
}
- public boolean next() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public boolean next() throws LdapException, CursorException, IOException
{
checkNotClosed( "next()" );
if ( wrapped.next() )
@@ -209,9 +236,13 @@ public class KeyTupleArrayCursor<K, V> e
}
- public Tuple<K, V> get() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public Tuple<K, V> get() throws CursorException, IOException
{
checkNotClosed( "get()" );
+
if ( valueAvailable )
{
return returnedTuple;
@@ -224,7 +255,7 @@ public class KeyTupleArrayCursor<K, V> e
/**
* {@inheritDoc}
*/
- public void close() throws Exception
+ public void close()
{
if ( IS_DEBUG )
{
@@ -243,7 +274,7 @@ public class KeyTupleArrayCursor<K, V> e
/**
* {@inheritDoc}
*/
- public void close( Exception reason ) throws Exception
+ public void close( Exception reason )
{
if ( IS_DEBUG )
{
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java?rev=1423287&r1=1423286&r2=1423287&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java Tue Dec 18 06:28:48 2012
@@ -19,8 +19,12 @@
package org.apache.directory.server.xdbm;
+import java.io.IOException;
+
import org.apache.directory.server.i18n.I18n;
+import org.apache.directory.shared.ldap.model.cursor.CursorException;
import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
+import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -70,7 +74,10 @@ public class SingletonIndexCursor<V> ext
}
- public void beforeFirst() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public void beforeFirst() throws LdapException, CursorException, IOException
{
checkNotClosed( "()" );
beforeFirst = true;
@@ -79,7 +86,10 @@ public class SingletonIndexCursor<V> ext
}
- public void afterLast() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public void afterLast() throws LdapException, CursorException, IOException
{
checkNotClosed( "()" );
beforeFirst = false;
@@ -88,7 +98,10 @@ public class SingletonIndexCursor<V> ext
}
- public boolean first() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public boolean first() throws LdapException, CursorException, IOException
{
checkNotClosed( "()" );
beforeFirst = false;
@@ -98,7 +111,10 @@ public class SingletonIndexCursor<V> ext
}
- public boolean last() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public boolean last() throws LdapException, CursorException, IOException
{
checkNotClosed( "()" );
beforeFirst = false;
@@ -108,35 +124,46 @@ public class SingletonIndexCursor<V> ext
}
- public boolean isFirst() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isFirst()
{
- checkNotClosed( "()" );
return onSingleton;
}
- public boolean isLast() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isLast()
{
- checkNotClosed( "()" );
return onSingleton;
}
- public boolean isAfterLast() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isAfterLast()
{
- checkNotClosed( "()" );
return afterLast;
}
- public boolean isBeforeFirst() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isBeforeFirst()
{
- checkNotClosed( "()" );
return beforeFirst;
}
- public boolean previous() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public boolean previous() throws LdapException, CursorException, IOException
{
checkNotClosed( "()" );
if ( beforeFirst )
@@ -160,7 +187,10 @@ public class SingletonIndexCursor<V> ext
}
- public boolean next() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public boolean next() throws LdapException, CursorException, IOException
{
checkNotClosed( "()" );
if ( beforeFirst )
@@ -184,7 +214,10 @@ public class SingletonIndexCursor<V> ext
}
- public IndexEntry<V, String> get() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public IndexEntry<V, String> get() throws CursorException, IOException
{
checkNotClosed( "()" );
@@ -204,7 +237,10 @@ public class SingletonIndexCursor<V> ext
}
- public void close() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public void close()
{
if ( IS_DEBUG )
{
@@ -215,7 +251,10 @@ public class SingletonIndexCursor<V> ext
}
- public void close( Exception cause ) throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public void close( Exception cause )
{
if ( IS_DEBUG )
{
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java?rev=1423287&r1=1423286&r2=1423287&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java Tue Dec 18 06:28:48 2012
@@ -31,6 +31,7 @@ import org.apache.directory.server.const
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.Modification;
+import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.name.Dn;
import org.apache.directory.shared.ldap.model.name.Rdn;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
@@ -244,7 +245,7 @@ public interface Store
* System's index list
* @throws Exception If something went wrong
*/
- boolean hasSystemIndexOn( AttributeType attributeType ) throws Exception;
+ boolean hasSystemIndexOn( AttributeType attributeType ) throws LdapException;
/**
@@ -320,7 +321,7 @@ public interface Store
* @return the deleted entry if found
* @throws Exception If the deletion failed for any reason
*/
- Entry delete( String id ) throws Exception;
+ Entry delete( String id ) throws LdapException;
/**
@@ -330,7 +331,7 @@ public interface Store
* @return The found Entry, or null if not found
* @throws Exception If the lookup failed for any reason (except a not found entry)
*/
- Entry fetch( String id ) throws Exception;
+ Entry fetch( String id ) throws LdapException;
/**
@@ -341,7 +342,7 @@ public interface Store
* @return The found Entry, or null if not found
* @throws Exception If the lookup failed for any reason (except a not found entry)
*/
- Entry fetch( String id, Dn dn ) throws Exception;
+ Entry fetch( String id, Dn dn ) throws LdapException;
/**
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java?rev=1423287&r1=1423286&r2=1423287&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java Tue Dec 18 06:28:48 2012
@@ -30,6 +30,7 @@ import org.apache.directory.server.xdbm.
import org.apache.directory.shared.ldap.model.cursor.Cursor;
import org.apache.directory.shared.ldap.model.cursor.EmptyCursor;
import org.apache.directory.shared.ldap.model.cursor.Tuple;
+import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.LdapComparator;
import org.apache.directory.shared.ldap.model.schema.MatchingRule;
@@ -223,7 +224,7 @@ public class AvlIndex<K, O> extends Abst
/**
* {@inheritDoc}
*/
- public boolean forward( K attrVal, String id ) throws Exception
+ public boolean forward( K attrVal, String id ) throws LdapException
{
return forward.has( attrVal, id );
}
@@ -233,7 +234,7 @@ public class AvlIndex<K, O> extends Abst
* {@inheritDoc}
*/
@SuppressWarnings("unchecked")
- public Cursor<IndexEntry<K, String>> forwardCursor() throws Exception
+ public Cursor<IndexEntry<K, String>> forwardCursor() throws LdapException
{
return new IndexCursorAdaptor( forward.cursor(), true );
}
@@ -406,7 +407,7 @@ public class AvlIndex<K, O> extends Abst
/**
* {@inheritDoc}
*/
- public boolean reverseGreaterOrEq( String id, K attrVal ) throws Exception
+ public boolean reverseGreaterOrEq( String id, K attrVal ) throws LdapException
{
if ( withReverse )
{
@@ -454,7 +455,7 @@ public class AvlIndex<K, O> extends Abst
/**
* {@inheritDoc}
*/
- public K reverseLookup( String id ) throws Exception
+ public K reverseLookup( String id ) throws LdapException
{
if ( withReverse )
{
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTable.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTable.java?rev=1423287&r1=1423286&r2=1423287&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTable.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTable.java Tue Dec 18 06:28:48 2012
@@ -36,6 +36,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.cursor.EmptyCursor;
import org.apache.directory.shared.ldap.model.cursor.SingletonCursor;
import org.apache.directory.shared.ldap.model.cursor.Tuple;
+import org.apache.directory.shared.ldap.model.exception.LdapException;
/**
@@ -104,7 +105,7 @@ public class AvlTable<K, V> extends Abst
/**
* {@inheritDoc}
*/
- public V get( K key ) throws Exception
+ public V get( K key ) throws LdapException
{
if ( key == null )
{
@@ -155,7 +156,7 @@ public class AvlTable<K, V> extends Abst
/**
* {@inheritDoc}
*/
- public boolean has( K key, V value ) throws Exception
+ public boolean has( K key, V value ) throws LdapException
{
if ( key == null )
{
@@ -183,7 +184,7 @@ public class AvlTable<K, V> extends Abst
/**
* {@inheritDoc}
*/
- public boolean hasGreaterOrEqual( K key, V val ) throws Exception
+ public boolean hasGreaterOrEqual( K key, V val ) throws LdapException
{
if ( key == null )
{
@@ -326,7 +327,7 @@ public class AvlTable<K, V> extends Abst
/**
* {@inheritDoc}
*/
- public Cursor<Tuple<K, V>> cursor() throws Exception
+ public Cursor<Tuple<K, V>> cursor() throws LdapException
{
if ( !allowsDuplicates )
{
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTableDupsCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTableDupsCursor.java?rev=1423287&r1=1423286&r2=1423287&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTableDupsCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTableDupsCursor.java Tue Dec 18 06:28:48 2012
@@ -20,15 +20,19 @@
package org.apache.directory.server.xdbm.impl.avl;
+import java.io.IOException;
+
import org.apache.directory.server.core.avltree.AvlSingletonOrOrderedSetCursor;
import org.apache.directory.server.core.avltree.AvlTree;
import org.apache.directory.server.core.avltree.AvlTreeCursor;
import org.apache.directory.server.core.avltree.SingletonOrOrderedSet;
import org.apache.directory.shared.ldap.model.cursor.AbstractCursor;
import org.apache.directory.shared.ldap.model.cursor.Cursor;
+import org.apache.directory.shared.ldap.model.cursor.CursorException;
import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
import org.apache.directory.shared.ldap.model.cursor.SingletonCursor;
import org.apache.directory.shared.ldap.model.cursor.Tuple;
+import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -121,7 +125,7 @@ public class AvlTableDupsCursor<K, V> ex
/**
* {@inheritDoc}
*/
- public void beforeValue( K key, V value ) throws Exception
+ public void beforeValue( K key, V value ) throws LdapException, CursorException, IOException
{
checkNotClosed( "beforeValue()" );
wrappedCursor.beforeKey( key );
@@ -185,7 +189,7 @@ public class AvlTableDupsCursor<K, V> ex
/**
* {@inheritDoc}
*/
- public void afterValue( K key, V value ) throws Exception
+ public void afterValue( K key, V value ) throws LdapException, CursorException, IOException
{
checkNotClosed( "afterValue()" );
@@ -265,7 +269,7 @@ public class AvlTableDupsCursor<K, V> ex
/**
* {@inheritDoc}
*/
- public void after( Tuple<K, V> element ) throws Exception
+ public void after( Tuple<K, V> element ) throws LdapException, CursorException, IOException
{
afterValue( element.getKey(), element.getValue() );
}
@@ -274,7 +278,7 @@ public class AvlTableDupsCursor<K, V> ex
/**
* {@inheritDoc}
*/
- public void afterLast() throws Exception
+ public void afterLast() throws LdapException, CursorException, IOException
{
checkNotClosed( "afterLast()" );
clearValue();
@@ -294,7 +298,7 @@ public class AvlTableDupsCursor<K, V> ex
/**
* {@inheritDoc}
*/
- public void before( Tuple<K, V> element ) throws Exception
+ public void before( Tuple<K, V> element ) throws LdapException, CursorException, IOException
{
beforeValue( element.getKey(), element.getValue() );
}
@@ -303,7 +307,7 @@ public class AvlTableDupsCursor<K, V> ex
/**
* {@inheritDoc}
*/
- public void beforeFirst() throws Exception
+ public void beforeFirst() throws LdapException, CursorException, IOException
{
checkNotClosed( "beforeFirst()" );
clearValue();
@@ -323,7 +327,7 @@ public class AvlTableDupsCursor<K, V> ex
/**
* {@inheritDoc}
*/
- public boolean first() throws Exception
+ public boolean first() throws LdapException, CursorException, IOException
{
checkNotClosed( "first()" );
clearValue();
@@ -369,7 +373,7 @@ public class AvlTableDupsCursor<K, V> ex
/**
* {@inheritDoc}
*/
- public Tuple<K, V> get() throws Exception
+ public Tuple<K, V> get() throws CursorException, IOException
{
checkNotClosed( "get()" );
@@ -385,7 +389,7 @@ public class AvlTableDupsCursor<K, V> ex
/**
* {@inheritDoc}
*/
- public boolean last() throws Exception
+ public boolean last() throws LdapException, CursorException, IOException
{
checkNotClosed( "last()" );
clearValue();
@@ -429,7 +433,7 @@ public class AvlTableDupsCursor<K, V> ex
/**
* {@inheritDoc}
*/
- public boolean next() throws Exception
+ public boolean next() throws LdapException, CursorException, IOException
{
checkNotClosed( "next()" );
@@ -496,7 +500,7 @@ public class AvlTableDupsCursor<K, V> ex
/**
* {@inheritDoc}
*/
- public boolean previous() throws Exception
+ public boolean previous() throws LdapException, CursorException, IOException
{
checkNotClosed( "previous()" );
/*
@@ -553,7 +557,7 @@ public class AvlTableDupsCursor<K, V> ex
}
- public void close() throws Exception
+ public void close()
{
if ( IS_DEBUG )
{
@@ -569,7 +573,7 @@ public class AvlTableDupsCursor<K, V> ex
}
- public void close( Exception reason ) throws Exception
+ public void close( Exception reason )
{
if ( IS_DEBUG )
{
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/Evaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/Evaluator.java?rev=1423287&r1=1423286&r2=1423287&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/Evaluator.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/Evaluator.java Tue Dec 18 06:28:48 2012
@@ -22,6 +22,7 @@ package org.apache.directory.server.xdbm
import org.apache.directory.server.xdbm.IndexEntry;
import org.apache.directory.shared.ldap.model.entry.Entry;
+import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.filter.ExprNode;
@@ -63,7 +64,7 @@ public interface Evaluator<N extends Exp
* @return true if filter selects the candidate false otherwise
* @throws Exception if there are faults during evaluation
*/
- boolean evaluate( IndexEntry<?, String> entry ) throws Exception;
+ boolean evaluate( IndexEntry<?, String> entry ) throws LdapException;
/**
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/AllEntriesCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/AllEntriesCursor.java?rev=1423287&r1=1423286&r2=1423287&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/AllEntriesCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/AllEntriesCursor.java Tue Dec 18 06:28:48 2012
@@ -20,11 +20,15 @@
package org.apache.directory.server.xdbm.search.cursor;
+import java.io.IOException;
+
import org.apache.directory.server.core.partition.impl.btree.IndexCursorAdaptor;
import org.apache.directory.server.xdbm.AbstractIndexCursor;
import org.apache.directory.server.xdbm.IndexEntry;
import org.apache.directory.server.xdbm.Store;
import org.apache.directory.shared.ldap.model.cursor.Cursor;
+import org.apache.directory.shared.ldap.model.cursor.CursorException;
+import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -78,7 +82,7 @@ public class AllEntriesCursor extends Ab
/**
* {@inheritDoc}
*/
- public void after( IndexEntry<String, String> indexEntry ) throws Exception
+ public void after( IndexEntry<String, String> indexEntry ) throws LdapException, CursorException, IOException
{
checkNotClosed( "after()" );
}
@@ -87,7 +91,7 @@ public class AllEntriesCursor extends Ab
/**
* {@inheritDoc}
*/
- public void afterLast() throws Exception
+ public void afterLast() throws LdapException, CursorException, IOException
{
checkNotClosed( "afterLast()" );
@@ -107,7 +111,7 @@ public class AllEntriesCursor extends Ab
/**
* {@inheritDoc}
*/
- public void before( IndexEntry<String, String> indexEntry ) throws Exception
+ public void before( IndexEntry<String, String> indexEntry ) throws LdapException, CursorException, IOException
{
checkNotClosed( "before()" );
}
@@ -116,7 +120,7 @@ public class AllEntriesCursor extends Ab
/**
* {@inheritDoc}
*/
- public void beforeFirst() throws Exception
+ public void beforeFirst() throws LdapException, CursorException, IOException
{
checkNotClosed( "beforeFirst()" );
@@ -127,7 +131,7 @@ public class AllEntriesCursor extends Ab
/**
* {@inheritDoc}
*/
- public boolean first() throws Exception
+ public boolean first() throws LdapException, CursorException, IOException
{
checkNotClosed( "first()" );
@@ -138,7 +142,7 @@ public class AllEntriesCursor extends Ab
/**
* {@inheritDoc}
*/
- public IndexEntry<String, String> get() throws Exception
+ public IndexEntry<String, String> get() throws CursorException, IOException
{
checkNotClosed( "get()" );
@@ -157,7 +161,7 @@ public class AllEntriesCursor extends Ab
/**
* {@inheritDoc}
*/
- public boolean last() throws Exception
+ public boolean last() throws LdapException, CursorException, IOException
{
checkNotClosed( "last()" );
@@ -168,7 +172,7 @@ public class AllEntriesCursor extends Ab
/**
* {@inheritDoc}
*/
- public boolean next() throws Exception
+ public boolean next() throws LdapException, CursorException, IOException
{
checkNotClosed( "next()" );
@@ -179,7 +183,7 @@ public class AllEntriesCursor extends Ab
/**
* {@inheritDoc}
*/
- public boolean previous() throws Exception
+ public boolean previous() throws LdapException, CursorException, IOException
{
checkNotClosed( "previous()" );
@@ -191,7 +195,7 @@ public class AllEntriesCursor extends Ab
* {@inheritDoc}
*/
@Override
- public void close() throws Exception
+ public void close()
{
if ( IS_DEBUG )
{
@@ -206,7 +210,7 @@ public class AllEntriesCursor extends Ab
* {@inheritDoc}
*/
@Override
- public void close( Exception cause ) throws Exception
+ public void close( Exception cause )
{
if ( IS_DEBUG )
{
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/AndCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/AndCursor.java?rev=1423287&r1=1423286&r2=1423287&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/AndCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/AndCursor.java Tue Dec 18 06:28:48 2012
@@ -20,6 +20,7 @@
package org.apache.directory.server.xdbm.search.cursor;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -30,7 +31,9 @@ import org.apache.directory.server.xdbm.
import org.apache.directory.server.xdbm.search.Evaluator;
import org.apache.directory.server.xdbm.search.impl.ScanCountComparator;
import org.apache.directory.shared.ldap.model.cursor.Cursor;
+import org.apache.directory.shared.ldap.model.cursor.CursorException;
import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
+import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.filter.ExprNode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -91,7 +94,7 @@ public class AndCursor<V> extends Abstra
/**
* {@inheritDoc}
*/
- public void beforeFirst() throws Exception
+ public void beforeFirst() throws LdapException, CursorException, IOException
{
checkNotClosed( "beforeFirst()" );
wrapped.beforeFirst();
@@ -102,7 +105,7 @@ public class AndCursor<V> extends Abstra
/**
* {@inheritDoc}
*/
- public void afterLast() throws Exception
+ public void afterLast() throws LdapException, CursorException, IOException
{
checkNotClosed( "afterLast()" );
wrapped.afterLast();
@@ -113,7 +116,7 @@ public class AndCursor<V> extends Abstra
/**
* {@inheritDoc}
*/
- public boolean first() throws Exception
+ public boolean first() throws LdapException, CursorException, IOException
{
beforeFirst();
@@ -124,7 +127,7 @@ public class AndCursor<V> extends Abstra
/**
* {@inheritDoc}
*/
- public boolean last() throws Exception
+ public boolean last() throws LdapException, CursorException, IOException
{
afterLast();
@@ -135,7 +138,7 @@ public class AndCursor<V> extends Abstra
/**
* {@inheritDoc}
*/
- public boolean previous() throws Exception
+ public boolean previous() throws LdapException, CursorException, IOException
{
while ( wrapped.previous() )
{
@@ -156,7 +159,7 @@ public class AndCursor<V> extends Abstra
/**
* {@inheritDoc}
*/
- public boolean next() throws Exception
+ public boolean next() throws LdapException, CursorException, IOException
{
while ( wrapped.next() )
{
@@ -176,7 +179,7 @@ public class AndCursor<V> extends Abstra
/**
* {@inheritDoc}
*/
- public IndexEntry<V, String> get() throws Exception
+ public IndexEntry<V, String> get() throws CursorException, IOException
{
checkNotClosed( "get()" );
@@ -192,7 +195,7 @@ public class AndCursor<V> extends Abstra
/**
* {@inheritDoc}
*/
- public void close() throws Exception
+ public void close()
{
if ( IS_DEBUG )
{
@@ -207,7 +210,7 @@ public class AndCursor<V> extends Abstra
/**
* {@inheritDoc}
*/
- public void close( Exception cause ) throws Exception
+ public void close( Exception cause )
{
if ( IS_DEBUG )
{
@@ -246,7 +249,7 @@ public class AndCursor<V> extends Abstra
/**
* Checks if the entry is a valid candidate by using the evaluators.
*/
- private boolean matches( IndexEntry<V, String> indexEntry ) throws Exception
+ private boolean matches( IndexEntry<V, String> indexEntry ) throws LdapException
{
for ( Evaluator<?> evaluator : evaluators )
{
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/ApproximateCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/ApproximateCursor.java?rev=1423287&r1=1423286&r2=1423287&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/ApproximateCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/ApproximateCursor.java Tue Dec 18 06:28:48 2012
@@ -20,6 +20,8 @@
package org.apache.directory.server.xdbm.search.cursor;
+import java.io.IOException;
+
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.server.xdbm.AbstractIndexCursor;
import org.apache.directory.server.xdbm.Index;
@@ -27,9 +29,11 @@ import org.apache.directory.server.xdbm.
import org.apache.directory.server.xdbm.Store;
import org.apache.directory.server.xdbm.search.evaluator.ApproximateEvaluator;
import org.apache.directory.shared.ldap.model.cursor.Cursor;
+import org.apache.directory.shared.ldap.model.cursor.CursorException;
import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.Value;
+import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -126,7 +130,7 @@ public class ApproximateCursor<V> extend
/**
* {@inheritDoc}
*/
- public void before( IndexEntry<V, String> element ) throws Exception
+ public void before( IndexEntry<V, String> element ) throws LdapException, CursorException, IOException
{
checkNotClosed( "before()" );
@@ -145,7 +149,7 @@ public class ApproximateCursor<V> extend
* {@inheritDoc}
*/
@Override
- public void after( IndexEntry<V, String> element ) throws Exception
+ public void after( IndexEntry<V, String> element ) throws LdapException, CursorException, IOException
{
checkNotClosed( "after()" );
@@ -163,7 +167,7 @@ public class ApproximateCursor<V> extend
/**
* {@inheritDoc}
*/
- public void beforeFirst() throws Exception
+ public void beforeFirst() throws LdapException, CursorException, IOException
{
checkNotClosed( "beforeFirst()" );
if ( userIdxCursor != null )
@@ -181,7 +185,7 @@ public class ApproximateCursor<V> extend
/**
* {@inheritDoc}
*/
- public void afterLast() throws Exception
+ public void afterLast() throws LdapException, CursorException, IOException
{
checkNotClosed( "afterLast()" );
@@ -200,7 +204,7 @@ public class ApproximateCursor<V> extend
/**
* {@inheritDoc}
*/
- public boolean first() throws Exception
+ public boolean first() throws LdapException, CursorException, IOException
{
beforeFirst();
@@ -211,7 +215,7 @@ public class ApproximateCursor<V> extend
/**
* {@inheritDoc}
*/
- public boolean last() throws Exception
+ public boolean last() throws LdapException, CursorException, IOException
{
afterLast();
@@ -222,7 +226,7 @@ public class ApproximateCursor<V> extend
/**
* {@inheritDoc}
*/
- public boolean previous() throws Exception
+ public boolean previous() throws LdapException, CursorException, IOException
{
if ( userIdxCursor != null )
{
@@ -247,7 +251,7 @@ public class ApproximateCursor<V> extend
/**
* {@inheritDoc}
*/
- public boolean next() throws Exception
+ public boolean next() throws LdapException, CursorException, IOException
{
if ( userIdxCursor != null )
{
@@ -273,7 +277,7 @@ public class ApproximateCursor<V> extend
* {@inheritDoc}
*/
@SuppressWarnings("unchecked")
- public IndexEntry<V, String> get() throws Exception
+ public IndexEntry<V, String> get() throws CursorException, IOException
{
checkNotClosed( "get()" );
@@ -294,7 +298,7 @@ public class ApproximateCursor<V> extend
/**
* {@inheritDoc}
*/
- public void close() throws Exception
+ public void close()
{
if ( IS_DEBUG )
{
@@ -317,7 +321,7 @@ public class ApproximateCursor<V> extend
/**
* {@inheritDoc}
*/
- public void close( Exception cause ) throws Exception
+ public void close( Exception cause )
{
if ( IS_DEBUG )
{
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/ChildrenCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/ChildrenCursor.java?rev=1423287&r1=1423286&r2=1423287&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/ChildrenCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/ChildrenCursor.java Tue Dec 18 06:28:48 2012
@@ -20,12 +20,16 @@
package org.apache.directory.server.xdbm.search.cursor;
+import java.io.IOException;
+
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.server.xdbm.AbstractIndexCursor;
import org.apache.directory.server.xdbm.IndexEntry;
import org.apache.directory.server.xdbm.ParentIdAndRdn;
import org.apache.directory.server.xdbm.Store;
import org.apache.directory.shared.ldap.model.cursor.Cursor;
+import org.apache.directory.shared.ldap.model.cursor.CursorException;
+import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -86,20 +90,29 @@ public class ChildrenCursor extends Abst
}
- public void beforeFirst() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public void beforeFirst() throws LdapException, CursorException, IOException
{
checkNotClosed( "beforeFirst()" );
setAvailable( false );
}
- public void afterLast() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public void afterLast() throws LdapException, CursorException, IOException
{
throw new UnsupportedOperationException( getUnsupportedMessage() );
}
- public boolean first() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public boolean first() throws LdapException, CursorException, IOException
{
beforeFirst();
@@ -107,13 +120,19 @@ public class ChildrenCursor extends Abst
}
- public boolean last() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public boolean last() throws LdapException, CursorException, IOException
{
throw new UnsupportedOperationException( getUnsupportedMessage() );
}
- public boolean previous() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public boolean previous() throws LdapException, CursorException, IOException
{
checkNotClosed( "next()" );
@@ -137,7 +156,7 @@ public class ChildrenCursor extends Abst
/**
* {@inheritDoc}
*/
- public boolean next() throws Exception
+ public boolean next() throws LdapException, CursorException, IOException
{
checkNotClosed( "next()" );
@@ -161,7 +180,10 @@ public class ChildrenCursor extends Abst
}
- public IndexEntry<String, String> get() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public IndexEntry<String, String> get() throws CursorException, IOException
{
checkNotClosed( "get()" );
@@ -169,8 +191,11 @@ public class ChildrenCursor extends Abst
}
+ /**
+ * {@inheritDoc}
+ */
@Override
- public void close() throws Exception
+ public void close()
{
if ( IS_DEBUG )
{
@@ -183,8 +208,11 @@ public class ChildrenCursor extends Abst
}
+ /**
+ * {@inheritDoc}
+ */
@Override
- public void close( Exception cause ) throws Exception
+ public void close( Exception cause )
{
if ( IS_DEBUG )
{
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/DescendantCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/DescendantCursor.java?rev=1423287&r1=1423286&r2=1423287&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/DescendantCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/DescendantCursor.java Tue Dec 18 06:28:48 2012
@@ -20,6 +20,8 @@
package org.apache.directory.server.xdbm.search.cursor;
+import java.io.IOException;
+
import org.apache.commons.collections.ArrayStack;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.server.xdbm.AbstractIndexCursor;
@@ -27,6 +29,8 @@ import org.apache.directory.server.xdbm.
import org.apache.directory.server.xdbm.ParentIdAndRdn;
import org.apache.directory.server.xdbm.Store;
import org.apache.directory.shared.ldap.model.cursor.Cursor;
+import org.apache.directory.shared.ldap.model.cursor.CursorException;
+import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.name.Rdn;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -128,21 +132,29 @@ public class DescendantCursor extends Ab
return UNSUPPORTED_MSG;
}
-
- public void beforeFirst() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public void beforeFirst() throws LdapException, CursorException, IOException
{
checkNotClosed( "beforeFirst()" );
setAvailable( false );
}
- public void afterLast() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public void afterLast() throws LdapException, CursorException, IOException
{
throw new UnsupportedOperationException( getUnsupportedMessage() );
}
- public boolean first() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public boolean first() throws LdapException, CursorException, IOException
{
beforeFirst();
@@ -150,13 +162,19 @@ public class DescendantCursor extends Ab
}
- public boolean last() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public boolean last() throws LdapException, CursorException, IOException
{
throw new UnsupportedOperationException( getUnsupportedMessage() );
}
- public boolean previous() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public boolean previous() throws LdapException, CursorException, IOException
{
checkNotClosed( "next()" );
@@ -180,7 +198,7 @@ public class DescendantCursor extends Ab
/**
* {@inheritDoc}
*/
- public boolean next() throws Exception
+ public boolean next() throws LdapException, CursorException, IOException
{
checkNotClosed( "next()" );
boolean finished = false;
@@ -268,7 +286,10 @@ public class DescendantCursor extends Ab
}
- public IndexEntry<String, String> get() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public IndexEntry<String, String> get() throws CursorException, IOException
{
checkNotClosed( "get()" );
@@ -276,8 +297,11 @@ public class DescendantCursor extends Ab
}
+ /**
+ * {@inheritDoc}
+ */
@Override
- public void close() throws Exception
+ public void close()
{
if ( IS_DEBUG )
{
@@ -297,8 +321,11 @@ public class DescendantCursor extends Ab
}
+ /**
+ * {@inheritDoc}
+ */
@Override
- public void close( Exception cause ) throws Exception
+ public void close( Exception cause )
{
if ( IS_DEBUG )
{
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/EqualityCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/EqualityCursor.java?rev=1423287&r1=1423286&r2=1423287&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/EqualityCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/EqualityCursor.java Tue Dec 18 06:28:48 2012
@@ -20,6 +20,8 @@
package org.apache.directory.server.xdbm.search.cursor;
+import java.io.IOException;
+
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.server.xdbm.AbstractIndexCursor;
import org.apache.directory.server.xdbm.Index;
@@ -27,9 +29,11 @@ import org.apache.directory.server.xdbm.
import org.apache.directory.server.xdbm.Store;
import org.apache.directory.server.xdbm.search.evaluator.EqualityEvaluator;
import org.apache.directory.shared.ldap.model.cursor.Cursor;
+import org.apache.directory.shared.ldap.model.cursor.CursorException;
import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.Value;
+import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -124,7 +128,7 @@ public class EqualityCursor<V> extends A
/**
* {@inheritDoc}
*/
- public void before( IndexEntry<V, String> element ) throws Exception
+ public void before( IndexEntry<V, String> element ) throws LdapException, CursorException, IOException
{
checkNotClosed( "before()" );
@@ -142,7 +146,7 @@ public class EqualityCursor<V> extends A
/**
* {@inheritDoc}
*/
- public void after( IndexEntry<V, String> element ) throws Exception
+ public void after( IndexEntry<V, String> element ) throws LdapException, CursorException, IOException
{
checkNotClosed( "after()" );
@@ -160,7 +164,7 @@ public class EqualityCursor<V> extends A
/**
* {@inheritDoc}
*/
- public void beforeFirst() throws Exception
+ public void beforeFirst() throws LdapException, CursorException, IOException
{
checkNotClosed( "beforeFirst()" );
@@ -180,7 +184,7 @@ public class EqualityCursor<V> extends A
/**
* {@inheritDoc}
*/
- public void afterLast() throws Exception
+ public void afterLast() throws LdapException, CursorException, IOException
{
checkNotClosed( "afterLast()" );
@@ -200,7 +204,7 @@ public class EqualityCursor<V> extends A
/**
* {@inheritDoc}
*/
- public boolean first() throws Exception
+ public boolean first() throws LdapException, CursorException, IOException
{
beforeFirst();
@@ -211,7 +215,7 @@ public class EqualityCursor<V> extends A
/**
* {@inheritDoc}
*/
- public boolean last() throws Exception
+ public boolean last() throws LdapException, CursorException, IOException
{
afterLast();
@@ -222,7 +226,7 @@ public class EqualityCursor<V> extends A
/**
* {@inheritDoc}
*/
- public boolean previous() throws Exception
+ public boolean previous() throws LdapException, CursorException, IOException
{
if ( userIdxCursor != null )
{
@@ -247,7 +251,7 @@ public class EqualityCursor<V> extends A
/**
* {@inheritDoc}
*/
- public boolean next() throws Exception
+ public boolean next() throws LdapException, CursorException, IOException
{
if ( userIdxCursor != null )
{
@@ -273,7 +277,7 @@ public class EqualityCursor<V> extends A
* {@inheritDoc}
*/
@SuppressWarnings("unchecked")
- public IndexEntry<V, String> get() throws Exception
+ public IndexEntry<V, String> get() throws CursorException, IOException
{
checkNotClosed( "get()" );
@@ -294,7 +298,7 @@ public class EqualityCursor<V> extends A
/**
* {@inheritDoc}
*/
- public void close() throws Exception
+ public void close()
{
if ( IS_DEBUG )
{
@@ -317,7 +321,7 @@ public class EqualityCursor<V> extends A
/**
* {@inheritDoc}
*/
- public void close( Exception cause ) throws Exception
+ public void close( Exception cause )
{
if ( IS_DEBUG )
{
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/GreaterEqCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/GreaterEqCursor.java?rev=1423287&r1=1423286&r2=1423287&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/GreaterEqCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/GreaterEqCursor.java Tue Dec 18 06:28:48 2012
@@ -20,6 +20,8 @@
package org.apache.directory.server.xdbm.search.cursor;
+import java.io.IOException;
+
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.server.xdbm.AbstractIndexCursor;
import org.apache.directory.server.xdbm.Index;
@@ -27,8 +29,10 @@ import org.apache.directory.server.xdbm.
import org.apache.directory.server.xdbm.Store;
import org.apache.directory.server.xdbm.search.evaluator.GreaterEqEvaluator;
import org.apache.directory.shared.ldap.model.cursor.Cursor;
+import org.apache.directory.shared.ldap.model.cursor.CursorException;
import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
import org.apache.directory.shared.ldap.model.entry.Entry;
+import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -113,7 +117,7 @@ public class GreaterEqCursor<V> extends
/**
* {@inheritDoc}
*/
- public void before( IndexEntry<V, String> element ) throws Exception
+ public void before( IndexEntry<V, String> element ) throws LdapException, CursorException, IOException
{
checkNotClosed( "before()" );
@@ -147,7 +151,7 @@ public class GreaterEqCursor<V> extends
/**
* {@inheritDoc}
*/
- public void after( IndexEntry<V, String> element ) throws Exception
+ public void after( IndexEntry<V, String> element ) throws LdapException, CursorException, IOException
{
checkNotClosed( "after()" );
@@ -194,7 +198,7 @@ public class GreaterEqCursor<V> extends
* {@inheritDoc}
*/
@SuppressWarnings("unchecked")
- public void beforeFirst() throws Exception
+ public void beforeFirst() throws LdapException, CursorException, IOException
{
checkNotClosed( "beforeFirst()" );
@@ -217,7 +221,7 @@ public class GreaterEqCursor<V> extends
/**
* {@inheritDoc}
*/
- public void afterLast() throws Exception
+ public void afterLast() throws LdapException, CursorException, IOException
{
checkNotClosed( "afterLast()" );
@@ -238,7 +242,7 @@ public class GreaterEqCursor<V> extends
/**
* {@inheritDoc}
*/
- public boolean first() throws Exception
+ public boolean first() throws LdapException, CursorException, IOException
{
beforeFirst();
@@ -249,7 +253,7 @@ public class GreaterEqCursor<V> extends
/**
* {@inheritDoc}
*/
- public boolean last() throws Exception
+ public boolean last() throws LdapException, CursorException, IOException
{
afterLast();
@@ -260,7 +264,7 @@ public class GreaterEqCursor<V> extends
/**
* {@inheritDoc}
*/
- public boolean previous() throws Exception
+ public boolean previous() throws LdapException, CursorException, IOException
{
checkNotClosed( "previous()" );
@@ -303,7 +307,7 @@ public class GreaterEqCursor<V> extends
/**
* {@inheritDoc}
*/
- public boolean next() throws Exception
+ public boolean next() throws LdapException, CursorException, IOException
{
checkNotClosed( "next()" );
@@ -334,8 +338,7 @@ public class GreaterEqCursor<V> extends
/**
* {@inheritDoc}
*/
- @SuppressWarnings("unchecked")
- public IndexEntry<V, String> get() throws Exception
+ public IndexEntry<V, String> get() throws CursorException, IOException
{
checkNotClosed( "get()" );
@@ -361,7 +364,7 @@ public class GreaterEqCursor<V> extends
/**
* {@inheritDoc}
*/
- public void close() throws Exception
+ public void close()
{
if ( IS_DEBUG )
{
@@ -385,7 +388,7 @@ public class GreaterEqCursor<V> extends
/**
* {@inheritDoc}
*/
- public void close( Exception cause ) throws Exception
+ public void close( Exception cause )
{
if ( IS_DEBUG )
{
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/LessEqCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/LessEqCursor.java?rev=1423287&r1=1423286&r2=1423287&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/LessEqCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/LessEqCursor.java Tue Dec 18 06:28:48 2012
@@ -20,6 +20,8 @@
package org.apache.directory.server.xdbm.search.cursor;
+import java.io.IOException;
+
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.server.xdbm.AbstractIndexCursor;
import org.apache.directory.server.xdbm.Index;
@@ -27,8 +29,10 @@ import org.apache.directory.server.xdbm.
import org.apache.directory.server.xdbm.Store;
import org.apache.directory.server.xdbm.search.evaluator.LessEqEvaluator;
import org.apache.directory.shared.ldap.model.cursor.Cursor;
+import org.apache.directory.shared.ldap.model.cursor.CursorException;
import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
import org.apache.directory.shared.ldap.model.entry.Entry;
+import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -107,7 +111,7 @@ public class LessEqCursor<V> extends Abs
/**
* {@inheritDoc}
*/
- public void before( IndexEntry<V, String> element ) throws Exception
+ public void before( IndexEntry<V, String> element ) throws LdapException, CursorException, IOException
{
checkNotClosed( "before()" );
@@ -155,7 +159,7 @@ public class LessEqCursor<V> extends Abs
/**
* {@inheritDoc}
*/
- public void after( IndexEntry<V, String> element ) throws Exception
+ public void after( IndexEntry<V, String> element ) throws LdapException, CursorException, IOException
{
checkNotClosed( "after()" );
@@ -192,7 +196,10 @@ public class LessEqCursor<V> extends Abs
}
- public void beforeFirst() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public void beforeFirst() throws LdapException, CursorException, IOException
{
checkNotClosed( "beforeFirst()" );
if ( userIdxCursor != null )
@@ -208,8 +215,11 @@ public class LessEqCursor<V> extends Abs
setAvailable( false );
}
-
- public void afterLast() throws Exception
+
+ /**
+ * {@inheritDoc}
+ */
+ public void afterLast() throws LdapException, CursorException, IOException
{
checkNotClosed( "afterLast()" );
if ( userIdxCursor != null )
@@ -229,21 +239,31 @@ public class LessEqCursor<V> extends Abs
}
- public boolean first() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public boolean first() throws LdapException, CursorException, IOException
{
beforeFirst();
return next();
}
- public boolean last() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public boolean last() throws LdapException, CursorException, IOException
{
afterLast();
+
return previous();
}
- public boolean previous() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public boolean previous() throws LdapException, CursorException, IOException
{
checkNotClosed( "previous()" );
@@ -276,7 +296,10 @@ public class LessEqCursor<V> extends Abs
}
- public boolean next() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public boolean next() throws LdapException, CursorException, IOException
{
checkNotClosed( "next()" );
@@ -322,7 +345,10 @@ public class LessEqCursor<V> extends Abs
}
- public IndexEntry<V, String> get() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public IndexEntry<V, String> get() throws CursorException, IOException
{
checkNotClosed( "get()" );
@@ -345,7 +371,10 @@ public class LessEqCursor<V> extends Abs
}
- public void close() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public void close()
{
if ( IS_DEBUG )
{
@@ -369,7 +398,7 @@ public class LessEqCursor<V> extends Abs
/**
* {@inheritDoc}
*/
- public void close( Exception cause ) throws Exception
+ public void close( Exception cause )
{
LOG_CURSOR.debug( "Closing LessEqCursor {}", this );
super.close( cause );
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/NotCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/NotCursor.java?rev=1423287&r1=1423286&r2=1423287&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/NotCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/NotCursor.java Tue Dec 18 06:28:48 2012
@@ -20,12 +20,16 @@
package org.apache.directory.server.xdbm.search.cursor;
+import java.io.IOException;
+
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.server.xdbm.AbstractIndexCursor;
import org.apache.directory.server.xdbm.IndexEntry;
import org.apache.directory.server.xdbm.Store;
import org.apache.directory.server.xdbm.search.Evaluator;
+import org.apache.directory.shared.ldap.model.cursor.CursorException;
import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
+import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.filter.ExprNode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -73,7 +77,10 @@ public class NotCursor<V> extends Abstra
}
- public void beforeFirst() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public void beforeFirst() throws LdapException, CursorException, IOException
{
checkNotClosed( "beforeFirst()" );
uuidCursor.beforeFirst();
@@ -81,7 +88,10 @@ public class NotCursor<V> extends Abstra
}
- public void afterLast() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public void afterLast() throws LdapException, CursorException, IOException
{
checkNotClosed( "afterLast()" );
uuidCursor.afterLast();
@@ -89,7 +99,10 @@ public class NotCursor<V> extends Abstra
}
- public boolean first() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public boolean first() throws LdapException, CursorException, IOException
{
beforeFirst();
@@ -97,7 +110,10 @@ public class NotCursor<V> extends Abstra
}
- public boolean last() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public boolean last() throws LdapException, CursorException, IOException
{
afterLast();
@@ -105,7 +121,10 @@ public class NotCursor<V> extends Abstra
}
- public boolean previous() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public boolean previous() throws LdapException, CursorException, IOException
{
while ( uuidCursor.previous() )
{
@@ -122,7 +141,10 @@ public class NotCursor<V> extends Abstra
}
- public boolean next() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public boolean next() throws LdapException, CursorException, IOException
{
while ( uuidCursor.next() )
{
@@ -139,7 +161,10 @@ public class NotCursor<V> extends Abstra
}
- public IndexEntry<V, String> get() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public IndexEntry<V, String> get() throws CursorException, IOException
{
checkNotClosed( "get()" );
@@ -152,7 +177,10 @@ public class NotCursor<V> extends Abstra
}
- public void close() throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public void close()
{
if ( IS_DEBUG )
{
@@ -164,7 +192,10 @@ public class NotCursor<V> extends Abstra
}
- public void close( Exception cause ) throws Exception
+ /**
+ * {@inheritDoc}
+ */
+ public void close( Exception cause )
{
if ( IS_DEBUG )
{