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 [13/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/syntaxCheckers/DITStructureRuleDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DITStructureRuleDescriptionSyntaxChecker.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/DITStructureRuleDescriptionSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DITStructureRuleDescriptionSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -89,7 +89,7 @@ public class DITStructureRuleDescription
}
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/DLSubmitPermissionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DLSubmitPermissionSyntaxChecker.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/DLSubmitPermissionSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DLSubmitPermissionSyntaxChecker.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 DLSubmitPermissionSyntaxChe
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( DLSubmitPermissionSyntaxChecker.class );
+
/**
* Creates a new instance of DLSubmitPermissionSyntaxChecker.
*/
@@ -43,7 +45,7 @@ public class DLSubmitPermissionSyntaxChe
{
super( SchemaConstants.DL_SUBMIT_PERMISSION_SYNTAX );
}
-
+
/**
* {@inheritDoc}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DNSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DNSyntaxChecker.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/DNSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DNSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -40,6 +40,7 @@ public class DNSyntaxChecker extends Syn
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( DNSyntaxChecker.class );
+
/**
* Creates a new instance of DNSyntaxChecker.
*/
@@ -48,7 +49,7 @@ public class DNSyntaxChecker extends Syn
super( SchemaConstants.DN_SYNTAX );
}
-
+
/**
* {@inheritDoc}
*/
@@ -61,14 +62,14 @@ public class DNSyntaxChecker extends Syn
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,10 +84,10 @@ public class DNSyntaxChecker extends Syn
LOG.debug( "Syntax valid for '{}'", value );
return true;
}
-
+
// Check that the value is a valid Dn
- boolean result = Dn.isValid(strValue);
-
+ boolean result = Dn.isValid( strValue );
+
if ( result )
{
LOG.debug( "Syntax valid for '{}'", value );
@@ -95,7 +96,7 @@ public class DNSyntaxChecker extends Syn
{
LOG.debug( "Syntax invalid for '{}'", value );
}
-
+
return result;
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DSAQualitySyntaxSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DSAQualitySyntaxSyntaxChecker.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/DSAQualitySyntaxSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DSAQualitySyntaxSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -47,6 +47,7 @@ public class DSAQualitySyntaxSyntaxCheck
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( DSAQualitySyntaxSyntaxChecker.class );
+
/**
* Creates a new instance of DSAQualitySyntaxSyntaxChecker.
*/
@@ -54,8 +55,8 @@ public class DSAQualitySyntaxSyntaxCheck
{
super( SchemaConstants.DSA_QUALITY_SYNTAX );
}
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -68,14 +69,14 @@ public class DSAQualitySyntaxSyntaxCheck
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
{
@@ -89,64 +90,64 @@ public class DSAQualitySyntaxSyntaxCheck
}
String remaining = null;
-
+
switch ( strValue.charAt( 0 ) )
{
- case 'B' :
+ case 'B':
if ( !strValue.startsWith( "BEST-EFFORT" ) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
remaining = strValue.substring( "BEST-EFFORT".length() );
break;
-
- case 'D' :
+
+ case 'D':
if ( !strValue.startsWith( "DEFUNCT" ) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
remaining = strValue.substring( "DEFUNCT".length() );
break;
-
- case 'E' :
+
+ case 'E':
if ( !strValue.startsWith( "EXPERIMENTAL" ) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
remaining = strValue.substring( "EXPERIMENTAL".length() );
break;
-
- case 'F' :
+
+ case 'F':
if ( !strValue.startsWith( "FULL-SERVICE" ) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
remaining = strValue.substring( "FULL-SERVICE".length() );
break;
-
- case 'P' :
+
+ case 'P':
if ( !strValue.startsWith( "PILOT-SERVICE" ) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
remaining = strValue.substring( "PILOT-SERVICE".length() );
break;
-
- default :
+
+ default:
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
// Now, we might have a description separated from the keyword by a '#'
// but this is optional
if ( remaining.length() == 0 )
@@ -154,17 +155,17 @@ public class DSAQualitySyntaxSyntaxCheck
LOG.debug( "Syntax valid for '{}'", value );
return true;
}
-
+
if ( remaining.charAt( 0 ) != '#' )
{
// We were expecting a '#'
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
// Check that the description is a PrintableString
- boolean result = Strings.isPrintableString(remaining.substring(1));
-
+ boolean result = Strings.isPrintableString( remaining.substring( 1 ) );
+
if ( result )
{
LOG.debug( "Syntax valid for '{}'", value );
@@ -173,7 +174,7 @@ public class DSAQualitySyntaxSyntaxCheck
{
LOG.debug( "Syntax invalid for '{}'", value );
}
-
+
return result;
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DSETypeSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DSETypeSyntaxChecker.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/DSETypeSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DSETypeSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -51,27 +51,26 @@ public class DSETypeSyntaxChecker extend
private static final Logger LOG = LoggerFactory.getLogger( DSETypeSyntaxChecker.class );
/** The DSE BITS keywords */
- private static final String[] DSE_BITS_STRINGS =
+ private static final String[] DSE_BITS_STRINGS =
{
- "root", "glue", "cp", "entry", "alias", "subr",
- "nssr", "supr", "xr", "admPoint", "subentry",
- "shadow", "zombie", "immSupr", "rhob", "sa"
- };
-
-
+ "root", "glue", "cp", "entry", "alias", "subr",
+ "nssr", "supr", "xr", "admPoint", "subentry",
+ "shadow", "zombie", "immSupr", "rhob", "sa"
+ };
+
/** The Set which contains the DESBits */
private static final Set<String> DSE_BITS = new HashSet<String>();
-
+
/** Initialization of the country set */
static
{
- for ( String country:DSE_BITS_STRINGS )
+ for ( String country : DSE_BITS_STRINGS )
{
DSE_BITS.add( country );
}
}
-
+
/**
*
* Creates a new instance of DSETypeSyntaxChecker.
@@ -81,8 +80,8 @@ public class DSETypeSyntaxChecker extend
{
super( SchemaConstants.DSE_TYPE_SYNTAX );
}
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -95,14 +94,14 @@ public class DSETypeSyntaxChecker 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
{
@@ -127,59 +126,59 @@ public class DSETypeSyntaxChecker extend
Set<String> keywords = new HashSet<String>();
int len = strValue.length() - 1;
boolean needKeyword = true;
-
+
//
- for ( int i = 1; i < len; /* */ )
+ for ( int i = 1; i < len; /* */)
{
// Skip spaces
while ( ( i < len ) && ( strValue.charAt( i ) == ' ' ) )
{
i++;
}
-
+
int pos = i;
-
+
// Search for a keyword
- while ( ( i < len ) && Chars.isAlphaASCII(strValue, pos) )
+ while ( ( i < len ) && Chars.isAlphaASCII( strValue, pos ) )
{
pos++;
}
-
+
if ( pos == i )
{
// No keyword : error
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
String keyword = strValue.substring( i, pos );
i = pos;
-
+
if ( !DSE_BITS.contains( keyword ) )
{
// Unknown keyword
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
// Check that the keyword has not been met
if ( keywords.contains( keyword ) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
keywords.add( keyword );
needKeyword = false;
-
+
// Skip spaces
while ( ( i < len ) && ( strValue.charAt( i ) == ' ' ) )
{
i++;
}
-
+
// Do we have another keyword ?
- if ( ( i < len) && ( strValue.charAt( i ) == '$' ) )
+ if ( ( i < len ) && ( strValue.charAt( i ) == '$' ) )
{
// yes
i++;
@@ -187,7 +186,7 @@ public class DSETypeSyntaxChecker extend
continue;
}
}
-
+
// We are done
if ( needKeyword )
{
@@ -197,7 +196,7 @@ public class DSETypeSyntaxChecker extend
{
LOG.debug( "Syntax valid for '{}'", value );
}
-
+
return !needKeyword;
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DataQualitySyntaxSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DataQualitySyntaxSyntaxChecker.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/DataQualitySyntaxSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DataQualitySyntaxSyntaxChecker.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 DataQualitySyntaxSyntaxChec
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( DataQualitySyntaxSyntaxChecker.class );
+
/**
* Creates a new instance of DataQualitySyntaxSyntaxChecker.
*/
@@ -44,7 +46,7 @@ public class DataQualitySyntaxSyntaxChec
super( SchemaConstants.DATA_QUALITY_SYNTAX );
}
-
+
/**
* {@inheritDoc}
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DeliveryMethodSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DeliveryMethodSyntaxChecker.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/DeliveryMethodSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DeliveryMethodSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -55,24 +55,25 @@ public class DeliveryMethodSyntaxChecker
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( DeliveryMethodSyntaxChecker.class );
- private static final String[] PDMS =
+ private static final String[] PDMS =
{
"any", "mhs", "physical", "telex", "teletex",
"g3fax", "g4fax", "ia5", "videotex", "telephone"
- };
+ };
/** The Set which contains the delivery methods */
private static final Set<String> DELIVERY_METHODS = new HashSet<String>();
-
+
/** Initialization of the delivery methods set */
static
{
- for ( String country:PDMS )
+ for ( String country : PDMS )
{
DELIVERY_METHODS.add( country );
}
}
-
+
+
/**
*
* Creates a new instance of DeliveryMethodSyntaxChecker.
@@ -82,8 +83,8 @@ public class DeliveryMethodSyntaxChecker
{
super( SchemaConstants.DELIVERY_METHOD_SYNTAX );
}
-
-
+
+
/**
*
* Check if the string contains a delivery method which has
@@ -98,21 +99,21 @@ public class DeliveryMethodSyntaxChecker
private int isPdm( String strValue, int start, Set<String> pdms )
{
int pos = start;
-
- while ( Chars.isAlphaDigit(strValue, pos) )
+
+ while ( Chars.isAlphaDigit( strValue, pos ) )
{
pos++;
}
-
+
// No ascii string, this is not a delivery method
if ( pos == start )
{
return -1;
}
-
+
String pdm = strValue.substring( start, pos );
-
- if ( ! DELIVERY_METHODS.contains( pdm ) )
+
+ if ( !DELIVERY_METHODS.contains( pdm ) )
{
// The delivery method is unknown
return -1;
@@ -145,14 +146,14 @@ public class DeliveryMethodSyntaxChecker
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
{
@@ -164,18 +165,18 @@ public class DeliveryMethodSyntaxChecker
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
// We will get the first delivery method
int length = strValue.length();
int pos = 0;
Set<String> pmds = new HashSet<String>();
-
- if ( ( pos = isPdm( strValue, pos, pmds ) ) == -1)
+
+ if ( ( pos = isPdm( strValue, pos, pmds ) ) == -1 )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
// We have found at least the first pmd,
// now iterate through the other ones. We may have
// SP* '$' SP* before each pmd.
@@ -186,8 +187,8 @@ public class DeliveryMethodSyntaxChecker
{
pos++;
}
-
- if ( ! Strings.isCharASCII( strValue, pos, '$' ) )
+
+ if ( !Strings.isCharASCII( strValue, pos, '$' ) )
{
// A '$' was expected
LOG.debug( "Syntax invalid for '{}'", value );
@@ -197,7 +198,7 @@ public class DeliveryMethodSyntaxChecker
{
pos++;
}
-
+
// Skip spaces
while ( Strings.isCharASCII( strValue, pos, ' ' ) )
{
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DerefAliasSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DerefAliasSyntaxChecker.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/DerefAliasSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DerefAliasSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -46,6 +46,7 @@ public class DerefAliasSyntaxChecker ext
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( DerefAliasSyntaxChecker.class );
+
/**
* Creates a new instance of DerefAliasSyntaxChecker.
*/
@@ -53,8 +54,8 @@ public class DerefAliasSyntaxChecker ext
{
super( SchemaConstants.DEREF_ALIAS_SYNTAX );
}
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -67,14 +68,14 @@ public class DerefAliasSyntaxChecker ext
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
{
@@ -82,10 +83,9 @@ public class DerefAliasSyntaxChecker ext
}
strValue = Strings.trim( Strings.toLowerCase( strValue ) );
-
- return ( "never".equals( strValue ) ||
- "finding".equals( strValue ) ||
- "searching".equals( strValue ) ||
- "always".equals( strValue ));
+
+ return ( "never".equals( strValue ) ||
+ "finding".equals( strValue ) ||
+ "searching".equals( strValue ) || "always".equals( strValue ) );
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DirectoryStringSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DirectoryStringSyntaxChecker.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/DirectoryStringSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DirectoryStringSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -41,6 +41,7 @@ public class DirectoryStringSyntaxChecke
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( DirectoryStringSyntaxChecker.class );
+
/**
* Creates a new instance of DirectoryStringSyntaxChecker.
*/
@@ -48,8 +49,8 @@ public class DirectoryStringSyntaxChecke
{
super( SchemaConstants.DIRECTORY_STRING_SYNTAX );
}
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -62,14 +63,14 @@ public class DirectoryStringSyntaxChecke
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
{
@@ -84,10 +85,10 @@ public class DirectoryStringSyntaxChecke
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
// In any other case, we have to check that the
// string does not contains the '0xFFFD' character
- for ( char c:strValue.toCharArray() )
+ for ( char c : strValue.toCharArray() )
{
if ( c == 0xFFFD )
{
@@ -95,7 +96,7 @@ public class DirectoryStringSyntaxChecke
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/EnhancedGuideSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/EnhancedGuideSyntaxChecker.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/EnhancedGuideSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/EnhancedGuideSyntaxChecker.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;
@@ -38,6 +39,7 @@ public class EnhancedGuideSyntaxChecker
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( EnhancedGuideSyntaxChecker.class );
+
/**
* Creates a new instance of EnhancedGuideSyntaxChecker.
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/FacsimileTelephoneNumberSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/FacsimileTelephoneNumberSyntaxChecker.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/FacsimileTelephoneNumberSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/FacsimileTelephoneNumberSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -57,17 +57,17 @@ public class FacsimileTelephoneNumberSyn
private static final Logger LOG = LoggerFactory.getLogger( FacsimileTelephoneNumberSyntaxChecker.class );
/** Fax parameters possible values */
- private static final String TWO_DIMENSIONAL = "twoDimensional";
- private static final String FINE_RESOLUTION = "fineResolution";
+ private static final String TWO_DIMENSIONAL = "twoDimensional";
+ private static final String FINE_RESOLUTION = "fineResolution";
private static final String UNLIMITED_LENGTH = "unlimitedLength";
- private static final String B4_LENGTH = "b4Length";
- private static final String A3_LENGTH = "a3Width";
- private static final String B4_WIDTH = "b4Width";
- private static final String UNCOMPRESSED = "uncompressed";
-
+ private static final String B4_LENGTH = "b4Length";
+ private static final String A3_LENGTH = "a3Width";
+ private static final String B4_WIDTH = "b4Width";
+ private static final String UNCOMPRESSED = "uncompressed";
+
/** A set which contaons all the possible fax parameters values */
private static Set<String> faxParameters = new HashSet<String>();
-
+
/** Initialization of the fax parameters set of values */
static
{
@@ -79,7 +79,8 @@ public class FacsimileTelephoneNumberSyn
faxParameters.add( Strings.toLowerCase( B4_WIDTH ) );
faxParameters.add( Strings.toLowerCase( UNCOMPRESSED ) );
}
-
+
+
/**
* Creates a new instance of TelephoneNumberSyntaxChecker.
*/
@@ -102,14 +103,14 @@ public class FacsimileTelephoneNumberSyn
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
{
@@ -121,16 +122,16 @@ public class FacsimileTelephoneNumberSyn
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
// The facsimile telephone number might be composed
// of two parts separated by a '$'.
int dollarPos = strValue.indexOf( '$' );
-
+
if ( dollarPos == -1 )
{
// We have no fax-parameter : check the Telephone number
boolean result = super.isValidSyntax( strValue );
-
+
if ( result )
{
LOG.debug( "Syntax valid for '{}'", value );
@@ -139,24 +140,24 @@ public class FacsimileTelephoneNumberSyn
{
LOG.debug( "Syntax invalid for '{}'", value );
}
-
+
return result;
}
-
+
// First check the telephone number if the '$' is not at the first position
if ( dollarPos > 0 )
{
- if ( !super.isValidSyntax( strValue.substring( 0, dollarPos -1 ) ) )
+ if ( !super.isValidSyntax( strValue.substring( 0, dollarPos - 1 ) ) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
// Now, try to validate the fax-parameters : we may
// have more than one, so we will store the seen params
// in a set to check that we don't have the same param twice
- Set<String> paramsSeen = new HashSet<String>();
-
+ Set<String> paramsSeen = new HashSet<String>();
+
while ( dollarPos > 0 )
{
String faxParam = null;
@@ -164,23 +165,23 @@ public class FacsimileTelephoneNumberSyn
if ( newDollar == -1 )
{
- faxParam = strValue.substring( dollarPos+1 );
+ faxParam = strValue.substring( dollarPos + 1 );
}
else
{
- faxParam = strValue.substring( dollarPos+1, newDollar );
+ faxParam = strValue.substring( dollarPos + 1, newDollar );
}
-
+
if ( faxParam == null )
{
// Not allowed
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
// Relax a little bit the syntax by lowercasing the param
faxParam = Strings.toLowerCase( faxParam );
-
+
if ( !faxParameters.contains( faxParam ) )
{
// This parameter is not in the possible set
@@ -192,21 +193,21 @@ public class FacsimileTelephoneNumberSyn
// We have the same parameters twice...
LOG.debug( "Syntax invalid for '{}'", value );
return false;
- }
+ }
else
{
// It's a correct param, let's add it to the seen
// params.
paramsSeen.add( faxParam );
}
-
+
dollarPos = newDollar;
}
-
+
LOG.debug( "Syntax valid for '{}'", value );
return true;
}
-
+
// We must have a valid telephone number !
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/FaxSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/FaxSyntaxChecker.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/FaxSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/FaxSyntaxChecker.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;
@@ -38,6 +39,7 @@ public class FaxSyntaxChecker extends Bi
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( FaxSyntaxChecker.class );
+
/**
* Private default constructor to prevent unnecessary instantiation.
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/GeneralizedTimeSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/GeneralizedTimeSyntaxChecker.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/GeneralizedTimeSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/GeneralizedTimeSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -75,16 +75,16 @@ public class GeneralizedTimeSyntaxChecke
/** The GeneralizedDate pattern matching */
private static final String GENERALIZED_TIME_PATTERN =
- "^\\d{4}" // century + year : 0000 to 9999
- + "(0[1-9]|1[0-2])" // month : 01 to 12
- + "(0[1-9]|[12]\\d|3[01])" // day : 01 to 31
- + "([01]\\d|2[0-3])" // hour : 00 to 23
- + "("
- + "([0-5]\\d)" // optional minute : 00 to 59
- + "([0-5]\\d|60)?" // optional second | leap second
- + ")?"
- + "([.,]\\d+)?" // fraction
- + "(Z|[+-]([01]\\d|2[0-3])([0-5]\\d)?)$"; // time-zone
+ "^\\d{4}" // century + year : 0000 to 9999
+ + "(0[1-9]|1[0-2])" // month : 01 to 12
+ + "(0[1-9]|[12]\\d|3[01])" // day : 01 to 31
+ + "([01]\\d|2[0-3])" // hour : 00 to 23
+ + "("
+ + "([0-5]\\d)" // optional minute : 00 to 59
+ + "([0-5]\\d|60)?" // optional second | leap second
+ + ")?"
+ + "([.,]\\d+)?" // fraction
+ + "(Z|[+-]([01]\\d|2[0-3])([0-5]\\d)?)$"; // time-zone
/** The date pattern. The regexp pattern is immutable, only one instance needed. */
private static final Pattern DATE_PATTERN = Pattern.compile( GENERALIZED_TIME_PATTERN );
@@ -118,7 +118,7 @@ public class GeneralizedTimeSyntaxChecke
}
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/GuideSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/GuideSyntaxChecker.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/GuideSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/GuideSyntaxChecker.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;
@@ -37,6 +38,7 @@ public class GuideSyntaxChecker extends
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( GuideSyntaxChecker.class );
+
/**
* Creates a new instance of GuideSyntaxChecker
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/Ia5StringSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/Ia5StringSyntaxChecker.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/Ia5StringSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/Ia5StringSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -41,6 +41,7 @@ public class Ia5StringSyntaxChecker exte
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( Ia5StringSyntaxChecker.class );
+
/**
* Creates a new instance of Ia5StringSyntaxChecker.
*/
@@ -48,7 +49,7 @@ public class Ia5StringSyntaxChecker exte
{
super( SchemaConstants.IA5_STRING_SYNTAX );
}
-
+
/**
* {@inheritDoc}
@@ -62,22 +63,22 @@ public class Ia5StringSyntaxChecker exte
LOG.debug( "Syntax invalid for 'null'" );
return true;
}
-
+
if ( value instanceof String )
{
strValue = ( String ) value;
}
else if ( value instanceof byte[] )
{
- strValue = Strings.utf8ToString((byte[]) value);
+ strValue = Strings.utf8ToString( ( byte[] ) value );
}
else
{
strValue = value.toString();
}
- boolean result = Strings.isIA5String(strValue);
-
+ boolean result = Strings.isIA5String( strValue );
+
if ( result )
{
LOG.debug( "Syntax valid for '{}'", value );
@@ -86,7 +87,7 @@ public class Ia5StringSyntaxChecker exte
{
LOG.debug( "Syntax invalid for '{}'", value );
}
-
+
return result;
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/IntegerSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/IntegerSyntaxChecker.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/IntegerSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/IntegerSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -50,6 +50,7 @@ public class IntegerSyntaxChecker extend
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( IntegerSyntaxChecker.class );
+
/**
* Creates a new instance of IntegerSyntaxChecker.
*/
@@ -57,28 +58,28 @@ public class IntegerSyntaxChecker extend
{
super( SchemaConstants.INTEGER_SYNTAX );
}
-
-
+
+
/**
* {@inheritDoc}
*/
public boolean isValidSyntax( Object value )
{
- String strValue =null;
+ String strValue = null;
if ( value == null )
{
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
{
@@ -90,17 +91,17 @@ public class IntegerSyntaxChecker extend
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
// The first char must be either a '-' or in [0..9].
// If it's a '0', then there should be any other char after
int pos = 0;
char c = strValue.charAt( pos );
-
+
if ( c == '-' )
{
pos = 1;
}
- else if ( !Chars.isDigit(c) )
+ else if ( !Chars.isDigit( c ) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
@@ -118,9 +119,9 @@ public class IntegerSyntaxChecker extend
return true;
}
}
-
+
// We must have at least a digit which is not '0'
- if ( !Chars.isDigit(strValue, pos) )
+ if ( !Chars.isDigit( strValue, pos ) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
@@ -134,14 +135,14 @@ public class IntegerSyntaxChecker extend
{
pos++;
}
-
- while ( Chars.isDigit(strValue, pos) )
+
+ while ( Chars.isDigit( strValue, pos ) )
{
pos++;
}
-
+
boolean result = ( pos == strValue.length() );
-
+
if ( result )
{
LOG.debug( "Syntax valid for '{}'", value );
@@ -150,7 +151,7 @@ public class IntegerSyntaxChecker extend
{
LOG.debug( "Syntax invalid for '{}'", value );
}
-
+
return result;
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/JavaByteSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/JavaByteSyntaxChecker.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/JavaByteSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/JavaByteSyntaxChecker.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.apache.directory.shared.util.Chars;
@@ -26,6 +27,7 @@ import org.apache.directory.shared.util.
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
/**
* A SyntaxChecker which verifies that a value is a valid Java primitive short or
* the Short wrapper. Essentially this constrains the min and max values of
@@ -50,6 +52,7 @@ public class JavaByteSyntaxChecker exten
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( JavaByteSyntaxChecker.class );
+
/**
* Creates a new instance of JavaByteSyntaxChecker.
*/
@@ -78,7 +81,7 @@ public class JavaByteSyntaxChecker exten
}
else if ( value instanceof byte[] )
{
- strValue = Strings.utf8ToString((byte[]) value);
+ strValue = Strings.utf8ToString( ( byte[] ) value );
}
else
{
@@ -100,7 +103,7 @@ public class JavaByteSyntaxChecker exten
{
pos = 1;
}
- else if ( !Chars.isDigit(c) )
+ else if ( !Chars.isDigit( c ) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
@@ -120,7 +123,7 @@ public class JavaByteSyntaxChecker exten
}
// We must have at least a digit which is not '0'
- if ( !Chars.isDigit(strValue, pos) )
+ if ( !Chars.isDigit( strValue, pos ) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
@@ -135,7 +138,7 @@ public class JavaByteSyntaxChecker exten
pos++;
}
- while ( Chars.isDigit(strValue, pos) )
+ while ( Chars.isDigit( strValue, pos ) )
{
pos++;
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/JavaIntegerSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/JavaIntegerSyntaxChecker.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/JavaIntegerSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/JavaIntegerSyntaxChecker.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.apache.directory.shared.util.Chars;
@@ -51,6 +52,7 @@ public class JavaIntegerSyntaxChecker ex
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( JavaIntegerSyntaxChecker.class );
+
/**
* Creates a new instance of JavaIntegerSyntaxChecker.
*/
@@ -65,7 +67,7 @@ public class JavaIntegerSyntaxChecker ex
*/
public boolean isValidSyntax( Object value )
{
- String strValue =null;
+ String strValue = null;
if ( value == null )
{
@@ -79,7 +81,7 @@ public class JavaIntegerSyntaxChecker ex
}
else if ( value instanceof byte[] )
{
- strValue = Strings.utf8ToString((byte[]) value);
+ strValue = Strings.utf8ToString( ( byte[] ) value );
}
else
{
@@ -101,7 +103,7 @@ public class JavaIntegerSyntaxChecker ex
{
pos = 1;
}
- else if ( !Chars.isDigit(c) )
+ else if ( !Chars.isDigit( c ) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
@@ -109,7 +111,7 @@ public class JavaIntegerSyntaxChecker ex
else if ( c == '0' )
{
boolean result = strValue.length() <= 1;
-
+
if ( result )
{
LOG.debug( "Syntax valid for '{}'", value );
@@ -118,12 +120,12 @@ public class JavaIntegerSyntaxChecker ex
{
LOG.debug( "Syntax invalid for '{}'", value );
}
-
+
return result;
}
// We must have at least a digit which is not '0'
- if ( !Chars.isDigit(strValue, pos) )
+ if ( !Chars.isDigit( strValue, pos ) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
@@ -138,7 +140,7 @@ public class JavaIntegerSyntaxChecker ex
pos++;
}
- while ( Chars.isDigit(strValue, pos) )
+ while ( Chars.isDigit( strValue, pos ) )
{
pos++;
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/JavaLongSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/JavaLongSyntaxChecker.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/JavaLongSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/JavaLongSyntaxChecker.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.apache.directory.shared.util.Chars;
@@ -26,6 +27,7 @@ import org.apache.directory.shared.util.
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
/**
* A SyntaxChecker which verifies that a value is a valid Java primitive long or
* the Long wrapper. Essentially this constrains the min and max values of
@@ -50,6 +52,7 @@ public class JavaLongSyntaxChecker exten
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( JavaLongSyntaxChecker.class );
+
/**
* Creates a new instance of JavaLongSyntaxChecker.
*/
@@ -78,7 +81,7 @@ public class JavaLongSyntaxChecker exten
}
else if ( value instanceof byte[] )
{
- strValue = Strings.utf8ToString((byte[]) value);
+ strValue = Strings.utf8ToString( ( byte[] ) value );
}
else
{
@@ -100,7 +103,7 @@ public class JavaLongSyntaxChecker exten
{
pos = 1;
}
- else if ( !Chars.isDigit(c) )
+ else if ( !Chars.isDigit( c ) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
@@ -120,7 +123,7 @@ public class JavaLongSyntaxChecker exten
}
// We must have at least a digit which is not '0'
- if ( !Chars.isDigit(strValue, pos) )
+ if ( !Chars.isDigit( strValue, pos ) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
@@ -135,7 +138,7 @@ public class JavaLongSyntaxChecker exten
pos++;
}
- while ( Chars.isDigit(strValue, pos) )
+ while ( Chars.isDigit( strValue, pos ) )
{
pos++;
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/JavaShortSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/JavaShortSyntaxChecker.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/JavaShortSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/JavaShortSyntaxChecker.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.apache.directory.shared.util.Chars;
@@ -26,6 +27,7 @@ import org.apache.directory.shared.util.
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
/**
* A SyntaxChecker which verifies that a value is a valid Java primitive Short or
* the Short wrapper. Essentially this constrains the min and max values of
@@ -50,6 +52,7 @@ public class JavaShortSyntaxChecker exte
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( JavaShortSyntaxChecker.class );
+
/**
* Creates a new instance of JavaShortSyntaxChecker.
*/
@@ -78,7 +81,7 @@ public class JavaShortSyntaxChecker exte
}
else if ( value instanceof byte[] )
{
- strValue = Strings.utf8ToString((byte[]) value);
+ strValue = Strings.utf8ToString( ( byte[] ) value );
}
else
{
@@ -100,7 +103,7 @@ public class JavaShortSyntaxChecker exte
{
pos = 1;
}
- else if ( !Chars.isDigit(c) )
+ else if ( !Chars.isDigit( c ) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
@@ -120,7 +123,7 @@ public class JavaShortSyntaxChecker exte
}
// We must have at least a digit which is not '0'
- if ( !Chars.isDigit(strValue, pos) )
+ if ( !Chars.isDigit( strValue, pos ) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
@@ -135,7 +138,7 @@ public class JavaShortSyntaxChecker exte
pos++;
}
- while ( Chars.isDigit(strValue, pos) )
+ while ( Chars.isDigit( strValue, pos ) )
{
pos++;
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/JpegSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/JpegSyntaxChecker.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/JpegSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/JpegSyntaxChecker.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;
@@ -46,6 +47,7 @@ public class JpegSyntaxChecker extends S
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( JpegSyntaxChecker.class );
+
/**
* Creates a new instance of JpegSyntaxChecker.
*/
@@ -53,8 +55,8 @@ public class JpegSyntaxChecker extends S
{
super( SchemaConstants.JPEG_SYNTAX );
}
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -65,15 +67,15 @@ public class JpegSyntaxChecker extends S
LOG.debug( "Syntax invalid for 'null'" );
return false;
}
-
+
// The value must be a byte array
- if ( ! ( value instanceof byte[] ) )
+ if ( !( value instanceof byte[] ) )
{
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
- byte[] bytes = (byte[])value;
+
+ byte[] bytes = ( byte[] ) value;
// The header must be at least 11 bytes long
if ( bytes.length < 11 )
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/LdapSyntaxDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/LdapSyntaxDescriptionSyntaxChecker.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/LdapSyntaxDescriptionSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/LdapSyntaxDescriptionSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -63,12 +63,13 @@ public class LdapSyntaxDescriptionSyntax
super( SchemaConstants.LDAP_SYNTAX_DESCRIPTION_SYNTAX );
}
+
/**
* {@inheritDoc}
*/
public boolean isValidSyntax( Object value )
{
- String strValue =null;
+ String strValue = null;
if ( value == null )
{
@@ -82,7 +83,7 @@ public class LdapSyntaxDescriptionSyntax
}
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/MHSORAddressSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/MHSORAddressSyntaxChecker.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/MHSORAddressSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/MHSORAddressSyntaxChecker.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;
@@ -37,6 +38,7 @@ public class MHSORAddressSyntaxChecker e
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( MHSORAddressSyntaxChecker.class );
+
/**
* Creates a new instance of MHSORAddressSyntaxChecker.
*/
@@ -44,7 +46,7 @@ public class MHSORAddressSyntaxChecker e
{
super( SchemaConstants.MHS_OR_ADDRESS_SYNTAX );
}
-
+
/**
* {@inheritDoc}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/MailPreferenceSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/MailPreferenceSyntaxChecker.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/MailPreferenceSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/MailPreferenceSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -43,6 +43,7 @@ public class MailPreferenceSyntaxChecker
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( MailPreferenceSyntaxChecker.class );
+
/**
* Creates a new instance of MailPreferenceSyntaxChecker.
*/
@@ -50,7 +51,8 @@ public class MailPreferenceSyntaxChecker
{
super( SchemaConstants.MAIL_PREFERENCE_SYNTAX );
}
-
+
+
/**
*
* Creates a new instance of MailPreferenceSyntaxChecker.
@@ -62,28 +64,28 @@ public class MailPreferenceSyntaxChecker
{
super( oid );
}
-
-
+
+
/**
* {@inheritDoc}
*/
public boolean isValidSyntax( Object value )
{
- String strValue =null;
+ String strValue = null;
if ( value == null )
{
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
{
@@ -95,7 +97,7 @@ public class MailPreferenceSyntaxChecker
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
boolean result = ( ( "NO-LISTS".equals( strValue ) ) || ( "ANY-LIST".equals( strValue ) )
|| ( "PROFESSIONAL-LISTS".equals( strValue ) ) );
@@ -107,7 +109,7 @@ public class MailPreferenceSyntaxChecker
{
LOG.debug( "Syntax invalid for '{}'", value );
}
-
+
return result;
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/MasterAndShadowAccessPointSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/MasterAndShadowAccessPointSyntaxChecker.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/MasterAndShadowAccessPointSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/MasterAndShadowAccessPointSyntaxChecker.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;
@@ -37,6 +38,7 @@ public class MasterAndShadowAccessPointS
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( MasterAndShadowAccessPointSyntaxChecker.class );
+
/**
* Create a new instance of MasterAndShadowAccessPointSyntaxChecker
*/
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/MatchingRuleDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/MatchingRuleDescriptionSyntaxChecker.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/MatchingRuleDescriptionSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/MatchingRuleDescriptionSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -69,7 +69,7 @@ public class MatchingRuleDescriptionSynt
{
super( SchemaConstants.MATCHING_RULE_DESCRIPTION_SYNTAX );
}
-
+
/**
* {@inheritDoc}
@@ -90,7 +90,7 @@ public class MatchingRuleDescriptionSynt
}
else if ( value instanceof byte[] )
{
- strValue = Strings.utf8ToString((byte[]) value);
+ strValue = Strings.utf8ToString( ( byte[] ) value );
}
else
{
@@ -110,5 +110,5 @@ public class MatchingRuleDescriptionSynt
return false;
}
}
-
+
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/MatchingRuleUseDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/MatchingRuleUseDescriptionSyntaxChecker.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/MatchingRuleUseDescriptionSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/MatchingRuleUseDescriptionSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -66,7 +66,7 @@ public class MatchingRuleUseDescriptionS
{
super( SchemaConstants.MATCHING_RULE_USE_DESCRIPTION_SYNTAX );
}
-
+
/**
* {@inheritDoc}
@@ -87,7 +87,7 @@ public class MatchingRuleUseDescriptionS
}
else if ( value instanceof byte[] )
{
- strValue = Strings.utf8ToString((byte[]) value);
+ strValue = Strings.utf8ToString( ( byte[] ) value );
}
else
{
@@ -107,5 +107,5 @@ public class MatchingRuleUseDescriptionS
return false;
}
}
-
+
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/NameAndOptionalUIDSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/NameAndOptionalUIDSyntaxChecker.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/NameAndOptionalUIDSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/NameAndOptionalUIDSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -48,6 +48,7 @@ public class NameAndOptionalUIDSyntaxChe
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( NameAndOptionalUIDSyntaxChecker.class );
+
/**
* Creates a new instance of NameAndOptionalUIDSyntaxChecker.
*/
@@ -55,7 +56,7 @@ public class NameAndOptionalUIDSyntaxChe
{
super( SchemaConstants.NAME_AND_OPTIONAL_UID_SYNTAX );
}
-
+
/**
* {@inheritDoc}
@@ -69,14 +70,14 @@ public class NameAndOptionalUIDSyntaxChe
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
{
@@ -88,10 +89,10 @@ public class NameAndOptionalUIDSyntaxChe
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
// Let's see if we have an UID part
int sharpPos = strValue.lastIndexOf( '#' );
-
+
if ( sharpPos != -1 )
{
// Now, check that we don't have another '#'
@@ -102,7 +103,7 @@ public class NameAndOptionalUIDSyntaxChe
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
// This is an UID if the '#' is immediatly
// followed by a BitString, except if the '#' is
// on the last position
@@ -114,8 +115,8 @@ public class NameAndOptionalUIDSyntaxChe
// except if the '#' is in first position
if ( sharpPos > 0 )
{
- boolean result = Dn.isValid(strValue.substring(0, sharpPos));
-
+ boolean result = Dn.isValid( strValue.substring( 0, sharpPos ) );
+
if ( result )
{
LOG.debug( "Syntax valid for '{}'", value );
@@ -124,9 +125,9 @@ public class NameAndOptionalUIDSyntaxChe
{
LOG.debug( "Syntax invalid for '{}'", value );
}
-
+
return result;
-
+
}
else
{
@@ -146,8 +147,8 @@ public class NameAndOptionalUIDSyntaxChe
{
// No UID, the strValue is a Dn
// Check that the value is a valid Dn
- boolean result = Dn.isValid(strValue);
-
+ boolean result = Dn.isValid( strValue );
+
if ( result )
{
LOG.debug( "Syntax valid for '{}'", value );
@@ -156,7 +157,7 @@ public class NameAndOptionalUIDSyntaxChe
{
LOG.debug( "Syntax invalid for '{}'", value );
}
-
+
return result;
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/NameFormDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/NameFormDescriptionSyntaxChecker.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/NameFormDescriptionSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/NameFormDescriptionSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -67,7 +67,7 @@ public class NameFormDescriptionSyntaxCh
{
super( SchemaConstants.NAME_FORM_DESCRIPTION_SYNTAX );
}
-
+
/**
* {@inheritDoc}
@@ -88,7 +88,7 @@ public class NameFormDescriptionSyntaxCh
}
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/NormalizerSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/NormalizerSyntaxChecker.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/NormalizerSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/NormalizerSyntaxChecker.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 Normalizer schema element
*
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/NumberSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/NumberSyntaxChecker.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/NumberSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/NumberSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -44,6 +44,7 @@ public class NumberSyntaxChecker extends
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( NumberSyntaxChecker.class );
+
/**
* Creates a new instance of NumberSyntaxChecker.
*/
@@ -51,7 +52,7 @@ public class NumberSyntaxChecker extends
{
super( SchemaConstants.NUMBER_SYNTAX );
}
-
+
/**
* {@inheritDoc}
@@ -65,14 +66,14 @@ public class NumberSyntaxChecker extends
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
{
@@ -85,30 +86,30 @@ public class NumberSyntaxChecker extends
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
// Check that each char is either a digit or a space
for ( int i = 0; i < strValue.length(); i++ )
{
switch ( strValue.charAt( i ) )
{
- case '0':
- case '1' :
- case '2' :
- case '3' :
- case '4' :
- case '5' :
- case '6' :
- case '7' :
- case '8' :
- case '9' :
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
continue;
-
- default :
+
+ default:
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
}
-
+
if ( ( strValue.charAt( 0 ) == '0' ) && strValue.length() > 1 )
{
// A number can't start with a '0' unless it's the only
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/NumericOidSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/NumericOidSyntaxChecker.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/NumericOidSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/NumericOidSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -20,7 +20,6 @@
package org.apache.directory.shared.ldap.model.schema.syntaxCheckers;
-
import org.apache.directory.shared.asn1.util.Oid;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
@@ -50,6 +49,7 @@ public class NumericOidSyntaxChecker ext
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( NumericOidSyntaxChecker.class );
+
/**
* Creates a new instance of NumericOidSyntaxChecker.
*/
@@ -57,8 +57,8 @@ public class NumericOidSyntaxChecker ext
{
super( SchemaConstants.NUMERIC_OID_SYNTAX );
}
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -71,14 +71,14 @@ public class NumericOidSyntaxChecker ext
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
{
@@ -93,7 +93,7 @@ public class NumericOidSyntaxChecker ext
// Just check that the value is a valid OID
boolean result = ( Oid.isOid( strValue ) );
-
+
if ( result )
{
LOG.debug( "Syntax valid for '{}'", value );
@@ -102,7 +102,7 @@ public class NumericOidSyntaxChecker ext
{
LOG.debug( "Syntax invalid for '{}'", value );
}
-
+
return result;
}
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/NumericStringSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/NumericStringSyntaxChecker.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/NumericStringSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/NumericStringSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -48,6 +48,7 @@ public class NumericStringSyntaxChecker
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( NumericStringSyntaxChecker.class );
+
/**
* Creates a new instance of NumericStringSyntaxChecker.
*/
@@ -56,7 +57,7 @@ public class NumericStringSyntaxChecker
super( SchemaConstants.NUMERIC_STRING_SYNTAX );
}
-
+
/**
* {@inheritDoc}
*/
@@ -69,14 +70,14 @@ public class NumericStringSyntaxChecker
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
{
@@ -89,31 +90,31 @@ public class NumericStringSyntaxChecker
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
// Check that each char is either a digit or a space
for ( int i = 0; i < strValue.length(); i++ )
{
switch ( strValue.charAt( i ) )
{
- case '0':
- case '1' :
- case '2' :
- case '3' :
- case '4' :
- case '5' :
- case '6' :
- case '7' :
- case '8' :
- case '9' :
- case ' ' :
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
+ case ' ':
continue;
-
- default :
+
+ default:
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/ObjectClassDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/ObjectClassDescriptionSyntaxChecker.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/ObjectClassDescriptionSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/ObjectClassDescriptionSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -63,6 +63,7 @@ public class ObjectClassDescriptionSynta
/** The schema parser used to parse the ObjectClassDescription Syntax */
private ObjectClassDescriptionSchemaParser schemaParser = new ObjectClassDescriptionSchemaParser();
+
/**
* Creates a new instance of ObjectClassDescriptionSyntaxChecker.
*/
@@ -70,7 +71,7 @@ public class ObjectClassDescriptionSynta
{
super( SchemaConstants.OBJECT_CLASS_DESCRIPTION_SYNTAX );
}
-
+
/**
* {@inheritDoc}
@@ -91,7 +92,7 @@ public class ObjectClassDescriptionSynta
}
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/ObjectClassTypeSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/ObjectClassTypeSyntaxChecker.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/ObjectClassTypeSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/ObjectClassTypeSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -39,6 +39,7 @@ public class ObjectClassTypeSyntaxChecke
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( ObjectClassTypeSyntaxChecker.class );
+
/**
* Creates a new instance of ObjectClassTypeSyntaxChecker.
*/
@@ -47,7 +48,7 @@ public class ObjectClassTypeSyntaxChecke
super( SchemaConstants.OBJECT_CLASS_TYPE_SYNTAX );
}
-
+
/**
* {@inheritDoc}
*/
@@ -60,14 +61,14 @@ public class ObjectClassTypeSyntaxChecke
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
{
@@ -79,24 +80,24 @@ public class ObjectClassTypeSyntaxChecke
LOG.debug( "Syntax invalid for '{}'", value );
return false;
}
-
+
char ch = strValue.charAt( 0 );
- switch( ch )
+ switch ( ch )
{
- case( 'A' ):
+ case ( 'A' ):
if ( "AUXILIARY".equals( strValue ) || "ABSTRACT".equals( strValue ) )
{
LOG.debug( "Syntax valid for '{}'", value );
return true;
}
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( "Syntax invalid for '{}'", value );
return false;
-
- case( 'S' ):
+
+ case ( 'S' ):
boolean result = "STRUCTURAL".equals( strValue );
-
+
if ( result )
{
LOG.debug( "Syntax valid for '{}'", value );
@@ -105,9 +106,9 @@ public class ObjectClassTypeSyntaxChecke
{
LOG.debug( "Syntax invalid for '{}'", value );
}
-
+
return result;
-
+
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/ObjectNameSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/ObjectNameSyntaxChecker.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/ObjectNameSyntaxChecker.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/ObjectNameSyntaxChecker.java Tue Jan 24 17:44:03 2012
@@ -53,9 +53,10 @@ public class ObjectNameSyntaxChecker ext
private static final Logger LOG = LoggerFactory.getLogger( ObjectNameSyntaxChecker.class );
private static final String REGEXP = "^([a-zA-Z][a-zA-Z0-9-;]*)$";
-
- private static final Pattern PATTERN = Pattern.compile( REGEXP );
-
+
+ private static final Pattern PATTERN = Pattern.compile( REGEXP );
+
+
/**
* Creates a new instance of ObjectNameSyntaxChecker.
*/
@@ -63,8 +64,8 @@ public class ObjectNameSyntaxChecker ext
{
super( SchemaConstants.OBJECT_NAME_SYNTAX );
}
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -77,14 +78,14 @@ public class ObjectNameSyntaxChecker ext
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
{
@@ -98,10 +99,10 @@ public class ObjectNameSyntaxChecker ext
}
// Search for the '$' separator
- Matcher match = PATTERN.matcher ( strValue );
-
+ Matcher match = PATTERN.matcher( strValue );
+
boolean result = match.matches();
-
+
if ( result )
{
LOG.debug( "Syntax valid for '{}'", value );
@@ -110,7 +111,7 @@ public class ObjectNameSyntaxChecker ext
{
LOG.debug( "Syntax invalid for '{}'", value );
}
-
+
return result;
}
}