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 2016/11/29 10:48:28 UTC
svn commit: r1771880 [5/8] - in /directory/shared/trunk:
integ/src/test/java/org/apache/directory/api/ldap/entry/
ldap/model/src/main/java/org/apache/directory/api/ldap/model/cursor/
ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/ l...
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MatchingRuleUse.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MatchingRuleUse.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MatchingRuleUse.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MatchingRuleUse.java Tue Nov 29 10:48:26 2016
@@ -102,8 +102,8 @@ public class MatchingRuleUse extends Abs
{
super( SchemaObjectType.MATCHING_RULE_USE, oid );
- applicableAttributeOids = new ArrayList<String>();
- applicableAttributes = new ArrayList<AttributeType>();
+ applicableAttributeOids = new ArrayList<>();
+ applicableAttributes = new ArrayList<>();
}
@@ -213,6 +213,7 @@ public class MatchingRuleUse extends Abs
/**
* @see Object#toString()
*/
+ @Override
public String toString()
{
return SchemaObjectRenderer.OPEN_LDAP_SCHEMA_RENDERER.render( this );
@@ -222,6 +223,7 @@ public class MatchingRuleUse extends Abs
/**
* Copy an MatchingRuleUse
*/
+ @Override
public MatchingRuleUse copy()
{
MatchingRuleUse copy = new MatchingRuleUse( oid );
@@ -230,7 +232,7 @@ public class MatchingRuleUse extends Abs
copy.copy( this );
// Clone the APPLY AttributeTypes
- copy.applicableAttributeOids = new ArrayList<String>();
+ copy.applicableAttributeOids = new ArrayList<>();
// Copy the APPLIES oid list
for ( String oid : applicableAttributeOids )
@@ -239,7 +241,7 @@ public class MatchingRuleUse extends Abs
}
// Copy the APPLIES list (will be empty)
- copy.applicableAttributes = new ArrayList<AttributeType>();
+ copy.applicableAttributes = new ArrayList<>();
return copy;
}
@@ -272,6 +274,7 @@ public class MatchingRuleUse extends Abs
/**
* {@inheritDoc}
*/
+ @Override
public void clear()
{
// Clear the common elements
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MutableAttributeType.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MutableAttributeType.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MutableAttributeType.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MutableAttributeType.java Tue Nov 29 10:48:26 2016
@@ -588,6 +588,7 @@ public class MutableAttributeType extend
/**
* {@inheritDoc}
*/
+ @Override
public void clear()
{
// Clear the common elements
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MutableMatchingRule.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MutableMatchingRule.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MutableMatchingRule.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MutableMatchingRule.java Tue Nov 29 10:48:26 2016
@@ -220,6 +220,7 @@ public class MutableMatchingRule extends
/**
* {@inheritDoc}
*/
+ @Override
public void clear()
{
// Clear the common elements
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MutableObjectClass.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MutableObjectClass.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MutableObjectClass.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/MutableObjectClass.java Tue Nov 29 10:48:26 2016
@@ -446,6 +446,7 @@ public class MutableObjectClass extends
/**
* {@inheritDoc}
*/
+ @Override
public void clear()
{
// Clear the common elements
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/NameForm.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/NameForm.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/NameForm.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/NameForm.java Tue Nov 29 10:48:26 2016
@@ -123,11 +123,11 @@ public class NameForm extends AbstractSc
{
super( SchemaObjectType.NAME_FORM, oid );
- mustAttributeTypeOids = new ArrayList<String>();
- mayAttributeTypeOids = new ArrayList<String>();
+ mustAttributeTypeOids = new ArrayList<>();
+ mayAttributeTypeOids = new ArrayList<>();
- mustAttributeTypes = new ArrayList<AttributeType>();
- mayAttributeTypes = new ArrayList<AttributeType>();
+ mustAttributeTypes = new ArrayList<>();
+ mayAttributeTypes = new ArrayList<>();
}
@@ -419,6 +419,7 @@ public class NameForm extends AbstractSc
/**
* @see Object#toString()
*/
+ @Override
public String toString()
{
return SchemaObjectRenderer.OPEN_LDAP_SCHEMA_RENDERER.render( this );
@@ -428,6 +429,7 @@ public class NameForm extends AbstractSc
/**
* Copy a NameForm
*/
+ @Override
public NameForm copy()
{
NameForm copy = new NameForm( oid );
@@ -436,7 +438,7 @@ public class NameForm extends AbstractSc
copy.copy( this );
// Copy the MAY AttributeTypes OIDs
- copy.mayAttributeTypeOids = new ArrayList<String>();
+ copy.mayAttributeTypeOids = new ArrayList<>();
for ( String oid : mayAttributeTypeOids )
{
@@ -444,10 +446,10 @@ public class NameForm extends AbstractSc
}
// Copy the MAY AttributeTypes (will be empty)
- copy.mayAttributeTypes = new ArrayList<AttributeType>();
+ copy.mayAttributeTypes = new ArrayList<>();
// Copy the MUST AttributeTypes OIDs
- copy.mustAttributeTypeOids = new ArrayList<String>();
+ copy.mustAttributeTypeOids = new ArrayList<>();
for ( String oid : mustAttributeTypeOids )
{
@@ -455,7 +457,7 @@ public class NameForm extends AbstractSc
}
// Copy the MUST AttributeTypes ( will be empty )
- copy.mustAttributeTypes = new ArrayList<AttributeType>();
+ copy.mustAttributeTypes = new ArrayList<>();
// Copy the Structural ObjectClass OID
copy.structuralObjectClassOid = structuralObjectClassOid;
@@ -494,6 +496,7 @@ public class NameForm extends AbstractSc
/**
* {@inheritDoc}
*/
+ @Override
public void clear()
{
// Clear the common elements
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/ObjectClass.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/ObjectClass.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/ObjectClass.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/ObjectClass.java Tue Nov 29 10:48:26 2016
@@ -101,13 +101,13 @@ public class ObjectClass extends Abstrac
{
super( SchemaObjectType.OBJECT_CLASS, oid );
- mayAttributeTypeOids = new ArrayList<String>();
- mustAttributeTypeOids = new ArrayList<String>();
- superiorOids = new ArrayList<String>();
-
- mayAttributeTypes = new ArrayList<AttributeType>();
- mustAttributeTypes = new ArrayList<AttributeType>();
- superiors = new ArrayList<ObjectClass>();
+ mayAttributeTypeOids = new ArrayList<>();
+ mustAttributeTypeOids = new ArrayList<>();
+ superiorOids = new ArrayList<>();
+
+ mayAttributeTypes = new ArrayList<>();
+ mustAttributeTypes = new ArrayList<>();
+ superiors = new ArrayList<>();
objectClassType = ObjectClassTypeEnum.STRUCTURAL;
}
@@ -217,6 +217,7 @@ public class ObjectClass extends Abstrac
/**
* {@inheritDoc}
*/
+ @Override
public String toString()
{
return SchemaObjectRenderer.OPEN_LDAP_SCHEMA_RENDERER.render( this );
@@ -226,6 +227,7 @@ public class ObjectClass extends Abstrac
/**
* Copy an ObjectClass
*/
+ @Override
public ObjectClass copy()
{
ObjectClass copy = new ObjectClass( oid );
@@ -237,7 +239,7 @@ public class ObjectClass extends Abstrac
copy.objectClassType = objectClassType;
// Copy the Superiors ObjectClasses OIDs
- copy.superiorOids = new ArrayList<String>();
+ copy.superiorOids = new ArrayList<>();
for ( String oid : superiorOids )
{
@@ -245,10 +247,10 @@ public class ObjectClass extends Abstrac
}
// Copy the Superiors ObjectClasses ( will be empty )
- copy.superiors = new ArrayList<ObjectClass>();
+ copy.superiors = new ArrayList<>();
// Copy the MAY AttributeTypes OIDs
- copy.mayAttributeTypeOids = new ArrayList<String>();
+ copy.mayAttributeTypeOids = new ArrayList<>();
for ( String oid : mayAttributeTypeOids )
{
@@ -256,10 +258,10 @@ public class ObjectClass extends Abstrac
}
// Copy the MAY AttributeTypes ( will be empty )
- copy.mayAttributeTypes = new ArrayList<AttributeType>();
+ copy.mayAttributeTypes = new ArrayList<>();
// Copy the MUST AttributeTypes OIDs
- copy.mustAttributeTypeOids = new ArrayList<String>();
+ copy.mustAttributeTypeOids = new ArrayList<>();
for ( String oid : mustAttributeTypeOids )
{
@@ -267,12 +269,11 @@ public class ObjectClass extends Abstrac
}
// Copy the MUST AttributeTypes ( will be empty )
- copy.mustAttributeTypes = new ArrayList<AttributeType>();
+ copy.mustAttributeTypes = new ArrayList<>();
return copy;
}
-
/**
* @see Object#equals(Object)
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/PrepareString.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/PrepareString.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/PrepareString.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/PrepareString.java Tue Nov 29 10:48:26 2016
@@ -4739,6 +4739,7 @@ public final class PrepareString
case 0xFE63: // SMALL HYPHEN-MINUS
case 0xFF0D: // FULLWIDTH HYPHEN-MINUS
soh = c;
+ isSpaceOrHyphen = true;
break;
default:
@@ -4747,6 +4748,10 @@ public final class PrepareString
array[pos++] = soh;
isSpaceOrHyphen = false;
}
+ else
+ {
+ isSpaceOrHyphen = false;
+ }
array[pos++] = c;
break;
@@ -4830,7 +4835,7 @@ public final class PrepareString
// TODO : we have to find a way to prevent this waste of space.
char[] target = new char[str.length() * 3 + 2];
- int pos = 0;
+ int pos;
char lowerCase = ( char ) ( caseSensitive ? 0x00 : 0x20 );
// First pass to map the chars. This will copy the array into the target
@@ -4882,7 +4887,7 @@ public final class PrepareString
}
// Now remove the spaces at the end
- int i = 0;
+ int i;
for ( i = limit - 1; i >= start; i-- )
{
@@ -4993,10 +4998,9 @@ public final class PrepareString
{
target[pos++] = '\\';
}
+
// Ends by unescaping the escaped elements
- String result = unescape( target, pos );
-
- return result;
+ return unescape( target, pos );
}
@@ -5022,7 +5026,7 @@ public final class PrepareString
char[] array = str.toCharArray();
- int pos = 0;
+ int pos;
char lowerCase = ( char ) ( caseSensitive ? 0x00 : 0x20 );
// First pass to map the chars
@@ -5067,7 +5071,7 @@ public final class PrepareString
}
// Now remove the spaces at the end
- int i = 0;
+ int i;
for ( i = limit - 1; i >= start; i-- )
{
@@ -5121,11 +5125,7 @@ public final class PrepareString
checkProhibited( c );
- /*if ( isCombiningMark( c ) )
- {
- throw new InvalidCharacterException( c );
- }
- else*/ if ( c == ' ' )
+ if ( c == ' ' )
{
if ( escapeSeen )
{
@@ -5184,9 +5184,7 @@ public final class PrepareString
}
// Ends by unescaping the escaped elements
- String result = unescape( array, pos );
-
- return result;
+ return unescape( array, pos );
}
@@ -5249,7 +5247,8 @@ public final class PrepareString
case '7' :
case '8' :
case '9' :
- bytes[pos++] = ( byte ) ( ( ( byte ) ( array[i] - '0' ) << 4 ) + toByte( array[i + 1] ) );
+ bytes[pos++] = ( byte ) ( ( ( byte ) ( array[i] - '0' ) << 4 )
+ + ( toByte( array[i + 1] ) & 0xff ) );
i++;
break;
@@ -5259,7 +5258,8 @@ public final class PrepareString
case 'd' :
case 'e' :
case 'f' :
- bytes[pos++] = ( byte ) ( ( ( byte ) ( array[i] - 'a' + 10 ) << 4 ) + toByte( array[i + 1] ) );
+ bytes[pos++] = ( byte ) ( ( ( byte ) ( array[i] - 'a' + 10 ) << 4 )
+ + ( toByte( array[i + 1] ) & 0xFF ) );
i++;
break;
@@ -5269,7 +5269,8 @@ public final class PrepareString
case 'D' :
case 'E' :
case 'F' :
- bytes[pos++] = ( byte ) ( ( ( byte ) ( array[i] - 'A' + 10 ) << 4 ) + toByte( array[i + 1] ) );
+ bytes[pos++] = ( byte ) ( ( ( byte ) ( array[i] - 'A' + 10 ) << 4 )
+ + ( toByte( array[i + 1] ) & 0xff ) );
i++;
break;
@@ -5308,9 +5309,7 @@ public final class PrepareString
bytes[pos++] = '\\';
}
- String result = Strings.utf8ToString( bytes, pos );
-
- return result;
+ return Strings.utf8ToString( bytes, pos );
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SchemaObject.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SchemaObject.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SchemaObject.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SchemaObject.java Tue Nov 29 10:48:26 2016
@@ -306,12 +306,14 @@ public interface SchemaObject
/**
* {@inheritDoc}
*/
+ @Override
int hashCode();
/**
* {@inheritDoc}
*/
+ @Override
boolean equals( Object o1 );
@@ -341,7 +343,6 @@ public interface SchemaObject
/**
* Transform the SchemaObject to an immutable object
- * TODO locked.
*
*/
void lock();
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SchemaObjectRenderer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SchemaObjectRenderer.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SchemaObjectRenderer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SchemaObjectRenderer.java Tue Nov 29 10:48:26 2016
@@ -452,7 +452,7 @@ public final class SchemaObjectRenderer
List<String> applies = mru.getApplicableAttributeOids();
- if ( ( applies != null ) && ( applies.size() > 0 ) )
+ if ( ( applies != null ) && !applies.isEmpty() )
{
prettyPrintIndent( buf );
buf.append( "APPLIES " );
@@ -592,7 +592,7 @@ public final class SchemaObjectRenderer
{
List<String> names = so.getNames();
- if ( ( names != null ) && ( names.size() > 0 ) )
+ if ( ( names != null ) && !names.isEmpty() )
{
buf.append( " NAME " );
renderQDescrs( buf, names );
@@ -662,7 +662,7 @@ public final class SchemaObjectRenderer
*/
private StringBuilder renderQDescrs( StringBuilder buf, List<String> qdescrs )
{
- if ( ( qdescrs == null ) || ( qdescrs.size() == 0 ) )
+ if ( ( qdescrs == null ) || qdescrs.isEmpty() )
{
return buf;
}
@@ -689,7 +689,7 @@ public final class SchemaObjectRenderer
private void renderOids( StringBuilder buf, String prefix, List<String> oids )
{
- if ( ( oids != null ) && ( oids.size() > 0 ) )
+ if ( ( oids != null ) && !oids.isEmpty() )
{
prettyPrintIndent( buf );
buf.append( prefix ).append( ' ' );
@@ -778,7 +778,7 @@ public final class SchemaObjectRenderer
private StringBuilder renderRuleIds( StringBuilder buf, List<Integer> ruleIds )
{
- if ( ( ruleIds != null ) && ( ruleIds.size() > 0 ) )
+ if ( ( ruleIds != null ) && !ruleIds.isEmpty() )
{
prettyPrintIndent( buf );
buf.append( "SUP " );
@@ -832,14 +832,12 @@ public final class SchemaObjectRenderer
private void renderClose( StringBuilder buf )
{
- if ( style.prettyPrint )
+ if ( ( style.prettyPrint ) && ( buf.charAt( buf.length() - 1 ) == '\n' ) )
{
- if ( buf.charAt( buf.length() - 1 ) == '\n' )
- {
- buf.deleteCharAt( buf.length() - 1 );
- buf.append( " " );
- }
+ buf.deleteCharAt( buf.length() - 1 );
+ buf.append( " " );
}
+
buf.append( ")" );
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SchemaObjectSorter.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SchemaObjectSorter.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SchemaObjectSorter.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SchemaObjectSorter.java Tue Nov 29 10:48:26 2016
@@ -52,7 +52,7 @@ public final class SchemaObjectSorter
*/
public static Iterable<AttributeType> hierarchicalOrdered( List<AttributeType> attributeTypes )
{
- return new SchemaObjectIterable<AttributeType>( attributeTypes, new ReferenceCallback<AttributeType>()
+ return new SchemaObjectIterable<>( attributeTypes, new ReferenceCallback<AttributeType>()
{
@Override
public Collection<String> getSuperiorOids( AttributeType at )
@@ -71,7 +71,7 @@ public final class SchemaObjectSorter
*/
public static Iterable<ObjectClass> sortObjectClasses( List<ObjectClass> objectClasses )
{
- return new SchemaObjectIterable<ObjectClass>( objectClasses, new ReferenceCallback<ObjectClass>()
+ return new SchemaObjectIterable<>( objectClasses, new ReferenceCallback<ObjectClass>()
{
@Override
public Collection<String> getSuperiorOids( ObjectClass oc )
@@ -105,7 +105,7 @@ public final class SchemaObjectSorter
@Override
public Iterator<T> iterator()
{
- return new SchemaObjectIterator<T>( schemaObjects, callback );
+ return new SchemaObjectIterator<>( schemaObjects, callback );
}
}
@@ -127,8 +127,8 @@ public final class SchemaObjectSorter
this.schemaObjects = schemaObjects;
this.callback = callback;
- this.oid2numericOid = new HashMap<String, String>();
- this.numericOid2schemaObject = new TreeMap<String, T>();
+ this.oid2numericOid = new HashMap<>();
+ this.numericOid2schemaObject = new TreeMap<>();
this.loopCount = 0;
for ( T schemaObject : schemaObjects )
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SchemaObjectType.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SchemaObjectType.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SchemaObjectType.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SchemaObjectType.java Tue Nov 29 10:48:26 2016
@@ -71,7 +71,7 @@ public enum SchemaObjectType
*/
public String getRdn()
{
- String schemaObjectPath = null;
+ String schemaObjectPath;
switch ( this )
{
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SchemaObjectWrapper.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SchemaObjectWrapper.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SchemaObjectWrapper.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SchemaObjectWrapper.java Tue Nov 29 10:48:26 2016
@@ -49,6 +49,7 @@ public class SchemaObjectWrapper
* Compute the hash code for this wrapper. We only use the object type
* and its oid.
*/
+ @Override
public int hashCode()
{
int h = 37;
@@ -66,6 +67,7 @@ public class SchemaObjectWrapper
/**
* @see Object#equals(Object)
*/
+ @Override
public boolean equals( Object o )
{
if ( o == this )
@@ -90,7 +92,7 @@ public class SchemaObjectWrapper
// If both OID are null, instances are equals
if ( that.getOid() == null )
{
- return ( current.getOid() == null );
+ return current.getOid() == null;
}
// The that'oid will never be null, we don't really care if current.oid is null here.
@@ -110,6 +112,7 @@ public class SchemaObjectWrapper
/**
* @see Object#toString()
*/
+ @Override
public String toString()
{
return "<" + schemaObject.getObjectType() + "," + schemaObject.getOid() + ">";
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SchemaUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SchemaUtils.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SchemaUtils.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/SchemaUtils.java Tue Nov 29 10:48:26 2016
@@ -140,9 +140,9 @@ public final class SchemaUtils
* the quoted description strings to render
* @return the same string buffer that was given for call chaining
*/
- public static StringBuffer render( StringBuffer buf, List<String> qdescrs )
+ public static StringBuilder render( StringBuilder buf, List<String> qdescrs )
{
- if ( ( qdescrs == null ) || ( qdescrs.size() == 0 ) )
+ if ( ( qdescrs == null ) || qdescrs.isEmpty() )
{
return buf;
}
@@ -176,9 +176,9 @@ public final class SchemaUtils
* @param qdescrs the quoted description strings to render
* @return the string buffer the qdescrs are rendered into
*/
- /* No qualifier */static StringBuffer renderQDescrs( StringBuffer buf, List<String> qdescrs )
+ /* No qualifier */static StringBuilder renderQDescrs( StringBuilder buf, List<String> qdescrs )
{
- if ( ( qdescrs == null ) || ( qdescrs.size() == 0 ) )
+ if ( ( qdescrs == null ) || qdescrs.isEmpty() )
{
return buf;
}
@@ -209,7 +209,7 @@ public final class SchemaUtils
* @param qdescrs the quoted description strings to render
* @return the string buffer the qdescrs are rendered into
*/
- private static StringBuffer renderQDString( StringBuffer buf, String qdString )
+ private static StringBuilder renderQDString( StringBuilder buf, String qdString )
{
buf.append( '\'' );
@@ -249,9 +249,9 @@ public final class SchemaUtils
* the objectClasses to list
* @return a buffer which contains the rendered list
*/
- public static StringBuffer render( ObjectClass[] ocs )
+ public static StringBuilder render( ObjectClass[] ocs )
{
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
return render( buf, ocs );
}
@@ -267,7 +267,7 @@ public final class SchemaUtils
* the objectClasses to list
* @return a buffer which contains the rendered list
*/
- public static StringBuffer render( StringBuffer buf, ObjectClass[] ocs )
+ public static StringBuilder render( StringBuilder buf, ObjectClass[] ocs )
{
if ( ocs == null || ocs.length == 0 )
{
@@ -312,9 +312,10 @@ public final class SchemaUtils
* the attributeTypes to list
* @return a buffer which contains the rendered list
*/
- public static StringBuffer render( AttributeType[] ats )
+ public static StringBuilder render( AttributeType[] ats )
{
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
+
return render( buf, ats );
}
@@ -329,7 +330,7 @@ public final class SchemaUtils
* the attributeTypes to list
* @return a buffer which contains the rendered list
*/
- public static StringBuffer render( StringBuffer buf, AttributeType[] ats )
+ public static StringBuilder render( StringBuilder buf, AttributeType[] ats )
{
if ( ats == null || ats.length == 0 )
{
@@ -365,14 +366,14 @@ public final class SchemaUtils
// ------------------------------------------------------------------------
/**
- * Renders the schema extensions into a new StringBuffer.
+ * Renders the schema extensions into a new StringBuilder.
*
* @param extensions the schema extensions map with key and values
- * @return a StringBuffer with the extensions component of a syntax description
+ * @return a StringBuilder with the extensions component of a syntax description
*/
- public static StringBuffer render( Map<String, List<String>> extensions )
+ public static StringBuilder render( Map<String, List<String>> extensions )
{
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
if ( extensions.isEmpty() )
{
@@ -427,7 +428,7 @@ public final class SchemaUtils
*/
public static String render( LoadableSchemaObject description )
{
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
buf.append( "( " ).append( description.getOid() );
if ( description.getDescription() != null )
@@ -455,7 +456,7 @@ public final class SchemaUtils
{
List<String> values = desc.getExtension( MetaSchemaConstants.X_SCHEMA_AT );
- if ( values == null || values.size() == 0 )
+ if ( values == null || values.isEmpty() )
{
return MetaSchemaConstants.SCHEMA_OTHER;
}
@@ -510,7 +511,7 @@ public final class SchemaUtils
if ( optionsPos != -1 )
{
- Set<String> options = new HashSet<String>();
+ Set<String> options = new HashSet<>();
String[] res = attributeId.substring( optionsPos + 1 ).split( ";" );
@@ -595,7 +596,7 @@ public final class SchemaUtils
}
// Check the first char which must be ALPHA or DIGIT
- boolean descr = false;
+ boolean descr;
boolean zero = false;
boolean dot = false;
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/UsageEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/UsageEnum.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/UsageEnum.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/UsageEnum.java Tue Nov 29 10:48:26 2016
@@ -82,9 +82,7 @@ public enum UsageEnum
{
try
{
- UsageEnum result = valueOf( usage );
-
- return result;
+ return valueOf( usage );
}
catch ( IllegalArgumentException iae )
{
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/BitStringComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/BitStringComparator.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/BitStringComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/BitStringComparator.java Tue Nov 29 10:48:26 2016
@@ -71,7 +71,7 @@ public class BitStringComparator extends
// have been caught by the previous test
if ( ( bs1 == null ) || ( bs2 == null ) )
{
- return ( bs1 == null ? -1 : 1 );
+ return bs1 == null ? -1 : 1;
}
// We have to get rid of 0 from left of each BitString
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/BooleanComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/BooleanComparator.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/BooleanComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/BooleanComparator.java Tue Nov 29 10:48:26 2016
@@ -71,7 +71,7 @@ public class BooleanComparator extends L
// have been catched by the previous test
if ( ( b1 == null ) || ( b2 == null ) )
{
- return ( b1 == null ? -1 : 1 );
+ return b1 == null ? -1 : 1;
}
// The boolean should have been stored as 'TRUE' or 'FALSE'
@@ -79,14 +79,14 @@ public class BooleanComparator extends L
// with normalized booleans, so no need to upper case them.
// We don't need to check the assertion value, because we
// are dealing with booleans.
- boolean boolean1 = Boolean.valueOf( b1 );
- boolean boolean2 = Boolean.valueOf( b2 );
+ boolean boolean1 = Boolean.parseBoolean( b1 );
+ boolean boolean2 = Boolean.parseBoolean( b2 );
if ( boolean1 == boolean2 )
{
return 0;
}
- return ( boolean1 ? 1 : -1 );
+ return boolean1 ? 1 : -1;
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/CsnComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/CsnComparator.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/CsnComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/CsnComparator.java Tue Nov 29 10:48:26 2016
@@ -61,6 +61,7 @@ public class CsnComparator extends LdapC
/**
* {@inheritDoc}
*/
+ @Override
public int compare( Object csnObj1, Object csnObj2 )
{
LOG.debug( "comparing CSN objects '{}' with '{}'", csnObj1, csnObj2 );
@@ -75,7 +76,7 @@ public class CsnComparator extends LdapC
// -------------------------------------------------------------------
if ( csnObj1 == null )
{
- return ( csnObj2 == null ) ? 0 : -1;
+ return -1;
}
if ( csnObj2 == null )
@@ -83,8 +84,8 @@ public class CsnComparator extends LdapC
return 1;
}
- String csnStr1 = null;
- String csnStr2 = null;
+ String csnStr1;
+ String csnStr2;
if ( csnObj1 instanceof StringValue )
{
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/CsnSidComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/CsnSidComparator.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/CsnSidComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/CsnSidComparator.java Tue Nov 29 10:48:26 2016
@@ -74,7 +74,7 @@ public class CsnSidComparator extends Ld
}
int sid1 = 0;
- int sid2 = 0;
+ int sid2;
try
{
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/DeepTrimCachingNormalizingComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/DeepTrimCachingNormalizingComparator.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/DeepTrimCachingNormalizingComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/DeepTrimCachingNormalizingComparator.java Tue Nov 29 10:48:26 2016
@@ -25,7 +25,8 @@ import org.apache.directory.api.ldap.mod
/**
- * TODO DeepTrimCachingNormalizingComparator.
+ * A comparator that compare two Strings after having trimmed them on left and right,
+ * and replaced any contiguous spaces in the middle by 1 single space. We also keep a cache.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/DeepTrimToLowerCachingNormalizingComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/DeepTrimToLowerCachingNormalizingComparator.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/DeepTrimToLowerCachingNormalizingComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/DeepTrimToLowerCachingNormalizingComparator.java Tue Nov 29 10:48:26 2016
@@ -25,7 +25,9 @@ import org.apache.directory.api.ldap.mod
/**
- * TODO DeepTrimCachingNormalizingComparator.
+ * A comparator that compare two Strings after having trimmed them on left and right,
+ * and replaced any contiguous spaces in the middle by 1 single space. The Strings are compared
+ * case insensitive. We also keep a cache
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/DnComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/DnComparator.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/DnComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/DnComparator.java Tue Nov 29 10:48:26 2016
@@ -55,6 +55,7 @@ public class DnComparator extends LdapCo
/**
* {@inheritDoc}
*/
+ @Override
public int compare( Object obj0, Object obj1 )
{
Dn dn0 = null;
@@ -95,13 +96,13 @@ public class DnComparator extends LdapCo
private Dn getDn( Object obj ) throws LdapInvalidDnException
{
- Dn dn = null;
+ Dn dn;
if ( obj instanceof Dn )
{
dn = ( Dn ) obj;
- dn = ( dn.isSchemaAware() ? dn : dn.apply( schemaManager ) );
+ dn = dn.isSchemaAware() ? dn : dn.apply( schemaManager );
}
else if ( obj instanceof String )
{
@@ -109,7 +110,7 @@ public class DnComparator extends LdapCo
}
else
{
- throw new IllegalStateException( I18n.err( I18n.ERR_04218, ( obj == null ? null : obj.getClass() ) ) );
+ throw new IllegalStateException( I18n.err( I18n.ERR_04218, obj == null ? null : obj.getClass() ) );
}
return dn;
@@ -119,6 +120,7 @@ public class DnComparator extends LdapCo
/**
* {@inheritDoc}
*/
+ @Override
public void setSchemaManager( SchemaManager schemaManager )
{
this.schemaManager = schemaManager;
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/GeneralizedTimeComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/GeneralizedTimeComparator.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/GeneralizedTimeComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/GeneralizedTimeComparator.java Tue Nov 29 10:48:26 2016
@@ -77,7 +77,7 @@ public class GeneralizedTimeComparator e
// have been caught by the previous test
if ( ( backendValue == null ) || ( assertValue == null ) )
{
- return ( backendValue == null ? -1 : 1 );
+ return backendValue == null ? -1 : 1;
}
// Both objects must be stored as String for generalized tim.
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/IntegerComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/IntegerComparator.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/IntegerComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/IntegerComparator.java Tue Nov 29 10:48:26 2016
@@ -60,6 +60,7 @@ public class IntegerComparator extends L
/**
* {@inheritDoc}
*/
+ @Override
public int compare( Object v1, Object v2 )
{
if ( v1 instanceof String )
@@ -93,7 +94,7 @@ public class IntegerComparator extends L
// have been caught by the previous test
if ( ( backendValue == null ) || ( assertValue == null ) )
{
- return ( backendValue == null ? -1 : 1 );
+ return backendValue == null ? -1 : 1;
}
return backendValue.compareTo( assertValue );
@@ -120,7 +121,7 @@ public class IntegerComparator extends L
// have been caught by the previous test
if ( ( backendValue == null ) || ( assertValue == null ) )
{
- return ( backendValue == null ? -1 : 1 );
+ return backendValue == null ? -1 : 1;
}
// Both objects must be stored as String for numeric.
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/NumericStringComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/NumericStringComparator.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/NumericStringComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/NumericStringComparator.java Tue Nov 29 10:48:26 2016
@@ -75,7 +75,7 @@ public class NumericStringComparator ext
// have been caught by the previous test
if ( ( backendValue == null ) || ( assertValue == null ) )
{
- return ( backendValue == null ? -1 : 1 );
+ return backendValue == null ? -1 : 1;
}
// Both objects must be stored as String for numeric.
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/ObjectClassTypeComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/ObjectClassTypeComparator.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/ObjectClassTypeComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/ObjectClassTypeComparator.java Tue Nov 29 10:48:26 2016
@@ -51,6 +51,7 @@ public class ObjectClassTypeComparator<T
/**
* {@inheritDoc}
*/
+ @Override
public int compare( T o1, T o2 )
{
String s1 = getString( o1 );
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/ObjectIdentifierComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/ObjectIdentifierComparator.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/ObjectIdentifierComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/ObjectIdentifierComparator.java Tue Nov 29 10:48:26 2016
@@ -54,6 +54,7 @@ public class ObjectIdentifierComparator
/**
* {@inheritDoc}
*/
+ @Override
public int compare( Object o1, Object o2 )
{
LOG.debug( "comparing ObjectIdentifier objects '{}' with '{}'", o1, o2 );
@@ -78,11 +79,6 @@ public class ObjectIdentifierComparator
if ( !( o1 instanceof String && o2 instanceof String ) )
{
// Both objects must be strings...
- if ( o1.equals( o2 ) )
- {
- return 0;
- }
-
return -1;
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/SerializableComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/SerializableComparator.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/SerializableComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/SerializableComparator.java Tue Nov 29 10:48:26 2016
@@ -71,6 +71,7 @@ public class SerializableComparator<E> e
* {@inheritDoc}
*/
@SuppressWarnings("unchecked")
+ @Override
public int compare( E o1, E o2 )
{
if ( wrapped == null )
@@ -93,6 +94,7 @@ public class SerializableComparator<E> e
* @param schemaManager the schemaManager to set
*/
@SuppressWarnings("unchecked")
+ @Override
public void setSchemaManager( SchemaManager schemaManager )
{
if ( wrapped == null )
@@ -106,7 +108,7 @@ public class SerializableComparator<E> e
{
// Not found : get the default comparator
wrapped = ( Comparator<E> )
- new ComparableComparator<Comparable<E>>( matchingRuleOid );
+ new ComparableComparator<>( matchingRuleOid );
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/StringComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/StringComparator.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/StringComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/StringComparator.java Tue Nov 29 10:48:26 2016
@@ -70,7 +70,7 @@ public class StringComparator extends Ld
// -------------------------------------------------------------------
if ( s1 == null )
{
- return ( s2 == null ) ? 0 : -1;
+ return -1;
}
if ( s2 == null )
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/TelephoneNumberComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/TelephoneNumberComparator.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/TelephoneNumberComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/TelephoneNumberComparator.java Tue Nov 29 10:48:26 2016
@@ -102,6 +102,6 @@ public class TelephoneNumberComparator e
String strippedTelephoneNumber1 = strip( telephoneNumber1 );
String strippedTelephoneNumber2 = strip( telephoneNumber2 );
- return ( strippedTelephoneNumber1.compareToIgnoreCase( strippedTelephoneNumber2 ) );
+ return strippedTelephoneNumber1.compareToIgnoreCase( strippedTelephoneNumber2 );
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/UniqueMemberComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/UniqueMemberComparator.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/UniqueMemberComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/UniqueMemberComparator.java Tue Nov 29 10:48:26 2016
@@ -103,8 +103,8 @@ public class UniqueMemberComparator exte
return 1;
}
- Dn dn1 = null;
- Dn dn2 = null;
+ Dn dn1;
+ Dn dn2;
// This is an UID if the '#' is immediatly
// followed by a BitString, except if the '#' is
@@ -161,6 +161,7 @@ public class UniqueMemberComparator exte
/**
* {@inheritDoc}
*/
+ @Override
public void setSchemaManager( SchemaManager schemaManager )
{
this.schemaManager = schemaManager;
@@ -176,13 +177,13 @@ public class UniqueMemberComparator exte
*/
public Dn getDn( Object obj ) throws LdapInvalidDnException
{
- Dn dn = null;
+ Dn dn;
if ( obj instanceof Dn )
{
dn = ( Dn ) obj;
- dn = ( dn.isSchemaAware() ? dn : dn.apply( schemaManager ) );
+ dn = dn.isSchemaAware() ? dn : dn.apply( schemaManager );
}
else if ( obj instanceof String )
{
@@ -190,7 +191,7 @@ public class UniqueMemberComparator exte
}
else
{
- throw new IllegalStateException( I18n.err( I18n.ERR_04218, ( obj == null ? null : obj.getClass() ) ) );
+ throw new IllegalStateException( I18n.err( I18n.ERR_04218, obj == null ? null : obj.getClass() ) );
}
return dn;
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/UuidComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/UuidComparator.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/UuidComparator.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/comparators/UuidComparator.java Tue Nov 29 10:48:26 2016
@@ -58,6 +58,7 @@ public class UuidComparator extends Seri
/**
* {@inheritDoc}
*/
+ @Override
public int compare( String uuid1, String uuid2 )
{
if ( IS_DEBUG )
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/BooleanNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/BooleanNormalizer.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/BooleanNormalizer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/BooleanNormalizer.java Tue Nov 29 10:48:26 2016
@@ -49,6 +49,7 @@ public class BooleanNormalizer extends N
/**
* {@inheritDoc}
*/
+ @Override
public Value<?> normalize( Value<?> value ) throws LdapInvalidDnException
{
if ( value == null )
@@ -65,6 +66,7 @@ public class BooleanNormalizer extends N
/**
* {@inheritDoc}
*/
+ @Override
public String normalize( String value ) throws LdapInvalidDnException
{
if ( value == null )
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/CachingDnNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/CachingDnNormalizer.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/CachingDnNormalizer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/CachingDnNormalizer.java Tue Nov 29 10:48:26 2016
@@ -44,6 +44,7 @@ public class CachingDnNormalizer extends
/**
* {@inheritDoc}
*/
+ @Override
public void setSchemaManager( SchemaManager schemaManager )
{
super.normalizer.setSchemaManager( schemaManager );
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/CachingNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/CachingNormalizer.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/CachingNormalizer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/CachingNormalizer.java Tue Nov 29 10:48:26 2016
@@ -98,6 +98,7 @@ public class CachingNormalizer extends N
/**
* {@inheritDoc}
*/
+ @Override
public Value<?> normalize( Value<?> value ) throws LdapException
{
if ( value == null )
@@ -105,15 +106,14 @@ public class CachingNormalizer extends N
return null;
}
- Value<?> normalized = normalizer.normalize( value );
-
- return normalized;
+ return normalizer.normalize( value );
}
/**
* {@inheritDoc}
*/
+ @Override
public String normalize( String value ) throws LdapException
{
if ( value == null )
@@ -121,9 +121,7 @@ public class CachingNormalizer extends N
return null;
}
- String normalized = normalizer.normalize( value );
-
- return normalized;
+ return normalizer.normalize( value );
}
@@ -132,6 +130,7 @@ public class CachingNormalizer extends N
*
* @param schemaManager The SchemaManager
*/
+ @Override
public void setSchemaManager( SchemaManager schemaManager )
{
normalizer.setSchemaManager( schemaManager );
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/ConcreteNameComponentNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/ConcreteNameComponentNormalizer.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/ConcreteNameComponentNormalizer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/ConcreteNameComponentNormalizer.java Tue Nov 29 10:48:26 2016
@@ -61,7 +61,7 @@ public class ConcreteNameComponentNormal
char[] newVal = new char[value.length()];
int escaped = 0;
char high = 0;
- char low = 0;
+ char low;
int pos = 0;
for ( int index = 0; index < value.length(); index++ )
@@ -105,6 +105,7 @@ public class ConcreteNameComponentNormal
/**
* {@inheritDoc}
*/
+ @Override
public Object normalizeByName( String name, String value ) throws LdapException
{
AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( name );
@@ -127,6 +128,7 @@ public class ConcreteNameComponentNormal
/**
* {@inheritDoc}
*/
+ @Override
public Object normalizeByName( String name, byte[] value ) throws LdapException
{
AttributeType attributeType = schemaManager.lookupAttributeTypeRegistry( name );
@@ -146,6 +148,7 @@ public class ConcreteNameComponentNormal
/**
* {@inheritDoc}
*/
+ @Override
public Object normalizeByOid( String oid, String value ) throws LdapException
{
return lookup( oid ).normalize( value );
@@ -155,6 +158,7 @@ public class ConcreteNameComponentNormal
/**
* {@inheritDoc}
*/
+ @Override
public Object normalizeByOid( String oid, byte[] value ) throws LdapException
{
return lookup( oid ).normalize( new BinaryValue( value ) );
@@ -189,12 +193,14 @@ public class ConcreteNameComponentNormal
/**
* @see NameComponentNormalizer#isDefined(String)
*/
+ @Override
public boolean isDefined( String id )
{
return schemaManager.getAttributeTypeRegistry().contains( id );
}
+ @Override
public String normalizeName( String attributeName ) throws LdapException
{
return schemaManager.getAttributeTypeRegistry().getOidByName( attributeName );
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/DeepTrimNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/DeepTrimNormalizer.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/DeepTrimNormalizer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/DeepTrimNormalizer.java Tue Nov 29 10:48:26 2016
@@ -65,6 +65,7 @@ public class DeepTrimNormalizer extends
/**
* {@inheritDoc}
*/
+ @Override
public Value<?> normalize( Value<?> value ) throws LdapException
{
try
@@ -85,14 +86,12 @@ public class DeepTrimNormalizer extends
/**
* {@inheritDoc}
*/
+ @Override
public String normalize( String value ) throws LdapException
{
try
{
- String normalized = PrepareString.normalize( value,
- PrepareString.StringType.DIRECTORY_STRING );
-
- return normalized;
+ return PrepareString.normalize( value, PrepareString.StringType.DIRECTORY_STRING );
}
catch ( IOException ioe )
{
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/DeepTrimToLowerNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/DeepTrimToLowerNormalizer.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/DeepTrimToLowerNormalizer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/DeepTrimToLowerNormalizer.java Tue Nov 29 10:48:26 2016
@@ -66,6 +66,7 @@ public class DeepTrimToLowerNormalizer e
/**
* {@inheritDoc}
*/
+ @Override
public Value<?> normalize( Value<?> value ) throws LdapException
{
if ( value == null )
@@ -91,6 +92,7 @@ public class DeepTrimToLowerNormalizer e
/**
* {@inheritDoc}
*/
+ @Override
public String normalize( String value ) throws LdapException
{
if ( value == null )
@@ -100,10 +102,7 @@ public class DeepTrimToLowerNormalizer e
try
{
- String normalized = PrepareString.normalize( value,
- PrepareString.StringType.CASE_IGNORE );
-
- return normalized;
+ return PrepareString.normalize( value, PrepareString.StringType.CASE_IGNORE );
}
catch ( IOException ioe )
{
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/DefaultStringNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/DefaultStringNormalizer.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/DefaultStringNormalizer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/DefaultStringNormalizer.java Tue Nov 29 10:48:26 2016
@@ -53,6 +53,7 @@ public class DefaultStringNormalizer ext
/**
* {@inheritDoc}
*/
+ @Override
public Value<?> normalize( Value<?> value ) throws LdapException
{
String str = value.getString();
@@ -69,6 +70,7 @@ public class DefaultStringNormalizer ext
/**
* {@inheritDoc}
*/
+ @Override
public String normalize( String value ) throws LdapException
{
if ( Strings.isEmpty( value ) )
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/DnNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/DnNormalizer.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/DnNormalizer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/DnNormalizer.java Tue Nov 29 10:48:26 2016
@@ -53,9 +53,10 @@ public class DnNormalizer extends Normal
/**
* {@inheritDoc}
*/
+ @Override
public Value<?> normalize( Value<?> value ) throws LdapException
{
- Dn dn = null;
+ Dn dn;
String dnStr = value.getString();
@@ -68,9 +69,10 @@ public class DnNormalizer extends Normal
/**
* {@inheritDoc}
*/
+ @Override
public String normalize( String value ) throws LdapException
{
- Dn dn = null;
+ Dn dn;
dn = new Dn( schemaManager, value );
@@ -86,7 +88,7 @@ public class DnNormalizer extends Normal
*/
public String normalize( Dn value ) throws LdapException
{
- Dn dn = null;
+ Dn dn;
dn = value.apply( schemaManager );
@@ -97,6 +99,7 @@ public class DnNormalizer extends Normal
/**
* {@inheritDoc}
*/
+ @Override
public void setSchemaManager( SchemaManager schemaManager )
{
this.schemaManager = schemaManager;
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/GeneralizedTimeNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/GeneralizedTimeNormalizer.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/GeneralizedTimeNormalizer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/GeneralizedTimeNormalizer.java Tue Nov 29 10:48:26 2016
@@ -65,6 +65,7 @@ public class GeneralizedTimeNormalizer e
/**
* {@inheritDoc}
*/
+ @Override
public Value<?> normalize( Value<?> value ) throws LdapException
{
try
@@ -84,6 +85,7 @@ public class GeneralizedTimeNormalizer e
/**
* {@inheritDoc}
*/
+ @Override
public String normalize( String value ) throws LdapException
{
try
@@ -91,10 +93,9 @@ public class GeneralizedTimeNormalizer e
String prepared = PrepareString.normalize( value, PrepareString.StringType.DIRECTORY_STRING );
GeneralizedTime time = new GeneralizedTime( prepared );
- String normalized = time.toGeneralizedTime( Format.YEAR_MONTH_DAY_HOUR_MIN_SEC_FRACTION,
- FractionDelimiter.DOT, 3, TimeZoneFormat.Z );
- return normalized;
+ return time.toGeneralizedTime( Format.YEAR_MONTH_DAY_HOUR_MIN_SEC_FRACTION,
+ FractionDelimiter.DOT, 3, TimeZoneFormat.Z );
}
catch ( IOException ioe )
{
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/NameOrNumericIdNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/NameOrNumericIdNormalizer.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/NameOrNumericIdNormalizer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/NameOrNumericIdNormalizer.java Tue Nov 29 10:48:26 2016
@@ -63,6 +63,7 @@ public class NameOrNumericIdNormalizer e
/**
* {@inheritDoc}
*/
+ @Override
public Value<?> normalize( Value<?> value ) throws LdapException
{
if ( value == null )
@@ -99,6 +100,7 @@ public class NameOrNumericIdNormalizer e
/**
* {@inheritDoc}
*/
+ @Override
public String normalize( String value ) throws LdapException
{
if ( value == null )
@@ -133,6 +135,7 @@ public class NameOrNumericIdNormalizer e
/**
* {@inheritDoc}
*/
+ @Override
public void setSchemaManager( SchemaManager schemaManager )
{
this.schemaManager = schemaManager;
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/NoOpNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/NoOpNormalizer.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/NoOpNormalizer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/NoOpNormalizer.java Tue Nov 29 10:48:26 2016
@@ -59,6 +59,7 @@ public class NoOpNormalizer extends Norm
* @return the value argument returned as-is
* @see org.apache.directory.api.ldap.model.schema.Normalizer#normalize(Value)
*/
+ @Override
public Value<?> normalize( Value<?> value )
{
return value;
@@ -72,6 +73,7 @@ public class NoOpNormalizer extends Norm
* @return the value argument returned as-is
* @see org.apache.directory.api.ldap.model.schema.Normalizer#normalize(String)
*/
+ @Override
public String normalize( String value )
{
return value;
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/NumericNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/NumericNormalizer.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/NumericNormalizer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/NumericNormalizer.java Tue Nov 29 10:48:26 2016
@@ -52,6 +52,7 @@ public class NumericNormalizer extends N
/**
* {@inheritDoc}
*/
+ @Override
public Value<?> normalize( Value<?> value ) throws LdapException
{
try
@@ -71,6 +72,7 @@ public class NumericNormalizer extends N
/**
* {@inheritDoc}
*/
+ @Override
public String normalize( String value ) throws LdapException
{
try
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/ObjectIdentifierNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/ObjectIdentifierNormalizer.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/ObjectIdentifierNormalizer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/ObjectIdentifierNormalizer.java Tue Nov 29 10:48:26 2016
@@ -48,6 +48,7 @@ public class ObjectIdentifierNormalizer
/**
* {@inheritDoc}
*/
+ @Override
public Value<?> normalize( Value<?> value ) throws LdapException
{
if ( value == null )
@@ -76,6 +77,7 @@ public class ObjectIdentifierNormalizer
/**
* {@inheritDoc}
*/
+ @Override
public String normalize( String value ) throws LdapException
{
if ( value == null )
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/OidNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/OidNormalizer.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/OidNormalizer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/OidNormalizer.java Tue Nov 29 10:48:26 2016
@@ -89,6 +89,7 @@ public class OidNormalizer
/**
* Return a String representation of this class
*/
+ @Override
public String toString()
{
return "OidNormalizer : { " + attributeTypeOid + ", " + normalizer.toString() + "}";
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/RegexNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/RegexNormalizer.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/RegexNormalizer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/RegexNormalizer.java Tue Nov 29 10:48:26 2016
@@ -75,6 +75,7 @@ public class RegexNormalizer extends Nor
/**
* {@inheritDoc}
*/
+ @Override
public Value<?> normalize( final Value<?> value )
{
if ( value == null )
@@ -102,6 +103,7 @@ public class RegexNormalizer extends Nor
/**
* {@inheritDoc}
*/
+ @Override
public String normalize( String value )
{
if ( value == null )
@@ -124,9 +126,10 @@ public class RegexNormalizer extends Nor
/**
* @see java.lang.Object#toString()
*/
+ @Override
public String toString()
{
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
buf.append( "RegexNormalizer( " );
for ( int i = 0; i < regexes.length; i++ )
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/TelephoneNumberNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/TelephoneNumberNormalizer.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/TelephoneNumberNormalizer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/TelephoneNumberNormalizer.java Tue Nov 29 10:48:26 2016
@@ -52,6 +52,7 @@ public class TelephoneNumberNormalizer e
/**
* {@inheritDoc}
*/
+ @Override
public Value<?> normalize( Value<?> value ) throws LdapException
{
try
@@ -71,6 +72,7 @@ public class TelephoneNumberNormalizer e
/**
* {@inheritDoc}
*/
+ @Override
public String normalize( String value ) throws LdapException
{
try
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/UniqueMemberNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/UniqueMemberNormalizer.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/UniqueMemberNormalizer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/normalizers/UniqueMemberNormalizer.java Tue Nov 29 10:48:26 2016
@@ -49,6 +49,7 @@ public class UniqueMemberNormalizer exte
}
+ @Override
public Value<?> normalize( Value<?> value ) throws LdapException
{
String nameAndUid = value.getString();
@@ -96,6 +97,7 @@ public class UniqueMemberNormalizer exte
}
+ @Override
public String normalize( String value ) throws LdapException
{
if ( Strings.isEmpty( value ) )
@@ -144,6 +146,7 @@ public class UniqueMemberNormalizer exte
/**
* {@inheritDoc}
*/
+ @Override
public void setSchemaManager( SchemaManager schemaManager )
{
this.schemaManager = schemaManager;
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/AbstractSchemaParser.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/AbstractSchemaParser.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/AbstractSchemaParser.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/AbstractSchemaParser.java Tue Nov 29 10:48:26 2016
@@ -172,26 +172,22 @@ public abstract class AbstractSchemaPars
}
catch ( RecognitionException re )
{
- ParseException parseException = wrapRecognitionException( schemaDescription, re );
- throw parseException;
+ throw wrapRecognitionException( schemaDescription, re );
}
catch ( TokenStreamRecognitionException tsre )
{
if ( tsre.recog != null )
{
- ParseException parseException = wrapRecognitionException( schemaDescription, tsre.recog );
- throw parseException;
+ throw wrapRecognitionException( schemaDescription, tsre.recog );
}
else
{
- ParseException parseException = wrapTokenStreamException( schemaDescription, tsre );
- throw parseException;
+ throw wrapTokenStreamException( schemaDescription, tsre );
}
}
catch ( TokenStreamException tse )
{
- ParseException parseException = wrapTokenStreamException( schemaDescription, tse );
- throw parseException;
+ throw wrapTokenStreamException( schemaDescription, tse );
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/ConsoleParserMonitor.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/ConsoleParserMonitor.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/ConsoleParserMonitor.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/ConsoleParserMonitor.java Tue Nov 29 10:48:26 2016
@@ -31,6 +31,7 @@ public class ConsoleParserMonitor implem
public static final String TRACE_KEY = "maven.eve.schema.parser.trace";
+ @Override
public void matchedProduction( String prod )
{
if ( System.getProperties().containsKey( TRACE_KEY ) )
@@ -40,6 +41,7 @@ public class ConsoleParserMonitor implem
}
+ @Override
public void startedParse( String s )
{
if ( System.getProperties().containsKey( TRACE_KEY ) )
@@ -49,6 +51,7 @@ public class ConsoleParserMonitor implem
}
+ @Override
public void finishedParse( String s )
{
if ( System.getProperties().containsKey( TRACE_KEY ) )
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/LdapComparatorDescription.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/LdapComparatorDescription.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/LdapComparatorDescription.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/LdapComparatorDescription.java Tue Nov 29 10:48:26 2016
@@ -49,6 +49,7 @@ public class LdapComparatorDescription e
/**
* {@inheritDoc}
*/
+ @Override
public String toString()
{
return "Comparator description : " + getDescription();
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/NormalizerDescription.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/NormalizerDescription.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/NormalizerDescription.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/NormalizerDescription.java Tue Nov 29 10:48:26 2016
@@ -49,6 +49,7 @@ public class NormalizerDescription exten
/**
* {@inheritDoc}
*/
+ @Override
public String toString()
{
return "SyntaxChecker description : " + getDescription();
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/OpenLdapSchemaParser.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/OpenLdapSchemaParser.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/OpenLdapSchemaParser.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/OpenLdapSchemaParser.java Tue Nov 29 10:48:26 2016
@@ -137,9 +137,9 @@ public class OpenLdapSchemaParser extend
*/
private void afterParse() throws ParseException
{
- objectClasses = new ArrayList<ObjectClass>();
- attributeTypes = new ArrayList<MutableAttributeType>();
- objectIdentifierMacros = new HashMap<String, OpenLdapObjectIdentifierMacro>();
+ objectClasses = new ArrayList<>();
+ attributeTypes = new ArrayList<>();
+ objectIdentifierMacros = new HashMap<>();
// split parsed schema descriptions
for ( Object obj : schemaDescriptions )
@@ -253,9 +253,10 @@ public class OpenLdapSchemaParser extend
* @return the schema object
* @throws ParseException If the schemaObject can't be parsed
*/
+ @Override
public SchemaObject parse( String schemaObject ) throws ParseException
{
- if ( schemaObject == null || schemaObject.trim().equals( "" ) )
+ if ( schemaObject == null || ( schemaObject.trim().length() == 0 ) )
{
throw new ParseException( I18n.err( I18n.ERR_04258 ), 0 );
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/ParserMonitorAdapter.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/ParserMonitorAdapter.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/ParserMonitorAdapter.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/ParserMonitorAdapter.java Tue Nov 29 10:48:26 2016
@@ -30,6 +30,7 @@ public class ParserMonitorAdapter implem
/**
* {@inheritDoc}
*/
+ @Override
public void matchedProduction( String prod )
{
}
@@ -38,6 +39,7 @@ public class ParserMonitorAdapter implem
/**
* {@inheritDoc}
*/
+ @Override
public void startedParse( String s )
{
}
@@ -46,6 +48,7 @@ public class ParserMonitorAdapter implem
/**
* {@inheritDoc}
*/
+ @Override
public void finishedParse( String s )
{
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/SyntaxCheckerDescription.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/SyntaxCheckerDescription.java?rev=1771880&r1=1771879&r2=1771880&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/SyntaxCheckerDescription.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/SyntaxCheckerDescription.java Tue Nov 29 10:48:26 2016
@@ -49,6 +49,7 @@ public class SyntaxCheckerDescription ex
/**
* {@inheritDoc}
*/
+ @Override
public String toString()
{
return "SyntaxChecker description : " + getDescription();