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 2014/03/27 12:51:20 UTC
svn commit: r1582268 - in /directory/apacheds/trunk:
core-api/src/main/java/org/apache/directory/server/core/api/filtering/
core-api/src/test/java/org/apache/directory/server/core/api/
core-jndi/src/main/java/org/apache/directory/server/core/jndi/ core...
Author: elecharny
Date: Thu Mar 27 11:51:19 2014
New Revision: 1582268
URL: http://svn.apache.org/r1582268
Log:
Renamed the BaseEntryFilteringCursor to EntryFilteringCursorImpl
Added:
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/EntryFilteringCursorImpl.java
- copied, changed from r1580201, directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/BaseEntryFilteringCursor.java
Removed:
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/BaseEntryFilteringCursor.java
Modified:
directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockOperation.java
directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockOperationManager.java
directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/partition/DefaultPartitionNexus.java
directory/apacheds/trunk/interceptors/normalization/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java
directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AbstractCursorTest.java
Copied: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/EntryFilteringCursorImpl.java (from r1580201, directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/BaseEntryFilteringCursor.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/EntryFilteringCursorImpl.java?p2=directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/EntryFilteringCursorImpl.java&p1=directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/BaseEntryFilteringCursor.java&r1=1580201&r2=1582268&rev=1582268&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/BaseEntryFilteringCursor.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/EntryFilteringCursorImpl.java Thu Mar 27 11:51:19 2014
@@ -49,10 +49,10 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class BaseEntryFilteringCursor extends AbstractCursor<Entry> implements EntryFilteringCursor
+public class EntryFilteringCursorImpl extends AbstractCursor<Entry> implements EntryFilteringCursor
{
/** the logger used by this class */
- private static final Logger log = LoggerFactory.getLogger( BaseEntryFilteringCursor.class );
+ private static final Logger log = LoggerFactory.getLogger( EntryFilteringCursorImpl.class );
/** A dedicated log for cursors */
private static final Logger LOG_CURSOR = LoggerFactory.getLogger( Loggers.CURSOR_LOG.getName() );
@@ -89,7 +89,7 @@ public class BaseEntryFilteringCursor ex
* @param invocation the search operation invocation creating this Cursor
* @param filter a single filter to be used
*/
- public BaseEntryFilteringCursor( Cursor<Entry> wrapped,
+ public EntryFilteringCursorImpl( Cursor<Entry> wrapped,
SearchOperationContext operationContext, SchemaManager schemaManager, EntryFilter filter )
{
this( wrapped, operationContext, schemaManager, Collections.singletonList( filter ) );
@@ -105,7 +105,7 @@ public class BaseEntryFilteringCursor ex
* @param invocation the search operation invocation creating this Cursor
* @param filter a single filter to be used
*/
- public BaseEntryFilteringCursor( Cursor<Entry> wrapped, SearchOperationContext operationContext,
+ public EntryFilteringCursorImpl( Cursor<Entry> wrapped, SearchOperationContext operationContext,
SchemaManager schemaManager )
{
if ( IS_DEBUG )
@@ -129,7 +129,7 @@ public class BaseEntryFilteringCursor ex
* @param invocation the search operation invocation creating this Cursor
* @param filters a list of filters to be used
*/
- public BaseEntryFilteringCursor( Cursor<Entry> wrapped,
+ public EntryFilteringCursorImpl( Cursor<Entry> wrapped,
SearchOperationContext operationContext,
SchemaManager schemaManager,
List<EntryFilter> filters )
Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockOperation.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockOperation.java?rev=1582268&r1=1582267&r2=1582268&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockOperation.java (original)
+++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockOperation.java Thu Mar 27 11:51:19 2014
@@ -31,7 +31,7 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.server.core.api.CoreSession;
import org.apache.directory.server.core.api.LdapPrincipal;
import org.apache.directory.server.core.api.ReferralHandlingMode;
-import org.apache.directory.server.core.api.filtering.BaseEntryFilteringCursor;
+import org.apache.directory.server.core.api.filtering.EntryFilteringCursorImpl;
import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext;
import org.apache.directory.server.core.api.interceptor.context.OperationContext;
@@ -58,7 +58,7 @@ public class MockOperation implements Op
public EntryFilteringCursor search( SearchOperationContext searchContext ) throws LdapException
{
- return new BaseEntryFilteringCursor( new MockCursor( count ), searchContext, schemaManager );
+ return new EntryFilteringCursorImpl( new MockCursor( count ), searchContext, schemaManager );
}
Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockOperationManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockOperationManager.java?rev=1582268&r1=1582267&r2=1582268&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockOperationManager.java (original)
+++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/api/MockOperationManager.java Thu Mar 27 11:51:19 2014
@@ -25,7 +25,7 @@ import java.util.concurrent.locks.Reentr
import org.apache.directory.api.ldap.model.entry.Entry;
import org.apache.directory.api.ldap.model.exception.LdapException;
-import org.apache.directory.server.core.api.filtering.BaseEntryFilteringCursor;
+import org.apache.directory.server.core.api.filtering.EntryFilteringCursorImpl;
import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
import org.apache.directory.server.core.api.interceptor.context.BindOperationContext;
@@ -116,7 +116,7 @@ public class MockOperationManager implem
{
MockCursor cursor = new MockCursor( count );
cursor.setSchemaManager( searchContext.getSession().getDirectoryService().getSchemaManager() );
- return new BaseEntryFilteringCursor( cursor, searchContext, cursor.schemaManager );
+ return new EntryFilteringCursorImpl( cursor, searchContext, cursor.schemaManager );
}
Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=1582268&r1=1582267&r2=1582268&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Thu Mar 27 11:51:19 2014
@@ -105,7 +105,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.api.entry.ServerEntryUtils;
import org.apache.directory.server.core.api.event.DirectoryListener;
import org.apache.directory.server.core.api.event.NotificationCriteria;
-import org.apache.directory.server.core.api.filtering.BaseEntryFilteringCursor;
+import org.apache.directory.server.core.api.filtering.EntryFilteringCursorImpl;
import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
import org.apache.directory.server.core.api.interceptor.context.BindOperationContext;
@@ -547,12 +547,12 @@ public abstract class ServerContext impl
if ( result )
{
Entry emptyEntry = new DefaultEntry( service.getSchemaManager(), Dn.EMPTY_DN );
- return new BaseEntryFilteringCursor( new SingletonCursor<Entry>( emptyEntry ),
+ return new EntryFilteringCursorImpl( new SingletonCursor<Entry>( emptyEntry ),
searchContext, schemaManager );
}
else
{
- return new BaseEntryFilteringCursor( new EmptyCursor<Entry>(), searchContext, schemaManager );
+ return new EntryFilteringCursorImpl( new EmptyCursor<Entry>(), searchContext, schemaManager );
}
}
else
Modified: directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/partition/DefaultPartitionNexus.java?rev=1582268&r1=1582267&r2=1582268&view=diff
==============================================================================
--- directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/partition/DefaultPartitionNexus.java (original)
+++ directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/partition/DefaultPartitionNexus.java Thu Mar 27 11:51:19 2014
@@ -63,7 +63,7 @@ import org.apache.directory.server.const
import org.apache.directory.server.core.api.DirectoryService;
import org.apache.directory.server.core.api.InterceptorEnum;
import org.apache.directory.server.core.api.entry.ClonedServerEntry;
-import org.apache.directory.server.core.api.filtering.BaseEntryFilteringCursor;
+import org.apache.directory.server.core.api.filtering.EntryFilteringCursorImpl;
import org.apache.directory.server.core.api.filtering.CursorList;
import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
@@ -531,7 +531,7 @@ public class DefaultPartitionNexus exten
if ( ( ids == null ) || ( ids.size() == 0 ) )
{
Entry rootDse = getRootDse( null );
- return new BaseEntryFilteringCursor( new SingletonCursor<Entry>( rootDse ), searchContext,
+ return new EntryFilteringCursorImpl( new SingletonCursor<Entry>( rootDse ), searchContext,
directoryService.getSchemaManager() );
}
@@ -561,7 +561,7 @@ public class DefaultPartitionNexus exten
if ( noAttribute )
{
Entry serverEntry = new DefaultEntry( schemaManager, Dn.ROOT_DSE );
- return new BaseEntryFilteringCursor( new SingletonCursor<Entry>( serverEntry ), searchContext,
+ return new EntryFilteringCursorImpl( new SingletonCursor<Entry>( serverEntry ), searchContext,
directoryService.getSchemaManager() );
}
@@ -569,7 +569,7 @@ public class DefaultPartitionNexus exten
if ( allUserAttributes && allOperationalAttributes )
{
Entry rootDse = getRootDse( null );
- return new BaseEntryFilteringCursor( new SingletonCursor<Entry>( rootDse ), searchContext,
+ return new EntryFilteringCursorImpl( new SingletonCursor<Entry>( rootDse ), searchContext,
directoryService.getSchemaManager() );
}
@@ -595,7 +595,7 @@ public class DefaultPartitionNexus exten
}
}
- return new BaseEntryFilteringCursor( new SingletonCursor<Entry>( serverEntry ), searchContext,
+ return new EntryFilteringCursorImpl( new SingletonCursor<Entry>( serverEntry ), searchContext,
directoryService.getSchemaManager() );
}
@@ -672,7 +672,7 @@ public class DefaultPartitionNexus exten
else
{
// Nothing to return in this case
- return new BaseEntryFilteringCursor( new EmptyCursor<Entry>(), searchContext,
+ return new EntryFilteringCursorImpl( new EmptyCursor<Entry>(), searchContext,
directoryService.getSchemaManager() );
}
}
Modified: directory/apacheds/trunk/interceptors/normalization/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/normalization/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java?rev=1582268&r1=1582267&r2=1582268&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/normalization/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/normalization/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java Thu Mar 27 11:51:19 2014
@@ -46,7 +46,7 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.api.ldap.model.schema.normalizers.NameComponentNormalizer;
import org.apache.directory.server.core.api.DirectoryService;
import org.apache.directory.server.core.api.InterceptorEnum;
-import org.apache.directory.server.core.api.filtering.BaseEntryFilteringCursor;
+import org.apache.directory.server.core.api.filtering.EntryFilteringCursorImpl;
import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.api.interceptor.BaseInterceptor;
import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
@@ -283,7 +283,7 @@ public class NormalizationInterceptor ex
if ( filter == null )
{
LOG.warn( "undefined filter based on undefined attributeType not evaluted at all. Returning empty enumeration." );
- return new BaseEntryFilteringCursor( new EmptyCursor<Entry>(), searchContext, schemaManager );
+ return new EntryFilteringCursorImpl( new EmptyCursor<Entry>(), searchContext, schemaManager );
}
// Normalize the filter
@@ -292,7 +292,7 @@ public class NormalizationInterceptor ex
if ( filter == null )
{
LOG.warn( "undefined filter based on undefined attributeType not evaluted at all. Returning empty enumeration." );
- return new BaseEntryFilteringCursor( new EmptyCursor<Entry>(), searchContext, schemaManager );
+ return new EntryFilteringCursorImpl( new EmptyCursor<Entry>(), searchContext, schemaManager );
}
// We now have to remove the (ObjectClass=*) filter if it's present, and to add the scope filter
Modified: directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=1582268&r1=1582267&r2=1582268&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Thu Mar 27 11:51:19 2014
@@ -80,7 +80,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.api.InterceptorEnum;
import org.apache.directory.server.core.api.entry.ClonedServerEntry;
import org.apache.directory.server.core.api.entry.ServerEntryUtils;
-import org.apache.directory.server.core.api.filtering.BaseEntryFilteringCursor;
+import org.apache.directory.server.core.api.filtering.EntryFilteringCursorImpl;
import org.apache.directory.server.core.api.filtering.EntryFilter;
import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.api.interceptor.BaseInterceptor;
@@ -1301,7 +1301,7 @@ public class SchemaInterceptor extends B
}
else
{
- return new BaseEntryFilteringCursor( new EmptyCursor<Entry>(), searchContext, schemaManager );
+ return new EntryFilteringCursorImpl( new EmptyCursor<Entry>(), searchContext, schemaManager );
}
AttributeType nodeAt = node.getAttributeType();
@@ -1315,12 +1315,12 @@ public class SchemaInterceptor extends B
Entry serverEntry = SchemaService.getSubschemaEntry( directoryService,
searchContext );
serverEntry.setDn( base );
- return new BaseEntryFilteringCursor( new SingletonCursor<Entry>( serverEntry ), searchContext,
+ return new EntryFilteringCursorImpl( new SingletonCursor<Entry>( serverEntry ), searchContext,
schemaManager );
}
else
{
- return new BaseEntryFilteringCursor( new EmptyCursor<Entry>(), searchContext, schemaManager );
+ return new EntryFilteringCursorImpl( new EmptyCursor<Entry>(), searchContext, schemaManager );
}
}
else if ( filter instanceof ObjectClassNode )
@@ -1329,14 +1329,14 @@ public class SchemaInterceptor extends B
Entry serverEntry = SchemaService.getSubschemaEntry( directoryService,
searchContext );
serverEntry.setDn( base );
- EntryFilteringCursor cursor = new BaseEntryFilteringCursor(
+ EntryFilteringCursor cursor = new EntryFilteringCursorImpl(
new SingletonCursor<Entry>( serverEntry ), searchContext, schemaManager );
return cursor;
}
}
// In any case not handled previously, just return an empty result
- return new BaseEntryFilteringCursor( new EmptyCursor<Entry>(), searchContext, schemaManager );
+ return new EntryFilteringCursorImpl( new EmptyCursor<Entry>(), searchContext, schemaManager );
}
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java?rev=1582268&r1=1582267&r2=1582268&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java Thu Mar 27 11:51:19 2014
@@ -67,7 +67,7 @@ import org.apache.directory.api.util.exc
import org.apache.directory.server.constants.ApacheSchemaConstants;
import org.apache.directory.server.core.api.DnFactory;
import org.apache.directory.server.core.api.entry.ClonedServerEntry;
-import org.apache.directory.server.core.api.filtering.BaseEntryFilteringCursor;
+import org.apache.directory.server.core.api.filtering.EntryFilteringCursorImpl;
import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext;
@@ -1119,7 +1119,7 @@ public abstract class AbstractBTreeParti
Cursor<Entry> result = new EntryCursorAdaptor( this, searchResult );
- return new BaseEntryFilteringCursor( result, searchContext, schemaManager );
+ return new EntryFilteringCursorImpl( result, searchContext, schemaManager );
}
catch ( LdapException le )
{
Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AbstractCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AbstractCursorTest.java?rev=1582268&r1=1582267&r2=1582268&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AbstractCursorTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AbstractCursorTest.java Thu Mar 27 11:51:19 2014
@@ -31,7 +31,7 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.api.ldap.model.schema.SchemaManager;
import org.apache.directory.server.core.api.CoreSession;
import org.apache.directory.server.core.api.DirectoryService;
-import org.apache.directory.server.core.api.filtering.BaseEntryFilteringCursor;
+import org.apache.directory.server.core.api.filtering.EntryFilteringCursorImpl;
import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext;
import org.apache.directory.server.core.partition.impl.btree.AbstractBTreePartition;
import org.apache.directory.server.core.partition.impl.btree.EntryCursorAdaptor;
@@ -111,7 +111,7 @@ public class AbstractCursorTest
SearchOperationContext operationContext =
new SearchOperationContext( session, Dn.ROOT_DSE, SearchScope.ONELEVEL, null, "*", "EntryUUID" );
- return new BaseEntryFilteringCursor( new EntryCursorAdaptor( ( AbstractBTreePartition ) store, searchResult ),
+ return new EntryFilteringCursorImpl( new EntryCursorAdaptor( ( AbstractBTreePartition ) store, searchResult ),
operationContext, directoryService.getSchemaManager() );
}
}