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/01/24 15:11:01 UTC
svn commit: r1235258 [3/8] - in /directory/apacheds/trunk:
core-annotations/src/main/java/org/apache/directory/server/core/annotations/
core-annotations/src/main/java/org/apache/directory/server/core/factory/
core-annotations/src/test/java/org/apache/d...
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/entry/ServerSearchResult.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/entry/ServerSearchResult.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/entry/ServerSearchResult.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/entry/ServerSearchResult.java Tue Jan 24 14:10:56 2012
@@ -20,10 +20,10 @@
package org.apache.directory.server.core.api.entry;
-
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.name.Dn;
+
/**
* Creates a wrapper around a SearchResult object so that we can use the Dn
* instead of parser it over and over
@@ -34,16 +34,16 @@ public class ServerSearchResult
{
/** Distinguished name for this result */
private Dn dn;
-
+
/** The associated entry */
private Entry serverEntry;
-
+
/** Tells if the name is relative to the target context */
private boolean isRelative;
-
+
/** The bound object */
private Object object;
-
+
/**
*
@@ -84,8 +84,8 @@ public class ServerSearchResult
{
return dn;
}
-
-
+
+
/**
* @return The entry
*/
@@ -95,42 +95,42 @@ public class ServerSearchResult
}
- public boolean isRelative()
+ public boolean isRelative()
{
return isRelative;
}
- public void setRelative( boolean isRelative )
+ public void setRelative( boolean isRelative )
{
this.isRelative = isRelative;
}
- public void setServerEntry( Entry serverEntry )
+ public void setServerEntry( Entry serverEntry )
{
this.serverEntry = serverEntry;
}
- public Object getObject()
+ public Object getObject()
{
return object;
}
- public void setObject( Object object )
+ public void setObject( Object object )
{
this.object = object;
}
-
-
+
+
/**
* @see Object#toString()
*/
public String toString()
{
- String name = (dn == null ? "null" : ( dn == Dn.EMPTY_DN ? "\"\"" : dn.getName() ) );
+ String name = ( dn == null ? "null" : ( dn == Dn.EMPTY_DN ? "\"\"" : dn.getName() ) );
return "ServerSearchResult : " + name + "\n" + serverEntry;
}
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/entry/TestServerEntryUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/entry/TestServerEntryUtils.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/entry/TestServerEntryUtils.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/entry/TestServerEntryUtils.java Tue Jan 24 14:10:56 2012
@@ -18,6 +18,8 @@
*
*/
package org.apache.directory.server.core.api.entry;
+
+
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.model.entry.BinaryValue;
import org.apache.directory.shared.ldap.model.entry.StringValue;
@@ -33,6 +35,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.schema.normalizers.DeepTrimToLowerNormalizer;
import org.apache.directory.shared.util.Strings;
+
/**
* Some common declaration used by the serverEntry tests.
*
@@ -47,18 +50,21 @@ public class TestServerEntryUtils
{
private static final long serialVersionUID = 0L;
+
protected AT( String oid )
{
super( oid );
}
}
+
public static MatchingRule matchingRuleFactory( String oid )
{
MatchingRule matchingRule = new MatchingRule( oid );
-
+
return matchingRule;
}
+
/**
* A local MatchingRule class for tests
*/
@@ -77,22 +83,25 @@ public class TestServerEntryUtils
public static LdapSyntax syntaxFactory( String oid, boolean humanReadable )
{
LdapSyntax ldapSyntax = new LdapSyntax( oid );
-
+
ldapSyntax.setHumanReadable( humanReadable );
-
+
return ldapSyntax;
}
+
static class S extends LdapSyntax
{
private static final long serialVersionUID = 0L;
+
public S( String oid, boolean humanReadible )
{
super( oid, "", humanReadible );
}
}
- /* no protection*/
+
+ /* no protection*/
//This will suppress PMD.AvoidUsingHardCodedIP warnings in this class
@SuppressWarnings("PMD.AvoidUsingHardCodedIP")
static AttributeType getCaseIgnoringAttributeNoNumbersType()
@@ -110,8 +119,8 @@ public class TestServerEntryUtils
}
String strval = ( String ) value;
-
- for ( char c:strval.toCharArray() )
+
+ for ( char c : strval.toCharArray() )
{
if ( Character.isDigit( c ) )
{
@@ -121,39 +130,39 @@ public class TestServerEntryUtils
return true;
}
} );
-
+
MatchingRule matchingRule = new MatchingRule( "1.1.2.1" );
matchingRule.setSyntax( syntax );
-
matchingRule.setLdapComparator( new LdapComparator<String>( matchingRule.getOid() )
{
public int compare( String o1, String o2 )
{
- return ( o1 == null ?
+ return ( o1 == null ?
( o2 == null ? 0 : -1 ) :
( o2 == null ? 1 : o1.compareTo( o2 ) ) );
}
+
int getValue( String val )
{
- if ( val.equals( "LOW" ) )
+ if ( val.equals( "LOW" ) )
{
return 0;
}
- else if ( val.equals( "MEDIUM" ) )
+ else if ( val.equals( "MEDIUM" ) )
{
return 1;
}
- else if ( val.equals( "HIGH" ) )
+ else if ( val.equals( "HIGH" ) )
{
return 2;
}
-
+
throw new IllegalArgumentException( I18n.err( I18n.ERR_472 ) );
}
} );
-
+
Normalizer normalizer = new Normalizer( "1.1.1" )
{
public Value<?> normalize( Value<?> value ) throws LdapException
@@ -165,24 +174,24 @@ public class TestServerEntryUtils
throw new IllegalStateException( I18n.err( I18n.ERR_473 ) );
}
-
-
+
+
public String normalize( String value ) throws LdapException
{
return Strings.toLowerCase( value );
}
};
-
+
matchingRule.setNormalizer( normalizer );
-
+
attributeType.setEquality( matchingRule );
attributeType.setSyntax( syntax );
-
+
return attributeType;
}
- /* no protection*/ static AttributeType getIA5StringAttributeType()
+ /* no protection*/static AttributeType getIA5StringAttributeType()
{
AttributeType attributeType = new AttributeType( "1.1" );
attributeType.addName( "1.1" );
@@ -192,34 +201,33 @@ public class TestServerEntryUtils
{
public boolean isValidSyntax( Object value )
{
- return ((String)value == null) || (((String)value).length() < 7) ;
+ return ( ( String ) value == null ) || ( ( ( String ) value ).length() < 7 );
}
} );
-
+
MatchingRule matchingRule = new MatchingRule( "1.1.2" );
matchingRule.setSyntax( syntax );
-
matchingRule.setLdapComparator( new LdapComparator<String>( matchingRule.getOid() )
{
public int compare( String o1, String o2 )
{
- return ( ( o1 == null ) ?
+ return ( ( o1 == null ) ?
( o2 == null ? 0 : -1 ) :
( o2 == null ? 1 : o1.compareTo( o2 ) ) );
}
} );
-
+
matchingRule.setNormalizer( new DeepTrimToLowerNormalizer( matchingRule.getOid() ) );
-
+
attributeType.setEquality( matchingRule );
attributeType.setSyntax( syntax );
-
+
return attributeType;
}
- /* No protection */ static AttributeType getBytesAttributeType()
+ /* No protection */static AttributeType getBytesAttributeType()
{
AttributeType attributeType = new AttributeType( "1.2" );
LdapSyntax syntax = new LdapSyntax( "1.2.1", "", true );
@@ -228,7 +236,7 @@ public class TestServerEntryUtils
{
public boolean isValidSyntax( Object value )
{
- return ( value == null ) || ( ((byte[])value).length < 5 );
+ return ( value == null ) || ( ( ( byte[] ) value ).length < 5 );
}
} );
@@ -236,7 +244,7 @@ public class TestServerEntryUtils
matchingRule.setSyntax( syntax );
matchingRule.setLdapComparator( new ByteArrayComparator( "1.2.2" ) );
-
+
matchingRule.setNormalizer( new Normalizer( "1.1.1" )
{
public Value<?> normalize( Value<?> value ) throws LdapException
@@ -244,29 +252,30 @@ public class TestServerEntryUtils
if ( !value.isHumanReadable() )
{
byte[] val = value.getBytes();
-
+
// each byte will be changed to be > 0, and spaces will be trimmed
- byte[] newVal = new byte[ val.length ];
-
+ byte[] newVal = new byte[val.length];
+
int i = 0;
-
- for ( byte b:val )
+
+ for ( byte b : val )
{
- newVal[i++] = (byte)(b & 0x007F);
+ newVal[i++] = ( byte ) ( b & 0x007F );
}
-
- return new BinaryValue( Strings.trim(newVal) );
+
+ return new BinaryValue( Strings.trim( newVal ) );
}
throw new IllegalStateException( I18n.err( I18n.ERR_474 ) );
}
+
public String normalize( String value ) throws LdapException
{
throw new IllegalStateException( I18n.err( I18n.ERR_474 ) );
}
} );
-
+
attributeType.setEquality( matchingRule );
attributeType.setSyntax( syntax );
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/event/DirectoryListener.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/event/DirectoryListener.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/event/DirectoryListener.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/event/DirectoryListener.java Tue Jan 24 14:10:56 2012
@@ -40,41 +40,41 @@ public interface DirectoryListener
*
* @param addContext the add operation context responsible for the change
*/
- void entryAdded( AddOperationContext addContext );
-
-
+ void entryAdded( AddOperationContext addContext );
+
+
/**
* Called when an entry has been deleted.
*
* @param deleteContext the delete operation context responsible for the change
*/
void entryDeleted( DeleteOperationContext deleteContext );
-
-
+
+
/**
* Called when an entry has been modified.
*
* @param modifyContext the modify operation context responsible for the change
*/
void entryModified( ModifyOperationContext modifyContext );
-
-
+
+
/**
* Called when an entry has been renamed.
*
* @param renameContext the rename operation context responsible for the change
*/
void entryRenamed( RenameOperationContext renameContext );
-
-
+
+
/**
* Called when an entry is moved.
*
* @param moveContext the move operation context responsible for the change
*/
void entryMoved( MoveOperationContext moveContext );
-
-
+
+
/**
* Called when an entry is moved and renamed at the same time.
*
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/event/EventService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/event/EventService.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/event/EventService.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/event/EventService.java Tue Jan 24 14:10:56 2012
@@ -23,8 +23,6 @@ package org.apache.directory.server.core
import java.util.List;
-
-
/**
* Interface used by the DirectoryService to manage subscriptions for DIT
* change notifications.
@@ -42,8 +40,8 @@ public interface EventService
* @throws Exception
*/
void addListener( DirectoryListener listener, NotificationCriteria criteria ) throws Exception;
-
-
+
+
/**
* Removes the listener from this EventService preventing all events
* registered from being delivered to it.
@@ -51,8 +49,8 @@ public interface EventService
* @param listener the DirectoryListener to stop delivering notifications to
*/
void removeListener( DirectoryListener listener );
-
-
+
+
/**
* Lists the listeners registered with this EventService.
*/
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/event/EventType.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/event/EventType.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/event/EventType.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/event/EventType.java Tue Jan 24 14:10:56 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.server.core.api.event;
+
import java.util.ArrayList;
import org.apache.directory.shared.ldap.codec.controls.search.persistentSearch.PersistentSearchDecorator;
@@ -34,32 +35,32 @@ import org.apache.directory.shared.ldap.
*/
public enum EventType
{
- ADD(1),
- DELETE(2),
- MODIFY(4),
- RENAME(8),
- MOVE(16);
-
+ ADD(1),
+ DELETE(2),
+ MODIFY(4),
+ RENAME(8),
+ MOVE(16);
+
public static final int ALL_EVENT_TYPES_MASK = getAllEventTypesMask();
public static final int MOVE_AND_RENAME_MASK = MOVE.mask | RENAME.mask;
private static final EventType[] EMPTY_EVENT_ARRAY = new EventType[0];
-
+
// The internal value
private int mask;
-
-
+
+
private EventType( int mask )
{
this.mask = mask;
}
-
-
+
+
public int getMask()
{
return mask;
}
-
+
/**
* Gets an array of EventTypes from the PSearchControl changeTypes
* parameter value. According to the documentation of the changeTypes
@@ -81,45 +82,45 @@ public enum EventType
public static EventType[] getEventTypes( int psearchChangeTypes )
{
ArrayList<EventType> types = new ArrayList<EventType>();
-
+
if ( isAdd( psearchChangeTypes ) )
{
types.add( ADD );
}
-
+
if ( isDelete( psearchChangeTypes ) )
{
types.add( DELETE );
}
-
+
if ( isModify( psearchChangeTypes ) )
{
types.add( MODIFY );
}
-
+
if ( ( psearchChangeTypes & 8 ) > 0 )
{
types.add( MOVE );
types.add( RENAME );
}
-
+
return types.toArray( EMPTY_EVENT_ARRAY );
}
-
-
+
+
private static int getAllEventTypesMask()
{
int allTypes = 0;
-
+
for ( EventType type : values() )
{
allTypes |= type.getMask();
}
-
+
return allTypes;
}
-
-
+
+
/**
* Tells if the EventType is an ADD
*/
@@ -127,8 +128,8 @@ public enum EventType
{
return ( ( mask & ADD.mask ) != 0 );
}
-
-
+
+
/**
* Tells if the EventType is a DELETE
*/
@@ -136,8 +137,8 @@ public enum EventType
{
return ( ( mask & DELETE.mask ) != 0 );
}
-
-
+
+
/**
* Tells if the EventType is a MODIFY
*/
@@ -145,8 +146,8 @@ public enum EventType
{
return ( ( mask & MODIFY.mask ) != 0 );
}
-
-
+
+
/**
* Tells if the EventType is a MOVE
*/
@@ -154,8 +155,8 @@ public enum EventType
{
return ( ( mask & MOVE.mask ) != 0 );
}
-
-
+
+
/**
* Tells if the EventType is a RENAME
*/
@@ -163,17 +164,17 @@ public enum EventType
{
return ( ( mask & RENAME.mask ) != 0 );
}
-
-
+
+
/**
* Tells if the EventType is a MOVE and RENAME
*/
public static boolean isMoveAndRename( int mask )
{
- return ( ( mask & MOVE_AND_RENAME_MASK) != 0 );
+ return ( ( mask & MOVE_AND_RENAME_MASK ) != 0 );
}
-
-
+
+
/**
* Compute the mask associated with the given eventTypes
*
@@ -183,16 +184,16 @@ public enum EventType
public static int getMask( EventType... eventTypes )
{
int mask = 0;
-
+
for ( EventType type : eventTypes )
{
mask |= type.getMask();
}
-
+
return mask;
}
-
-
+
+
/**
* checks if the given mask value matches with any of the defined
* standard EventTypes
@@ -204,21 +205,27 @@ public enum EventType
{
switch ( mask )
{
- case 1: return ADD;
-
- case 2: return DELETE;
-
- case 4: return MODIFY;
-
- case 8: return RENAME;
-
- case 16: return MOVE;
-
- default: throw new IllegalArgumentException( "unknown mask value " + mask );
+ case 1:
+ return ADD;
+
+ case 2:
+ return DELETE;
+
+ case 4:
+ return MODIFY;
+
+ case 8:
+ return RENAME;
+
+ case 16:
+ return MOVE;
+
+ default:
+ throw new IllegalArgumentException( "unknown mask value " + mask );
}
}
-
-
+
+
/**
* Print the flags
*
@@ -229,23 +236,32 @@ public enum EventType
{
switch ( mask )
{
- case 0 : return "no event";
-
- case 1: return "ADD";
-
- case 2: return "DELETE";
-
- case 4: return "MODIFY";
-
- case 8: return "RENAME";
-
- case 16: return "MOVE";
-
- case 24 : return "MOVE_AND_RENAME";
-
- case 31 : return "ALL EVENTS";
-
- default : return "Unknown";
+ case 0:
+ return "no event";
+
+ case 1:
+ return "ADD";
+
+ case 2:
+ return "DELETE";
+
+ case 4:
+ return "MODIFY";
+
+ case 8:
+ return "RENAME";
+
+ case 16:
+ return "MOVE";
+
+ case 24:
+ return "MOVE_AND_RENAME";
+
+ case 31:
+ return "ALL EVENTS";
+
+ default:
+ return "Unknown";
}
}
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/event/ExpressionEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/event/ExpressionEvaluator.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/event/ExpressionEvaluator.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/event/ExpressionEvaluator.java Tue Jan 24 14:10:56 2012
@@ -34,7 +34,6 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.schema.SchemaManager;
-
/**
* Top level filter expression evaluator implementation.
*
@@ -71,7 +70,7 @@ public class ExpressionEvaluator impleme
{
SubstringEvaluator substringEvaluator = null;
substringEvaluator = new SubstringEvaluator();
-// leafEvaluator = new LeafEvaluator( schemaManager, substringEvaluator );
+ // leafEvaluator = new LeafEvaluator( schemaManager, substringEvaluator );
leafEvaluator = new LeafEvaluator( substringEvaluator );
}
@@ -104,7 +103,7 @@ public class ExpressionEvaluator impleme
if ( bnode instanceof OrNode )
{
- for ( ExprNode child: bnode.getChildren() )
+ for ( ExprNode child : bnode.getChildren() )
{
if ( evaluate( child, dn, entry ) )
{
@@ -114,12 +113,12 @@ public class ExpressionEvaluator impleme
return false;
}
- else if ( bnode instanceof AndNode)
+ else if ( bnode instanceof AndNode )
{
- for ( ExprNode child: bnode.getChildren() )
+ for ( ExprNode child : bnode.getChildren() )
{
boolean res = evaluate( child, dn, entry );
-
+
if ( !res )
{
return false;
@@ -128,7 +127,7 @@ public class ExpressionEvaluator impleme
return true;
}
- else if ( bnode instanceof NotNode)
+ else if ( bnode instanceof NotNode )
{
if ( null != bnode.getFirstChild() )
{
@@ -139,7 +138,7 @@ public class ExpressionEvaluator impleme
}
else
{
- throw new LdapInvalidSearchFilterException( I18n.err( I18n.ERR_244, bnode ) );
+ throw new LdapInvalidSearchFilterException( I18n.err( I18n.ERR_244, bnode ) );
}
}
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/event/LeafEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/event/LeafEvaluator.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/event/LeafEvaluator.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/event/LeafEvaluator.java Tue Jan 24 14:10:56 2012
@@ -56,19 +56,19 @@ public class LeafEvaluator implements Ev
{
/** equality matching type constant */
private static final int EQUALITY_MATCH = 0;
-
+
/** ordering matching type constant */
private static final int ORDERING_MATCH = 1;
-
+
/** substring matching type constant */
private static final int SUBSTRING_MATCH = 3;
-// /** SchemaManager needed for normalizing and comparing values */
-// private SchemaManager schemaManager;
-
+ // /** SchemaManager needed for normalizing and comparing values */
+ // private SchemaManager schemaManager;
+
/** Substring node evaluator we depend on */
private SubstringEvaluator substringEvaluator;
-
+
/** ScopeNode evaluator we depend on */
private ScopeEvaluator scopeEvaluator;
@@ -89,19 +89,18 @@ public class LeafEvaluator implements Ev
}
-// /**
-// * Creates a leaf expression node evaluator.
-// *
-// * @param schemaManager The server schemaManager
-// */
-// public LeafEvaluator( SchemaManager schemaManager,
-// SubstringEvaluator substringEvaluator )
-// {
-// this.schemaManager = schemaManager;
-// this.scopeEvaluator = new ScopeEvaluator();
-// this.substringEvaluator = substringEvaluator;
-// }
-
+ // /**
+ // * Creates a leaf expression node evaluator.
+ // *
+ // * @param schemaManager The server schemaManager
+ // */
+ // public LeafEvaluator( SchemaManager schemaManager,
+ // SubstringEvaluator substringEvaluator )
+ // {
+ // this.schemaManager = schemaManager;
+ // this.scopeEvaluator = new ScopeEvaluator();
+ // this.substringEvaluator = substringEvaluator;
+ // }
public ScopeEvaluator getScopeEvaluator()
{
@@ -137,7 +136,7 @@ public class LeafEvaluator implements Ev
{
return evalGreaterOrLesser( ( GreaterEqNode<?> ) node, entry, COMPARE_GREATER );
}
- else if ( node instanceof LessEqNode)
+ else if ( node instanceof LessEqNode )
{
return evalGreaterOrLesser( ( LessEqNode<?> ) node, entry, COMPARE_LESSER );
}
@@ -272,7 +271,7 @@ public class LeafEvaluator implements Ev
// check if Ava value exists in attribute
AttributeType attributeType = node.getAttributeType();
Value<?> value = null;
-
+
if ( attributeType.getSyntax().isHumanReadable() )
{
if ( node.getValue().isHumanReadable() )
@@ -288,7 +287,7 @@ public class LeafEvaluator implements Ev
{
value = node.getValue();
}
-
+
if ( attr.contains( value ) )
{
return true;
@@ -333,7 +332,7 @@ public class LeafEvaluator implements Ev
private LdapComparator<? super Object> getComparator( AttributeType attributeType ) throws LdapException
{
MatchingRule mrule = getMatchingRule( attributeType, EQUALITY_MATCH );
-
+
return mrule.getLdapComparator();
}
@@ -348,7 +347,7 @@ public class LeafEvaluator implements Ev
private Normalizer getNormalizer( AttributeType attributeType ) throws LdapException
{
MatchingRule mrule = getMatchingRule( attributeType, EQUALITY_MATCH );
-
+
return mrule.getNormalizer();
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/event/NotificationCriteria.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/event/NotificationCriteria.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/event/NotificationCriteria.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/event/NotificationCriteria.java Tue Jan 24 14:10:56 2012
@@ -40,28 +40,28 @@ public class NotificationCriteria
{
/** The scope to use (default to ONE_LEVEL) */
private SearchScope scope = SearchScope.ONELEVEL;
-
+
/** The AliasderefMode to use (default to DEREF_ALWAYS) */
private AliasDerefMode aliasDerefMode = AliasDerefMode.DEREF_ALWAYS;
-
+
/** The Base DN to search from (default to null) */
private Dn base = null;
-
+
/** The filter to use (default to '(ObjectClass=*)') */
private ExprNode filter = new PresenceNode( SchemaConstants.OBJECT_CLASS_AT );
-
+
/** The event mask to use (default to everything) */
private int eventMask = EventType.ALL_EVENT_TYPES_MASK;
-
-
+
+
/**
* Create a new instance of a NotiticationCriteria
*/
public NotificationCriteria()
{
}
-
-
+
+
/**
* Create a new instance of a NotiticationCriteria initialized with a search request
*/
@@ -72,8 +72,8 @@ public class NotificationCriteria
this.base = req.getBase();
this.filter = req.getFilter();
}
-
-
+
+
/**
* @param scope the scope to set
*/
@@ -81,8 +81,8 @@ public class NotificationCriteria
{
this.scope = scope;
}
-
-
+
+
/**
* @return the scope
*/
@@ -142,7 +142,7 @@ public class NotificationCriteria
*/
public void setFilter( String filter ) throws Exception
{
- this.filter = FilterParser.parse(filter);
+ this.filter = FilterParser.parse( filter );
}
@@ -167,7 +167,7 @@ public class NotificationCriteria
/**
* @param eventTypes the eventTypes to set
*/
- public void setEventMask( EventType ...eventTypes )
+ public void setEventMask( EventType... eventTypes )
{
this.eventMask = EventType.getMask( eventTypes );
}
@@ -180,22 +180,22 @@ public class NotificationCriteria
{
return eventMask;
}
-
-
+
+
/**
* {@inheritDoc}
*/
public String toString()
{
StringBuilder sb = new StringBuilder();
-
+
sb.append( "Notification criteria : " );
sb.append( '\'' ).append( base ).append( "', " );
sb.append( '\'' ).append( filter ).append( "', " );
sb.append( '\'' ).append( scope ).append( "', " );
sb.append( '\'' ).append( aliasDerefMode ).append( "', " );
sb.append( '\'' ).append( EventType.toString( eventMask ) ).append( '\'' );
-
+
return sb.toString();
}
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/event/RegistrationEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/event/RegistrationEntry.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/event/RegistrationEntry.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/event/RegistrationEntry.java Tue Jan 24 14:10:56 2012
@@ -29,11 +29,11 @@ public class RegistrationEntry
{
/** The associated listener */
private final DirectoryListener listener;
-
+
/** The notification criteria */
private final NotificationCriteria criteria;
-
+
/**
* Creates a new instance of RegistrationEntry associated with a listener
* @param listener The associated listener
@@ -43,7 +43,7 @@ public class RegistrationEntry
this( listener, new NotificationCriteria() );
}
-
+
/**
* Creates a new instance of RegistrationEntry associated with a listener
* and a notification criteria
@@ -73,22 +73,22 @@ public class RegistrationEntry
{
return listener;
}
-
-
+
+
/**
* {@inheritDoc}
*/
public String toString()
{
StringBuilder sb = new StringBuilder();
-
+
sb.append( listener ).append( '/' );
-
+
if ( criteria != null )
{
sb.append( criteria.toString() );
}
-
+
return sb.toString();
}
}
\ No newline at end of file
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/event/ScopeEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/event/ScopeEvaluator.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/event/ScopeEvaluator.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/event/ScopeEvaluator.java Tue Jan 24 14:10:56 2012
@@ -53,16 +53,16 @@ public class ScopeEvaluator implements E
{
case OBJECT:
return dn.equals( snode.getBaseDn() );
-
+
case ONELEVEL:
if ( dn.isDescendantOf( snode.getBaseDn() ) )
{
return ( snode.getBaseDn().size() + 1 ) == dn.size();
}
-
+
case SUBTREE:
return dn.isDescendantOf( snode.getBaseDn() );
-
+
default:
throw new LdapInvalidSearchFilterException( I18n.err( I18n.ERR_247 ) );
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/event/SubstringEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/event/SubstringEvaluator.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/event/SubstringEvaluator.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/event/SubstringEvaluator.java Tue Jan 24 14:10:56 2012
@@ -59,17 +59,16 @@ public class SubstringEvaluator implemen
public boolean evaluate( ExprNode node, Dn dn, Entry entry ) throws LdapException
{
Pattern regex = null;
- SubstringNode snode = (SubstringNode)node;
+ SubstringNode snode = ( SubstringNode ) node;
AttributeType attributeType = snode.getAttributeType();
MatchingRule matchingRule = attributeType.getSubstring();
-
+
if ( matchingRule == null )
{
matchingRule = attributeType.getEquality();
}
-
+
Normalizer normalizer = matchingRule.getNormalizer();
-
// get the attribute
Attribute attr = entry.get( snode.getAttribute() );
@@ -99,7 +98,7 @@ public class SubstringEvaluator implemen
* substring matching rule.
*/
- for ( Value<?> value: attr )
+ for ( Value<?> value : attr )
{
String normValue = normalizer.normalize( value.getString() );
Modified: 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/BaseEntryFilteringCursor.java?rev=1235258&r1=1235257&r2=1235258&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/BaseEntryFilteringCursor.java Tue Jan 24 14:10:56 2012
@@ -58,22 +58,21 @@ public class BaseEntryFilteringCursor im
/** the underlying wrapped search results Cursor */
private final Cursor<Entry> wrapped;
-
+
/** the parameters associated with the search operation */
private final SearchingOperationContext operationContext;
-
+
/** the list of filters to be applied */
private final List<EntryFilter> filters;
-
+
/** the first accepted search result that is pre fetched */
private Entry prefetched;
-
+
// ------------------------------------------------------------------------
// C O N S T R U C T O R S
// ------------------------------------------------------------------------
-
/**
* Creates a new entry filtering Cursor over an existing Cursor using a
* single filter initially: more can be added later after creation.
@@ -83,13 +82,13 @@ public class BaseEntryFilteringCursor im
* @param invocation the search operation invocation creating this Cursor
* @param filter a single filter to be used
*/
- public BaseEntryFilteringCursor( Cursor<Entry> wrapped,
+ public BaseEntryFilteringCursor( Cursor<Entry> wrapped,
SearchingOperationContext operationContext, EntryFilter filter )
{
this( wrapped, operationContext, Collections.singletonList( filter ) );
}
-
+
/**
* Creates a new entry filtering Cursor over an existing Cursor using a
* no filter initially: more can be added later after creation.
@@ -106,7 +105,7 @@ public class BaseEntryFilteringCursor im
this.filters = new ArrayList<EntryFilter>();
}
-
+
/**
* Creates a new entry filtering Cursor over an existing Cursor using a
* list of filters initially: more can be added later after creation.
@@ -116,7 +115,7 @@ public class BaseEntryFilteringCursor im
* @param invocation the search operation invocation creating this Cursor
* @param filters a list of filters to be used
*/
- public BaseEntryFilteringCursor( Cursor<Entry> wrapped,
+ public BaseEntryFilteringCursor( Cursor<Entry> wrapped,
SearchingOperationContext operationContext, List<EntryFilter> filters )
{
this.wrapped = wrapped;
@@ -124,13 +123,12 @@ public class BaseEntryFilteringCursor im
this.filters = new ArrayList<EntryFilter>();
this.filters.addAll( filters );
}
-
-
+
+
// ------------------------------------------------------------------------
// Class Specific Methods
// ------------------------------------------------------------------------
-
/* (non-Javadoc)
* @see org.apache.directory.server.core.filtering.EntryFilteringCursor#isAbandoned()
*/
@@ -138,22 +136,22 @@ public class BaseEntryFilteringCursor im
{
return getOperationContext().isAbandoned();
}
-
-
+
+
/* (non-Javadoc)
* @see org.apache.directory.server.core.filtering.EntryFilteringCursor#setAbandoned(boolean)
*/
public void setAbandoned( boolean abandoned )
{
getOperationContext().setAbandoned( abandoned );
-
+
if ( abandoned )
{
log.info( "Cursor has been abandoned." );
}
}
-
-
+
+
/* (non-Javadoc)
* @see org.apache.directory.server.core.filtering.EntryFilteringCursor#addEntryFilter(org.apache.directory.server.core.filtering.EntryFilter)
*/
@@ -161,8 +159,8 @@ public class BaseEntryFilteringCursor im
{
return filters.add( filter );
}
-
-
+
+
/* (non-Javadoc)
* @see org.apache.directory.server.core.filtering.EntryFilteringCursor#removeEntryFilter(org.apache.directory.server.core.filtering.EntryFilter)
*/
@@ -170,8 +168,8 @@ public class BaseEntryFilteringCursor im
{
return filters.remove( filter );
}
-
-
+
+
/* (non-Javadoc)
* @see org.apache.directory.server.core.filtering.EntryFilteringCursor#getEntryFilters()
*/
@@ -179,8 +177,8 @@ public class BaseEntryFilteringCursor im
{
return Collections.unmodifiableList( filters );
}
-
-
+
+
/* (non-Javadoc)
* @see org.apache.directory.server.core.filtering.EntryFilteringCursor#getOperationContext()
*/
@@ -189,12 +187,11 @@ public class BaseEntryFilteringCursor im
return operationContext;
}
-
+
// ------------------------------------------------------------------------
// Cursor Interface Methods
// ------------------------------------------------------------------------
-
/*
* @see Cursor#after(Object)
*/
@@ -281,8 +278,8 @@ public class BaseEntryFilteringCursor im
wrapped.close( reason );
prefetched = null;
}
-
-
+
+
public final void setClosureMonitor( ClosureMonitor monitor )
{
wrapped.setClosureMonitor( monitor );
@@ -303,7 +300,7 @@ public class BaseEntryFilteringCursor im
close();
throw new OperationAbandonedException();
}
-
+
beforeFirst();
return next();
}
@@ -321,7 +318,7 @@ public class BaseEntryFilteringCursor im
{
return prefetched;
}
-
+
throw new InvalidCursorPositionException();
}
@@ -356,22 +353,23 @@ public class BaseEntryFilteringCursor im
afterLast();
return previous();
}
-
-
+
+
private void filterContents( Entry entry ) throws Exception
{
boolean typesOnly = getOperationContext().isTypesOnly();
boolean returnAll = ( getOperationContext().getReturningAttributes() == null ||
- ( getOperationContext().isAllOperationalAttributes() && getOperationContext().isAllUserAttributes() ) ) && ( ! typesOnly );
-
+ ( getOperationContext().isAllOperationalAttributes() && getOperationContext().isAllUserAttributes() ) )
+ && ( !typesOnly );
+
if ( returnAll )
{
return;
}
- Entry originalEntry = ((ClonedServerEntry)entry).getOriginalEntry();
-
+ Entry originalEntry = ( ( ClonedServerEntry ) entry ).getOriginalEntry();
+
if ( getOperationContext().isNoAttributes() )
{
for ( Attribute attribute : originalEntry.getAttributes() )
@@ -379,53 +377,52 @@ public class BaseEntryFilteringCursor im
AttributeType attributeType = attribute.getAttributeType();
entry.remove( entry.get( attributeType ) );
}
-
+
return;
}
-
-
+
if ( getOperationContext().isAllUserAttributes() )
{
for ( Attribute attribute : originalEntry.getAttributes() )
{
AttributeType attributeType = attribute.getAttributeType();
boolean isNotRequested = true;
-
- for ( AttributeTypeOptions attrOptions:getOperationContext().getReturningAttributes() )
+
+ for ( AttributeTypeOptions attrOptions : getOperationContext().getReturningAttributes() )
{
- if ( attrOptions.getAttributeType().equals( attributeType ) ||
+ if ( attrOptions.getAttributeType().equals( attributeType ) ||
attrOptions.getAttributeType().isAncestorOf( attributeType ) )
{
isNotRequested = false;
break;
}
}
-
+
boolean isNotUserAttribute = attributeType.getUsage() != UsageEnum.USER_APPLICATIONS;
-
- if ( isNotRequested && isNotUserAttribute )
+
+ if ( isNotRequested && isNotUserAttribute )
{
entry.removeAttributes( attributeType );
}
- else if( typesOnly )
+ else if ( typesOnly )
{
entry.get( attributeType ).clear();
}
}
-
+
return;
}
-
+
if ( getOperationContext().isAllOperationalAttributes() )
{
for ( Attribute attribute : originalEntry.getAttributes() )
{
AttributeType attributeType = attribute.getAttributeType();
boolean isNotRequested = true;
-
- for ( AttributeTypeOptions attrOptions:getOperationContext().getReturningAttributes() )
+
+ for ( AttributeTypeOptions attrOptions : getOperationContext().getReturningAttributes() )
{
- if ( attrOptions.getAttributeType().equals( attributeType ) ||
+ if ( attrOptions.getAttributeType().equals( attributeType ) ||
attrOptions.getAttributeType().isAncestorOf( attributeType ) )
{
isNotRequested = false;
@@ -434,50 +431,50 @@ public class BaseEntryFilteringCursor im
}
boolean isUserAttribute = attributeType.getUsage() == UsageEnum.USER_APPLICATIONS;
-
+
if ( isNotRequested && isUserAttribute )
{
entry.removeAttributes( attributeType );
}
- else if( typesOnly )
+ else if ( typesOnly )
{
entry.get( attributeType ).clear();
}
}
-
+
return;
}
-
+
if ( getOperationContext().getReturningAttributes() != null )
{
for ( Attribute attribute : originalEntry.getAttributes() )
{
AttributeType attributeType = attribute.getAttributeType();
boolean isNotRequested = true;
-
- for ( AttributeTypeOptions attrOptions:getOperationContext().getReturningAttributes() )
+
+ for ( AttributeTypeOptions attrOptions : getOperationContext().getReturningAttributes() )
{
- if ( attrOptions.getAttributeType().equals( attributeType ) ||
+ if ( attrOptions.getAttributeType().equals( attributeType ) ||
attrOptions.getAttributeType().isAncestorOf( attributeType ) )
{
isNotRequested = false;
break;
}
}
-
+
if ( isNotRequested )
{
entry.removeAttributes( attributeType );
}
- else if( typesOnly )
+ else if ( typesOnly )
{
entry.get( attributeType ).clear();
}
}
}
}
-
-
+
+
/*
* @see Cursor#next()
*/
@@ -492,15 +489,15 @@ public class BaseEntryFilteringCursor im
close();
throw new OperationAbandonedException();
}
-
+
Entry tempResult = null;
-
+
outer: while ( wrapped.next() )
{
boolean accepted = true;
-
+
Entry tempEntry = wrapped.get();
-
+
if ( tempEntry instanceof ClonedServerEntry )
{
tempResult = tempEntry;
@@ -509,7 +506,7 @@ public class BaseEntryFilteringCursor im
{
tempResult = new ClonedServerEntrySearch( tempEntry );
}
-
+
/*
* O P T I M I Z A T I O N
* -----------------------
@@ -517,40 +514,40 @@ public class BaseEntryFilteringCursor im
* Don't want to waste cycles on enabling a loop for processing
* filters if we have zero or one filter.
*/
-
+
if ( filters.isEmpty() )
{
prefetched = tempResult;
filterContents( prefetched );
return true;
}
-
- if ( ( filters.size() == 1 ) && filters.get( 0 ).accept( getOperationContext(), tempResult ) )
+
+ if ( ( filters.size() == 1 ) && filters.get( 0 ).accept( getOperationContext(), tempResult ) )
{
prefetched = tempResult;
filterContents( prefetched );
return true;
}
-
+
/* E N D O P T I M I Z A T I O N */
for ( EntryFilter filter : filters )
{
// if a filter rejects then short and continue with outer loop
- if ( ! ( accepted &= filter.accept( getOperationContext(), tempResult ) ) )
+ if ( !( accepted &= filter.accept( getOperationContext(), tempResult ) ) )
{
continue outer;
}
}
-
+
/*
* Here the entry has been accepted by all filters.
*/
prefetched = tempResult;
filterContents( prefetched );
-
+
return true;
}
-
+
prefetched = null;
return false;
}
@@ -570,14 +567,14 @@ public class BaseEntryFilteringCursor im
close();
throw new OperationAbandonedException();
}
-
+
Entry tempResult = null;
-
+
outer: while ( wrapped.previous() )
{
boolean accepted = true;
tempResult = new ClonedServerEntrySearch( wrapped.get() );
-
+
/*
* O P T I M I Z A T I O N
* -----------------------
@@ -585,32 +582,32 @@ public class BaseEntryFilteringCursor im
* Don't want to waste cycles on enabling a loop for processing
* filters if we have zero or one filter.
*/
-
+
if ( filters.isEmpty() )
{
prefetched = tempResult;
filterContents( prefetched );
return true;
}
-
+
if ( ( filters.size() == 1 ) && filters.get( 0 ).accept( getOperationContext(), tempResult ) )
{
prefetched = tempResult;
filterContents( prefetched );
return true;
}
-
+
/* E N D O P T I M I Z A T I O N */
-
+
for ( EntryFilter filter : filters )
{
// if a filter rejects then short and continue with outer loop
- if ( ! ( accepted &= filter.accept( getOperationContext(), tempResult ) ) )
+ if ( !( accepted &= filter.accept( getOperationContext(), tempResult ) ) )
{
continue outer;
}
}
-
+
/*
* Here the entry has been accepted by all filters.
*/
@@ -618,9 +615,9 @@ public class BaseEntryFilteringCursor im
filterContents( prefetched );
return true;
}
-
+
prefetched = null;
-
+
return false;
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/CursorList.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/CursorList.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/CursorList.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/CursorList.java Tue Jan 24 14:10:56 2012
@@ -375,7 +375,7 @@ public class CursorList implements Entry
{
return list.get( index ).get();
}
-
+
throw new InvalidCursorPositionException();
}
@@ -436,7 +436,7 @@ public class CursorList implements Entry
public void close( Exception reason ) throws Exception
{
closed = true;
-
+
for ( Cursor<?> c : list )
{
try
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/BaseInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/BaseInterceptor.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/BaseInterceptor.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/BaseInterceptor.java Tue Jan 24 14:10:56 2012
@@ -116,7 +116,6 @@ public abstract class BaseInterceptor im
/** A starage for the uniqueMember attributeType */
protected static AttributeType UNIQUE_MEMBER_AT;
-
/**
* The final interceptor which acts as a proxy in charge to dialog with the nexus partition.
*/
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/AbstractChangeOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/AbstractChangeOperationContext.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/AbstractChangeOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/AbstractChangeOperationContext.java Tue Jan 24 14:10:56 2012
@@ -36,14 +36,14 @@ public abstract class AbstractChangeOper
{
/** The ChangeLog event */
private ChangeLogEvent changeLogEvent;
-
+
/** The flag used to tell the server to store the changes into the changeLog */
protected LogChange logChange;
-
+
/** The modified Entry as it will be stored into the backend */
protected Entry modifiedEntry;
-
+
/**
*
* Creates a new instance of AbstractChangeOperationContext.
@@ -55,7 +55,7 @@ public abstract class AbstractChangeOper
super( session );
}
-
+
/**
*
* Creates a new instance of AbstractChangeOperationContext.
@@ -67,7 +67,7 @@ public abstract class AbstractChangeOper
super( session, dn );
}
-
+
/**
* @return the modifiedEntry
*/
@@ -93,14 +93,14 @@ public abstract class AbstractChangeOper
{
return changeLogEvent;
}
-
-
+
+
public void setChangeLogEvent( ChangeLogEvent changeLogEvent )
{
this.changeLogEvent = changeLogEvent;
}
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -108,8 +108,8 @@ public abstract class AbstractChangeOper
{
this.logChange = logChange;
}
-
-
+
+
/**
* {@inheritDoc}
*/
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/AbstractOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/AbstractOperationContext.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/AbstractOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/AbstractOperationContext.java Tue Jan 24 14:10:56 2012
@@ -53,10 +53,10 @@ public abstract class AbstractOperationC
protected Entry originalEntry;
/** The associated request's controls */
- protected Map<String, Control> requestControls = new HashMap<String, Control>(4);
+ protected Map<String, Control> requestControls = new HashMap<String, Control>( 4 );
/** The associated response's controls */
- protected Map<String, Control> responseControls = new HashMap<String, Control>(4);
+ protected Map<String, Control> responseControls = new HashMap<String, Control>( 4 );
/** the Interceptors bypassed by this operation */
protected Collection<String> byPassed;
@@ -181,7 +181,7 @@ public abstract class AbstractOperationC
*/
public boolean hasRequestControls()
{
- return ! requestControls.isEmpty();
+ return !requestControls.isEmpty();
}
@@ -231,7 +231,7 @@ public abstract class AbstractOperationC
*/
public boolean hasResponseControls()
{
- return ! responseControls.isEmpty();
+ return !responseControls.isEmpty();
}
@@ -313,8 +313,8 @@ public abstract class AbstractOperationC
return interceptor;
}
-
-
+
+
/**
* @return The number of the current interceptor in the list
*/
@@ -322,8 +322,8 @@ public abstract class AbstractOperationC
{
return currentInterceptor;
}
-
-
+
+
/**
* Sets the current interceptor number to a new value.
*
@@ -369,11 +369,11 @@ public abstract class AbstractOperationC
{
LookupOperationContext lookupContext = new LookupOperationContext( session, dn );
setup( lookupContext );
-
+
return lookupContext;
}
-
+
/**
* {@inheritDoc}
*/
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/BindOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/BindOperationContext.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/BindOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/BindOperationContext.java Tue Jan 24 14:10:56 2012
@@ -94,7 +94,7 @@ public class BindOperationContext extend
//
if ( dn.isEmpty() )
{
- if ( Strings.isEmpty(credentials) )
+ if ( Strings.isEmpty( credentials ) )
{
// Dn and Credentials are empty, this is an anonymous authent
return AuthenticationLevel.NONE;
@@ -106,7 +106,7 @@ public class BindOperationContext extend
throw new LdapAuthenticationException( "Invalid authentication" );
}
}
- else if ( Strings.isEmpty(credentials) )
+ else if ( Strings.isEmpty( credentials ) )
{
return AuthenticationLevel.UNAUTHENT;
}
@@ -188,7 +188,7 @@ public class BindOperationContext extend
public String toString()
{
return "BindContext for Dn '" + getDn().getName() + "', credentials <" +
- ( credentials != null ? Strings.dumpBytes(credentials) : "" ) + ">" +
+ ( credentials != null ? Strings.dumpBytes( credentials ) : "" ) + ">" +
( saslMechanism != null ? ", saslMechanism : <" + saslMechanism + ">" : "" ) +
( saslAuthId != null ? ", saslAuthId <" + saslAuthId + ">" : "" );
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/ChangeOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/ChangeOperationContext.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/ChangeOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/ChangeOperationContext.java Tue Jan 24 14:10:56 2012
@@ -39,8 +39,8 @@ public interface ChangeOperationContext
* @return the ChangeLogEvent associated with this operation, or null
*/
ChangeLogEvent getChangeLogEvent();
-
-
+
+
/**
* Set the flag which tells the server to log the changes into
* the changeLog file
@@ -49,7 +49,7 @@ public interface ChangeOperationContext
*/
void setLogChange( LogChange log );
-
+
/**
* @return True if the changes are logged into the changeLog
*/
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/CompareOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/CompareOperationContext.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/CompareOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/CompareOperationContext.java Tue Jan 24 14:10:56 2012
@@ -42,14 +42,14 @@ public class CompareOperationContext ext
{
/** The entry OID */
private String oid;
-
+
/** The associated AttributeType */
private AttributeType attributeType;
/** The value to be compared */
private Value<?> value;
-
-
+
+
/**
*
* Creates a new instance of CompareOperationContext.
@@ -65,7 +65,7 @@ public class CompareOperationContext ext
}
}
-
+
/**
*
* Creates a new instance of CompareOperationContext.
@@ -81,7 +81,7 @@ public class CompareOperationContext ext
}
}
-
+
/**
*
* Creates a new instance of LookupOperationContext.
@@ -98,7 +98,7 @@ public class CompareOperationContext ext
}
}
-
+
/**
*
* Creates a new instance of LookupOperationContext.
@@ -115,7 +115,7 @@ public class CompareOperationContext ext
}
}
-
+
/**
*
* Creates a new instance of LookupOperationContext.
@@ -133,7 +133,7 @@ public class CompareOperationContext ext
}
}
-
+
public CompareOperationContext( CoreSession session, CompareRequest compareRequest )
{
super( session, compareRequest.getName() );
@@ -145,7 +145,7 @@ public class CompareOperationContext ext
{
setInterceptors( session.getDirectoryService().getInterceptors( OperationEnum.COMPARE ) );
}
-
+
if ( requestControls.containsKey( ManageDsaIT.OID ) )
{
ignoreReferral();
@@ -165,17 +165,17 @@ public class CompareOperationContext ext
return oid;
}
-
+
/**
* Set the compared OID
* @param oid The compared OID
*/
- public void setOid( String oid )
+ public void setOid( String oid )
{
this.oid = oid;
}
-
+
/**
* @return The value to compare
*/
@@ -184,7 +184,7 @@ public class CompareOperationContext ext
return value;
}
-
+
/**
* Set the value to compare
* @param value The value to compare
@@ -213,8 +213,8 @@ public class CompareOperationContext ext
{
this.attributeType = attributeType;
}
-
-
+
+
/**
* @return the operation name
*/
@@ -223,7 +223,7 @@ public class CompareOperationContext ext
return MessageTypeEnum.COMPARE_REQUEST.name();
}
-
+
/**
* @see Object#toString()
*/
@@ -232,12 +232,12 @@ public class CompareOperationContext ext
return "CompareContext for Dn '" + getDn().getName() + "'" +
( ( oid != null ) ? ", oid : <" + oid + ">" : "" ) +
( ( value != null ) ? ", value :'" +
- ( ( value.isHumanReadable() ) ?
- value.getString() :
- ( ( !value.isHumanReadable() ) ?
- Strings.dumpBytes(((BinaryValue) value).getReference()) :
- "unknown value type" ) )
- + "'"
- : "" );
+ ( ( value.isHumanReadable() ) ?
+ value.getString() :
+ ( ( !value.isHumanReadable() ) ?
+ Strings.dumpBytes( ( ( BinaryValue ) value ).getReference() ) :
+ "unknown value type" ) )
+ + "'"
+ : "" );
}
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/DeleteOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/DeleteOperationContext.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/DeleteOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/DeleteOperationContext.java Tue Jan 24 14:10:56 2012
@@ -49,7 +49,7 @@ public class DeleteOperationContext exte
setInterceptors( session.getDirectoryService().getInterceptors( OperationEnum.DELETE ) );
}
}
-
+
/**
* Creates a new instance of DeleteOperationContext.
@@ -75,9 +75,9 @@ public class DeleteOperationContext exte
{
setInterceptors( session.getDirectoryService().getInterceptors( OperationEnum.DELETE ) );
}
-
+
requestControls = deleteRequest.getControls();
-
+
if ( requestControls.containsKey( ManageDsaIT.OID ) )
{
ignoreReferral();
@@ -87,8 +87,8 @@ public class DeleteOperationContext exte
throwReferral();
}
}
-
-
+
+
/**
* @return the operation name
*/
@@ -97,7 +97,7 @@ public class DeleteOperationContext exte
return MessageTypeEnum.DEL_REQUEST.name();
}
-
+
/**
* @see Object#toString()
*/
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/EmptyOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/EmptyOperationContext.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/EmptyOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/EmptyOperationContext.java Tue Jan 24 14:10:56 2012
@@ -40,7 +40,7 @@ public abstract class EmptyOperationCont
{
super( session, Dn.EMPTY_DN );
}
-
+
/**
* Set the context Dn
@@ -53,11 +53,11 @@ public abstract class EmptyOperationCont
{
return;
}
-
+
throw new UnsupportedOperationException( I18n.err( I18n.ERR_324 ) );
}
-
+
/**
* @see Object#toString()
*/
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/GetRootDseOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/GetRootDseOperationContext.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/GetRootDseOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/GetRootDseOperationContext.java Tue Jan 24 14:10:56 2012
@@ -45,8 +45,8 @@ public class GetRootDseOperationContext
setInterceptors( session.getDirectoryService().getInterceptors( OperationEnum.GET_ROOT_DSE ) );
}
}
-
-
+
+
/**
* Creates a new instance of GetRootDseOperationContext.
*
@@ -61,8 +61,8 @@ public class GetRootDseOperationContext
setInterceptors( session.getDirectoryService().getInterceptors( OperationEnum.GET_ROOT_DSE ) );
}
}
-
-
+
+
/**
* @return the operation name
*/
@@ -71,7 +71,7 @@ public class GetRootDseOperationContext
return "GetRootDse";
}
-
+
/**
* @see Object#toString()
*/
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/HasEntryOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/HasEntryOperationContext.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/HasEntryOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/HasEntryOperationContext.java Tue Jan 24 14:10:56 2012
@@ -46,8 +46,8 @@ public class HasEntryOperationContext ex
setInterceptors( session.getDirectoryService().getInterceptors( OperationEnum.HAS_ENTRY ) );
}
}
-
-
+
+
/**
* Creates a new instance of HasEntryOperationContext.
*
@@ -62,7 +62,7 @@ public class HasEntryOperationContext ex
setInterceptors( session.getDirectoryService().getInterceptors( OperationEnum.HAS_ENTRY ) );
}
}
-
+
/**
* @return the operation name
@@ -72,7 +72,7 @@ public class HasEntryOperationContext ex
return MessageTypeEnum.ADD_REQUEST.name();
}
-
+
/**
* @see Object#toString()
*/
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/LookupOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/LookupOperationContext.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/LookupOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/LookupOperationContext.java Tue Jan 24 14:10:56 2012
@@ -291,6 +291,6 @@ public class LookupOperationContext exte
public String toString()
{
return "LookupContext for Dn '" + getDn().getName() + "'"
- + ( ( attrsId != null ) ? ", attributes : <" + Strings.listToString(attrsId) + ">" : "" );
+ + ( ( attrsId != null ) ? ", attributes : <" + Strings.listToString( attrsId ) + ">" : "" );
}
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/ModifyOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/ModifyOperationContext.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/ModifyOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/ModifyOperationContext.java Tue Jan 24 14:10:56 2012
@@ -134,7 +134,7 @@ public class ModifyOperationContext exte
public static List<Modification> createModItems( Entry serverEntry, ModificationOperation modOp )
throws LdapException
- {
+ {
List<Modification> items = new ArrayList<Modification>( serverEntry.size() );
for ( Attribute attribute : serverEntry )
@@ -143,7 +143,7 @@ public class ModifyOperationContext exte
}
return items;
- }
+ }
/**
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/MoveAndRenameOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/MoveAndRenameOperationContext.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/MoveAndRenameOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/MoveAndRenameOperationContext.java Tue Jan 24 14:10:56 2012
@@ -41,6 +41,7 @@ public class MoveAndRenameOperationConte
/** The new superior Dn */
private Dn newSuperiorDn;
+
/**
* Creates a new instance of MoveAndRenameOperationContext.
*/
@@ -109,7 +110,6 @@ public class MoveAndRenameOperationConte
throwReferral();
}
-
try
{
newDn = newSuperiorDn.add( newRdn ).apply( session.getDirectoryService().getSchemaManager() );
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/MoveOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/MoveOperationContext.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/MoveOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/MoveOperationContext.java Tue Jan 24 14:10:56 2012
@@ -124,7 +124,7 @@ public class MoveOperationContext extend
}
oldSuperior = modifyDnRequest.getName().getParent();
- rdn = (modifyDnRequest.getName().getRdn().clone());
+ rdn = ( modifyDnRequest.getName().getRdn().clone() );
try
{
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/OperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/OperationContext.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/OperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/OperationContext.java Tue Jan 24 14:10:56 2012
@@ -43,8 +43,8 @@ public interface OperationContext
* @return The number of the current interceptor in the list
*/
int getCurrentInterceptor();
-
-
+
+
/**
* Sets the current interceptor number to a new value.
*
@@ -70,8 +70,8 @@ public interface OperationContext
* @return The associated Dn
*/
Dn getDn();
-
-
+
+
/**
* Set the context Dn
*
@@ -79,7 +79,7 @@ public interface OperationContext
*/
void setDn( Dn dn );
-
+
/**
* Gets the server entry associated with the target Dn of this
* OperationContext. The entry associated with the Dn may be altered
@@ -105,8 +105,8 @@ public interface OperationContext
* @return target entry associated with the Dn of this OperationContext
*/
Entry getEntry();
-
-
+
+
/**
* Sets the server entry associated with the target Dn of this
* OperationContext.
@@ -114,16 +114,16 @@ public interface OperationContext
* @param entry the entry whose Dn is associated with this OperationContext.
*/
void setEntry( Entry entry );
-
-
+
+
/**
* Adds a response control to this operation.
*
* @param responseControl the response control to add to this operation
*/
void addResponseControl( Control responseControl );
-
-
+
+
/**
* Checks to see if a response control is present on this operation.
*
@@ -131,8 +131,8 @@ public interface OperationContext
* @return true if the control is associated with this operation, false otherwise
*/
boolean hasResponseControl( String numericOid );
-
-
+
+
/**
* Gets a response control if present for this request.
*
@@ -140,40 +140,40 @@ public interface OperationContext
* @return the control if present
*/
Control getResponseControl( String numericOid );
-
-
+
+
/**
* Gets all the response controls producted during this operation.
*
* @return an array over all the response controls
*/
Control[] getResponseControls();
-
-
+
+
/**
* Checks if any response controls have been generated for this operation.
*
* @return true if any response controls have been generated, false otherwise
*/
boolean hasResponseControls();
-
-
+
+
/**
* Checks the number of response controls have been generated for this operation.
*
* @return the number of response controls that have been generated
*/
int getResponseControlCount();
-
-
+
+
/**
* Adds a request control to this operation.
*
* @param requestControl the request control to add to this operation
*/
void addRequestControl( Control requestControl );
-
-
+
+
/**
* Checks to see if a request control is present on this request.
*
@@ -181,16 +181,16 @@ public interface OperationContext
* @return true if the control is associated with this operation, false otherwise
*/
boolean hasRequestControl( String numericOid );
-
-
+
+
/**
* Checks if any request controls exists for this operation.
*
* @return true if any request controls exist, false otherwise
*/
boolean hasRequestControls();
-
-
+
+
/**
* Gets a request control if present for this request.
*
@@ -206,14 +206,14 @@ public interface OperationContext
* @param requestControls the request controls to add to this operation
*/
void addRequestControls( Control[] requestControls );
-
-
+
+
/**
* @return the operation's name
*/
String getName();
-
-
+
+
/**
* Gets the next interceptor in the list of interceptors. The
* position in the list will be incremented.
@@ -221,7 +221,7 @@ public interface OperationContext
* @return The next interceptor from the list of interceptors
*/
String getNextInterceptor();
-
+
/**
* Sets the list of interceptors to go through for an operation
@@ -229,25 +229,25 @@ public interface OperationContext
* @param interceptors The list of interceptors
*/
void setInterceptors( List<String> interceptors );
-
-
+
+
/**
* Gets the session associated with this operation.
*
* @return the session associated with this operation
*/
CoreSession getSession();
-
-
+
+
// -----------------------------------------------------------------------
// Utility Factory Methods to Create New OperationContexts
// -----------------------------------------------------------------------
LookupOperationContext newLookupContext( Dn dn );
-
+
Entry lookup( LookupOperationContext lookupContext ) throws LdapException;
-
-
+
+
/**
* Process the delete for inner operations. This is only valid for SubschemaSubentry
* operations, and will most certainly be removed later.
@@ -262,8 +262,8 @@ public interface OperationContext
* Set the throwReferral flag to true
*/
void throwReferral();
-
-
+
+
/**
* @return <code>true</code> if the referrals are thrown
*/
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/RenameOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/RenameOperationContext.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/RenameOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/RenameOperationContext.java Tue Jan 24 14:10:56 2012
@@ -49,6 +49,7 @@ public class RenameOperationContext exte
/** The flag to remove the old Rdn Attribute */
private boolean deleteOldRdn;
+
/**
* Creates a new instance of RenameOperationContext.
*/
@@ -185,6 +186,6 @@ public class RenameOperationContext exte
{
return "RenameContext for old Dn '" + getDn().getName() + "'" +
", new Rdn '" + newRdn + "'" +
- ( deleteOldRdn ? ", delete old Rdn" : "" ) ;
+ ( deleteOldRdn ? ", delete old Rdn" : "" );
}
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/SearchOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/SearchOperationContext.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/SearchOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/SearchOperationContext.java Tue Jan 24 14:10:56 2012
@@ -58,7 +58,7 @@ public class SearchOperationContext exte
public SearchOperationContext( CoreSession session )
{
super( session );
-
+
if ( session != null )
{
setInterceptors( session.getDirectoryService().getInterceptors( OperationEnum.SEARCH ) );
@@ -73,7 +73,7 @@ public class SearchOperationContext exte
public SearchOperationContext( CoreSession session, SearchRequest searchRequest ) throws LdapException
{
super( session );
-
+
if ( session != null )
{
setInterceptors( session.getDirectoryService().getInterceptors( OperationEnum.SEARCH ) );
@@ -114,7 +114,8 @@ public class SearchOperationContext exte
* @param filter the filter AST to use for the search
* @param searchControls the search controls
*/
- public SearchOperationContext( CoreSession session, Dn dn, ExprNode filter, SearchControls searchControls ) throws LdapException
+ public SearchOperationContext( CoreSession session, Dn dn, ExprNode filter, SearchControls searchControls )
+ throws LdapException
{
super( session, dn );
this.filter = filter;
@@ -122,7 +123,7 @@ public class SearchOperationContext exte
timeLimit = searchControls.getTimeLimit();
sizeLimit = searchControls.getCountLimit();
typesOnly = searchControls.getReturningObjFlag();
-
+
if ( session != null )
{
setInterceptors( session.getDirectoryService().getInterceptors( OperationEnum.SEARCH ) );
@@ -155,7 +156,7 @@ public class SearchOperationContext exte
super( session, dn, returningAttributes );
super.setScope( scope );
this.filter = filter;
-
+
if ( session != null )
{
setInterceptors( session.getDirectoryService().getInterceptors( OperationEnum.SEARCH ) );