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 18:44:32 UTC
svn commit: r1235374 [6/27] - in /directory/shared/trunk:
ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/
ldap/model/src/main/java/org/apache/directory/shared/ldap/model/csn/
ldap/model/src/main/java/org/apache/directory/shar...
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/FilterParser.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/FilterParser.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/FilterParser.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/FilterParser.java Tue Jan 24 17:44:03 2012
@@ -58,14 +58,15 @@ public class FilterParser
* / ( [":dn"] ':' oid ":=" assertionvalue )
* matchingrule = ":" oid
*/
- private static ExprNode parseExtensible( SchemaManager schemaManager, String attribute, String filter, Position pos ) throws LdapException, ParseException
+ private static ExprNode parseExtensible( SchemaManager schemaManager, String attribute, String filter, Position pos )
+ throws LdapException, ParseException
{
ExtensibleNode node = null;
-
+
if ( schemaManager != null )
{
AttributeType attributeType = schemaManager.getAttributeType( attribute );
-
+
if ( attributeType != null )
{
node = new ExtensibleNode( attributeType );
@@ -96,12 +97,12 @@ public class FilterParser
}
// Do we have a MatchingRule ?
- if ( Strings.charAt(filter, pos.start) == ':' )
+ if ( Strings.charAt( filter, pos.start ) == ':' )
{
pos.start++;
int start = pos.start;
- if ( Strings.charAt(filter, pos.start) == '=' )
+ if ( Strings.charAt( filter, pos.start ) == '=' )
{
pos.start++;
@@ -153,12 +154,12 @@ public class FilterParser
}
// Do we have a MatchingRule ?
- if ( Strings.charAt(filter, pos.start) == ':' )
+ if ( Strings.charAt( filter, pos.start ) == ':' )
{
pos.start++;
int start = pos.start;
- if ( Strings.charAt(filter, pos.start) == '=' )
+ if ( Strings.charAt( filter, pos.start ) == '=' )
{
if ( oidRequested )
{
@@ -174,7 +175,7 @@ public class FilterParser
}
else
{
- AttributeUtils.parseAttribute(filter, pos, false);
+ AttributeUtils.parseAttribute( filter, pos, false );
node.setMatchingRuleId( filter.substring( start, pos.start ) );
@@ -236,17 +237,17 @@ public class FilterParser
*/
private static Value<?> parseAssertionValue( String filter, Position pos ) throws ParseException
{
- char c = Strings.charAt(filter, pos.start);
-
+ char c = Strings.charAt( filter, pos.start );
+
// Create a buffer big enough to contain the value once converted
- byte[] value = new byte[ filter.length() - pos.start];
+ byte[] value = new byte[filter.length() - pos.start];
int current = 0;
do
{
- if ( Unicode.isUnicodeSubset(c) )
+ if ( Unicode.isUnicodeSubset( c ) )
{
- value[current++] = (byte)c;
+ value[current++] = ( byte ) c;
pos.start++;
}
else if ( Strings.isCharASCII( filter, pos.start, '\\' ) )
@@ -255,7 +256,7 @@ public class FilterParser
pos.start++;
// First hex
- if ( Chars.isHex(filter, pos.start) )
+ if ( Chars.isHex( filter, pos.start ) )
{
pos.start++;
}
@@ -265,9 +266,9 @@ public class FilterParser
}
// second hex
- if ( Chars.isHex(filter, pos.start) )
+ if ( Chars.isHex( filter, pos.start ) )
{
- value[current++] = Hex.getHexValue(filter.charAt(pos.start - 1), filter.charAt(pos.start));
+ value[current++] = Hex.getHexValue( filter.charAt( pos.start - 1 ), filter.charAt( pos.start ) );
pos.start++;
}
else
@@ -281,18 +282,18 @@ public class FilterParser
break;
}
}
- while ( ( c = Strings.charAt(filter, pos.start) ) != '\0' );
+ while ( ( c = Strings.charAt( filter, pos.start ) ) != '\0' );
if ( current != 0 )
{
- byte[] result = new byte[ current ];
+ byte[] result = new byte[current];
System.arraycopy( value, 0, result, 0, current );
-
+
return new BinaryValue( result );
}
else
{
- return new BinaryValue( (byte[])null );
+ return new BinaryValue( ( byte[] ) null );
}
}
@@ -300,18 +301,19 @@ public class FilterParser
/**
* Parse a substring
*/
- private static ExprNode parseSubstring( SchemaManager schemaManager, String attribute, Value<?> initial, String filter, Position pos )
+ private static ExprNode parseSubstring( SchemaManager schemaManager, String attribute, Value<?> initial,
+ String filter, Position pos )
throws ParseException, LdapException
{
if ( Strings.isCharASCII( filter, pos.start, '*' ) )
{
// We have found a '*' : this is a substring
SubstringNode node = null;
-
+
if ( schemaManager != null )
{
AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( attribute );
-
+
if ( attributeType != null )
{
node = new SubstringNode( schemaManager.lookupAttributeTypeRegistry( attribute ) );
@@ -406,8 +408,10 @@ public class FilterParser
* @param pos
* @return
*/
- @SuppressWarnings({ "rawtypes", "unchecked" })
- private static ExprNode parsePresenceEqOrSubstring( SchemaManager schemaManager, String attribute, String filter, Position pos )
+ @SuppressWarnings(
+ { "rawtypes", "unchecked" })
+ private static ExprNode parsePresenceEqOrSubstring( SchemaManager schemaManager, String attribute, String filter,
+ Position pos )
throws ParseException, LdapException
{
if ( Strings.isCharASCII( filter, pos.start, '*' ) )
@@ -421,7 +425,7 @@ public class FilterParser
if ( schemaManager != null )
{
AttributeType attributeType = schemaManager.getAttributeType( attribute );
-
+
if ( attributeType != null )
{
return new PresenceNode( attributeType );
@@ -450,12 +454,12 @@ public class FilterParser
if ( schemaManager != null )
{
AttributeType attributeType = schemaManager.getAttributeType( attribute );
-
+
if ( attributeType != null )
{
- return new EqualityNode( attributeType, new BinaryValue( (byte[])null ) );
+ return new EqualityNode( attributeType, new BinaryValue( ( byte[] ) null ) );
}
-
+
else
{
return null;
@@ -463,7 +467,7 @@ public class FilterParser
}
else
{
- return new EqualityNode( attribute, new BinaryValue( (byte[])null ) );
+ return new EqualityNode( attribute, new BinaryValue( ( byte[] ) null ) );
}
}
else
@@ -478,7 +482,7 @@ public class FilterParser
if ( schemaManager != null )
{
AttributeType attributeType = schemaManager.getAttributeType( attribute );
-
+
if ( attributeType != null )
{
return new EqualityNode( attributeType, value );
@@ -512,8 +516,9 @@ public class FilterParser
*
* An item starts with an attribute or a colon.
*/
- @SuppressWarnings({ "rawtypes", "unchecked" })
- private static ExprNode parseItem( SchemaManager schemaManager, String filter, Position pos, char c )
+ @SuppressWarnings(
+ { "rawtypes", "unchecked" })
+ private static ExprNode parseItem( SchemaManager schemaManager, String filter, Position pos, char c )
throws ParseException, LdapException
{
String attribute = null;
@@ -532,9 +537,9 @@ public class FilterParser
{
// We must have an attribute
attribute = AttributeUtils.parseAttribute( filter, pos, true );
-
+
// Now, we may have a present, substring, simple or an extensible
- c = Strings.charAt(filter, pos.start);
+ c = Strings.charAt( filter, pos.start );
switch ( c )
{
@@ -563,7 +568,7 @@ public class FilterParser
else
{
AttributeType attributeType = schemaManager.getAttributeType( attribute );
-
+
if ( attributeType != null )
{
return new ApproximateNode( attributeType, parseAssertionValue( filter, pos ) );
@@ -594,7 +599,7 @@ public class FilterParser
else
{
AttributeType attributeType = schemaManager.getAttributeType( attribute );
-
+
if ( attributeType != null )
{
return new GreaterEqNode( attributeType, parseAssertionValue( filter, pos ) );
@@ -625,7 +630,7 @@ public class FilterParser
else
{
AttributeType attributeType = schemaManager.getAttributeType( attribute );
-
+
if ( attributeType != null )
{
return new LessEqNode( attributeType, parseAssertionValue( filter, pos ) );
@@ -659,7 +664,7 @@ public class FilterParser
*
* @return
*/
- private static ExprNode parseBranchNode( SchemaManager schemaManager, ExprNode node, String filter, Position pos )
+ private static ExprNode parseBranchNode( SchemaManager schemaManager, ExprNode node, String filter, Position pos )
throws ParseException, LdapException
{
BranchNode branchNode = ( BranchNode ) node;
@@ -667,17 +672,17 @@ public class FilterParser
// We must have at least one filter
ExprNode child = parseFilterInternal( schemaManager, filter, pos );
-
+
if ( child != UndefinedNode.UNDEFINED_NODE )
{
// Add the child to the node children
branchNode.addNode( child );
-
+
if ( branchNode instanceof NotNode )
{
return node;
}
-
+
nbChildren++;
}
else if ( node instanceof AndNode )
@@ -725,7 +730,7 @@ public class FilterParser
* / ( [dnattrs]
* matchingrule COLON EQUALS assertionvalue )
*/
- private static ExprNode parseFilterComp( SchemaManager schemaManager, String filter, Position pos )
+ private static ExprNode parseFilterComp( SchemaManager schemaManager, String filter, Position pos )
throws ParseException, LdapException
{
ExprNode node = null;
@@ -735,7 +740,7 @@ public class FilterParser
throw new ParseException( I18n.err( I18n.ERR_04154 ), pos.start );
}
- char c = Strings.charAt(filter, pos.start);
+ char c = Strings.charAt( filter, pos.start );
switch ( c )
{
@@ -821,15 +826,15 @@ public class FilterParser
{
return parse( null, filter );
}
-
-
+
+
/**
* @see FilterParser#parse(String)
*/
public static ExprNode parse( SchemaManager schemaManager, String filter ) throws ParseException
{
// The filter must not be null. This is a defensive test
- if ( Strings.isEmpty(filter) )
+ if ( Strings.isEmpty( filter ) )
{
throw new ParseException( I18n.err( I18n.ERR_04158 ), 0 );
}
@@ -856,7 +861,7 @@ public class FilterParser
public static ExprNode parse( SchemaManager schemaManager, String filter, Position pos ) throws ParseException
{
// The filter must not be null. This is a defensive test
- if ( Strings.isEmpty(filter) )
+ if ( Strings.isEmpty( filter ) )
{
throw new ParseException( I18n.err( I18n.ERR_04158 ), 0 );
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/GreaterEqNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/GreaterEqNode.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/GreaterEqNode.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/GreaterEqNode.java Tue Jan 24 17:44:03 2012
@@ -42,7 +42,7 @@ public class GreaterEqNode<T> extends Si
super( attributeType, value, AssertionType.GREATEREQ );
}
-
+
/**
* Creates a new GreaterOrEqual object.
*
@@ -54,7 +54,7 @@ public class GreaterEqNode<T> extends Si
super( attribute, value, AssertionType.GREATEREQ );
}
-
+
/**
* @see Object#toString()
* @return A string representing the AndNode
@@ -64,7 +64,7 @@ public class GreaterEqNode<T> extends Si
StringBuilder buf = new StringBuilder();
buf.append( '(' );
-
+
if ( attributeType != null )
{
buf.append( attributeType.getName() );
@@ -73,11 +73,11 @@ public class GreaterEqNode<T> extends Si
{
buf.append( attribute );
}
-
+
buf.append( ">=" );
Value<?> escapedValue = getEscapedValue();
- if ( !escapedValue.isNull())
+ if ( !escapedValue.isNull() )
{
buf.append( escapedValue );
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/LeafNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/LeafNode.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/LeafNode.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/LeafNode.java Tue Jan 24 17:44:03 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.model.filter;
+
import org.apache.directory.shared.ldap.model.schema.AttributeType;
@@ -31,7 +32,7 @@ public class LeafNode extends AbstractEx
{
/** attributeType on which this leaf is based */
protected AttributeType attributeType;
-
+
/** attribute on which this leaf is based */
protected String attribute;
@@ -46,7 +47,7 @@ public class LeafNode extends AbstractEx
{
super( assertionType );
this.attributeType = attributeType;
-
+
if ( attributeType != null )
{
this.attribute = attributeType.getName();
@@ -68,8 +69,8 @@ public class LeafNode extends AbstractEx
this.attribute = attribute;
isSchemaAware = false;
}
-
-
+
+
/**
* Gets whether this node is a leaf - the answer is always true here.
*
@@ -101,8 +102,8 @@ public class LeafNode extends AbstractEx
{
return attribute;
}
-
-
+
+
/**
* Sets the attributeType this leaf node is based on.
*
@@ -111,15 +112,15 @@ public class LeafNode extends AbstractEx
public void setAttributeType( AttributeType attributeType )
{
this.attributeType = attributeType;
-
+
if ( attributeType != null )
{
attribute = attributeType.getName();
isSchemaAware = true;
}
}
-
-
+
+
/**
* Sets the attribute this leaf node is based on.
*
@@ -131,7 +132,7 @@ public class LeafNode extends AbstractEx
isSchemaAware = false;
}
-
+
/**
* @see ExprNode#accept(
*FilterVisitor)
@@ -159,18 +160,18 @@ public class LeafNode extends AbstractEx
public int hashCode()
{
int h = 37;
-
- h = h*17 + super.hashCode();
-
+
+ h = h * 17 + super.hashCode();
+
if ( attributeType != null )
{
- h = h*17 + attributeType.hashCode();
+ h = h * 17 + attributeType.hashCode();
}
else
{
- h = h*17 + attribute.hashCode();
+ h = h * 17 + attribute.hashCode();
}
-
+
return h;
}
@@ -189,14 +190,14 @@ public class LeafNode extends AbstractEx
{
return false;
}
-
- LeafNode otherNode = (LeafNode)other;
+
+ LeafNode otherNode = ( LeafNode ) other;
if ( other.getClass() != this.getClass() )
{
return false;
}
-
+
if ( attributeType != null )
{
return attributeType.equals( otherNode.getAttributeType() );
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/LessEqNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/LessEqNode.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/LessEqNode.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/LessEqNode.java Tue Jan 24 17:44:03 2012
@@ -42,7 +42,7 @@ public class LessEqNode<T> extends Simpl
super( attributeType, value, AssertionType.LESSEQ );
}
-
+
/**
* Creates a new LessEqNode object.
*
@@ -54,7 +54,7 @@ public class LessEqNode<T> extends Simpl
super( attribute, value, AssertionType.LESSEQ );
}
-
+
/**
* @see Object#toString()
* @return A string representing the AndNode
@@ -64,7 +64,7 @@ public class LessEqNode<T> extends Simpl
StringBuilder buf = new StringBuilder();
buf.append( '(' );
-
+
if ( attributeType != null )
{
buf.append( attributeType.getName() );
@@ -73,11 +73,11 @@ public class LessEqNode<T> extends Simpl
{
buf.append( attribute );
}
-
+
buf.append( "<=" );
Value<?> escapedValue = getEscapedValue();
- if ( !escapedValue.isNull())
+ if ( !escapedValue.isNull() )
{
buf.append( escapedValue );
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/NotNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/NotNode.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/NotNode.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/NotNode.java Tue Jan 24 17:44:03 2012
@@ -25,6 +25,7 @@ import java.util.List;
import org.apache.directory.shared.i18n.I18n;
+
/**
* Node representing an Not connector in a filter operation
*
@@ -65,15 +66,16 @@ public class NotNode extends BranchNode
}
}
-
+
/**
* Creates an empty NotNode
*/
public NotNode()
{
- this( (ExprNode)null );
+ this( ( ExprNode ) null );
}
+
/**
* Adds a child node to this NOT node node
*
@@ -85,7 +87,7 @@ public class NotNode extends BranchNode
{
throw new IllegalStateException( I18n.err( I18n.ERR_04159 ) );
}
-
+
children.add( node );
}
@@ -99,9 +101,9 @@ public class NotNode extends BranchNode
{
if ( children.size() >= 1 )
{
- throw new IllegalStateException( I18n.err( I18n.ERR_04159 ) );
+ throw new IllegalStateException( I18n.err( I18n.ERR_04159 ) );
}
-
+
children.add( node );
}
@@ -115,13 +117,13 @@ public class NotNode extends BranchNode
{
if ( ( childList != null ) && ( childList.size() > 1 ) )
{
- throw new IllegalStateException( I18n.err( I18n.ERR_04159 ) );
+ throw new IllegalStateException( I18n.err( I18n.ERR_04159 ) );
}
children = childList;
}
-
+
/**
* Gets the operator for this branch node.
*
@@ -175,13 +177,14 @@ public class NotNode extends BranchNode
public StringBuilder printRefinementToBuffer( StringBuilder buf )
{
buf.append( "not: " );
-
+
// There is only one item for a not refinement
children.get( 0 ).printRefinementToBuffer( buf );
-
+
return buf;
}
+
/**
* Gets the recursive prefix string represent of the filter from this node
* down.
@@ -193,12 +196,12 @@ public class NotNode extends BranchNode
{
StringBuilder buf = new StringBuilder();
buf.append( "(!" );
-
+
buf.append( super.toString() );
buf.append( getFirstChild() );
buf.append( ')' );
-
+
return buf.toString();
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/OrNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/OrNode.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/OrNode.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/OrNode.java Tue Jan 24 17:44:03 2012
@@ -23,6 +23,7 @@ package org.apache.directory.shared.ldap
import java.util.List;
+
/**
* Node representing an OR connector in a filter operation
*
@@ -35,7 +36,7 @@ public class OrNode extends BranchNode
*
* @param childList the child nodes under this branch node.
*/
- public OrNode( List<ExprNode> childList)
+ public OrNode( List<ExprNode> childList )
{
super( AssertionType.OR, childList );
}
@@ -51,7 +52,7 @@ public class OrNode extends BranchNode
super( AssertionType.OR, childList );
}
-
+
/**
* Creates an empty OrNode
*/
@@ -115,8 +116,8 @@ public class OrNode extends BranchNode
{
buf.append( "or: {" );
boolean isFirst = true;
-
- for ( ExprNode node:children )
+
+ for ( ExprNode node : children )
{
if ( isFirst )
{
@@ -127,15 +128,16 @@ public class OrNode extends BranchNode
{
buf.append( ", " );
}
-
+
node.printRefinementToBuffer( buf );
}
-
+
buf.append( " }" );
-
+
return buf;
}
+
/**
* Gets the recursive prefix string represent of the filter from this node
* down.
@@ -147,16 +149,16 @@ public class OrNode extends BranchNode
{
StringBuilder buf = new StringBuilder();
buf.append( "(|" );
-
+
buf.append( super.toString() );
- for ( ExprNode child:getChildren() )
+ for ( ExprNode child : getChildren() )
{
buf.append( child );
}
-
+
buf.append( ')' );
-
+
return buf.toString();
}
@@ -168,8 +170,8 @@ public class OrNode extends BranchNode
public int hashCode()
{
int hash = 37;
- hash = hash*17 + AssertionType.OR.hashCode();
- hash = hash*17 + ( annotations == null ? 0 : annotations.hashCode() );
+ hash = hash * 17 + AssertionType.OR.hashCode();
+ hash = hash * 17 + ( annotations == null ? 0 : annotations.hashCode() );
return hash;
}
@@ -202,18 +204,18 @@ public class OrNode extends BranchNode
{
return false;
}
-
+
for ( int i = 0; i < children.size(); i++ )
{
ExprNode child = children.get( i );
ExprNode otherChild = otherChildren.get( i );
-
+
if ( !child.equals( otherChild ) )
{
return false;
}
}
-
+
return true;
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/PresenceNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/PresenceNode.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/PresenceNode.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/PresenceNode.java Tue Jan 24 17:44:03 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.model.filter;
+
import org.apache.directory.shared.ldap.model.schema.AttributeType;
@@ -40,7 +41,7 @@ public final class PresenceNode extends
super( attributeType, AssertionType.PRESENCE );
}
-
+
/**
* Creates a PresenceNode object based on an attribute.
*
@@ -51,7 +52,7 @@ public final class PresenceNode extends
super( attribute, AssertionType.PRESENCE );
}
-
+
/**
* @see java.lang.Object#toString()
* @return A string representing the AndNode
@@ -59,9 +60,9 @@ public final class PresenceNode extends
public String toString()
{
StringBuilder buf = new StringBuilder();
-
+
buf.append( '(' );
-
+
if ( attributeType != null )
{
buf.append( attributeType.getName() );
@@ -70,13 +71,13 @@ public final class PresenceNode extends
{
buf.append( attribute );
}
-
+
buf.append( "=*" );
buf.append( super.toString() );
buf.append( ')' );
-
+
return buf.toString();
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/ScopeNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/ScopeNode.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/ScopeNode.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/ScopeNode.java Tue Jan 24 17:44:03 2012
@@ -59,6 +59,7 @@ public class ScopeNode extends AbstractE
isSchemaAware = true;
}
+
/**
* Always returns true since a scope node has no children.
*
@@ -184,12 +185,12 @@ public class ScopeNode extends AbstractE
public int hashCode()
{
int h = 37;
-
- h = h*17 + super.hashCode();
- h = h*17 + ( aliasDerefAliases != null ? aliasDerefAliases.hashCode() : 0 );
- h = h*17 + ( baseDn != null ? baseDn.hashCode() : 0 );
- h = h*17 + scope.getScope();
-
+
+ h = h * 17 + super.hashCode();
+ h = h * 17 + ( aliasDerefAliases != null ? aliasDerefAliases.hashCode() : 0 );
+ h = h * 17 + ( baseDn != null ? baseDn.hashCode() : 0 );
+ h = h * 17 + scope.getScope();
+
return h;
}
@@ -201,7 +202,7 @@ public class ScopeNode extends AbstractE
public String toString()
{
StringBuilder buf = new StringBuilder();
-
+
buf.append( "(#{" );
switch ( scope )
@@ -225,7 +226,7 @@ public class ScopeNode extends AbstractE
buf.append( "UNKNOWN" );
break;
}
-
+
buf.append( ", '" );
buf.append( baseDn );
buf.append( "', " );
@@ -233,7 +234,7 @@ public class ScopeNode extends AbstractE
buf.append( "}" );
buf.append( super.toString() );
buf.append( ')' );
-
+
return buf.toString();
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/SimpleNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/SimpleNode.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/SimpleNode.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/SimpleNode.java Tue Jan 24 17:44:03 2012
@@ -159,7 +159,7 @@ public abstract class SimpleNode<T> exte
{
if ( ( attribute == null )
|| !( SchemaConstants.OBJECT_CLASS_AT.equalsIgnoreCase( attribute )
- || SchemaConstants.OBJECT_CLASS_AT_OID.equalsIgnoreCase( attribute ) ) )
+ || SchemaConstants.OBJECT_CLASS_AT_OID.equalsIgnoreCase( attribute ) ) )
{
throw new UnsupportedOperationException( I18n.err( I18n.ERR_04162, attribute ) );
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/SubstringNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/SubstringNode.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/SubstringNode.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/SubstringNode.java Tue Jan 24 17:44:03 2012
@@ -47,6 +47,7 @@ public class SubstringNode extends LeafN
/** List of fragments between wildcard */
private List<String> anyPattern;
+
/**
* Creates a new SubstringNode object with only one wildcard and no internal
* any fragments between wildcards.
@@ -64,7 +65,7 @@ public class SubstringNode extends LeafN
this.initialPattern = initialPattern;
}
-
+
/**
* Creates a new SubstringNode object with only one wildcard and no internal
* any fragments between wildcards.
@@ -82,7 +83,7 @@ public class SubstringNode extends LeafN
this.initialPattern = initialPattern;
}
-
+
/**
* Creates a new SubstringNode object without any value
*
@@ -122,7 +123,8 @@ public class SubstringNode extends LeafN
* @param initialPattern the initial fragment
* @param finalPattern the final fragment
*/
- public SubstringNode( List<String> anyPattern, AttributeType attributeType, String initialPattern, String finalPattern )
+ public SubstringNode( List<String> anyPattern, AttributeType attributeType, String initialPattern,
+ String finalPattern )
{
super( attributeType, AssertionType.SUBSTRING );
@@ -131,7 +133,7 @@ public class SubstringNode extends LeafN
this.initialPattern = initialPattern;
}
-
+
/**
* Creates a new SubstringNode object more than one wildcard and an any
* list.
@@ -150,6 +152,7 @@ public class SubstringNode extends LeafN
this.initialPattern = initialPattern;
}
+
/**
* Creates a regular expression from an LDAP substring assertion filter
* specification.
@@ -166,7 +169,7 @@ public class SubstringNode extends LeafN
* compiled
*/
public static Pattern getRegex( String initialPattern, String[] anyPattern, String finalPattern )
- throws PatternSyntaxException
+ throws PatternSyntaxException
{
StringBuffer buf = new StringBuffer();
@@ -192,27 +195,28 @@ public class SubstringNode extends LeafN
buf.append( ".*" );
}
- return Pattern.compile(buf.toString());
+ return Pattern.compile( buf.toString() );
}
/**
* Clone the Node
*/
- @Override public ExprNode clone()
+ @Override
+ public ExprNode clone()
{
- ExprNode clone = (ExprNode)super.clone();
-
+ ExprNode clone = ( ExprNode ) super.clone();
+
if ( anyPattern != null )
{
- ((SubstringNode)clone).anyPattern = new ArrayList<String>();
-
- for ( String any:anyPattern )
+ ( ( SubstringNode ) clone ).anyPattern = new ArrayList<String>();
+
+ for ( String any : anyPattern )
{
- ((SubstringNode)clone).anyPattern.add( any );
+ ( ( SubstringNode ) clone ).anyPattern.add( any );
}
}
-
+
return clone;
}
@@ -226,18 +230,18 @@ public class SubstringNode extends LeafN
{
return initialPattern;
}
-
-
+
+
/**
* Set the initial pattern
* @param initialPattern The initial pattern
*/
- public void setInitial( String initialPattern )
+ public void setInitial( String initialPattern )
{
this.initialPattern = initialPattern;
}
-
+
/**
* Gets the final fragment or suffix.
*
@@ -253,7 +257,7 @@ public class SubstringNode extends LeafN
* Set the final pattern
* @param finalPattern The final pattern
*/
- public void setFinal( String finalPattern )
+ public void setFinal( String finalPattern )
{
this.finalPattern = finalPattern;
}
@@ -274,7 +278,7 @@ public class SubstringNode extends LeafN
* Set the any patterns
* @param anyPattern The any patterns
*/
- public void setAny( List<String> anyPattern )
+ public void setAny( List<String> anyPattern )
{
this.anyPattern = anyPattern;
}
@@ -284,7 +288,7 @@ public class SubstringNode extends LeafN
* Add an any pattern
* @param anyPattern The any pattern
*/
- public void addAny( String anyPattern )
+ public void addAny( String anyPattern )
{
this.anyPattern.add( anyPattern );
}
@@ -306,7 +310,7 @@ public class SubstringNode extends LeafN
for ( int i = 0; i < any.length; i++ )
{
any[i] = ( String ) normalizer.normalize( anyPattern.get( i ) );
-
+
if ( any[i].length() == 0 )
{
any[i] = " ";
@@ -327,7 +331,7 @@ public class SubstringNode extends LeafN
finalStr = ( String ) normalizer.normalize( finalPattern );
}
- return getRegex(initialStr, any, finalStr);
+ return getRegex( initialStr, any, finalStr );
}
String initialStr = null;
@@ -344,7 +348,7 @@ public class SubstringNode extends LeafN
finalStr = ( String ) normalizer.normalize( finalPattern );
}
- return getRegex(initialStr, null, finalStr);
+ return getRegex( initialStr, null, finalStr );
}
@@ -364,7 +368,7 @@ public class SubstringNode extends LeafN
return false;
}
SubstringNode that = ( SubstringNode ) obj;
-
+
if ( initialPattern == null )
{
if ( that.initialPattern != null )
@@ -379,7 +383,7 @@ public class SubstringNode extends LeafN
return false;
}
}
-
+
if ( finalPattern == null )
{
if ( that.finalPattern != null )
@@ -394,7 +398,7 @@ public class SubstringNode extends LeafN
return false;
}
}
-
+
return super.equals( obj );
}
@@ -407,20 +411,20 @@ public class SubstringNode extends LeafN
public int hashCode()
{
int h = 37;
-
- h = h*17 + super.hashCode();
- h = h*17 + ( initialPattern != null ? initialPattern.hashCode() : 0 );
-
+
+ h = h * 17 + super.hashCode();
+ h = h * 17 + ( initialPattern != null ? initialPattern.hashCode() : 0 );
+
if ( anyPattern != null )
{
- for ( String pattern:anyPattern )
+ for ( String pattern : anyPattern )
{
- h = h*17 + pattern.hashCode();
+ h = h * 17 + pattern.hashCode();
}
}
-
- h = h*17 + ( finalPattern != null ? finalPattern.hashCode() : 0 );
-
+
+ h = h * 17 + ( finalPattern != null ? finalPattern.hashCode() : 0 );
+
return h;
}
@@ -432,9 +436,9 @@ public class SubstringNode extends LeafN
public String toString()
{
StringBuilder buf = new StringBuilder();
-
+
buf.append( '(' );
-
+
if ( attributeType != null )
{
buf.append( attributeType.getName() );
@@ -443,7 +447,6 @@ public class SubstringNode extends LeafN
{
buf.append( attribute );
}
-
buf.append( '=' );
@@ -458,7 +461,7 @@ public class SubstringNode extends LeafN
if ( null != anyPattern )
{
- for ( String any:anyPattern )
+ for ( String any : anyPattern )
{
buf.append( escapeFilterValue( new StringValue( any ) ) );
buf.append( '*' );
@@ -471,9 +474,9 @@ public class SubstringNode extends LeafN
}
buf.append( super.toString() );
-
+
buf.append( ')' );
-
+
return buf.toString();
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifAttributesReader.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifAttributesReader.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifAttributesReader.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifAttributesReader.java Tue Jan 24 17:44:03 2012
@@ -444,7 +444,7 @@ public class LdifAttributesReader extend
LOG.debug( "Starts parsing ldif buffer" );
- if ( Strings.isEmpty(ldif) )
+ if ( Strings.isEmpty( ldif ) )
{
return new BasicAttributes( true );
}
@@ -507,7 +507,7 @@ public class LdifAttributesReader extend
LOG.debug( "Starts parsing ldif buffer" );
- if ( Strings.isEmpty(ldif) )
+ if ( Strings.isEmpty( ldif ) )
{
return new DefaultEntry();
}
@@ -572,7 +572,7 @@ public class LdifAttributesReader extend
LOG.debug( "Starts parsing ldif buffer" );
- if ( Strings.isEmpty(ldif) )
+ if ( Strings.isEmpty( ldif ) )
{
return new DefaultEntry( schemaManager );
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifControl.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifControl.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifControl.java Tue Jan 24 17:44:03 2012
@@ -151,7 +151,7 @@ public class LdifControl implements Cont
{
out.writeBoolean( false );
}
-
+
out.flush();
}
@@ -163,7 +163,7 @@ public class LdifControl implements Cont
{
oid = in.readUTF();
criticality = in.readBoolean();
-
+
if ( in.readBoolean() )
{
int valueLength = in.readInt();
@@ -176,7 +176,7 @@ public class LdifControl implements Cont
}
}
-
+
/**
* @see Object#hashCode()
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifEntry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifEntry.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifEntry.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifEntry.java Tue Jan 24 17:44:03 2012
@@ -106,7 +106,7 @@ public class LdifEntry implements Clonea
changeType = ChangeType.None; // Default LDIF content
modificationList = new LinkedList<Modification>();
modifications = new HashMap<String, Modification>();
- entry = new DefaultEntry( (Dn) null );
+ entry = new DefaultEntry( ( Dn ) null );
entryDn = null;
controls = null;
}
@@ -124,8 +124,8 @@ public class LdifEntry implements Clonea
entryDn = entry.getDn();
controls = null;
}
-
-
+
+
/**
* Creates a LdifEntry using a list of strings representing the Ldif element
*
@@ -142,7 +142,7 @@ public class LdifEntry implements Clonea
int pos = 0;
boolean valueExpected = false;
String dnStr = null;
-
+
if ( dn == null )
{
dnStr = "";
@@ -151,7 +151,7 @@ public class LdifEntry implements Clonea
{
dnStr = dn.getName();
}
-
+
if ( LdifUtils.isLDIFSafe( dnStr ) )
{
sb.append( "dn: " ).append( dnStr ).append( '\n' );
@@ -160,7 +160,7 @@ public class LdifEntry implements Clonea
{
sb.append( "dn:: " ).append( Base64.encode( Strings.getBytesUtf8( dnStr ) ) ).append( '\n' );
}
-
+
for ( Object ava : avas )
{
if ( !valueExpected )
@@ -218,33 +218,33 @@ public class LdifEntry implements Clonea
if ( ( ldifEntries != null ) && ( ldifEntries.size() == 1 ) )
{
LdifEntry ldifEntry = ldifEntries.get( 0 );
-
+
changeType = ldifEntry.getChangeType();
controls = ldifEntry.getControls();
entryDn = ldifEntry.getDn();
-
+
switch ( ldifEntry.getChangeType() )
{
- case Add :
+ case Add:
// Fallback
- case None :
+ case None:
entry = ldifEntry.getEntry();
break;
-
- case Delete :
+
+ case Delete:
break;
-
- case ModDn :
- case ModRdn :
+
+ case ModDn:
+ case ModRdn:
newRdn = ldifEntry.getNewRdn();
newSuperior = ldifEntry.getNewSuperior();
deleteOldRdn = ldifEntry.isDeleteOldRdn();
break;
-
- case Modify :
+
+ case Modify:
modificationList = ldifEntry.getModifications();
modifications = new HashMap<String, Modification>();
-
+
for ( Modification modification : modificationList )
{
modifications.put( modification.getAttribute().getId(), modification );
@@ -253,8 +253,8 @@ public class LdifEntry implements Clonea
}
}
}
-
-
+
+
/**
* Creates a LdifEntry using a list of strings representing the Ldif element
*
@@ -265,7 +265,7 @@ public class LdifEntry implements Clonea
* is incorrect
* @throws LdapLdifException If we get any other exception
*/
- public LdifEntry( String dn, Object... strings )
+ public LdifEntry( String dn, Object... strings )
throws LdapInvalidAttributeValueException, LdapLdifException, LdapInvalidDnException
{
this( new Dn( dn ), strings );
@@ -451,7 +451,7 @@ public class LdifEntry implements Clonea
}
else
{
- entry.add( id, (Value<?>)null );
+ entry.add( id, ( Value<?> ) null );
}
}
@@ -773,12 +773,12 @@ public class LdifEntry implements Clonea
{
changeType = ChangeType.Add;
}
-
+
if ( this.controls == null )
{
this.controls = new ConcurrentHashMap<String, LdifControl>();
}
-
+
if ( control instanceof LdifControl )
{
this.controls.put( control.getOid(), ( LdifControl ) control );
@@ -807,7 +807,7 @@ public class LdifEntry implements Clonea
for ( Modification modif : modificationList )
{
Modification modifClone = new DefaultModification( modif.getOperation(),
- modif.getAttribute().clone() );
+ modif.getAttribute().clone() );
clone.modificationList.add( modifClone );
}
}
@@ -818,7 +818,7 @@ public class LdifEntry implements Clonea
{
Modification modif = modifications.get( key );
Modification modifClone = new DefaultModification( modif.getOperation(),
- modif.getAttribute().clone() );
+ modif.getAttribute().clone() );
clone.modifications.put( key, modifClone );
}
@@ -1145,7 +1145,7 @@ public class LdifEntry implements Clonea
// Read the changeType
int type = in.readInt();
changeType = ChangeType.getChangeType( type );
-
+
// Read the modification
switch ( changeType )
{
@@ -1154,14 +1154,14 @@ public class LdifEntry implements Clonea
// Read the entry
entry.readExternal( in );
entryDn = entry.getDn();
-
+
break;
-
+
case Delete:
// Read the Dn
entryDn = new Dn();
entryDn.readExternal( in );
-
+
break;
case ModDn:
@@ -1170,9 +1170,9 @@ public class LdifEntry implements Clonea
// Read the Dn
entryDn = new Dn();
entryDn.readExternal( in );
-
+
deleteOldRdn = in.readBoolean();
-
+
if ( in.readBoolean() )
{
newRdn = in.readUTF();
@@ -1197,7 +1197,7 @@ public class LdifEntry implements Clonea
{
Modification modification = new DefaultModification();
modification.readExternal( in );
-
+
addModification( modification );
}
@@ -1214,7 +1214,7 @@ public class LdifEntry implements Clonea
for ( int i = 0; i < nbControls; i++ )
{
LdifControl control = new LdifControl();
-
+
control.readExternal( in );
controls.put( control.getOid(), control );
@@ -1237,11 +1237,11 @@ public class LdifEntry implements Clonea
switch ( changeType )
{
case Add:
- case None :
+ case None:
entry.writeExternal( out );
break;
-
- // Fallback
+
+ // Fallback
case Delete:
// we write the Dn
entryDn.writeExternal( out );
@@ -1252,9 +1252,9 @@ public class LdifEntry implements Clonea
case ModRdn:
// Write the Dn
entryDn.writeExternal( out );
-
+
out.writeBoolean( deleteOldRdn );
-
+
if ( newRdn == null )
{
out.writeBoolean( false );
@@ -1279,7 +1279,7 @@ public class LdifEntry implements Clonea
case Modify:
// Write the Dn
entryDn.writeExternal( out );
-
+
// Write the modifications
out.writeInt( modificationList.size() );
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifReader.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifReader.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifReader.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifReader.java Tue Jan 24 17:44:03 2012
@@ -242,6 +242,7 @@ public class LdifReader implements Itera
init();
}
+
protected void init() throws LdapException
{
lines = new ArrayList<String>();
@@ -255,6 +256,7 @@ public class LdifReader implements Itera
prefetched = parseEntry();
}
+
/**
* A constructor which takes a file name
*
@@ -291,7 +293,7 @@ public class LdifReader implements Itera
}
catch ( LdapInvalidDnException lide )
{
- throw new LdapLdifException( lide.getMessage(), lide);
+ throw new LdapLdifException( lide.getMessage(), lide );
}
catch ( LdapException le )
{
@@ -354,7 +356,7 @@ public class LdifReader implements Itera
{
String msg = I18n.err( I18n.ERR_12010_CANNOT_FIND_FILE, file.getAbsoluteFile() );
LOG.error( msg );
- throw new LdapLdifException( msg , fnfe);
+ throw new LdapLdifException( msg, fnfe );
}
catch ( LdapInvalidDnException lide )
{
@@ -399,7 +401,7 @@ public class LdifReader implements Itera
// <fill> ::= ' ' <fill> | e
private void parseFill( char[] document )
{
- while ( Chars.isCharASCII(document, position, ' ') )
+ while ( Chars.isCharASCII( document, position, ' ' ) )
{
position++;
}
@@ -423,7 +425,7 @@ public class LdifReader implements Itera
while ( true )
{
- if ( Chars.isDigit(document, position) )
+ if ( Chars.isDigit( document, position ) )
{
position++;
}
@@ -454,7 +456,7 @@ public class LdifReader implements Itera
{
ChangeType operation = ChangeType.Add;
- String modOp = Strings.trim(line.substring("changetype:".length() + 1));
+ String modOp = Strings.trim( line.substring( "changetype:".length() + 1 ) );
if ( "add".equalsIgnoreCase( modOp ) )
{
@@ -568,13 +570,13 @@ public class LdifReader implements Itera
if ( c == ':' )
{
- String value = Strings.trim(line.substring(pos + 2));
+ String value = Strings.trim( line.substring( pos + 2 ) );
return Base64.decode( value.toCharArray() );
}
else
{
- return Strings.trim(line.substring(pos + 1));
+ return Strings.trim( line.substring( pos + 1 ) );
}
}
else
@@ -600,13 +602,13 @@ public class LdifReader implements Itera
if ( c == ':' )
{
- String value = Strings.trim(line.substring(pos + 2));
+ String value = Strings.trim( line.substring( pos + 2 ) );
- return Base64.decode(value.toCharArray());
+ return Base64.decode( value.toCharArray() );
}
else if ( c == '<' )
{
- String urlName = Strings.trim(line.substring(pos + 2));
+ String urlName = Strings.trim( line.substring( pos + 2 ) );
try
{
@@ -651,7 +653,8 @@ public class LdifReader implements Itera
// existence has already been
// checked
LOG.error( I18n.err( I18n.ERR_12018_FILE_NOT_FOUND, fileName ) );
- throw new LdapLdifException( I18n.err( I18n.ERR_12019_BAD_URL_FILE_NOT_FOUND ), fnfe );
+ throw new LdapLdifException( I18n.err( I18n.ERR_12019_BAD_URL_FILE_NOT_FOUND ),
+ fnfe );
}
catch ( IOException ioe )
{
@@ -693,11 +696,11 @@ public class LdifReader implements Itera
{
String value = Strings.trimLeft( line.substring( pos + 1 ) );
int end = value.length();
-
+
for ( int i = value.length() - 1; i > 0; i-- )
{
char cc = value.charAt( i );
-
+
if ( cc == ' ' )
{
if ( value.charAt( i - 1 ) == '\\' )
@@ -715,9 +718,9 @@ public class LdifReader implements Itera
break;
}
}
-
+
String result = null;
-
+
result = value.substring( 0, end );
return result;
@@ -769,7 +772,7 @@ public class LdifReader implements Itera
int initPos = pos;
- while ( Chars.isCharASCII(controlValue, pos, '.') || Chars.isDigit(controlValue, pos) )
+ while ( Chars.isCharASCII( controlValue, pos, '.' ) || Chars.isDigit( controlValue, pos ) )
{
pos++;
}
@@ -784,7 +787,7 @@ public class LdifReader implements Itera
// Create and check the OID
String oidString = lowerLine.substring( 0, pos );
- if ( !Oid.isOid(oidString) )
+ if ( !Oid.isOid( oidString ) )
{
String message = I18n.err( I18n.ERR_12031_INVALID_OID, oidString );
LOG.error( message );
@@ -795,7 +798,7 @@ public class LdifReader implements Itera
// Get the criticality, if any
// Skip the <fill>
- while ( Chars.isCharASCII(controlValue, pos, ' ') )
+ while ( Chars.isCharASCII( controlValue, pos, ' ' ) )
{
pos++;
}
@@ -834,14 +837,14 @@ public class LdifReader implements Itera
{
// We have a value. It can be a normal value, a base64 encoded value
// or a file contained value
- if ( Chars.isCharASCII(controlValue, criticalPos + 1, ':') )
+ if ( Chars.isCharASCII( controlValue, criticalPos + 1, ':' ) )
{
// Base 64 encoded value
-
+
// Skip the <fill>
pos = criticalPos + 2;
-
- while ( Chars.isCharASCII(controlValue, pos, ' ') )
+
+ while ( Chars.isCharASCII( controlValue, pos, ' ' ) )
{
pos++;
}
@@ -849,7 +852,7 @@ public class LdifReader implements Itera
byte[] value = Base64.decode( line.substring( pos ).toCharArray() );
control.setValue( value );
}
- else if ( Chars.isCharASCII(controlValue, criticalPos + 1, '<') )
+ else if ( Chars.isCharASCII( controlValue, criticalPos + 1, '<' ) )
{
// File contained value
throw new NotImplementedException( "See DIRSERVER-1547" );
@@ -858,8 +861,8 @@ public class LdifReader implements Itera
{
// Skip the <fill>
pos = criticalPos + 1;
-
- while ( Chars.isCharASCII(controlValue, pos, ' ') )
+
+ while ( Chars.isCharASCII( controlValue, pos, ' ' ) )
{
pos++;
}
@@ -967,7 +970,7 @@ public class LdifReader implements Itera
}
else
{
- entry.setNewRdn( Strings.utf8ToString((byte[]) attributeValue) );
+ entry.setNewRdn( Strings.utf8ToString( ( byte[] ) attributeValue ) );
}
}
else
@@ -1042,7 +1045,7 @@ public class LdifReader implements Itera
if ( lowerLine.startsWith( "-" ) )
{
- if ( ( state != ATTRVAL_SPEC_OR_SEP ) && ( state != ATTRVAL_SPEC ) )
+ if ( ( state != ATTRVAL_SPEC_OR_SEP ) && ( state != ATTRVAL_SPEC ) )
{
LOG.error( I18n.err( I18n.ERR_12040_BAD_MODIFY_SEPARATOR ) );
throw new LdapLdifException( I18n.err( I18n.ERR_12040_BAD_MODIFY_SEPARATOR ) );
@@ -1086,7 +1089,7 @@ public class LdifReader implements Itera
throw new LdapLdifException( I18n.err( I18n.ERR_12042_BAD_MODIFY_SEPARATOR_2 ) );
}
- modified = Strings.trim(line.substring("delete:".length()));
+ modified = Strings.trim( line.substring( "delete:".length() ) );
modificationType = ModificationOperation.REMOVE_ATTRIBUTE;
attribute = new DefaultAttribute( modified );
@@ -1100,7 +1103,7 @@ public class LdifReader implements Itera
throw new LdapLdifException( I18n.err( I18n.ERR_12042_BAD_MODIFY_SEPARATOR_2 ) );
}
- modified = Strings.trim(line.substring("replace:".length()));
+ modified = Strings.trim( line.substring( "replace:".length() ) );
modificationType = ModificationOperation.REPLACE_ATTRIBUTE;
attribute = new DefaultAttribute( modified );
@@ -1135,7 +1138,7 @@ public class LdifReader implements Itera
Object attributeValue = parseValue( line, colonIndex );
try
- {
+ {
if ( attributeValue instanceof String )
{
attribute.add( ( String ) attributeValue );
@@ -1246,7 +1249,7 @@ public class LdifReader implements Itera
}
else
{
- entry.setNewSuperior( Strings.utf8ToString((byte[]) attributeValue) );
+ entry.setNewSuperior( Strings.utf8ToString( ( byte[] ) attributeValue ) );
}
}
else
@@ -1507,8 +1510,8 @@ public class LdifReader implements Itera
{
return ( ( BufferedReader ) reader ).readLine();
}
-
-
+
+
/**
* Reads an entry in a ldif buffer, and returns the resulting lines, without
* comments, and unfolded.
@@ -1625,7 +1628,7 @@ public class LdifReader implements Itera
@SuppressWarnings("PMD.EmptyCatchBlock")
public List<LdifEntry> parseLdifFile( String fileName, String encoding ) throws LdapLdifException
{
- if ( Strings.isEmpty(fileName) )
+ if ( Strings.isEmpty( fileName ) )
{
LOG.error( I18n.err( I18n.ERR_12064_EMPTY_FILE_NAME ) );
throw new LdapLdifException( I18n.err( I18n.ERR_12064_EMPTY_FILE_NAME ) );
@@ -1689,7 +1692,7 @@ public class LdifReader implements Itera
{
LOG.debug( "Starts parsing ldif buffer" );
- if ( Strings.isEmpty(ldif) )
+ if ( Strings.isEmpty( ldif ) )
{
return new ArrayList<LdifEntry>();
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertor.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertor.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertor.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertor.java Tue Jan 24 17:44:03 2012
@@ -230,7 +230,7 @@ public final class LdifRevertor
}
- AttributeUtils.applyModification(clonedEntry, modification);
+ AttributeUtils.applyModification( clonedEntry, modification );
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifUtils.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifUtils.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifUtils.java Tue Jan 24 17:44:03 2012
@@ -66,7 +66,7 @@ public final class LdifUtils
LDIF_SAFE_STARTING_CHAR_ALPHABET[i] = true;
}
- LDIF_SAFE_STARTING_CHAR_ALPHABET[0] = false; // 0 (NUL)
+ LDIF_SAFE_STARTING_CHAR_ALPHABET[0] = false; // 0 (NUL)
LDIF_SAFE_STARTING_CHAR_ALPHABET[10] = false; // 10 (LF)
LDIF_SAFE_STARTING_CHAR_ALPHABET[13] = false; // 13 (CR)
LDIF_SAFE_STARTING_CHAR_ALPHABET[32] = false; // 32 (SPACE)
@@ -79,7 +79,7 @@ public final class LdifUtils
LDIF_SAFE_OTHER_CHARS_ALPHABET[i] = true;
}
- LDIF_SAFE_OTHER_CHARS_ALPHABET[0] = false; // 0 (NUL)
+ LDIF_SAFE_OTHER_CHARS_ALPHABET[0] = false; // 0 (NUL)
LDIF_SAFE_OTHER_CHARS_ALPHABET[10] = false; // 10 (LF)
LDIF_SAFE_OTHER_CHARS_ALPHABET[13] = false; // 13 (CR)
}
@@ -125,7 +125,7 @@ public final class LdifUtils
*/
public static boolean isLDIFSafe( String str )
{
- if ( Strings.isEmpty(str) )
+ if ( Strings.isEmpty( str ) )
{
// A null string is LDIF safe
return true;
@@ -178,7 +178,7 @@ public final class LdifUtils
*/
public static String convertToLdif( Attributes attrs, int length ) throws LdapException
{
- return convertAttributesToLdif( AttributeUtils.toEntry(attrs, null), length );
+ return convertAttributesToLdif( AttributeUtils.toEntry( attrs, null ), length );
}
@@ -386,7 +386,7 @@ public final class LdifUtils
if ( control.hasValue() )
{
- controlStr.append( "::" ).append( Base64.encode(control.getValue()) );
+ controlStr.append( "::" ).append( Base64.encode( control.getValue() ) );
}
sb.append( stripLineToNChars( controlStr.toString(), length ) );
@@ -456,7 +456,7 @@ public final class LdifUtils
sb.append( '\n' );
// Stores the optional newSuperior
- if ( !Strings.isEmpty(entry.getNewSuperior()) )
+ if ( !Strings.isEmpty( entry.getNewSuperior() ) )
{
Attribute newSuperior = new DefaultAttribute( "newsuperior", entry.getNewSuperior() );
sb.append( convertToLdif( newSuperior, length ) );
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AbandonListener.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AbandonListener.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AbandonListener.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AbandonListener.java Tue Jan 24 17:44:03 2012
@@ -20,7 +20,6 @@
package org.apache.directory.shared.ldap.model.message;
-
/**
* A listener interested in abandon operations performed on requests.
*
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AbandonRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AbandonRequest.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AbandonRequest.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AbandonRequest.java Tue Jan 24 17:44:03 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.model.message;
+
import org.apache.directory.shared.ldap.model.exception.MessageException;
@@ -55,20 +56,20 @@ public interface AbandonRequest extends
* {@inheritDoc}
*/
AbandonRequest setMessageId( int messageId );
-
-
+
+
/**
* {@inheritDoc}
*/
AbandonRequest addControl( Control control ) throws MessageException;
-
-
+
+
/**
* {@inheritDoc}
*/
AbandonRequest addAllControls( Control[] controls ) throws MessageException;
-
-
+
+
/**
* {@inheritDoc}
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AbandonRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AbandonRequestImpl.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AbandonRequestImpl.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AbandonRequestImpl.java Tue Jan 24 17:44:03 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.model.message;
+
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.ldap.model.exception.MessageException;
@@ -72,7 +73,7 @@ public class AbandonRequestImpl extends
public AbandonRequest setAbandoned( int abandonId )
{
this.abandonId = abandonId;
-
+
return this;
}
@@ -85,46 +86,46 @@ public class AbandonRequestImpl extends
{
throw new UnsupportedOperationException( I18n.err( I18n.ERR_04185 ) );
}
-
-
+
+
/**
* {@inheritDoc}
*/
public AbandonRequest setMessageId( int messageId )
{
super.setMessageId( messageId );
-
+
return this;
}
-
+
/**
* {@inheritDoc}
*/
public AbandonRequest addControl( Control control ) throws MessageException
{
- return (AbandonRequest)super.addControl( control );
+ return ( AbandonRequest ) super.addControl( control );
}
-
-
+
+
/**
* {@inheritDoc}
*/
public AbandonRequest addAllControls( Control[] controls ) throws MessageException
{
- return (AbandonRequest)super.addAllControls( controls );
+ return ( AbandonRequest ) super.addAllControls( controls );
}
-
-
+
+
/**
* {@inheritDoc}
*/
public AbandonRequest removeControl( Control control ) throws MessageException
{
- return (AbandonRequest)super.removeControl( control );
+ return ( AbandonRequest ) super.removeControl( control );
}
-
+
/**
* Checks for equality first by asking the super method which should compare
* all but the Abandoned request's Id. It then compares this to determine
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AbandonableRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AbandonableRequest.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AbandonableRequest.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AbandonableRequest.java Tue Jan 24 17:44:03 2012
@@ -20,7 +20,6 @@
package org.apache.directory.shared.ldap.model.message;
-
/**
* A request which can be abandoned.
*
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AbstractAbandonableRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AbstractAbandonableRequest.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AbstractAbandonableRequest.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AbstractAbandonableRequest.java Tue Jan 24 17:44:03 2012
@@ -60,7 +60,7 @@ public class AbstractAbandonableRequest
{
return;
}
-
+
abandoned = true;
if ( o == null )
{
@@ -87,7 +87,7 @@ public class AbstractAbandonableRequest
{
o = new RequestObservable();
}
-
+
o.addObserver( new Observer()
{
public void update( Observable o, Object arg )
@@ -95,11 +95,10 @@ public class AbstractAbandonableRequest
listener.requestAbandoned( AbstractAbandonableRequest.this );
}
} );
-
+
return this;
}
-
// False positive
static class RequestObservable extends Observable
{
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AbstractExtendedRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AbstractExtendedRequest.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AbstractExtendedRequest.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AbstractExtendedRequest.java Tue Jan 24 17:44:03 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.model.message;
+
import org.apache.directory.shared.ldap.model.exception.MessageException;
@@ -27,7 +28,8 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public abstract class AbstractExtendedRequest<R extends ExtendedResponse> extends AbstractRequest implements ExtendedRequest<R>
+public abstract class AbstractExtendedRequest<R extends ExtendedResponse> extends AbstractRequest implements
+ ExtendedRequest<R>
{
static final long serialVersionUID = 7916990159044177480L;
@@ -64,7 +66,6 @@ public abstract class AbstractExtendedRe
// ExtendedRequest Interface Method Implementations
// -----------------------------------------------------------------------
-
/**
* Gets the Object Identifier corresponding to the extended request type.
* This is the <b>requestName</b> portion of the ext. req. PDU.
@@ -76,7 +77,7 @@ public abstract class AbstractExtendedRe
return oid;
}
-
+
/**
* Sets the Object Identifier corresponding to the extended request type.
*
@@ -85,46 +86,46 @@ public abstract class AbstractExtendedRe
public ExtendedRequest<R> setRequestName( String newOid )
{
this.oid = newOid;
-
+
return this;
}
-
-
+
+
/**
* {@inheritDoc}
*/
public ExtendedRequest<R> setMessageId( int messageId )
{
super.setMessageId( messageId );
-
+
return this;
}
-
+
/**
* {@inheritDoc}
*/
public ExtendedRequest<R> addControl( Control control ) throws MessageException
{
- return (ExtendedRequest<R>)super.addControl( control );
+ return ( ExtendedRequest<R> ) super.addControl( control );
}
-
-
+
+
/**
* {@inheritDoc}
*/
public ExtendedRequest<R> addAllControls( Control[] controls ) throws MessageException
{
- return (ExtendedRequest<R>)super.addAllControls( controls );
+ return ( ExtendedRequest<R> ) super.addAllControls( controls );
}
-
-
+
+
/**
* {@inheritDoc}
*/
public ExtendedRequest<R> removeControl( Control control ) throws MessageException
{
- return (ExtendedRequest<R>)super.removeControl( control );
+ return ( ExtendedRequest<R> ) super.removeControl( control );
}
@@ -208,7 +209,7 @@ public abstract class AbstractExtendedRe
{
return false;
}
-
+
return true;
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AbstractMessage.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AbstractMessage.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AbstractMessage.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AbstractMessage.java Tue Jan 24 17:44:03 2012
@@ -84,7 +84,7 @@ public abstract class AbstractMessage im
public Message setMessageId( int id )
{
this.id = id;
-
+
return this;
}
@@ -122,7 +122,7 @@ public abstract class AbstractMessage im
public Message addControl( Control control ) throws MessageException
{
controls.put( control.getOid(), control );
-
+
return this;
}
@@ -137,7 +137,7 @@ public abstract class AbstractMessage im
public Message removeControl( Control control ) throws MessageException
{
controls.remove( control.getOid() );
-
+
return this;
}
@@ -230,7 +230,7 @@ public abstract class AbstractMessage im
for ( String key : this.controls.keySet() )
{
- if ( ! controls.containsKey( key ) )
+ if ( !controls.containsKey( key ) )
{
return false;
}
@@ -265,7 +265,7 @@ public abstract class AbstractMessage im
{
this.controls.put( c.getOid(), c );
}
-
+
return this;
}
@@ -278,10 +278,10 @@ public abstract class AbstractMessage im
public String toString( String message )
{
StringBuilder sb = new StringBuilder();
-
+
sb.append( "MessageType : " ).append( type ).append( '\n' );
sb.append( "Message ID : " ).append( id ).append( '\n' );
-
+
sb.append( message );
if ( controls != null )
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AbstractRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AbstractRequest.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AbstractRequest.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AbstractRequest.java Tue Jan 24 17:44:03 2012
@@ -76,7 +76,7 @@ public class AbstractRequest extends Abs
return false;
}
- if ( hasResponse != ( (Request) obj ).hasResponse() )
+ if ( hasResponse != ( ( Request ) obj ).hasResponse() )
{
return false;
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AbstractResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AbstractResponse.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AbstractResponse.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AbstractResponse.java Tue Jan 24 17:44:03 2012
@@ -20,7 +20,6 @@
package org.apache.directory.shared.ldap.model.message;
-
/**
* Abstract base for a Response message.
*
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AddRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AddRequest.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AddRequest.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AddRequest.java Tue Jan 24 17:44:03 2012
@@ -78,20 +78,20 @@ public interface AddRequest extends Sing
* {@inheritDoc}
*/
AddRequest setMessageId( int messageId );
-
-
+
+
/**
* {@inheritDoc}
*/
AddRequest addControl( Control control ) throws MessageException;
-
-
+
+
/**
* {@inheritDoc}
*/
AddRequest addAllControls( Control[] controls ) throws MessageException;
-
-
+
+
/**
* {@inheritDoc}
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AddRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AddRequestImpl.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AddRequestImpl.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/AddRequestImpl.java Tue Jan 24 17:44:03 2012
@@ -52,7 +52,6 @@ public class AddRequestImpl extends Abst
// Constructors
// ------------------------------------------------------------------------
-
/**
* Creates an AddRequest implementation to create a new entry.
*/
@@ -129,7 +128,6 @@ public class AddRequestImpl extends Abst
// AddRequest Interface Method Implementations
// ------------------------------------------------------------------------
-
/**
* Gets the distinguished name of the entry to add.
*
@@ -147,7 +145,7 @@ public class AddRequestImpl extends Abst
public AddRequest setEntryDn( Dn dn )
{
entry.setDn( dn );
-
+
return this;
}
@@ -167,49 +165,49 @@ public class AddRequestImpl extends Abst
public AddRequest setEntry( Entry entry )
{
this.entry = entry;
-
+
return this;
}
-
-
+
+
/**
* {@inheritDoc}
*/
public AddRequest setMessageId( int messageId )
{
super.setMessageId( messageId );
-
+
return this;
}
-
+
/**
* {@inheritDoc}
*/
public AddRequest addControl( Control control ) throws MessageException
{
- return (AddRequest)super.addControl( control );
+ return ( AddRequest ) super.addControl( control );
}
-
-
+
+
/**
* {@inheritDoc}
*/
public AddRequest addAllControls( Control[] controls ) throws MessageException
{
- return (AddRequest)super.addAllControls( controls );
+ return ( AddRequest ) super.addAllControls( controls );
}
-
-
+
+
/**
* {@inheritDoc}
*/
public AddRequest removeControl( Control control ) throws MessageException
{
- return (AddRequest)super.removeControl( control );
+ return ( AddRequest ) super.removeControl( control );
}
-
+
// ------------------------------------------------------------------------
// SingleReplyRequest Interface Method Implementations
// ------------------------------------------------------------------------
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/BindResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/BindResponseImpl.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/BindResponseImpl.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/BindResponseImpl.java Tue Jan 24 17:44:03 2012
@@ -140,7 +140,7 @@ public class BindResponseImpl extends Ab
return true;
}
- if ( ( obj == null ) || !( obj instanceof BindResponse) )
+ if ( ( obj == null ) || !( obj instanceof BindResponse ) )
{
return false;
}
@@ -183,7 +183,7 @@ public class BindResponseImpl extends Ab
if ( serverSaslCreds != null )
{
- sb.append( " Server sasl credentials : '" ).append( Strings.dumpBytes(serverSaslCreds) )
+ sb.append( " Server sasl credentials : '" ).append( Strings.dumpBytes( serverSaslCreds ) )
.append( "'\n" );
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/BindStatus.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/BindStatus.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/BindStatus.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/BindStatus.java Tue Jan 24 17:44:03 2012
@@ -20,6 +20,7 @@
package org.apache.directory.shared.ldap.model.message;
+
/**
* An enum used to store the BindRequest state.
*
@@ -32,17 +33,17 @@ public enum BindStatus
* be anonymous
**/
ANONYMOUS,
-
+
/**
* We have received a Simple BindRequest
*/
SIMPLE_AUTH_PENDING,
-
+
/**
* We have received a SASL BindRequest
*/
SASL_AUTH_PENDING,
-
+
/**
* The user has been authenticated
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/CompareRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/CompareRequest.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/CompareRequest.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/CompareRequest.java Tue Jan 24 17:44:03 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.model.message;
+
import org.apache.directory.shared.ldap.model.entry.Value;
import org.apache.directory.shared.ldap.model.exception.MessageException;
import org.apache.directory.shared.ldap.model.name.Dn;
@@ -105,20 +106,20 @@ public interface CompareRequest extends
* {@inheritDoc}
*/
CompareRequest setMessageId( int messageId );
-
-
+
+
/**
* {@inheritDoc}
*/
CompareRequest addControl( Control control ) throws MessageException;
-
-
+
+
/**
* {@inheritDoc}
*/
CompareRequest addAllControls( Control[] controls ) throws MessageException;
-
-
+
+
/**
* {@inheritDoc}
*/