* We didn't implemented the check against RFC 804, so the value is considered * to contain an OctetString. * @@ -38,15 +39,19 @@ public class FaxSyntaxChecker extends Bi { /** A logger for this class */ private static final Logger LOG = LoggerFactory.getLogger( FaxSyntaxChecker.class ); + + /** + * A static instance of FaxSyntaxChecker + */ + public static final FaxSyntaxChecker INSTANCE = new FaxSyntaxChecker(); - + /** * Private default constructor to prevent unnecessary instantiation. */ public FaxSyntaxChecker() { - super(); - setOid( SchemaConstants.FAX_SYNTAX ); + super( SchemaConstants.FAX_SYNTAX ); } @@ -56,7 +61,7 @@ public class FaxSyntaxChecker extends Bi @Override public boolean isValidSyntax( Object value ) { - LOG.debug( "Syntax valid for '{}'", value ); + LOG.debug( I18n.msg( I18n.MSG_04490_SYNTAX_VALID, value ) ); return true; } } Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/GeneralizedTimeSyntaxChecker.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/GeneralizedTimeSyntaxChecker.java?rev=1786491&r1=1786490&r2=1786491&view=diff ============================================================================== --- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/GeneralizedTimeSyntaxChecker.java (original) +++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/GeneralizedTimeSyntaxChecker.java Sat Mar 11 07:45:20 2017 @@ -22,6 +22,7 @@ package org.apache.directory.api.ldap.mo import java.util.regex.Pattern; +import org.apache.directory.api.i18n.I18n; import org.apache.directory.api.ldap.model.constants.SchemaConstants; import org.apache.directory.api.ldap.model.schema.SyntaxChecker; import org.apache.directory.api.util.Strings; @@ -32,8 +33,9 @@ import org.slf4j.LoggerFactory; /** * A SyntaxChecker which verifies that a value is a generalized time * according to RFC 4517. - * + *
* From RFC 4517 : + *
* GeneralizedTime = century year month day hour
* [ minute [ second / leap-second ] ]
* [ fraction ]
@@ -63,7 +65,7 @@ import org.slf4j.LoggerFactory;
* PLUS = %x2B ; plus sign ("+")
* DOT = %x2E ; period (".")
* COMMA = %x2C ; comma (",")
- *
+ *
*
* @author Apache Directory Project
*/
@@ -96,8 +98,13 @@ public class GeneralizedTimeSyntaxChecke
/** The date pattern. The regexp pattern is immutable, only one instance needed. */
private static final Pattern DATE_PATTERN = Pattern.compile( GENERALIZED_TIME_PATTERN );
+
+ /**
+ * A static instance of GeneralizedTimeSyntaxChecker
+ */
+ public static final GeneralizedTimeSyntaxChecker INSTANCE = new GeneralizedTimeSyntaxChecker();
-
+
/**
* Creates a new instance of GeneralizedTimeSyntaxChecker.
*/
@@ -117,7 +124,7 @@ public class GeneralizedTimeSyntaxChecke
if ( value == null )
{
- LOG.debug( "Syntax invalid for 'null'" );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, "null" ) );
return false;
}
@@ -137,7 +144,7 @@ public class GeneralizedTimeSyntaxChecke
// A generalized time must have a minimal length of 11
if ( strValue.length() < 11 )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
@@ -146,11 +153,11 @@ public class GeneralizedTimeSyntaxChecke
if ( result )
{
- LOG.debug( "Syntax valid for '{}'", value );
+ LOG.debug( I18n.msg( I18n.MSG_04490_SYNTAX_VALID, value ) );
}
else
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
}
return result;
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/GuideSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/GuideSyntaxChecker.java?rev=1786491&r1=1786490&r2=1786491&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/GuideSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/GuideSyntaxChecker.java Sat Mar 11 07:45:20 2017
@@ -20,6 +20,7 @@
package org.apache.directory.api.ldap.model.schema.syntaxCheckers;
+import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -27,7 +28,7 @@ import org.slf4j.LoggerFactory;
/**
* A SyntaxChecker which verifies that a value is a Guide according to RFC 4517.
- *
+ * * Implemented as binary right now ... * * @author Apache Directory Project @@ -37,15 +38,19 @@ public class GuideSyntaxChecker extends { /** A logger for this class */ private static final Logger LOG = LoggerFactory.getLogger( GuideSyntaxChecker.class ); + + /** + * A static instance of GuideSyntaxChecker + */ + public static final GuideSyntaxChecker INSTANCE = new GuideSyntaxChecker(); - + /** * Creates a new instance of GuideSyntaxChecker */ public GuideSyntaxChecker() { - super(); - setOid( SchemaConstants.GUIDE_SYNTAX ); + super( SchemaConstants.GUIDE_SYNTAX ); } @@ -55,7 +60,7 @@ public class GuideSyntaxChecker extends @Override public boolean isValidSyntax( Object value ) { - LOG.debug( "Syntax valid for '{}'", value ); + LOG.debug( I18n.msg( I18n.MSG_04490_SYNTAX_VALID, value ) ); return true; } } Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/Ia5StringSyntaxChecker.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/Ia5StringSyntaxChecker.java?rev=1786491&r1=1786490&r2=1786491&view=diff ============================================================================== --- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/Ia5StringSyntaxChecker.java (original) +++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/Ia5StringSyntaxChecker.java Sat Mar 11 07:45:20 2017 @@ -20,6 +20,7 @@ package org.apache.directory.api.ldap.model.schema.syntaxCheckers; +import org.apache.directory.api.i18n.I18n; import org.apache.directory.api.ldap.model.constants.SchemaConstants; import org.apache.directory.api.ldap.model.schema.SyntaxChecker; import org.apache.directory.api.util.Strings; @@ -29,10 +30,11 @@ import org.slf4j.LoggerFactory; /** * A SyntaxChecker which verifies that a value is a IA5 String according to RFC 4517. - * + *
* From RFC 4517 : + *
* IA5String = *(%x00-7F) - * + ** @author Apache Directory Project */ @SuppressWarnings("serial") @@ -40,7 +42,11 @@ public class Ia5StringSyntaxChecker exte { /** A logger for this class */ private static final Logger LOG = LoggerFactory.getLogger( Ia5StringSyntaxChecker.class ); - + + /** + * A static instance of Ia5StringSyntaxChecker + */ + public static final Ia5StringSyntaxChecker INSTANCE = new Ia5StringSyntaxChecker(); /** * Creates a new instance of Ia5StringSyntaxChecker. @@ -52,6 +58,17 @@ public class Ia5StringSyntaxChecker exte /** + * Creates a new instance of a child with a given OID. + * + * @param oid the child's oid + */ + protected Ia5StringSyntaxChecker( String oid ) + { + super( oid ); + } + + + /** * {@inheritDoc} */ @Override @@ -61,7 +78,7 @@ public class Ia5StringSyntaxChecker exte if ( value == null ) { - LOG.debug( "Syntax invalid for 'null'" ); + LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, "null" ) ); return true; } @@ -82,11 +99,11 @@ public class Ia5StringSyntaxChecker exte if ( result ) { - LOG.debug( "Syntax valid for '{}'", value ); + LOG.debug( I18n.msg( I18n.MSG_04490_SYNTAX_VALID, value ) ); } else { - LOG.debug( INVALID_SYNTAX_FOR, value ); + LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) ); } return result; Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/IntegerSyntaxChecker.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/IntegerSyntaxChecker.java?rev=1786491&r1=1786490&r2=1786491&view=diff ============================================================================== --- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/IntegerSyntaxChecker.java (original) +++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/IntegerSyntaxChecker.java Sat Mar 11 07:45:20 2017 @@ -20,6 +20,7 @@ package org.apache.directory.api.ldap.model.schema.syntaxCheckers; +import org.apache.directory.api.i18n.I18n; import org.apache.directory.api.ldap.model.constants.SchemaConstants; import org.apache.directory.api.ldap.model.schema.SyntaxChecker; import org.apache.directory.api.util.Chars; @@ -33,6 +34,7 @@ import org.slf4j.LoggerFactory; * * From RFC 4517 : * + *
* Integer = ( HYPHEN LDIGIT *DIGIT ) | number
*
* From RFC 4512 :
@@ -40,7 +42,7 @@ import org.slf4j.LoggerFactory;
* DIGIT = %x30 | LDIGIT ; "0"-"9"
* LDIGIT = %x31-39 ; "1"-"9"
* HYPHEN = %x2D ; hyphen ("-")
- *
+ *
*
* @author Apache Directory Project
*/
@@ -49,8 +51,13 @@ public class IntegerSyntaxChecker extend
{
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( IntegerSyntaxChecker.class );
+
+ /**
+ * A static instance of IntegerSyntaxChecker
+ */
+ public static final IntegerSyntaxChecker INSTANCE = new IntegerSyntaxChecker();
-
+
/**
* Creates a new instance of IntegerSyntaxChecker.
*/
@@ -70,7 +77,7 @@ public class IntegerSyntaxChecker extend
if ( value == null )
{
- LOG.debug( "Syntax invalid for 'null'" );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, "null" ) );
return false;
}
@@ -89,7 +96,7 @@ public class IntegerSyntaxChecker extend
if ( strValue.length() == 0 )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
@@ -104,19 +111,19 @@ public class IntegerSyntaxChecker extend
}
else if ( !Chars.isDigit( c ) )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
else if ( c == '0' )
{
if ( strValue.length() > 1 )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
else
{
- LOG.debug( "Syntax valid for '{}'", value );
+ LOG.debug( I18n.msg( I18n.MSG_04490_SYNTAX_VALID, value ) );
return true;
}
}
@@ -124,12 +131,12 @@ public class IntegerSyntaxChecker extend
// We must have at least a digit which is not '0'
if ( !Chars.isDigit( strValue, pos ) )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
else if ( Strings.isCharASCII( strValue, pos, '0' ) )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
else
@@ -146,11 +153,11 @@ public class IntegerSyntaxChecker extend
if ( result )
{
- LOG.debug( "Syntax valid for '{}'", value );
+ LOG.debug( I18n.msg( I18n.MSG_04490_SYNTAX_VALID, value ) );
}
else
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
}
return result;
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/JavaByteSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/JavaByteSyntaxChecker.java?rev=1786491&r1=1786490&r2=1786491&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/JavaByteSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/JavaByteSyntaxChecker.java Sat Mar 11 07:45:20 2017
@@ -20,6 +20,7 @@
package org.apache.directory.api.ldap.model.schema.syntaxCheckers;
+import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.schema.SyntaxChecker;
import org.apache.directory.api.util.Chars;
@@ -32,9 +33,10 @@ 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
* the Integer.
- *
+ * * From RFC 4517 : * + *
* Integer = ( HYPHEN LDIGIT *DIGIT ) | number
*
* From RFC 4512 :
@@ -42,7 +44,7 @@ import org.slf4j.LoggerFactory;
* DIGIT = %x30 | LDIGIT ; "0"-"9"
* LDIGIT = %x31-39 ; "1"-"9"
* HYPHEN = %x2D ; hyphen ("-")
- *
+ *
*
* @author Apache Directory Project
*/
@@ -51,7 +53,12 @@ public class JavaByteSyntaxChecker exten
{
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( JavaByteSyntaxChecker.class );
-
+
+ /**
+ * A static instance of JavaByteSyntaxChecker
+ */
+ public static final JavaByteSyntaxChecker INSTANCE = new JavaByteSyntaxChecker();
+
/**
* Creates a new instance of JavaByteSyntaxChecker.
@@ -72,7 +79,7 @@ public class JavaByteSyntaxChecker exten
if ( value == null )
{
- LOG.debug( "Syntax invalid for 'null'" );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, "null" ) );
return false;
}
@@ -91,7 +98,7 @@ public class JavaByteSyntaxChecker exten
if ( strValue.length() == 0 )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
@@ -106,32 +113,27 @@ public class JavaByteSyntaxChecker exten
}
else if ( !Chars.isDigit( c ) )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
else if ( c == '0' )
{
if ( strValue.length() > 1 )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
else
{
- LOG.debug( "Syntax valid for '{}'", value );
+ LOG.debug( I18n.msg( I18n.MSG_04490_SYNTAX_VALID, value ) );
return true;
}
}
// We must have at least a digit which is not '0'
- if ( !Chars.isDigit( strValue, pos ) )
- {
- LOG.debug( INVALID_SYNTAX_FOR, value );
- return false;
- }
- else if ( Strings.isCharASCII( strValue, pos, '0' ) )
+ if ( !Chars.isDigit( strValue, pos ) || Strings.isCharASCII( strValue, pos, '0' ) )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
else
@@ -146,7 +148,7 @@ public class JavaByteSyntaxChecker exten
if ( pos != strValue.length() )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
@@ -154,12 +156,12 @@ public class JavaByteSyntaxChecker exten
try
{
Byte.valueOf( strValue );
- LOG.debug( "Syntax valid for '{}'", value );
+ LOG.debug( I18n.msg( I18n.MSG_04490_SYNTAX_VALID, value ) );
return true;
}
catch ( NumberFormatException e )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/JavaIntegerSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/JavaIntegerSyntaxChecker.java?rev=1786491&r1=1786490&r2=1786491&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/JavaIntegerSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/JavaIntegerSyntaxChecker.java Sat Mar 11 07:45:20 2017
@@ -20,6 +20,7 @@
package org.apache.directory.api.ldap.model.schema.syntaxCheckers;
+import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.schema.SyntaxChecker;
import org.apache.directory.api.util.Chars;
@@ -32,9 +33,9 @@ import org.slf4j.LoggerFactory;
* A SyntaxChecker which verifies that a value is a valid Java primitive int or
* the Integer wrapper. Essentially this constrains the min and max values of
* the Integer.
- *
+ * * From RFC 4517 : - * + *
* Integer = ( HYPHEN LDIGIT *DIGIT ) | number
*
* From RFC 4512 :
@@ -42,7 +43,7 @@ import org.slf4j.LoggerFactory;
* DIGIT = %x30 | LDIGIT ; "0"-"9"
* LDIGIT = %x31-39 ; "1"-"9"
* HYPHEN = %x2D ; hyphen ("-")
- *
+ *
*
* @author Apache Directory Project
*/
@@ -51,8 +52,13 @@ public class JavaIntegerSyntaxChecker ex
{
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( JavaIntegerSyntaxChecker.class );
+
+ /**
+ * A static instance of JavaIntegerSyntaxChecker
+ */
+ public static final JavaIntegerSyntaxChecker INSTANCE = new JavaIntegerSyntaxChecker();
-
+
/**
* Creates a new instance of JavaIntegerSyntaxChecker.
*/
@@ -72,7 +78,7 @@ public class JavaIntegerSyntaxChecker ex
if ( value == null )
{
- LOG.debug( "Syntax invalid for 'null'" );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, "null" ) );
return false;
}
@@ -91,7 +97,7 @@ public class JavaIntegerSyntaxChecker ex
if ( strValue.length() == 0 )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
@@ -106,7 +112,7 @@ public class JavaIntegerSyntaxChecker ex
}
else if ( !Chars.isDigit( c ) )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
else if ( c == '0' )
@@ -115,25 +121,20 @@ public class JavaIntegerSyntaxChecker ex
if ( result )
{
- LOG.debug( "Syntax valid for '{}'", value );
+ LOG.debug( I18n.msg( I18n.MSG_04490_SYNTAX_VALID, value ) );
}
else
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
}
return result;
}
// We must have at least a digit which is not '0'
- if ( !Chars.isDigit( strValue, pos ) )
- {
- LOG.debug( INVALID_SYNTAX_FOR, value );
- return false;
- }
- else if ( Strings.isCharASCII( strValue, pos, '0' ) )
+ if ( !Chars.isDigit( strValue, pos ) || Strings.isCharASCII( strValue, pos, '0' ) )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
else
@@ -148,19 +149,19 @@ public class JavaIntegerSyntaxChecker ex
if ( pos != strValue.length() )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
try
{
Integer.valueOf( strValue );
- LOG.debug( "Syntax valid for '{}'", value );
+ LOG.debug( I18n.msg( I18n.MSG_04490_SYNTAX_VALID, value ) );
return true;
}
catch ( NumberFormatException e )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/JavaLongSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/JavaLongSyntaxChecker.java?rev=1786491&r1=1786490&r2=1786491&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/JavaLongSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/JavaLongSyntaxChecker.java Sat Mar 11 07:45:20 2017
@@ -20,6 +20,7 @@
package org.apache.directory.api.ldap.model.schema.syntaxCheckers;
+import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.schema.SyntaxChecker;
import org.apache.directory.api.util.Chars;
@@ -32,9 +33,9 @@ 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
* the Integer.
- *
+ * * From RFC 4517 : - * + *
* Integer = ( HYPHEN LDIGIT *DIGIT ) | number
*
* From RFC 4512 :
@@ -42,7 +43,7 @@ import org.slf4j.LoggerFactory;
* DIGIT = %x30 | LDIGIT ; "0"-"9"
* LDIGIT = %x31-39 ; "1"-"9"
* HYPHEN = %x2D ; hyphen ("-")
- *
+ *
*
* @author Apache Directory Project
*/
@@ -51,8 +52,13 @@ public class JavaLongSyntaxChecker exten
{
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( JavaLongSyntaxChecker.class );
+
+ /**
+ * A static instance of JavaLongSyntaxChecker
+ */
+ public static final JavaLongSyntaxChecker INSTANCE = new JavaLongSyntaxChecker();
-
+
/**
* Creates a new instance of JavaLongSyntaxChecker.
*/
@@ -72,7 +78,7 @@ public class JavaLongSyntaxChecker exten
if ( value == null )
{
- LOG.debug( "Syntax invalid for 'null'" );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, "null" ) );
return false;
}
@@ -91,7 +97,7 @@ public class JavaLongSyntaxChecker exten
if ( strValue.length() == 0 )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
@@ -106,32 +112,27 @@ public class JavaLongSyntaxChecker exten
}
else if ( !Chars.isDigit( c ) )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
else if ( c == '0' )
{
if ( strValue.length() > 1 )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
else
{
- LOG.debug( "Syntax valid for '{}'", value );
+ LOG.debug( I18n.msg( I18n.MSG_04490_SYNTAX_VALID, value ) );
return true;
}
}
// We must have at least a digit which is not '0'
- if ( !Chars.isDigit( strValue, pos ) )
- {
- LOG.debug( INVALID_SYNTAX_FOR, value );
- return false;
- }
- else if ( Strings.isCharASCII( strValue, pos, '0' ) )
+ if ( !Chars.isDigit( strValue, pos ) || Strings.isCharASCII( strValue, pos, '0' ) )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
else
@@ -146,7 +147,7 @@ public class JavaLongSyntaxChecker exten
if ( pos != strValue.length() )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
@@ -154,12 +155,12 @@ public class JavaLongSyntaxChecker exten
try
{
Long.valueOf( strValue );
- LOG.debug( "Syntax valid for '{}'", value );
+ LOG.debug( I18n.msg( I18n.MSG_04490_SYNTAX_VALID, value ) );
return true;
}
catch ( NumberFormatException e )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/JavaShortSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/JavaShortSyntaxChecker.java?rev=1786491&r1=1786490&r2=1786491&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/JavaShortSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/JavaShortSyntaxChecker.java Sat Mar 11 07:45:20 2017
@@ -20,6 +20,7 @@
package org.apache.directory.api.ldap.model.schema.syntaxCheckers;
+import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.schema.SyntaxChecker;
import org.apache.directory.api.util.Chars;
@@ -32,9 +33,9 @@ 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
* the Short.
- *
+ * * From RFC 4517 : - * + *
* Integer = ( HYPHEN LDIGIT *DIGIT ) | number
*
* From RFC 4512 :
@@ -42,7 +43,7 @@ import org.slf4j.LoggerFactory;
* DIGIT = %x30 | LDIGIT ; "0"-"9"
* LDIGIT = %x31-39 ; "1"-"9"
* HYPHEN = %x2D ; hyphen ("-")
- *
+ *
*
* @author Apache Directory Project
*/
@@ -51,8 +52,13 @@ public class JavaShortSyntaxChecker exte
{
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( JavaShortSyntaxChecker.class );
+
+ /**
+ * A static instance of JavaShortSyntaxChecker
+ */
+ public static final JavaShortSyntaxChecker INSTANCE = new JavaShortSyntaxChecker();
-
+
/**
* Creates a new instance of JavaShortSyntaxChecker.
*/
@@ -72,7 +78,7 @@ public class JavaShortSyntaxChecker exte
if ( value == null )
{
- LOG.debug( "Syntax invalid for 'null'" );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, "null" ) );
return false;
}
@@ -91,7 +97,7 @@ public class JavaShortSyntaxChecker exte
if ( strValue.length() == 0 )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
@@ -106,32 +112,27 @@ public class JavaShortSyntaxChecker exte
}
else if ( !Chars.isDigit( c ) )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
else if ( c == '0' )
{
if ( strValue.length() > 1 )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
else
{
- LOG.debug( "Syntax valid for '{}'", value );
+ LOG.debug( I18n.msg( I18n.MSG_04490_SYNTAX_VALID, value ) );
return true;
}
}
// We must have at least a digit which is not '0'
- if ( !Chars.isDigit( strValue, pos ) )
- {
- LOG.debug( INVALID_SYNTAX_FOR, value );
- return false;
- }
- else if ( Strings.isCharASCII( strValue, pos, '0' ) )
+ if ( !Chars.isDigit( strValue, pos ) || Strings.isCharASCII( strValue, pos, '0' ) )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
else
@@ -146,7 +147,7 @@ public class JavaShortSyntaxChecker exte
if ( pos != strValue.length() )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
@@ -154,12 +155,12 @@ public class JavaShortSyntaxChecker exte
try
{
Short.valueOf( strValue );
- LOG.debug( "Syntax valid for '{}'", value );
+ LOG.debug( I18n.msg( I18n.MSG_04490_SYNTAX_VALID, value ) );
return true;
}
catch ( NumberFormatException e )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/JpegSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/JpegSyntaxChecker.java?rev=1786491&r1=1786490&r2=1786491&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/JpegSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/JpegSyntaxChecker.java Sat Mar 11 07:45:20 2017
@@ -20,6 +20,7 @@
package org.apache.directory.api.ldap.model.schema.syntaxCheckers;
+import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.schema.SyntaxChecker;
import org.slf4j.Logger;
@@ -28,14 +29,16 @@ import org.slf4j.LoggerFactory;
/**
* A SyntaxChecker which verifies that a value is a Jpeg according to RFC 4517.
- *
+ * * The JFIF (Jpeg File Interchange Format) specify that a jpeg image starts with * the following bytes : + *
* 0xFF 0xD8 (SOI, Start Of Image)
* 0xFF 0xE0 (App0 for JFIF) or 0xDD 0xE1 (App1 for Exif)
* 0xNN 0xNN (Header length)
* "JFIF\0" (JFIF string with an ending \0)
* some other bytes which are related to the image.
+ *
*
* We will check for those 11 bytes, except the length.
*
@@ -46,8 +49,13 @@ public class JpegSyntaxChecker extends S
{
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( JpegSyntaxChecker.class );
+
+ /**
+ * A static instance of JpegSyntaxChecker
+ */
+ public static final JpegSyntaxChecker INSTANCE = new JpegSyntaxChecker();
-
+
/**
* Creates a new instance of JpegSyntaxChecker.
*/
@@ -65,14 +73,14 @@ public class JpegSyntaxChecker extends S
{
if ( value == null )
{
- LOG.debug( "Syntax invalid for 'null'" );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, "null" ) );
return false;
}
// The value must be a byte array
if ( !( value instanceof byte[] ) )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
@@ -81,7 +89,7 @@ public class JpegSyntaxChecker extends S
// The header must be at least 11 bytes long
if ( bytes.length < 11 )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
@@ -98,7 +106,7 @@ public class JpegSyntaxChecker extends S
&& ( bytes[9] == 'F' )
&& ( bytes[10] == 0x00 ) )
{
- LOG.debug( "Syntax valid for '{}'", value );
+ LOG.debug( I18n.msg( I18n.MSG_04490_SYNTAX_VALID, value ) );
return true;
}
// EXIF Format
@@ -109,12 +117,12 @@ public class JpegSyntaxChecker extends S
&& ( bytes[9] == 'f' )
&& ( bytes[10] == 0x00 ) )
{
- LOG.debug( "Syntax valid for '{}'", value );
+ LOG.debug( I18n.msg( I18n.MSG_04490_SYNTAX_VALID, value ) );
return true;
}
}
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/LdapSyntaxDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/LdapSyntaxDescriptionSyntaxChecker.java?rev=1786491&r1=1786490&r2=1786491&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/LdapSyntaxDescriptionSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/LdapSyntaxDescriptionSyntaxChecker.java Sat Mar 11 07:45:20 2017
@@ -22,6 +22,7 @@ package org.apache.directory.api.ldap.mo
import java.text.ParseException;
+import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.schema.SyntaxChecker;
import org.apache.directory.api.ldap.model.schema.parsers.LdapSyntaxDescriptionSchemaParser;
@@ -32,7 +33,7 @@ import org.slf4j.LoggerFactory;
/**
* A SyntaxChecker which verifies that a value follows the
- * LDAP syntax descripton syntax according to RFC 4512, par 4.2.2:
+ * LDAP syntax description syntax according to RFC 4512, par 4.2.2:
*
*
* SyntaxDescription = LPAREN WSP
@@ -50,9 +51,14 @@ public class LdapSyntaxDescriptionSyntax
private static final Logger LOG = LoggerFactory.getLogger( LdapSyntaxDescriptionSyntaxChecker.class );
/** The schema parser used to parse the LdapSyntax description Syntax */
- private transient LdapSyntaxDescriptionSchemaParser schemaParser = new LdapSyntaxDescriptionSchemaParser();
-
+ private LdapSyntaxDescriptionSchemaParser schemaParser = new LdapSyntaxDescriptionSchemaParser();
+
+ /**
+ * A static instance of LdapSyntaxDescriptionSyntaxChecker
+ */
+ public static final LdapSyntaxDescriptionSyntaxChecker INSTANCE = new LdapSyntaxDescriptionSyntaxChecker();
+
/**
*
* Creates a new instance of LdapSyntaxDescriptionSyntaxChecker.
@@ -74,7 +80,7 @@ public class LdapSyntaxDescriptionSyntax
if ( value == null )
{
- LOG.debug( "Syntax invalid for 'null'" );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, "null" ) );
return false;
}
@@ -94,13 +100,13 @@ public class LdapSyntaxDescriptionSyntax
try
{
schemaParser.parseLdapSyntaxDescription( strValue );
- LOG.debug( "Syntax valid for '{}'", value );
+ LOG.debug( I18n.msg( I18n.MSG_04490_SYNTAX_VALID, value ) );
return true;
}
catch ( ParseException pe )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/MailPreferenceSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/MailPreferenceSyntaxChecker.java?rev=1786491&r1=1786490&r2=1786491&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/MailPreferenceSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/MailPreferenceSyntaxChecker.java Sat Mar 11 07:45:20 2017
@@ -20,6 +20,7 @@
package org.apache.directory.api.ldap.model.schema.syntaxCheckers;
+import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.schema.SyntaxChecker;
import org.apache.directory.api.util.Strings;
@@ -42,8 +43,13 @@ public class MailPreferenceSyntaxChecker
{
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( MailPreferenceSyntaxChecker.class );
+
+ /**
+ * A static instance of MailPreferenceSyntaxChecker
+ */
+ public static final MailPreferenceSyntaxChecker INSTANCE = new MailPreferenceSyntaxChecker();
-
+
/**
* Creates a new instance of MailPreferenceSyntaxChecker.
*/
@@ -76,7 +82,7 @@ public class MailPreferenceSyntaxChecker
if ( value == null )
{
- LOG.debug( "Syntax invalid for 'null'" );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, "null" ) );
return false;
}
@@ -95,20 +101,20 @@ public class MailPreferenceSyntaxChecker
if ( ( strValue.length() < 8 ) || ( strValue.length() > 18 ) )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
- boolean result = "NO-LISTS".equals( strValue ) || "ANY-LIST".equals( strValue )
- || "PROFESSIONAL-LISTS".equals( strValue );
+ boolean result = ( "NO-LISTS".equals( strValue ) ) || ( "ANY-LIST".equals( strValue ) )
+ || ( "PROFESSIONAL-LISTS".equals( strValue ) );
if ( result )
{
- LOG.debug( "Syntax valid for '{}'", value );
+ LOG.debug( I18n.msg( I18n.MSG_04490_SYNTAX_VALID, value ) );
}
else
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
}
return result;
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/MasterAndShadowAccessPointSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/MasterAndShadowAccessPointSyntaxChecker.java?rev=1786491&r1=1786490&r2=1786491&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/MasterAndShadowAccessPointSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/MasterAndShadowAccessPointSyntaxChecker.java Sat Mar 11 07:45:20 2017
@@ -20,6 +20,7 @@
package org.apache.directory.api.ldap.model.schema.syntaxCheckers;
+import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.schema.SyntaxChecker;
import org.slf4j.Logger;
@@ -37,8 +38,13 @@ public class MasterAndShadowAccessPointS
{
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( MasterAndShadowAccessPointSyntaxChecker.class );
+
+ /**
+ * A static instance of MasterAndShadowAccessPointSyntaxChecker
+ */
+ public static final MasterAndShadowAccessPointSyntaxChecker INSTANCE = new MasterAndShadowAccessPointSyntaxChecker();
-
+
/**
* Create a new instance of MasterAndShadowAccessPointSyntaxChecker
*/
@@ -54,7 +60,7 @@ public class MasterAndShadowAccessPointS
@Override
public boolean isValidSyntax( Object value )
{
- LOG.debug( "Syntax valid for '{}'", value );
+ LOG.debug( I18n.msg( I18n.MSG_04490_SYNTAX_VALID, value ) );
return true;
}
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/MatchingRuleDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/MatchingRuleDescriptionSyntaxChecker.java?rev=1786491&r1=1786490&r2=1786491&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/MatchingRuleDescriptionSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/MatchingRuleDescriptionSyntaxChecker.java Sat Mar 11 07:45:20 2017
@@ -22,6 +22,7 @@ package org.apache.directory.api.ldap.mo
import java.text.ParseException;
+import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.schema.SyntaxChecker;
import org.apache.directory.api.ldap.model.schema.parsers.MatchingRuleDescriptionSchemaParser;
@@ -32,9 +33,9 @@ import org.slf4j.LoggerFactory;
/**
* A SyntaxChecker which verifies that a value follows the
- * matching rule descripton syntax according to RFC 4512, par 4.2.3:
+ * matching rule description syntax according to RFC 4512, par 4.2.3:
*
- *
+ *
* MatchingRuleDescription = LPAREN WSP
* numericoid ; object identifier
* [ SP "NAME" SP qdescrs ] ; short names (descriptors)
@@ -45,7 +46,6 @@ import org.slf4j.LoggerFactory;
*
* extensions = *( SP xstring SP qdstrings )
* xstring = "X" HYPHEN 1*( ALPHA / HYPHEN / USCORE )
- *
*
*
* @author Apache Directory Project
@@ -57,9 +57,14 @@ public class MatchingRuleDescriptionSynt
private static final Logger LOG = LoggerFactory.getLogger( MatchingRuleDescriptionSyntaxChecker.class );
/** The schema parser used to parse the MatchingRuleDescription Syntax */
- private transient MatchingRuleDescriptionSchemaParser schemaParser = new MatchingRuleDescriptionSchemaParser();
-
+ private MatchingRuleDescriptionSchemaParser schemaParser = new MatchingRuleDescriptionSchemaParser();
+
+ /**
+ * A static instance of MatchingRuleDescriptionSyntaxChecker
+ */
+ public static final MatchingRuleDescriptionSyntaxChecker INSTANCE = new MatchingRuleDescriptionSyntaxChecker();
+
/**
*
* Creates a new instance of MatchingRuleDescriptionSchemaParser.
@@ -81,7 +86,7 @@ public class MatchingRuleDescriptionSynt
if ( value == null )
{
- LOG.debug( "Syntax invalid for 'null'" );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, "null" ) );
return false;
}
@@ -101,13 +106,13 @@ public class MatchingRuleDescriptionSynt
try
{
schemaParser.parseMatchingRuleDescription( strValue );
- LOG.debug( "Syntax valid for '{}'", value );
+ LOG.debug( I18n.msg( I18n.MSG_04490_SYNTAX_VALID, value ) );
return true;
}
catch ( ParseException pe )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/MatchingRuleUseDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/MatchingRuleUseDescriptionSyntaxChecker.java?rev=1786491&r1=1786490&r2=1786491&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/MatchingRuleUseDescriptionSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/MatchingRuleUseDescriptionSyntaxChecker.java Sat Mar 11 07:45:20 2017
@@ -22,6 +22,7 @@ package org.apache.directory.api.ldap.mo
import java.text.ParseException;
+import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.schema.SyntaxChecker;
import org.apache.directory.api.ldap.model.schema.parsers.MatchingRuleUseDescriptionSchemaParser;
@@ -34,7 +35,7 @@ import org.slf4j.LoggerFactory;
* A SyntaxChecker which verifies that a value follows the
* matching rule use descripton syntax according to RFC 4512, par 4.2.4:
*
- *
+ *
* MatchingRuleUseDescription = LPAREN WSP
* numericoid ; object identifier
* [ SP "NAME" SP qdescrs ] ; short names (descriptors)
@@ -42,7 +43,6 @@ import org.slf4j.LoggerFactory;
* [ SP "OBSOLETE" ] ; not active
* SP "APPLIES" SP oids ; attribute types
* extensions WSP RPAREN ; extensions
- *
*
*
* @author Apache Directory Project
@@ -54,9 +54,14 @@ public class MatchingRuleUseDescriptionS
private static final Logger LOG = LoggerFactory.getLogger( MatchingRuleUseDescriptionSyntaxChecker.class );
/** The schema parser used to parse the MatchingRuleUseDescription Syntax */
- private transient MatchingRuleUseDescriptionSchemaParser schemaParser = new MatchingRuleUseDescriptionSchemaParser();
-
+ private MatchingRuleUseDescriptionSchemaParser schemaParser = new MatchingRuleUseDescriptionSchemaParser();
+
+ /**
+ * A static instance of MatchingRuleUseDescriptionSyntaxChecker
+ */
+ public static final MatchingRuleUseDescriptionSyntaxChecker INSTANCE = new MatchingRuleUseDescriptionSyntaxChecker();
+
/**
*
* Creates a new instance of MatchingRuleUseDescriptionSchemaParser.
@@ -78,7 +83,7 @@ public class MatchingRuleUseDescriptionS
if ( value == null )
{
- LOG.debug( "Syntax invalid for 'null'" );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, "null" ) );
return false;
}
@@ -98,13 +103,13 @@ public class MatchingRuleUseDescriptionS
try
{
schemaParser.parseMatchingRuleUseDescription( strValue );
- LOG.debug( "Syntax valid for '{}'", value );
+ LOG.debug( I18n.msg( I18n.MSG_04490_SYNTAX_VALID, value ) );
return true;
}
catch ( ParseException pe )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/MhsOrAddressSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/MhsOrAddressSyntaxChecker.java?rev=1786491&r1=1786490&r2=1786491&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/MhsOrAddressSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/MhsOrAddressSyntaxChecker.java Sat Mar 11 07:45:20 2017
@@ -20,6 +20,7 @@
package org.apache.directory.api.ldap.model.schema.syntaxCheckers;
+import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.schema.SyntaxChecker;
import org.slf4j.Logger;
@@ -37,8 +38,13 @@ public class MhsOrAddressSyntaxChecker e
{
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( MhsOrAddressSyntaxChecker.class );
+
+ /**
+ * A static instance of MhsOrAddressSyntaxChecker
+ */
+ public static final MhsOrAddressSyntaxChecker INSTANCE = new MhsOrAddressSyntaxChecker();
-
+
/**
* Creates a new instance of MHSORAddressSyntaxChecker.
*/
@@ -54,7 +60,7 @@ public class MhsOrAddressSyntaxChecker e
@Override
public boolean isValidSyntax( Object value )
{
- LOG.debug( "Syntax valid for '{}'", value );
+ LOG.debug( I18n.msg( I18n.MSG_04490_SYNTAX_VALID, value ) );
return true;
}
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/NameAndOptionalUIDSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/NameAndOptionalUIDSyntaxChecker.java?rev=1786491&r1=1786490&r2=1786491&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/NameAndOptionalUIDSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/NameAndOptionalUIDSyntaxChecker.java Sat Mar 11 07:45:20 2017
@@ -20,6 +20,7 @@
package org.apache.directory.api.ldap.model.schema.syntaxCheckers;
+import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.directory.api.ldap.model.schema.SyntaxChecker;
@@ -30,14 +31,15 @@ import org.slf4j.LoggerFactory;
/**
* A SyntaxChecker which verifies that a value is a valid Name and Optional UID.
- *
- * This element is a composition of two parts : a Dn and an optional UID :
+ *
+ * This element is a composition of two parts, a {@link Dn} and an optional UID :
+ *
* NameAndOptionalUID = distinguishedName [ SHARP BitString ]
- *
+ *
* Both part already have their syntax checkers, so we will just call them
* after having split the element in two ( if necessary)
- *
- * We just check that the Dn is valid, we don't need to verify each of the Rdn
+ *
+ * We just check that the {@link Dn} is valid, we don't need to verify each of the {@link Rdn}
* syntax.
*
* @author Apache Directory Project
@@ -47,8 +49,13 @@ public class NameAndOptionalUIDSyntaxChe
{
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( NameAndOptionalUIDSyntaxChecker.class );
+
+ /**
+ * A static instance of NameAndOptionalUIDSyntaxChecker
+ */
+ public static final NameAndOptionalUIDSyntaxChecker INSTANCE = new NameAndOptionalUIDSyntaxChecker();
-
+
/**
* Creates a new instance of NameAndOptionalUIDSyntaxChecker.
*/
@@ -68,7 +75,7 @@ public class NameAndOptionalUIDSyntaxChe
if ( value == null )
{
- LOG.debug( "Syntax invalid for 'null'" );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, "null" ) );
return false;
}
@@ -87,7 +94,7 @@ public class NameAndOptionalUIDSyntaxChe
if ( strValue.length() == 0 )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
@@ -101,7 +108,7 @@ public class NameAndOptionalUIDSyntaxChe
{
// Yes, we have one : this is not allowed, it should have been
// escaped.
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
@@ -119,11 +126,11 @@ public class NameAndOptionalUIDSyntaxChe
if ( result )
{
- LOG.debug( "Syntax valid for '{}'", value );
+ LOG.debug( I18n.msg( I18n.MSG_04490_SYNTAX_VALID, value ) );
}
else
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
}
return result;
@@ -132,14 +139,14 @@ public class NameAndOptionalUIDSyntaxChe
else
{
// The Dn must not be null ?
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
}
else
{
// We have found a '#' but no UID part.
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
}
@@ -151,11 +158,11 @@ public class NameAndOptionalUIDSyntaxChe
if ( result )
{
- LOG.debug( "Syntax valid for '{}'", value );
+ LOG.debug( I18n.msg( I18n.MSG_04490_SYNTAX_VALID, value ) );
}
else
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
}
return result;
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/NameFormDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/NameFormDescriptionSyntaxChecker.java?rev=1786491&r1=1786490&r2=1786491&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/NameFormDescriptionSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/NameFormDescriptionSyntaxChecker.java Sat Mar 11 07:45:20 2017
@@ -22,6 +22,7 @@ package org.apache.directory.api.ldap.mo
import java.text.ParseException;
+import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.schema.SyntaxChecker;
import org.apache.directory.api.ldap.model.schema.parsers.NameFormDescriptionSchemaParser;
@@ -55,9 +56,14 @@ public class NameFormDescriptionSyntaxCh
private static final Logger LOG = LoggerFactory.getLogger( NameFormDescriptionSyntaxChecker.class );
/** The schema parser used to parse the DITContentRuleDescription Syntax */
- private transient NameFormDescriptionSchemaParser schemaParser = new NameFormDescriptionSchemaParser();
-
+ private NameFormDescriptionSchemaParser schemaParser = new NameFormDescriptionSchemaParser();
+
+ /**
+ * A static instance of NameFormDescriptionSyntaxChecker
+ */
+ public static final NameFormDescriptionSyntaxChecker INSTANCE = new NameFormDescriptionSyntaxChecker();
+
/**
*
* Creates a new instance of DITContentRuleDescriptionSyntaxChecker.
@@ -79,7 +85,7 @@ public class NameFormDescriptionSyntaxCh
if ( value == null )
{
- LOG.debug( "Syntax invalid for 'null'" );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, "null" ) );
return false;
}
@@ -103,7 +109,7 @@ public class NameFormDescriptionSyntaxCh
}
catch ( ParseException pe )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/NormalizerSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/NormalizerSyntaxChecker.java?rev=1786491&r1=1786490&r2=1786491&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/NormalizerSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/NormalizerSyntaxChecker.java Sat Mar 11 07:45:20 2017
@@ -32,11 +32,16 @@ import org.apache.directory.api.ldap.mod
public class NormalizerSyntaxChecker extends Ia5StringSyntaxChecker
{
/**
+ * A static instance of NormalizerSyntaxChecker
+ */
+ public static final NormalizerSyntaxChecker INSTANCE = new NormalizerSyntaxChecker();
+
+
+ /**
* Creates a new instance of NormalizerSyntaxChecker.
*/
public NormalizerSyntaxChecker()
{
- super();
- setOid( SchemaConstants.NORMALIZER_SYNTAX );
+ super( SchemaConstants.NORMALIZER_SYNTAX );
}
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/NumberSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/NumberSyntaxChecker.java?rev=1786491&r1=1786490&r2=1786491&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/NumberSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/NumberSyntaxChecker.java Sat Mar 11 07:45:20 2017
@@ -20,6 +20,7 @@
package org.apache.directory.api.ldap.model.schema.syntaxCheckers;
+import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.schema.SyntaxChecker;
import org.apache.directory.api.util.Strings;
@@ -29,12 +30,13 @@ import org.slf4j.LoggerFactory;
/**
* A SyntaxChecker which verifies that a value is a Number according to RFC 4512.
- *
+ *
* From RFC 4512 :
+ *
* number = DIGIT | ( LDIGIT 1*DIGIT )
* DIGIT = %x30 | LDIGIT ; "0"-"9"
* LDIGIT = %x31-39 ; "1"-"9"
- *
+ *
*
* @author Apache Directory Project
*/
@@ -43,8 +45,13 @@ public class NumberSyntaxChecker extends
{
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( NumberSyntaxChecker.class );
+
+ /**
+ * A static instance of NumberSyntaxChecker
+ */
+ public static final NumberSyntaxChecker INSTANCE = new NumberSyntaxChecker();
-
+
/**
* Creates a new instance of NumberSyntaxChecker.
*/
@@ -64,7 +71,7 @@ public class NumberSyntaxChecker extends
if ( value == null )
{
- LOG.debug( "Syntax invalid for 'null'" );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, "null" ) );
return false;
}
@@ -84,7 +91,7 @@ public class NumberSyntaxChecker extends
// We should have at least one char
if ( strValue.length() == 0 )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
@@ -106,7 +113,7 @@ public class NumberSyntaxChecker extends
continue;
default:
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
}
@@ -115,11 +122,11 @@ public class NumberSyntaxChecker extends
{
// A number can't start with a '0' unless it's the only
// number
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
- LOG.debug( "Syntax valid for '{}'", value );
+ LOG.debug( I18n.msg( I18n.MSG_04490_SYNTAX_VALID, value ) );
return true;
}
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/NumericOidSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/NumericOidSyntaxChecker.java?rev=1786491&r1=1786490&r2=1786491&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/NumericOidSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/NumericOidSyntaxChecker.java Sat Mar 11 07:45:20 2017
@@ -21,6 +21,7 @@ package org.apache.directory.api.ldap.mo
import org.apache.directory.api.asn1.util.Oid;
+import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.schema.SyntaxChecker;
import org.apache.directory.api.util.Strings;
@@ -31,15 +32,15 @@ import org.slf4j.LoggerFactory;
/**
* A SyntaxChecker which verifies that a value is a numeric oid
* according to RFC 4512.
- *
+ *
* From RFC 4512 :
- *
+ *
* numericoid = number 1*( DOT number )
* number = DIGIT | ( LDIGIT 1*DIGIT )
* DIGIT = %x30 | LDIGIT ; "0"-"9"
* LDIGIT = %x31-39 ; "1"-"9"
* DOT = %x2E ; period (".")
-
+ *
*
* @author Apache Directory Project
*/
@@ -48,8 +49,13 @@ public class NumericOidSyntaxChecker ext
{
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( NumericOidSyntaxChecker.class );
+
+ /**
+ * A static instance of NumericOidSyntaxChecker
+ */
+ public static final NumericOidSyntaxChecker INSTANCE = new NumericOidSyntaxChecker();
-
+
/**
* Creates a new instance of NumericOidSyntaxChecker.
*/
@@ -69,7 +75,7 @@ public class NumericOidSyntaxChecker ext
if ( value == null )
{
- LOG.debug( "Syntax invalid for 'null'" );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, "null" ) );
return false;
}
@@ -88,7 +94,7 @@ public class NumericOidSyntaxChecker ext
if ( strValue.length() == 0 )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
@@ -97,11 +103,11 @@ public class NumericOidSyntaxChecker ext
if ( result )
{
- LOG.debug( "Syntax valid for '{}'", value );
+ LOG.debug( I18n.msg( I18n.MSG_04490_SYNTAX_VALID, value ) );
}
else
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
}
return result;
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/NumericStringSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/NumericStringSyntaxChecker.java?rev=1786491&r1=1786490&r2=1786491&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/NumericStringSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/NumericStringSyntaxChecker.java Sat Mar 11 07:45:20 2017
@@ -20,6 +20,7 @@
package org.apache.directory.api.ldap.model.schema.syntaxCheckers;
+import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.schema.SyntaxChecker;
import org.apache.directory.api.util.Strings;
@@ -29,16 +30,16 @@ import org.slf4j.LoggerFactory;
/**
* A SyntaxChecker which verifies that a value is a Numeric String according to RFC 4517.
- *
+ *
* From RFC 4517 :
- *
+ *
* NumericString = 1*(DIGIT / SPACE)
*
* From RFC 4512 :
* DIGIT = %x30 | LDIGIT ; "0"-"9"
* LDIGIT = %x31-39 ; "1"-"9"
* SPACE = %x20 ; space (" ")
- *
+ *
*
* @author Apache Directory Project
*/
@@ -47,8 +48,13 @@ public class NumericStringSyntaxChecker
{
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( NumericStringSyntaxChecker.class );
+
+ /**
+ * A static instance of NumericStringSyntaxChecker
+ */
+ public static final NumericStringSyntaxChecker INSTANCE = new NumericStringSyntaxChecker();
-
+
/**
* Creates a new instance of NumericStringSyntaxChecker.
*/
@@ -68,7 +74,7 @@ public class NumericStringSyntaxChecker
if ( value == null )
{
- LOG.debug( "Syntax invalid for 'null'" );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, "null" ) );
return false;
}
@@ -88,7 +94,7 @@ public class NumericStringSyntaxChecker
// We should have at least one char
if ( strValue.length() == 0 )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
@@ -111,12 +117,12 @@ public class NumericStringSyntaxChecker
continue;
default:
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
}
- LOG.debug( "Syntax valid for '{}'", value );
+ LOG.debug( I18n.msg( I18n.MSG_04490_SYNTAX_VALID, value ) );
return true;
}
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/ObjectClassDescriptionSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/ObjectClassDescriptionSyntaxChecker.java?rev=1786491&r1=1786490&r2=1786491&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/ObjectClassDescriptionSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/ObjectClassDescriptionSyntaxChecker.java Sat Mar 11 07:45:20 2017
@@ -22,6 +22,7 @@ package org.apache.directory.api.ldap.mo
import java.text.ParseException;
+import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.schema.SyntaxChecker;
import org.apache.directory.api.ldap.model.schema.parsers.ObjectClassDescriptionSchemaParser;
@@ -61,9 +62,14 @@ public class ObjectClassDescriptionSynta
private static final Logger LOG = LoggerFactory.getLogger( ObjectClassDescriptionSyntaxChecker.class );
/** The schema parser used to parse the ObjectClassDescription Syntax */
- private transient ObjectClassDescriptionSchemaParser schemaParser = new ObjectClassDescriptionSchemaParser();
-
+ private ObjectClassDescriptionSchemaParser schemaParser = new ObjectClassDescriptionSchemaParser();
+
+ /**
+ * A static instance of ObjectClassDescriptionSyntaxChecker
+ */
+ public static final ObjectClassDescriptionSyntaxChecker INSTANCE = new ObjectClassDescriptionSyntaxChecker();
+
/**
* Creates a new instance of ObjectClassDescriptionSyntaxChecker.
*/
@@ -83,7 +89,7 @@ public class ObjectClassDescriptionSynta
if ( value == null )
{
- LOG.debug( "Syntax invalid for 'null'" );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, "null" ) );
return false;
}
@@ -103,12 +109,12 @@ public class ObjectClassDescriptionSynta
try
{
schemaParser.parseObjectClassDescription( strValue );
- LOG.debug( "Syntax valid for '{}'", value );
+ LOG.debug( I18n.msg( I18n.MSG_04490_SYNTAX_VALID, value ) );
return true;
}
catch ( ParseException pe )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/ObjectClassTypeSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/ObjectClassTypeSyntaxChecker.java?rev=1786491&r1=1786490&r2=1786491&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/ObjectClassTypeSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/ObjectClassTypeSyntaxChecker.java Sat Mar 11 07:45:20 2017
@@ -20,6 +20,7 @@
package org.apache.directory.api.ldap.model.schema.syntaxCheckers;
+import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.schema.SyntaxChecker;
import org.apache.directory.api.util.Strings;
@@ -29,7 +30,7 @@ import org.slf4j.LoggerFactory;
/**
* A syntax checker which checks to see if an objectClass' type is either:
- * AUXILIARY, STRUCTURAL, or ABSTRACT. The case is NOT ignored.
+ * AUXILIARY, STRUCTURAL, or ABSTRACT. The case is NOT ignored.
*
* @author Apache Directory Project
*/
@@ -38,8 +39,13 @@ public class ObjectClassTypeSyntaxChecke
{
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( ObjectClassTypeSyntaxChecker.class );
+
+ /**
+ * A static instance of ObjectClassTypeSyntaxChecker
+ */
+ public static final ObjectClassTypeSyntaxChecker INSTANCE = new ObjectClassTypeSyntaxChecker();
-
+
/**
* Creates a new instance of ObjectClassTypeSyntaxChecker.
*/
@@ -59,7 +65,7 @@ public class ObjectClassTypeSyntaxChecke
if ( value == null )
{
- LOG.debug( "Syntax invalid for 'null'" );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, "null" ) );
return false;
}
@@ -78,40 +84,20 @@ public class ObjectClassTypeSyntaxChecke
if ( strValue.length() < 8 || strValue.length() > 10 )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
- char ch = strValue.charAt( 0 );
-
- switch ( ch )
+ switch ( strValue )
{
- case 'A':
- if ( "AUXILIARY".equals( strValue ) || "ABSTRACT".equals( strValue ) )
- {
- LOG.debug( "Syntax valid for '{}'", value );
- return true;
- }
-
- LOG.debug( INVALID_SYNTAX_FOR, value );
- return false;
-
- case 'S':
- boolean result = "STRUCTURAL".equals( strValue );
-
- if ( result )
- {
- LOG.debug( "Syntax valid for '{}'", value );
- }
- else
- {
- LOG.debug( INVALID_SYNTAX_FOR, value );
- }
-
- return result;
-
- default:
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ case "AUXILIARY" :
+ case "ABSTRACT" :
+ case "STRUCTURAL" :
+ LOG.debug( I18n.msg( I18n.MSG_04490_SYNTAX_VALID, value ) );
+ return true;
+
+ default :
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/ObjectNameSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/ObjectNameSyntaxChecker.java?rev=1786491&r1=1786490&r2=1786491&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/ObjectNameSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/ObjectNameSyntaxChecker.java Sat Mar 11 07:45:20 2017
@@ -23,6 +23,7 @@ package org.apache.directory.api.ldap.mo
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.directory.api.i18n.I18n;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.schema.SyntaxChecker;
import org.apache.directory.api.util.Strings;
@@ -56,8 +57,13 @@ public class ObjectNameSyntaxChecker ext
private static final String REGEXP = "^([a-zA-Z][a-zA-Z0-9-;]*)$";
private static final Pattern PATTERN = Pattern.compile( REGEXP );
+
+ /**
+ * A static instance of ObjectNameSyntaxChecker
+ */
+ public static final ObjectNameSyntaxChecker INSTANCE = new ObjectNameSyntaxChecker();
-
+
/**
* Creates a new instance of ObjectNameSyntaxChecker.
*/
@@ -77,7 +83,7 @@ public class ObjectNameSyntaxChecker ext
if ( value == null )
{
- LOG.debug( "Syntax invalid for 'null'" );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, "null" ) );
return false;
}
@@ -96,7 +102,7 @@ public class ObjectNameSyntaxChecker ext
if ( strValue.length() == 0 )
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
return false;
}
@@ -107,11 +113,11 @@ public class ObjectNameSyntaxChecker ext
if ( result )
{
- LOG.debug( "Syntax valid for '{}'", value );
+ LOG.debug( I18n.msg( I18n.MSG_04490_SYNTAX_VALID, value ) );
}
else
{
- LOG.debug( INVALID_SYNTAX_FOR, value );
+ LOG.debug( I18n.err( I18n.ERR_04489_SYNTAX_INVALID, value ) );
}
return result;
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/OctetStringSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/OctetStringSyntaxChecker.java?rev=1786491&r1=1786490&r2=1786491&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/OctetStringSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/OctetStringSyntaxChecker.java Sat Mar 11 07:45:20 2017
@@ -26,19 +26,27 @@ import org.apache.directory.api.ldap.mod
/**
* A SyntaxChecker which verifies that a value is a Octet String according to RFC 4517.
- *
+ *
* From RFC 4517 :
+ *
* OctetString = *OCTET
- *
+ *
* From RFC 4512 :
+ *
* OCTET = %x00-FF ; Any octet (8-bit data unit)
- *
+ *
* @author Apache Directory Project
*/
@SuppressWarnings("serial")
public class OctetStringSyntaxChecker extends SyntaxChecker
{
/**
+ * A static instance of OctetStringSyntaxChecker
+ */
+ public static final OctetStringSyntaxChecker INSTANCE = new OctetStringSyntaxChecker();
+
+
+ /**
* Creates a new instance of OctetStringSyntaxChecker.
*/
public OctetStringSyntaxChecker()