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 [12/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/sha...
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NumericNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NumericNormalizer.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NumericNormalizer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NumericNormalizer.java Tue Jan 24 17:44:03 2012
@@ -48,39 +48,39 @@ public class NumericNormalizer extends N
super( SchemaConstants.NUMERIC_STRING_MATCH_MR_OID );
}
-
- /**
- * {@inheritDoc}
- */
- public Value<?> normalize( Value<?> value ) throws LdapException
- {
- try
- {
- String normalized = PrepareString.normalize( value.getString(),
- PrepareString.StringType.NUMERIC_STRING );
-
- return new StringValue( normalized );
- }
- catch ( IOException ioe )
- {
- throw new LdapInvalidDnException( I18n.err( I18n.ERR_04224, value ), ioe );
- }
- }
+ /**
+ * {@inheritDoc}
+ */
+ public Value<?> normalize( Value<?> value ) throws LdapException
+ {
+ try
+ {
+ String normalized = PrepareString.normalize( value.getString(),
+ PrepareString.StringType.NUMERIC_STRING );
- /**
- * {@inheritDoc}
- */
- public String normalize( String value ) throws LdapException
- {
- try
- {
- return PrepareString.normalize( value,
- PrepareString.StringType.NUMERIC_STRING );
- }
- catch ( IOException ioe )
- {
- throw new LdapInvalidDnException( I18n.err( I18n.ERR_04224, value ), ioe );
- }
- }
+ return new StringValue( normalized );
+ }
+ catch ( IOException ioe )
+ {
+ throw new LdapInvalidDnException( I18n.err( I18n.ERR_04224, value ), ioe );
+ }
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public String normalize( String value ) throws LdapException
+ {
+ try
+ {
+ return PrepareString.normalize( value,
+ PrepareString.StringType.NUMERIC_STRING );
+ }
+ catch ( IOException ioe )
+ {
+ throw new LdapInvalidDnException( I18n.err( I18n.ERR_04224, value ), ioe );
+ }
+ }
}
\ No newline at end of file
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/ObjectIdentifierNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/ObjectIdentifierNormalizer.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/ObjectIdentifierNormalizer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/ObjectIdentifierNormalizer.java Tue Jan 24 17:44:03 2012
@@ -71,8 +71,8 @@ public class ObjectIdentifierNormalizer
return new StringValue( Strings.toLowerCase( str ) );
}
}
-
-
+
+
/**
* {@inheritDoc}
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/OidNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/OidNormalizer.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/OidNormalizer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/OidNormalizer.java Tue Jan 24 17:44:03 2012
@@ -20,6 +20,7 @@
package org.apache.directory.shared.ldap.model.schema.normalizers;
+
import org.apache.directory.shared.ldap.model.schema.Normalizer;
@@ -83,8 +84,8 @@ public class OidNormalizer
{
return attributeTypeOid;
}
-
-
+
+
/**
* Copy an OidNormalizer(). The contained Normalizer will be cloned too.
*
@@ -96,7 +97,7 @@ public class OidNormalizer
// Copy the SchemaObject common data
copy.copy();
-
+
return copy;
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/RegexNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/RegexNormalizer.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/RegexNormalizer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/RegexNormalizer.java Tue Jan 24 17:44:03 2012
@@ -54,7 +54,7 @@ public class RegexNormalizer extends Nor
super( oid );
if ( regexes != null )
{
- this.regexes = new Pattern[ regexes.length ];
+ this.regexes = new Pattern[regexes.length];
System.arraycopy( regexes, 0, this.regexes, 0, regexes.length );
matchers = new Matcher[regexes.length];
@@ -63,8 +63,8 @@ public class RegexNormalizer extends Nor
{
matchers[i] = regexes[i].matcher( "" );
}
- }
- else
+ }
+ else
{
this.regexes = null;
matchers = new Matcher[0];
@@ -99,8 +99,6 @@ public class RegexNormalizer extends Nor
}
-
-
/**
* {@inheritDoc}
*/
@@ -112,7 +110,7 @@ public class RegexNormalizer extends Nor
}
String str = value;
-
+
for ( int i = 0; i < matchers.length; i++ )
{
@@ -121,8 +119,8 @@ public class RegexNormalizer extends Nor
return str;
}
-
-
+
+
/**
* @see java.lang.Object#toString()
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/TelephoneNumberNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/TelephoneNumberNormalizer.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/TelephoneNumberNormalizer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/TelephoneNumberNormalizer.java Tue Jan 24 17:44:03 2012
@@ -49,39 +49,38 @@ public class TelephoneNumberNormalizer e
}
+ /**
+ * {@inheritDoc}
+ */
+ public Value<?> normalize( Value<?> value ) throws LdapException
+ {
+ try
+ {
+ String normalized = PrepareString.normalize( value.getString(),
+ PrepareString.StringType.TELEPHONE_NUMBER );
- /**
- * {@inheritDoc}
- */
- public Value<?> normalize( Value<?> value ) throws LdapException
- {
- try
- {
- String normalized = PrepareString.normalize( value.getString(),
- PrepareString.StringType.TELEPHONE_NUMBER );
-
- return new StringValue( normalized );
- }
- catch ( IOException ioe )
- {
- throw new LdapInvalidDnException( I18n.err( I18n.ERR_04224, value ), ioe );
- }
- }
+ return new StringValue( normalized );
+ }
+ catch ( IOException ioe )
+ {
+ throw new LdapInvalidDnException( I18n.err( I18n.ERR_04224, value ), ioe );
+ }
+ }
- /**
- * {@inheritDoc}
- */
- public String normalize( String value ) throws LdapException
- {
- try
- {
- return PrepareString.normalize( value,
- PrepareString.StringType.TELEPHONE_NUMBER );
- }
- catch ( IOException ioe )
- {
- throw new LdapInvalidDnException( I18n.err( I18n.ERR_04224, value ), ioe );
- }
- }
+ /**
+ * {@inheritDoc}
+ */
+ public String normalize( String value ) throws LdapException
+ {
+ try
+ {
+ return PrepareString.normalize( value,
+ PrepareString.StringType.TELEPHONE_NUMBER );
+ }
+ catch ( IOException ioe )
+ {
+ throw new LdapInvalidDnException( I18n.err( I18n.ERR_04224, value ), ioe );
+ }
+ }
}
\ No newline at end of file
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/UniqueMemberNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/UniqueMemberNormalizer.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/UniqueMemberNormalizer.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/UniqueMemberNormalizer.java Tue Jan 24 17:44:03 2012
@@ -41,26 +41,26 @@ public class UniqueMemberNormalizer exte
{
/** A reference to the schema manager used to normalize the Dn */
private SchemaManager schemaManager;
-
-
+
+
public UniqueMemberNormalizer()
{
super( SchemaConstants.UNIQUE_MEMBER_MATCH_MR_OID );
}
-
+
public Value<?> normalize( Value<?> value ) throws LdapException
{
String nameAndUid = value.getString();
-
+
if ( nameAndUid.length() == 0 )
{
return null;
}
-
+
// Let's see if we have an UID part
int sharpPos = nameAndUid.lastIndexOf( '#' );
-
+
if ( sharpPos != -1 )
{
// Now, check that we don't have another '#'
@@ -70,16 +70,16 @@ public class UniqueMemberNormalizer exte
// escaped.
return null;
}
-
+
// This is an UID if the '#' is immediately
// followed by a BitString, except if the '#' is
// on the last position
String uid = nameAndUid.substring( sharpPos + 1 );
-
+
if ( sharpPos > 0 )
{
Dn dn = new Dn( schemaManager, nameAndUid.substring( 0, sharpPos ) );
-
+
return new StringValue( dn.getNormName() + '#' + uid );
}
else
@@ -98,14 +98,14 @@ public class UniqueMemberNormalizer exte
public String normalize( String value ) throws LdapException
{
- if ( Strings.isEmpty(value) )
+ if ( Strings.isEmpty( value ) )
{
return null;
}
-
+
// Let's see if we have an UID part
int sharpPos = value.lastIndexOf( '#' );
-
+
if ( sharpPos != -1 )
{
// Now, check that we don't have another '#'
@@ -115,16 +115,16 @@ public class UniqueMemberNormalizer exte
// escaped.
return null;
}
-
+
// This is an UID if the '#' is immediatly
// followed by a BitString, except if the '#' is
// on the last position
String uid = value.substring( sharpPos + 1 );
-
+
if ( sharpPos > 0 )
{
Dn dn = new Dn( schemaManager, value.substring( 0, sharpPos ) );
-
+
return dn.getNormName() + '#' + uid;
}
else
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/AbstractSchemaParser.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/AbstractSchemaParser.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/AbstractSchemaParser.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/AbstractSchemaParser.java Tue Jan 24 17:44:03 2012
@@ -117,8 +117,8 @@ public abstract class AbstractSchemaPars
* @throws ParseException If the parsing failed
*/
public abstract SchemaObject parse( String schemaDescription ) throws ParseException;
-
-
+
+
/**
* Update the schemaName for the given SchemaObject, accordingly to the X-SCHEMA parameter. If
* not present, default to 'other'
@@ -129,12 +129,12 @@ public abstract class AbstractSchemaPars
{
// Update the Schema if we have the X-SCHEMA extension
List<String> schemaExtension = schemaObject.getExtensions().get( MetaSchemaConstants.X_SCHEMA );
-
+
if ( schemaExtension != null )
{
String schemaName = schemaExtension.get( 0 );
-
- if ( Strings.isEmpty(schemaName) )
+
+ if ( Strings.isEmpty( schemaName ) )
{
schemaObject.setSchemaName( MetaSchemaConstants.SCHEMA_OTHER );
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/AttributeTypeDescriptionSchemaParser.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/AttributeTypeDescriptionSchemaParser.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/AttributeTypeDescriptionSchemaParser.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/AttributeTypeDescriptionSchemaParser.java Tue Jan 24 17:44:03 2012
@@ -42,13 +42,14 @@ public class AttributeTypeDescriptionSch
/** The LoggerFactory used by this class */
protected static final Logger LOG = LoggerFactory.getLogger( AttributeTypeDescriptionSchemaParser.class );
+
/**
* Creates a schema parser instance.
*/
public AttributeTypeDescriptionSchemaParser()
{
}
-
+
/**
* Parses a attribute type description according to RFC 4512:
@@ -100,7 +101,7 @@ public class AttributeTypeDescriptionSch
try
{
AttributeType attributeType = parser.attributeTypeDescription();
-
+
// Update the schemaName
updateSchemaName( attributeType );
@@ -108,7 +109,7 @@ public class AttributeTypeDescriptionSch
}
catch ( RecognitionException re )
{
- String msg = I18n.err( I18n.ERR_04228, attributeTypeDescription , re.getMessage() , re.getColumn() );
+ String msg = I18n.err( I18n.ERR_04228, attributeTypeDescription, re.getMessage(), re.getColumn() );
LOG.error( msg );
throw new ParseException( msg, re.getColumn() );
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/OpenLdapSchemaParser.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/OpenLdapSchemaParser.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/OpenLdapSchemaParser.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/OpenLdapSchemaParser.java Tue Jan 24 17:44:03 2012
@@ -136,7 +136,7 @@ public class OpenLdapSchemaParser extend
{
if ( obj instanceof OpenLdapObjectIdentifierMacro )
{
- OpenLdapObjectIdentifierMacro oid = (OpenLdapObjectIdentifierMacro) obj;
+ OpenLdapObjectIdentifierMacro oid = ( OpenLdapObjectIdentifierMacro ) obj;
objectIdentifierMacros.put( oid.getName(), oid );
}
else if ( obj instanceof AttributeType )
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ParserDescriptionUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ParserDescriptionUtils.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ParserDescriptionUtils.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ParserDescriptionUtils.java Tue Jan 24 17:44:03 2012
@@ -29,7 +29,6 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.schema.SchemaObject;
-
/**
* Utilities for dealing with various schema descriptions.
*
@@ -55,7 +54,7 @@ public final class ParserDescriptionUtil
public static boolean objectClassesMatch( ObjectClass oc0, ObjectClass oc1 )
{
// compare all common description parameters
- if ( ! descriptionsMatch( oc0, oc1 ) )
+ if ( !descriptionsMatch( oc0, oc1 ) )
{
return false;
}
@@ -65,7 +64,7 @@ public final class ParserDescriptionUtil
{
return false;
}
-
+
// compare the superior objectClasses (sizes must match)
if ( oc0.getSuperiorOids().size() != oc1.getSuperiorOids().size() )
{
@@ -75,34 +74,34 @@ public final class ParserDescriptionUtil
// compare the superior objectClasses (sizes must match)
for ( int i = 0; i < oc0.getSuperiorOids().size(); i++ )
{
- if ( ! oc0.getSuperiorOids().get( i ).equals( oc1.getSuperiorOids().get( i ) ) )
+ if ( !oc0.getSuperiorOids().get( i ).equals( oc1.getSuperiorOids().get( i ) ) )
{
return false;
}
}
-
+
// compare the must attributes (sizes must match)
for ( int i = 0; i < oc0.getMustAttributeTypeOids().size(); i++ )
{
- if ( ! oc0.getMustAttributeTypeOids().get( i ).equals( oc1.getMustAttributeTypeOids().get( i ) ) )
+ if ( !oc0.getMustAttributeTypeOids().get( i ).equals( oc1.getMustAttributeTypeOids().get( i ) ) )
{
return false;
}
}
-
+
// compare the may attributes (sizes must match)
for ( int i = 0; i < oc0.getMayAttributeTypeOids().size(); i++ )
{
- if ( ! oc0.getMayAttributeTypeOids().get( i ).equals( oc1.getMayAttributeTypeOids().get( i ) ) )
+ if ( !oc0.getMayAttributeTypeOids().get( i ).equals( oc1.getMayAttributeTypeOids().get( i ) ) )
{
return false;
}
}
-
+
return true;
}
-
-
+
+
/**
* Checks two schema attributeTypes for an exact match.
*
@@ -113,75 +112,75 @@ public final class ParserDescriptionUtil
public static boolean attributeTypesMatch( AttributeType at0, AttributeType at1 )
{
// compare all common description parameters
- if ( ! descriptionsMatch( at0, at1 ) )
+ if ( !descriptionsMatch( at0, at1 ) )
{
return false;
}
// check that the same super type is being used for both attributes
- if ( ! at0.getSuperiorOid().equals( at1.getSuperiorOid() ) )
+ if ( !at0.getSuperiorOid().equals( at1.getSuperiorOid() ) )
{
return false;
}
-
+
// check that the same matchingRule is used by both ATs for EQUALITY
- if ( ! at0.getEqualityOid().equals( at1.getEqualityOid() ) )
+ if ( !at0.getEqualityOid().equals( at1.getEqualityOid() ) )
{
return false;
}
-
+
// check that the same matchingRule is used by both ATs for SUBSTRING
- if ( ! at0.getSubstringOid().equals( at1.getSubstringOid() ) )
+ if ( !at0.getSubstringOid().equals( at1.getSubstringOid() ) )
{
return false;
}
-
+
// check that the same matchingRule is used by both ATs for ORDERING
- if ( ! at0.getOrderingOid().equals( at1.getOrderingOid() ) )
+ if ( !at0.getOrderingOid().equals( at1.getOrderingOid() ) )
{
return false;
}
-
+
// check that the same syntax is used by both ATs
- if ( ! at0.getSyntaxOid().equals( at1.getSyntaxOid() ) )
+ if ( !at0.getSyntaxOid().equals( at1.getSyntaxOid() ) )
{
return false;
}
-
+
// check that the syntax length constraint is the same for both
if ( at0.getSyntaxLength() != at1.getSyntaxLength() )
{
return false;
}
-
+
// check that the ATs have the same single valued flag value
if ( at0.isSingleValued() != at1.isSingleValued() )
{
return false;
}
-
+
// check that the ATs have the same collective flag value
if ( at0.isCollective() != at1.isCollective() )
{
return false;
}
-
+
// check that the ATs have the same user modifiable flag value
if ( at0.isUserModifiable() != at1.isUserModifiable() )
{
return false;
}
-
+
// check that the ATs have the same USAGE
if ( at0.getUsage() != at1.getUsage() )
{
return false;
}
-
+
return true;
}
-
-
+
+
/**
* Checks to see if two matchingRule match exactly.
*
@@ -192,21 +191,21 @@ public final class ParserDescriptionUtil
public static boolean matchingRulesMatch( MatchingRule matchingRule0, MatchingRule matchingRule1 )
{
// compare all common description parameters
- if ( ! descriptionsMatch( matchingRule0, matchingRule1 ) )
+ if ( !descriptionsMatch( matchingRule0, matchingRule1 ) )
{
return false;
}
// check that the syntaxes of the matchingRules match
- if ( ! matchingRule0.getSyntaxOid().equals( matchingRule1.getSyntaxOid() ) )
+ if ( !matchingRule0.getSyntaxOid().equals( matchingRule1.getSyntaxOid() ) )
{
return false;
}
-
+
return true;
}
-
-
+
+
/**
* Checks to see if two syntax match exactly.
*
@@ -218,8 +217,8 @@ public final class ParserDescriptionUtil
{
return descriptionsMatch( ldapSyntax0, ldapSyntax1 );
}
-
-
+
+
/**
* Checks if two base schema descriptions match for the common components
* in every schema description. NOTE: for syntaxes the obsolete flag is
@@ -233,31 +232,31 @@ public final class ParserDescriptionUtil
public static boolean descriptionsMatch( SchemaObject so0, SchemaObject so1 )
{
// check that the OID matches
- if ( ! so0.getOid().equals( so1.getOid() ) )
+ if ( !so0.getOid().equals( so1.getOid() ) )
{
return false;
}
-
+
// check that the obsolete flag is equal but not for syntaxes
if ( ( ( so0 instanceof LdapSyntax ) || ( so1 instanceof LdapSyntax ) ) && so0.isObsolete() != so1.isObsolete() )
{
return false;
}
-
+
// check that the description matches
- if ( ! so0.getDescription().equals( so1.getDescription() ) )
+ if ( !so0.getDescription().equals( so1.getDescription() ) )
{
return false;
}
-
+
// check alias names for exact match
- if ( ! aliasNamesMatch( so0, so1 ) )
+ if ( !aliasNamesMatch( so0, so1 ) )
{
return false;
}
-
+
// check extensions for exact match
- if ( ! extensionsMatch( so0, so1 ) )
+ if ( !extensionsMatch( so0, so1 ) )
{
return false;
}
@@ -282,31 +281,31 @@ public final class ParserDescriptionUtil
{
return false;
}
-
+
// check contents and order of extension values must match
for ( String key : lsd0.getExtensions().keySet() )
{
List<String> values0 = lsd0.getExtensions().get( key );
List<String> values1 = lsd1.getExtensions().get( key );
-
+
// if the key is not present in asd1
if ( values1 == null )
{
return false;
}
-
+
for ( int i = 0; i < values0.size(); i++ )
{
- if ( ! values0.get( i ).equals( values1.get( i ) ) )
+ if ( !values0.get( i ).equals( values1.get( i ) ) )
{
return false;
}
}
}
-
+
return true;
}
-
+
/**
* Checks to see if the alias names of a schema description match another
@@ -323,16 +322,16 @@ public final class ParserDescriptionUtil
{
return false;
}
-
+
// check contents and order must match too
for ( int i = 0; i < so0.getNames().size(); i++ )
{
- if ( ! so0.getNames().get( i ).equals( so1.getNames().get( i ) ) )
+ if ( !so0.getNames().get( i ).equals( so1.getNames().get( i ) ) )
{
return false;
}
}
-
+
return true;
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/AbstractSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/AbstractSchemaLoader.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/AbstractSchemaLoader.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/AbstractSchemaLoader.java Tue Jan 24 17:44:03 2012
@@ -45,7 +45,7 @@ import org.apache.directory.shared.util.
*/
public abstract class AbstractSchemaLoader implements SchemaLoader
{
-
+
/** The listener. */
protected SchemaLoaderListener listener;
@@ -59,26 +59,29 @@ public abstract class AbstractSchemaLoad
/**
* a map implementation which converts the keys to lower case before inserting
*/
- private static class LowerCaseKeyMap extends HashMap<String,Schema>
+ private static class LowerCaseKeyMap extends HashMap<String, Schema>
{
private static final long serialVersionUID = 1L;
+
@Override
public Schema put( String key, Schema value )
{
- return super.put( Strings.lowerCase(key), value );
+ return super.put( Strings.lowerCase( key ), value );
}
+
@Override
public void putAll( Map<? extends String, ? extends Schema> map )
{
- for( Map.Entry<? extends String, ? extends Schema> e : map.entrySet() )
+ for ( Map.Entry<? extends String, ? extends Schema> e : map.entrySet() )
{
put( e.getKey(), e.getValue() );
}
}
}
+
/**
* {@inheritDoc}
*/
@@ -114,7 +117,7 @@ public abstract class AbstractSchemaLoad
public final Collection<Schema> getAllEnabled() throws Exception
{
Collection<Schema> enabledSchemas = new ArrayList<Schema>();
-
+
for ( Schema schema : schemaMap.values() )
{
if ( schema.isEnabled() )
@@ -122,7 +125,7 @@ public abstract class AbstractSchemaLoad
enabledSchemas.add( schema );
}
}
-
+
return enabledSchemas;
}
@@ -141,10 +144,10 @@ public abstract class AbstractSchemaLoad
*/
public Schema getSchema( String schemaName )
{
- return schemaMap.get( Strings.toLowerCase(schemaName) );
+ return schemaMap.get( Strings.toLowerCase( schemaName ) );
}
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -152,14 +155,14 @@ public abstract class AbstractSchemaLoad
{
schemaMap.put( schema.getSchemaName(), schema );
}
-
-
+
+
/**
* {@inheritDoc}
*/
public void removeSchema( Schema schema )
{
- schemaMap.remove( Strings.toLowerCase(schema.getSchemaName()) );
+ schemaMap.remove( Strings.toLowerCase( schema.getSchemaName() ) );
}
@@ -237,6 +240,7 @@ public abstract class AbstractSchemaLoad
return new DefaultSchema( name, owner, dependencies, isDisabled );
}
+
// TODO: clean commented code
/*
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ComparatorRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ComparatorRegistry.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ComparatorRegistry.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ComparatorRegistry.java Tue Jan 24 17:44:03 2012
@@ -50,8 +50,8 @@ public interface ComparatorRegistry exte
* @throws LdapException if the numeric identifier is invalid
*/
LdapComparator<?> unregister( String numericOid ) throws LdapException;
-
-
+
+
/**
* Unregisters all LdapComparators defined for a specific schema from
* this registry.
@@ -59,8 +59,8 @@ public interface ComparatorRegistry exte
* @param schemaName the name of the schema whose LdapComparators will be removed from
*/
void unregisterSchemaElements( String schemaName ) throws LdapException;
-
-
+
+
/**
* Copy the ComparatorRegistry
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DITStructureRuleRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DITStructureRuleRegistry.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DITStructureRuleRegistry.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DITStructureRuleRegistry.java Tue Jan 24 17:44:03 2012
@@ -44,23 +44,23 @@ public interface DITStructureRuleRegistr
*/
boolean contains( int ruleId );
-
+
/**
* Gets an iterator over the registered descriptions in the registry.
*
* @return an Iterator of descriptions
*/
Iterator<DITStructureRule> iterator();
-
-
+
+
/**
* Gets an iterator over the registered ruleId in the registry.
*
* @return an Iterator of ruleId
*/
Iterator<Integer> ruleIdIterator();
-
-
+
+
/**
* Gets the name of the schema this schema object is associated with.
*
@@ -70,7 +70,7 @@ public interface DITStructureRuleRegistr
*/
String getSchemaName( int ruleId ) throws LdapException;
-
+
/**
* Registers a new DITStructureRule with this registry.
*
@@ -80,7 +80,7 @@ public interface DITStructureRuleRegistr
*/
void register( DITStructureRule ditStructureRule ) throws LdapException;
-
+
/**
* Looks up an dITStructureRule by its unique Object IDentifier or by its
* name.
@@ -99,8 +99,8 @@ public interface DITStructureRuleRegistr
* @throws LdapException if no such DITStructureRule exists
*/
void unregister( int ruleId ) throws LdapException;
-
-
+
+
/**
* Unregisters all DITStructureRules defined for a specific schema from
* this registry.
@@ -110,7 +110,7 @@ public interface DITStructureRuleRegistr
*/
void unregisterSchemaElements( String schemaName ) throws LdapException;
-
+
/**
* Modify all the DITStructureRule using a schemaName when this name changes.
*
@@ -119,8 +119,8 @@ public interface DITStructureRuleRegistr
* @throws org.apache.directory.shared.ldap.model.exception.LdapException if the schema can't be renamed
*/
void renameSchema( String originalSchemaName, String newSchemaName ) throws LdapException;
-
-
+
+
/**
* Copy the DITStructureRuleRegistry
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultDITContentRuleRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultDITContentRuleRegistry.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultDITContentRuleRegistry.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultDITContentRuleRegistry.java Tue Jan 24 17:44:03 2012
@@ -39,15 +39,15 @@ public class DefaultDITContentRuleRegist
{
super( SchemaObjectType.DIT_CONTENT_RULE, new OidRegistry<DITContentRule>() );
}
-
-
+
+
/**
* {@inheritDoc}
*/
public DefaultDITContentRuleRegistry copy()
{
DefaultDITContentRuleRegistry copy = new DefaultDITContentRuleRegistry();
-
+
// Copy the base data
copy.copy( this );
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultSchema.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultSchema.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultSchema.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultSchema.java Tue Jan 24 17:44:03 2012
@@ -38,23 +38,23 @@ public class DefaultSchema implements Sc
{
/** The default schema's owner */
protected static final String DEFAULT_OWNER = "uid=admin,ou=system";
-
+
/** Tells if this schema is disabled */
protected boolean disabled;
-
+
/** Contains the list of schema it depends on */
protected String[] dependencies;
-
+
/** The schema owner */
protected String owner;
-
+
/** The schema name */
protected String name;
-
+
/** The set of SchemaObjects declared in this schema */
protected Set<SchemaObjectWrapper> content;
-
-
+
+
/**
* Creates a new instance of DefaultSchema.
*
@@ -64,8 +64,8 @@ public class DefaultSchema implements Sc
{
this( name, null, null, false );
}
-
-
+
+
/**
* Creates a new instance of DefaultSchema.
*
@@ -76,8 +76,8 @@ public class DefaultSchema implements Sc
{
this( name, owner, null, false );
}
-
-
+
+
/**
* Creates a new instance of DefaultSchema.
*
@@ -89,8 +89,8 @@ public class DefaultSchema implements Sc
{
this( name, owner, dependencies, false );
}
-
-
+
+
/**
* Creates a new instance of DefaultSchema.
*
@@ -105,9 +105,9 @@ public class DefaultSchema implements Sc
{
throw new IllegalArgumentException( I18n.err( I18n.ERR_04266 ) );
}
-
+
this.name = name;
-
+
if ( owner != null )
{
this.owner = owner;
@@ -116,7 +116,7 @@ public class DefaultSchema implements Sc
{
this.owner = DEFAULT_OWNER;
}
-
+
if ( dependencies != null )
{
this.dependencies = new String[dependencies.length];
@@ -126,10 +126,10 @@ public class DefaultSchema implements Sc
{
this.dependencies = StringConstants.EMPTY_STRINGS;
}
-
+
this.disabled = disabled;
-
- content = new HashSet<SchemaObjectWrapper>();
+
+ content = new HashSet<SchemaObjectWrapper>();
}
@@ -143,7 +143,7 @@ public class DefaultSchema implements Sc
return copy;
}
-
+
/**
* {@inheritDoc}
*/
@@ -152,24 +152,24 @@ public class DefaultSchema implements Sc
if ( dependenciesToAdd != null )
{
int start = 0;
-
+
if ( dependencies == null )
{
dependencies = new String[dependenciesToAdd.length];
}
else
{
- String[] tempDependencies = new String[ dependencies.length + dependenciesToAdd.length ];
+ String[] tempDependencies = new String[dependencies.length + dependenciesToAdd.length];
System.arraycopy( dependencies, 0, tempDependencies, 0, dependencies.length );
start = dependencies.length;
dependencies = tempDependencies;
}
-
+
System.arraycopy( dependenciesToAdd, 0, dependencies, start, dependenciesToAdd.length );
}
}
-
+
/**
* {@inheritDoc}
*/
@@ -178,7 +178,7 @@ public class DefaultSchema implements Sc
return owner;
}
-
+
/**
* {@inheritDoc}
*/
@@ -186,8 +186,8 @@ public class DefaultSchema implements Sc
{
return name;
}
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -195,8 +195,8 @@ public class DefaultSchema implements Sc
{
return disabled;
}
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -204,8 +204,8 @@ public class DefaultSchema implements Sc
{
return !disabled;
}
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -213,8 +213,8 @@ public class DefaultSchema implements Sc
{
this.disabled = true;
}
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -231,7 +231,7 @@ public class DefaultSchema implements Sc
{
return content;
}
-
+
/**
* {@inheritDoc}
@@ -247,7 +247,7 @@ public class DefaultSchema implements Sc
sb.append( owner );
sb.append( "\n\t\tDependencies: " );
sb.append( Arrays.toString( dependencies ) );
-
+
// TODO : print the associated ShcemaObjects
return sb.toString();
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultSchemaObjectRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultSchemaObjectRegistry.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultSchemaObjectRegistry.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultSchemaObjectRegistry.java Tue Jan 24 17:44:03 2012
@@ -359,7 +359,8 @@ public abstract class DefaultSchemaObjec
* {@inheritDoc}
*/
// This will suppress PMD.EmptyCatchBlock warnings in this method
- @SuppressWarnings({ "PMD.EmptyCatchBlock", "unchecked" })
+ @SuppressWarnings(
+ { "PMD.EmptyCatchBlock", "unchecked" })
public SchemaObjectRegistry<T> copy( SchemaObjectRegistry<T> original )
{
// Fill the byName and OidRegistry maps, the type has already be copied
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableAttributeTypeRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableAttributeTypeRegistry.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableAttributeTypeRegistry.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableAttributeTypeRegistry.java Tue Jan 24 17:44:03 2012
@@ -229,7 +229,7 @@ public class ImmutableAttributeTypeRegis
}
catch ( LdapException le )
{
- throw new LdapNoSuchAttributeException( le.getMessage() , le);
+ throw new LdapNoSuchAttributeException( le.getMessage(), le );
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/LdapSyntaxRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/LdapSyntaxRegistry.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/LdapSyntaxRegistry.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/LdapSyntaxRegistry.java Tue Jan 24 17:44:03 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.model.schema.registries;
+
import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/NormalizerRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/NormalizerRegistry.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/NormalizerRegistry.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/NormalizerRegistry.java Tue Jan 24 17:44:03 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.model.schema.registries;
+
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.schema.Normalizer;
@@ -49,8 +50,8 @@ public interface NormalizerRegistry exte
* @throws LdapException if the numeric identifier is invalid
*/
Normalizer unregister( String numericOid ) throws LdapException;
-
-
+
+
/**
* Unregisters all Normalizers defined for a specific schema from
* this registry.
@@ -58,8 +59,8 @@ public interface NormalizerRegistry exte
* @param schemaName the name of the schema whose Normalizers will be removed from
*/
void unregisterSchemaElements( String schemaName ) throws LdapException;
-
-
+
+
/**
* Copy the NormalizerRegistry
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ObjectClassRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ObjectClassRegistry.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ObjectClassRegistry.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ObjectClassRegistry.java Tue Jan 24 17:44:03 2012
@@ -45,8 +45,8 @@ public interface ObjectClassRegistry ext
* discerned from the ancestorId supplied
*/
boolean hasDescendants( String ancestorId ) throws LdapException;
-
-
+
+
/**
* Get's an iterator over the set of descendant ObjectClasses for
* some ancestor's name alias or their OID.
@@ -59,7 +59,7 @@ public interface ObjectClassRegistry ext
*/
Iterator<ObjectClass> descendants( String ancestorId ) throws LdapException;
-
+
/**
* Store the ObjectClass into a map associating an ObjectClass to its
* descendants.
@@ -68,10 +68,10 @@ public interface ObjectClassRegistry ext
* @param ancestors Its ancestors
* @throws LdapException If something went wrong
*/
- void registerDescendants( ObjectClass objectClass, List<ObjectClass> ancestors )
+ void registerDescendants( ObjectClass objectClass, List<ObjectClass> ancestors )
throws LdapException;
-
-
+
+
/**
* Remove the ObjectClass from the map associating an ObjectClass to its
* descendants.
@@ -80,10 +80,10 @@ public interface ObjectClassRegistry ext
* @param ancestors its ancestors
* @throws org.apache.directory.shared.ldap.model.exception.LdapException If something went wrong
*/
- void unregisterDescendants( ObjectClass attributeType, List<ObjectClass> ancestors )
+ void unregisterDescendants( ObjectClass attributeType, List<ObjectClass> ancestors )
throws LdapException;
-
-
+
+
/**
* Registers a new ObjectClass with this registry.
*
@@ -92,8 +92,8 @@ public interface ObjectClassRegistry ext
* the registration operation is not supported
*/
void register( ObjectClass objectClass ) throws LdapException;
-
-
+
+
/**
* Removes the ObjectClass registered with this registry.
*
@@ -101,8 +101,8 @@ public interface ObjectClassRegistry ext
* @throws LdapException if the numeric identifier is invalid
*/
ObjectClass unregister( String numericOid ) throws LdapException;
-
-
+
+
/**
* Copy the ObjectClassRegistry
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/Registries.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/Registries.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/Registries.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/Registries.java Tue Jan 24 17:44:03 2012
@@ -1011,7 +1011,8 @@ public class Registries implements Schem
{
// This MR's syntax has not been loaded into the Registries.
LdapSchemaException ldapSchemaException = new LdapSchemaException(
- LdapSchemaExceptionCodes.OID_ALREADY_REGISTERED, I18n.err( I18n.ERR_04294, matchingRule.getOid() ), ne );
+ LdapSchemaExceptionCodes.OID_ALREADY_REGISTERED, I18n.err( I18n.ERR_04294, matchingRule.getOid() ),
+ ne );
ldapSchemaException.setSourceObject( matchingRule );
errors.add( ldapSchemaException );
}
@@ -1389,7 +1390,7 @@ public class Registries implements Schem
{
// Check the registries now
List<Throwable> checkErrors = checkRefInteg();
-
+
errors.addAll( checkErrors );
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/Schema.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/Schema.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/Schema.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/Schema.java Tue Jan 24 17:44:03 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.model.schema.registries;
+
import java.util.Set;
import org.apache.directory.shared.ldap.model.schema.SchemaObjectWrapper;
@@ -37,28 +38,28 @@ public interface Schema
* @return true if this schema is disabled, false otherwise
*/
boolean isDisabled();
-
-
+
+
/**
* Disable the schema
*/
void disable();
-
-
+
+
/**
* Checks whether or not this schema is enabled or disabled.
*
* @return true if this schema is enabled, false otherwise
*/
boolean isEnabled();
-
+
/**
* Enable the schema
*/
void enable();
-
-
+
+
/**
* Gets the name of the owner of the schema objects within this
* Schema.
@@ -84,16 +85,16 @@ public interface Schema
* @return the String names of schema dependencies
*/
String[] getDependencies();
-
-
+
+
/**
* Add a set of dependencies this schema uses.
*
* @param dependencies The dependencies to add
*/
void addDependencies( String... dependencies );
-
-
+
+
/**
* Gets the set of SchemaObject elements declared in this schema
*
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/SchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/SchemaLoader.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/SchemaLoader.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/SchemaLoader.java Tue Jan 24 17:44:03 2012
@@ -51,7 +51,7 @@ public interface SchemaLoader
*/
Schema getSchema( String schemaName );
-
+
/**
* Build a list of AttributeTypes read from the underlying storage for
* a list of specified schema
@@ -278,20 +278,20 @@ public interface SchemaLoader
*/
Collection<Schema> getAllEnabled() throws Exception;
-
+
/**
* @return the list of all schemas
* @throws Exception TODO
*/
Collection<Schema> getAllSchemas() throws Exception;
-
+
/**
* Add a new schema to the schema's list
*/
void addSchema( Schema schema );
-
+
/**
* Remove a schema from the schema's list
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/SyntaxCheckerRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/SyntaxCheckerRegistry.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/SyntaxCheckerRegistry.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/SyntaxCheckerRegistry.java Tue Jan 24 17:44:03 2012
@@ -50,8 +50,8 @@ public interface SyntaxCheckerRegistry e
* @throws LdapException if the numeric identifier is invalid
*/
SyntaxChecker unregister( String numericOid ) throws LdapException;
-
-
+
+
/**
* Unregisters all SyntaxCheckers defined for a specific schema from
* this registry.
@@ -59,8 +59,8 @@ public interface SyntaxCheckerRegistry e
* @param schemaName the name of the schema whose SyntaxCheckers will be removed from
*/
void unregisterSchemaElements( String schemaName ) throws LdapException;
-
-
+
+
/**
* Copy the SyntaxCheckerRegistry
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/AccessPointSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/AccessPointSyntaxChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/AccessPointSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/AccessPointSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.model.schema.syntaxCheckers;
+
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
import org.slf4j.Logger;
@@ -36,6 +37,7 @@ public class AccessPointSyntaxChecker ex
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( AccessPointSyntaxChecker.class );
+
/**
* The AccessPoint SyntaxChecker constructor
*/
@@ -44,6 +46,7 @@ public class AccessPointSyntaxChecker ex
super( SchemaConstants.ACCESS_POINT_SYNTAX );
}
+
/**
* {@inheritDoc}
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/AttributeTypeDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/AttributeTypeDescriptionSyntaxChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/AttributeTypeDescriptionSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/AttributeTypeDescriptionSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -80,6 +80,7 @@ public class AttributeTypeDescriptionSyn
/** The schema parser used to parse the AttributeTypeDescription Syntax */
private AttributeTypeDescriptionSchemaParser schemaParser = new AttributeTypeDescriptionSchemaParser();
+
/**
*
* Creates a new instance of AttributeTypeDescriptionSchemaParser.
@@ -89,7 +90,8 @@ public class AttributeTypeDescriptionSyn
{
super( SchemaConstants.ATTRIBUTE_TYPE_DESCRIPTION_SYNTAX );
}
-
+
+
/**
* {@inheritDoc}
*/
@@ -109,7 +111,7 @@ public class AttributeTypeDescriptionSyn
}
else if ( value instanceof byte[] )
{
- strValue = Strings.utf8ToString((byte[]) value);
+ strValue = Strings.utf8ToString( ( byte[] ) value );
}
else
{
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/AttributeTypeUsageSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/AttributeTypeUsageSyntaxChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/AttributeTypeUsageSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/AttributeTypeUsageSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -43,6 +43,7 @@ public class AttributeTypeUsageSyntaxChe
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( AttributeTypeUsageSyntaxChecker.class );
+
/**
*
* Creates a new instance of AttributeTypeUsageSyntaxChecker.
@@ -66,14 +67,14 @@ public class AttributeTypeUsageSyntaxChe
LOG.debug( "Syntax invalid for 'null'" );
return false;
}
-
+
if ( value instanceof String )
{
strValue = ( String ) value;
}
else if ( value instanceof byte[] )
{
- strValue = Strings.utf8ToString((byte[]) value);
+ strValue = Strings.utf8ToString( ( byte[] ) value );
}
else
{
@@ -86,26 +87,26 @@ public class AttributeTypeUsageSyntaxChe
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
char ch = strValue.charAt( 0 );
switch ( ch )
{
- case( 'd' ):
+ case ( 'd' ):
if ( "dSAOperation".equals( strValue )
|| "directoryOperation".equals( strValue )
|| "distributedOperation".equals( strValue ) )
- {
+ {
LOG.debug( "Syntax valid for '{}'", value );
return true;
}
LOG.debug( "Syntax invalid for '{}'", value );
return false;
-
- case( 'u' ):
+
+ case ( 'u' ):
boolean comp = "userApplications".equals( strValue );
-
+
if ( comp )
{
LOG.debug( "Syntax valid for '{}'", value );
@@ -113,11 +114,11 @@ public class AttributeTypeUsageSyntaxChe
else
{
LOG.debug( "Syntax invalid for '{}'", value );
-
+
}
-
+
return comp;
-
+
default:
LOG.debug( "Syntax invalid for '{}'", value );
return false;
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/AudioSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/AudioSyntaxChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/AudioSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/AudioSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.model.schema.syntaxCheckers;
+
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,6 +42,7 @@ public class AudioSyntaxChecker extends
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( AudioSyntaxChecker.class );
+
/**
* Creates a new instance of AudioSyntaxChecker
*/
@@ -50,6 +52,7 @@ public class AudioSyntaxChecker extends
setOid( SchemaConstants.AUDIO_SYNTAX );
}
+
/**
* {@inheritDoc}
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/BinarySyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/BinarySyntaxChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/BinarySyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/BinarySyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.model.schema.syntaxCheckers;
+
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
import org.slf4j.Logger;
@@ -36,6 +37,7 @@ public class BinarySyntaxChecker extends
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( BinarySyntaxChecker.class );
+
/**
* Creates a new instance of BinarySyntaxChecker
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/BitStringSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/BitStringSyntaxChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/BitStringSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/BitStringSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -46,6 +46,7 @@ public class BitStringSyntaxChecker exte
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( BitStringSyntaxChecker.class );
+
/**
*
* Creates a new instance of BitStringSyntaxChecker.
@@ -55,7 +56,7 @@ public class BitStringSyntaxChecker exte
{
super( SchemaConstants.BIT_STRING_SYNTAX );
}
-
+
/**
* A shared and static method used to check that the string is a BitString.
@@ -73,38 +74,38 @@ public class BitStringSyntaxChecker exte
LOG.debug( "Syntax invalid for '{}'", strValue );
return false;
}
-
+
int pos = 0;
-
+
// Check that the String respect the syntax : ' ([01]+) ' B
- if ( ! Strings.isCharASCII( strValue, pos++, '\'' ) )
+ if ( !Strings.isCharASCII( strValue, pos++, '\'' ) )
{
LOG.debug( "Syntax invalid for '{}'", strValue );
return false;
}
// We must have at least one bit
- if ( ! Chars.isBit(strValue, pos++) )
+ if ( !Chars.isBit( strValue, pos++ ) )
{
LOG.debug( "Syntax invalid for '{}'", strValue );
return false;
}
-
- while ( Chars.isBit(strValue, pos) )
+
+ while ( Chars.isBit( strValue, pos ) )
{
// Loop until we get a char which is not a 0 or a 1
pos++;
}
// Now, we must have a simple quote
- if ( ! Strings.isCharASCII( strValue, pos++, '\'' ) )
+ if ( !Strings.isCharASCII( strValue, pos++, '\'' ) )
{
LOG.debug( "Syntax invalid for '{}'", strValue );
return false;
}
// followed by a 'B'
- if ( ! Strings.isCharASCII( strValue, pos, 'B' ) )
+ if ( !Strings.isCharASCII( strValue, pos, 'B' ) )
{
LOG.debug( "Syntax invalid for '{}'", strValue );
return false;
@@ -114,6 +115,7 @@ public class BitStringSyntaxChecker exte
return true;
}
+
/**
* {@inheritDoc}
*/
@@ -126,14 +128,14 @@ public class BitStringSyntaxChecker exte
LOG.debug( "Syntax invalid for 'null'" );
return false;
}
-
+
if ( value instanceof String )
{
strValue = ( String ) value;
}
else if ( value instanceof byte[] )
{
- strValue = Strings.utf8ToString((byte[]) value);
+ strValue = Strings.utf8ToString( ( byte[] ) value );
}
else
{
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/BooleanSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/BooleanSyntaxChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/BooleanSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/BooleanSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -43,6 +43,7 @@ public class BooleanSyntaxChecker extend
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( BooleanSyntaxChecker.class );
+
/**
* Creates a new instance of BooleanSyntaxChecker.
*/
@@ -50,8 +51,8 @@ public class BooleanSyntaxChecker extend
{
super( SchemaConstants.BOOLEAN_SYNTAX );
}
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -64,14 +65,14 @@ public class BooleanSyntaxChecker extend
LOG.debug( "Syntax invalid for 'null'" );
return false;
}
-
+
if ( value instanceof String )
{
strValue = ( String ) value;
}
else if ( value instanceof byte[] )
{
- strValue = Strings.utf8ToString((byte[]) value);
+ strValue = Strings.utf8ToString( ( byte[] ) value );
}
else
{
@@ -83,9 +84,9 @@ public class BooleanSyntaxChecker extend
LOG.debug( "Syntax invalid for '{}'", strValue );
return false;
}
-
+
boolean valid = ( ( "TRUE".equalsIgnoreCase( strValue ) ) || ( "FALSE".equalsIgnoreCase( strValue ) ) );
-
+
if ( valid )
{
LOG.debug( "Syntax valid for '{}'", strValue );
@@ -94,7 +95,7 @@ public class BooleanSyntaxChecker extend
{
LOG.debug( "Syntax invalid for '{}'", strValue );
}
-
+
return valid;
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/CertificateListSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/CertificateListSyntaxChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/CertificateListSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/CertificateListSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.model.schema.syntaxCheckers;
+
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,6 +44,7 @@ public class CertificateListSyntaxChecke
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( CertificateListSyntaxChecker.class );
+
/**
* Creates a new instance of CertificateListSyntaxChecker.
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/CertificatePairSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/CertificatePairSyntaxChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/CertificatePairSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/CertificatePairSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.model.schema.syntaxCheckers;
+
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,6 +44,7 @@ public class CertificatePairSyntaxChecke
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( CertificatePairSyntaxChecker.class );
+
/**
* Creates a new instance of CertificatePairSyntaxChecker.
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/CertificateSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/CertificateSyntaxChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/CertificateSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/CertificateSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.model.schema.syntaxCheckers;
+
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,6 +44,7 @@ public class CertificateSyntaxChecker ex
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( CertificateSyntaxChecker.class );
+
/**
* Creates a new instance of CertificateSyntaxChecker.
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/ComparatorSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/ComparatorSyntaxChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/ComparatorSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/ComparatorSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -19,8 +19,10 @@
*/
package org.apache.directory.shared.ldap.model.schema.syntaxCheckers;
+
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
+
/**
* A SyntaxChecker for the Comparator schema element
*
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/CountrySyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/CountrySyntaxChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/CountrySyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/CountrySyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -50,46 +50,265 @@ public class CountrySyntaxChecker extend
/** The ISO 3166 list of countries, as of 2006 */
private static final String[] COUNTRY_ISO_3166 =
{
- "AD", "AE", "AF", "AG", "AI", "AL", "AM", "AN", "AO", "AQ", "AR", "AS", "AT", "AU", "AW", "AX", "AZ",
- "BA", "BB", "BD", "BE", "BF", "BG", "BH", "BI", "BJ", "BM", "BN", "BO", "BR", "BS", "BT", "BV", "BW", "BY", "BZ",
- "CA", "CC", "CD", "CF", "CG", "CH", "CI", "CK", "CL", "CM", "CN", "CO", "CR", "CU", "CV", "CX", "CY", "CZ",
- "DE", "DJ", "DK", "DM", "DO", "DZ",
- "EC", "EE", "EG", "EH", "ER", "ES", "ET",
- "FI", "FJ", "FK", "FM", "FO", "FR",
- "GA", "GB", "GD", "GE", "GG", "GF", "GH", "GI", "GL", "GM", "GN", "GP", "GQ", "GR", "GS", "GT", "GU", "GW", "GY",
- "HK", "HM", "HN", "HR", "HT", "HU",
- "ID", "IE", "IL", "IM", "IN", "IO", "IQ", "IR", "IS", "IT",
- "JE", "JM", "JO", "JP",
- "KE", "KG", "KH", "KI", "KM", "KN", "KP", "KR", "KW", "KY", "KZ",
- "LA", "LB", "LC", "LI", "LK", "LR", "LS", "LT", "LU", "LV", "LY",
- "MA", "MC", "MD", "ME", "MG", "MH", "MK", "ML", "MM", "MN", "MO", "MP", "MQ", "MR", "MS", "MT", "MU", "MV", "MW", "MX",
- "MY", "MZ",
- "NA", "NC", "NE", "NF", "NG", "NI", "NL", "NO", "NP", "NR", "NU", "NZ",
- "OM",
- "PA", "PE", "PF", "PG", "PH", "PK", "PL", "PM", "PN", "PR", "PS", "PT", "PW", "PY",
- "QA",
- "RE", "RO", "RS", "RU", "RW",
- "SA", "SB", "SC", "SD", "SE", "SG", "SH", "SI", "SJ", "SK", "SL", "SM", "SN", "SO", "SR", "ST", "SV", "SY", "SZ",
- "TC", "TD", "TF", "TG", "TH", "TJ", "TK", "TL", "TM", "TN", "TO", "TR", "TT", "TV", "TW", "TZ",
- "UA", "UG", "UM", "US", "UY", "UZ",
- "VA", "VC", "VE", "VG", "VI", "VN", "VU",
- "WF", "WS",
- "YE", "YT",
- "ZA", "ZM", "ZW"
- };
-
+ "AD",
+ "AE",
+ "AF",
+ "AG",
+ "AI",
+ "AL",
+ "AM",
+ "AN",
+ "AO",
+ "AQ",
+ "AR",
+ "AS",
+ "AT",
+ "AU",
+ "AW",
+ "AX",
+ "AZ",
+ "BA",
+ "BB",
+ "BD",
+ "BE",
+ "BF",
+ "BG",
+ "BH",
+ "BI",
+ "BJ",
+ "BM",
+ "BN",
+ "BO",
+ "BR",
+ "BS",
+ "BT",
+ "BV",
+ "BW",
+ "BY",
+ "BZ",
+ "CA",
+ "CC",
+ "CD",
+ "CF",
+ "CG",
+ "CH",
+ "CI",
+ "CK",
+ "CL",
+ "CM",
+ "CN",
+ "CO",
+ "CR",
+ "CU",
+ "CV",
+ "CX",
+ "CY",
+ "CZ",
+ "DE",
+ "DJ",
+ "DK",
+ "DM",
+ "DO",
+ "DZ",
+ "EC",
+ "EE",
+ "EG",
+ "EH",
+ "ER",
+ "ES",
+ "ET",
+ "FI",
+ "FJ",
+ "FK",
+ "FM",
+ "FO",
+ "FR",
+ "GA",
+ "GB",
+ "GD",
+ "GE",
+ "GG",
+ "GF",
+ "GH",
+ "GI",
+ "GL",
+ "GM",
+ "GN",
+ "GP",
+ "GQ",
+ "GR",
+ "GS",
+ "GT",
+ "GU",
+ "GW",
+ "GY",
+ "HK",
+ "HM",
+ "HN",
+ "HR",
+ "HT",
+ "HU",
+ "ID",
+ "IE",
+ "IL",
+ "IM",
+ "IN",
+ "IO",
+ "IQ",
+ "IR",
+ "IS",
+ "IT",
+ "JE",
+ "JM",
+ "JO",
+ "JP",
+ "KE",
+ "KG",
+ "KH",
+ "KI",
+ "KM",
+ "KN",
+ "KP",
+ "KR",
+ "KW",
+ "KY",
+ "KZ",
+ "LA",
+ "LB",
+ "LC",
+ "LI",
+ "LK",
+ "LR",
+ "LS",
+ "LT",
+ "LU",
+ "LV",
+ "LY",
+ "MA",
+ "MC",
+ "MD",
+ "ME",
+ "MG",
+ "MH",
+ "MK",
+ "ML",
+ "MM",
+ "MN",
+ "MO",
+ "MP",
+ "MQ",
+ "MR",
+ "MS",
+ "MT",
+ "MU",
+ "MV",
+ "MW",
+ "MX",
+ "MY",
+ "MZ",
+ "NA",
+ "NC",
+ "NE",
+ "NF",
+ "NG",
+ "NI",
+ "NL",
+ "NO",
+ "NP",
+ "NR",
+ "NU",
+ "NZ",
+ "OM",
+ "PA",
+ "PE",
+ "PF",
+ "PG",
+ "PH",
+ "PK",
+ "PL",
+ "PM",
+ "PN",
+ "PR",
+ "PS",
+ "PT",
+ "PW",
+ "PY",
+ "QA",
+ "RE",
+ "RO",
+ "RS",
+ "RU",
+ "RW",
+ "SA",
+ "SB",
+ "SC",
+ "SD",
+ "SE",
+ "SG",
+ "SH",
+ "SI",
+ "SJ",
+ "SK",
+ "SL",
+ "SM",
+ "SN",
+ "SO",
+ "SR",
+ "ST",
+ "SV",
+ "SY",
+ "SZ",
+ "TC",
+ "TD",
+ "TF",
+ "TG",
+ "TH",
+ "TJ",
+ "TK",
+ "TL",
+ "TM",
+ "TN",
+ "TO",
+ "TR",
+ "TT",
+ "TV",
+ "TW",
+ "TZ",
+ "UA",
+ "UG",
+ "UM",
+ "US",
+ "UY",
+ "UZ",
+ "VA",
+ "VC",
+ "VE",
+ "VG",
+ "VI",
+ "VN",
+ "VU",
+ "WF",
+ "WS",
+ "YE",
+ "YT",
+ "ZA",
+ "ZM",
+ "ZW"
+ };
+
/** The Set which contains the countries */
private static final Set<String> COUNTRIES = new HashSet<String>();
-
+
/** Initialization of the country set */
static
{
- for ( String country:COUNTRY_ISO_3166 )
+ for ( String country : COUNTRY_ISO_3166 )
{
COUNTRIES.add( country );
}
}
-
+
+
/**
*
* Creates a new instance of CountrySyntaxChecker.
@@ -99,8 +318,8 @@ public class CountrySyntaxChecker extend
{
super( SchemaConstants.COUNTRY_STRING_SYNTAX );
}
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -113,14 +332,14 @@ public class CountrySyntaxChecker extend
LOG.debug( "Syntax invalid for 'null'" );
return false;
}
-
+
if ( value instanceof String )
{
strValue = ( String ) value;
}
else if ( value instanceof byte[] )
{
- strValue = Strings.utf8ToString((byte[]) value);
+ strValue = Strings.utf8ToString( ( byte[] ) value );
}
else
{
@@ -132,9 +351,9 @@ public class CountrySyntaxChecker extend
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
- boolean result = COUNTRIES.contains( Strings.toUpperCase(strValue) );
-
+
+ boolean result = COUNTRIES.contains( Strings.toUpperCase( strValue ) );
+
if ( result )
{
LOG.debug( "Syntax valid for '{}'", value );
@@ -143,7 +362,7 @@ public class CountrySyntaxChecker extend
{
LOG.debug( "Syntax invalid for '{}'", value );
}
-
- return result;
+
+ return result;
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/CsnSidSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/CsnSidSyntaxChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/CsnSidSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/CsnSidSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.model.schema.syntaxCheckers;
+
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
import org.slf4j.Logger;
@@ -36,6 +37,7 @@ public class CsnSidSyntaxChecker extends
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( CsnSidSyntaxChecker.class );
+
/**
* Creates a new instance of CsnSyntaxChecker.
*/
@@ -55,15 +57,15 @@ public class CsnSidSyntaxChecker extends
LOG.debug( "Syntax invalid for 'null'" );
return false;
}
-
- if ( ! ( value instanceof String ) )
+
+ if ( !( value instanceof String ) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
- String sidStr = (String)value;
-
+
+ String sidStr = ( String ) value;
+
if ( sidStr.length() > 3 )
{
LOG.debug( "Syntax invalid for '{}'", value );
@@ -71,11 +73,11 @@ public class CsnSidSyntaxChecker extends
}
// The SID must be an hexadecimal number between 0x00 and 0xFFF
-
+
try
{
int sid = Integer.parseInt( sidStr, 16 );
-
+
if ( ( sid < 0 ) || ( sid > 0x0fff ) )
{
LOG.debug( "Syntax invalid for '{}'", value );
@@ -87,7 +89,7 @@ public class CsnSidSyntaxChecker extends
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
LOG.debug( "Syntax valid for '{}'", value );
return true;
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/CsnSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/CsnSyntaxChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/CsnSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/CsnSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.ldap.model.schema.syntaxCheckers;
+
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.csn.Csn;
import org.apache.directory.shared.ldap.model.csn.InvalidCSNException;
@@ -38,6 +39,7 @@ public class CsnSyntaxChecker extends Sy
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( CsnSyntaxChecker.class );
+
/**
* Creates a new instance of CsnSyntaxChecker.
*/
@@ -57,20 +59,20 @@ public class CsnSyntaxChecker extends Sy
LOG.debug( "Syntax invalid for 'null'" );
return false;
}
-
- if ( ! ( value instanceof String ) )
+
+ if ( !( value instanceof String ) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
- String csnStr = (String)value;
-
+
+ String csnStr = ( String ) value;
+
// It must be a valid CSN : try to create a new one.
try
{
boolean result = Csn.isValid( csnStr );
-
+
if ( result )
{
LOG.debug( "Syntax valid for '{}'", value );
@@ -79,7 +81,7 @@ public class CsnSyntaxChecker extends Sy
{
LOG.debug( "Syntax invalid for '{}'", value );
}
-
+
return result;
}
catch ( InvalidCSNException icsne )
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DITContentRuleDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DITContentRuleDescriptionSyntaxChecker.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DITContentRuleDescriptionSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DITContentRuleDescriptionSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -66,7 +66,7 @@ public class DITContentRuleDescriptionSy
{
super( SchemaConstants.DIT_CONTENT_RULE_SYNTAX );
}
-
+
/**
* {@inheritDoc}
@@ -87,7 +87,7 @@ public class DITContentRuleDescriptionSy
}
else if ( value instanceof byte[] )
{
- strValue = Strings.utf8ToString((byte[]) value);
+ strValue = Strings.utf8ToString( ( byte[] ) value );
}
else
{