You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2016/05/31 09:32:13 UTC
svn commit: r1746258 [7/9] - in /directory/shared/branches/shared-value:
asn1/ber/src/main/java/org/apache/directory/api/asn1/actions/
asn1/ber/src/main/java/org/apache/directory/api/asn1/ber/
asn1/ber/src/main/java/org/apache/directory/api/asn1/ber/gr...
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/CountrySyntaxChecker.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/CountrySyntaxChecker.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/CountrySyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/CountrySyntaxChecker.java Tue May 31 09:32:09 2016
@@ -297,7 +297,7 @@ public class CountrySyntaxChecker extend
};
/** The Set which contains the countries */
- private static final Set<String> COUNTRIES = new HashSet<String>();
+ private static final Set<String> COUNTRIES = new HashSet<>();
/** Initialization of the country set */
static
@@ -323,9 +323,10 @@ public class CountrySyntaxChecker extend
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
- String strValue = null;
+ String strValue;
if ( value == null )
{
@@ -348,7 +349,7 @@ public class CountrySyntaxChecker extend
if ( strValue.length() == 0 )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -360,7 +361,7 @@ public class CountrySyntaxChecker extend
}
else
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
}
return result;
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/CsnSidSyntaxChecker.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/CsnSidSyntaxChecker.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/CsnSidSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/CsnSidSyntaxChecker.java Tue May 31 09:32:09 2016
@@ -50,6 +50,7 @@ public class CsnSidSyntaxChecker extends
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
if ( value == null )
@@ -60,7 +61,7 @@ public class CsnSidSyntaxChecker extends
if ( !( value instanceof String ) )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -68,7 +69,7 @@ public class CsnSidSyntaxChecker extends
if ( sidStr.length() > 3 )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -80,13 +81,13 @@ public class CsnSidSyntaxChecker extends
if ( ( sid < 0 ) || ( sid > 0x0fff ) )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
}
catch ( NumberFormatException nfe )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/CsnSyntaxChecker.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/CsnSyntaxChecker.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/CsnSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/CsnSyntaxChecker.java Tue May 31 09:32:09 2016
@@ -52,6 +52,7 @@ public class CsnSyntaxChecker extends Sy
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
if ( value == null )
@@ -62,7 +63,7 @@ public class CsnSyntaxChecker extends Sy
if ( !( value instanceof String ) )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -79,14 +80,14 @@ public class CsnSyntaxChecker extends Sy
}
else
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
}
return result;
}
catch ( InvalidCSNException icsne )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/DataQualitySyntaxSyntaxChecker.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/DataQualitySyntaxSyntaxChecker.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/DataQualitySyntaxSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/DataQualitySyntaxSyntaxChecker.java Tue May 31 09:32:09 2016
@@ -50,6 +50,7 @@ public class DataQualitySyntaxSyntaxChec
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
LOG.debug( "Syntax valid for '{}'", value );
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/DeliveryMethodSyntaxChecker.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/DeliveryMethodSyntaxChecker.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/DeliveryMethodSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/DeliveryMethodSyntaxChecker.java Tue May 31 09:32:09 2016
@@ -62,7 +62,7 @@ public class DeliveryMethodSyntaxChecker
};
/** The Set which contains the delivery methods */
- private static final Set<String> DELIVERY_METHODS = new HashSet<String>();
+ private static final Set<String> DELIVERY_METHODS = new HashSet<>();
/** Initialization of the delivery methods set */
static
@@ -137,9 +137,10 @@ public class DeliveryMethodSyntaxChecker
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
- String strValue = null;
+ String strValue;
if ( value == null )
{
@@ -162,19 +163,19 @@ public class DeliveryMethodSyntaxChecker
if ( strValue.length() == 0 )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
// We will get the first delivery method
int length = strValue.length();
int pos = 0;
- Set<String> pmds = new HashSet<String>();
+ Set<String> pmds = new HashSet<>();
pos = isPdm( strValue, pos, pmds );
if ( pos == -1 )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -192,7 +193,7 @@ public class DeliveryMethodSyntaxChecker
if ( !Strings.isCharASCII( strValue, pos, '$' ) )
{
// A '$' was expected
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
else
@@ -209,7 +210,7 @@ public class DeliveryMethodSyntaxChecker
pos = isPdm( strValue, pos, pmds );
if ( pos == -1 )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/DerefAliasSyntaxChecker.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/DerefAliasSyntaxChecker.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/DerefAliasSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/DerefAliasSyntaxChecker.java Tue May 31 09:32:09 2016
@@ -59,9 +59,10 @@ public class DerefAliasSyntaxChecker ext
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
- String strValue = null;
+ String strValue;
if ( value == null )
{
@@ -84,7 +85,7 @@ public class DerefAliasSyntaxChecker ext
strValue = Strings.trim( Strings.toLowerCaseAscii( 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/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/DirectoryStringSyntaxChecker.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/DirectoryStringSyntaxChecker.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/DirectoryStringSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/DirectoryStringSyntaxChecker.java Tue May 31 09:32:09 2016
@@ -54,9 +54,10 @@ public class DirectoryStringSyntaxChecke
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
- String strValue = null;
+ String strValue;
if ( value == null )
{
@@ -82,7 +83,7 @@ public class DirectoryStringSyntaxChecke
// return an empty string
if ( strValue.length() == 0 )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -92,7 +93,7 @@ public class DirectoryStringSyntaxChecke
{
if ( c == 0xFFFD )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/DitContentRuleDescriptionSyntaxChecker.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/DitContentRuleDescriptionSyntaxChecker.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/DitContentRuleDescriptionSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/DitContentRuleDescriptionSyntaxChecker.java Tue May 31 09:32:09 2016
@@ -56,7 +56,7 @@ public class DitContentRuleDescriptionSy
private static final Logger LOG = LoggerFactory.getLogger( DitContentRuleDescriptionSyntaxChecker.class );
/** The schema parser used to parse the DITContentRuleDescription Syntax */
- private DitContentRuleDescriptionSchemaParser schemaParser = new DitContentRuleDescriptionSchemaParser();
+ private transient DitContentRuleDescriptionSchemaParser schemaParser = new DitContentRuleDescriptionSchemaParser();
/**
@@ -71,9 +71,10 @@ public class DitContentRuleDescriptionSy
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
- String strValue = null;
+ String strValue;
if ( value == null )
{
@@ -102,7 +103,7 @@ public class DitContentRuleDescriptionSy
}
catch ( ParseException pe )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/DitStructureRuleDescriptionSyntaxChecker.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/DitStructureRuleDescriptionSyntaxChecker.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/DitStructureRuleDescriptionSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/DitStructureRuleDescriptionSyntaxChecker.java Tue May 31 09:32:09 2016
@@ -58,7 +58,7 @@ public class DitStructureRuleDescription
private static final Logger LOG = LoggerFactory.getLogger( DitStructureRuleDescriptionSyntaxChecker.class );
/** The schema parser used to parse the DITContentRuleDescription Syntax */
- private DitStructureRuleDescriptionSchemaParser schemaParser = new DitStructureRuleDescriptionSchemaParser();
+ private transient DitStructureRuleDescriptionSchemaParser schemaParser = new DitStructureRuleDescriptionSchemaParser();
/**
@@ -73,9 +73,10 @@ public class DitStructureRuleDescription
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
- String strValue = null;
+ String strValue;
if ( value == null )
{
@@ -104,7 +105,7 @@ public class DitStructureRuleDescription
}
catch ( ParseException pe )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/DlSubmitPermissionSyntaxChecker.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/DlSubmitPermissionSyntaxChecker.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/DlSubmitPermissionSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/DlSubmitPermissionSyntaxChecker.java Tue May 31 09:32:09 2016
@@ -50,6 +50,7 @@ public class DlSubmitPermissionSyntaxChe
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
LOG.debug( "Syntax valid for '{}'", value );
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/DnSyntaxChecker.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/DnSyntaxChecker.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/DnSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/DnSyntaxChecker.java Tue May 31 09:32:09 2016
@@ -53,6 +53,7 @@ public class DnSyntaxChecker extends Syn
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
String strValue;
@@ -94,7 +95,7 @@ public class DnSyntaxChecker extends Syn
}
else
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
}
return result;
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/DsaQualitySyntaxSyntaxChecker.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/DsaQualitySyntaxSyntaxChecker.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/DsaQualitySyntaxSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/DsaQualitySyntaxSyntaxChecker.java Tue May 31 09:32:09 2016
@@ -60,9 +60,10 @@ public class DsaQualitySyntaxSyntaxCheck
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
- String strValue = null;
+ String strValue;
if ( value == null )
{
@@ -85,18 +86,18 @@ public class DsaQualitySyntaxSyntaxCheck
if ( strValue.length() < 7 )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
- String remaining = null;
+ String remaining;
switch ( strValue.charAt( 0 ) )
{
case 'B':
if ( !strValue.startsWith( "BEST-EFFORT" ) )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -106,7 +107,7 @@ public class DsaQualitySyntaxSyntaxCheck
case 'D':
if ( !strValue.startsWith( "DEFUNCT" ) )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -116,7 +117,7 @@ public class DsaQualitySyntaxSyntaxCheck
case 'E':
if ( !strValue.startsWith( "EXPERIMENTAL" ) )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -126,7 +127,7 @@ public class DsaQualitySyntaxSyntaxCheck
case 'F':
if ( !strValue.startsWith( "FULL-SERVICE" ) )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -136,7 +137,7 @@ public class DsaQualitySyntaxSyntaxCheck
case 'P':
if ( !strValue.startsWith( "PILOT-SERVICE" ) )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -144,7 +145,7 @@ public class DsaQualitySyntaxSyntaxCheck
break;
default:
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -159,7 +160,7 @@ public class DsaQualitySyntaxSyntaxCheck
if ( remaining.charAt( 0 ) != '#' )
{
// We were expecting a '#'
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -172,7 +173,7 @@ public class DsaQualitySyntaxSyntaxCheck
}
else
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
}
return result;
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/DseTypeSyntaxChecker.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/DseTypeSyntaxChecker.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/DseTypeSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/DseTypeSyntaxChecker.java Tue May 31 09:32:09 2016
@@ -59,7 +59,7 @@ public class DseTypeSyntaxChecker extend
};
/** The Set which contains the DESBits */
- private static final Set<String> DSE_BITS = new HashSet<String>();
+ private static final Set<String> DSE_BITS = new HashSet<>();
/** Initialization of the country set */
static
@@ -85,9 +85,10 @@ public class DseTypeSyntaxChecker extend
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
- String strValue = null;
+ String strValue;
if ( value == null )
{
@@ -111,7 +112,7 @@ public class DseTypeSyntaxChecker extend
// We must have at least '(cp)', '(xr)' or '(ca)'
if ( strValue.length() < 4 )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -119,11 +120,11 @@ public class DseTypeSyntaxChecker extend
if ( ( strValue.charAt( 0 ) != '(' )
|| ( strValue.charAt( strValue.length() - 1 ) != ')' ) )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
- Set<String> keywords = new HashSet<String>();
+ Set<String> keywords = new HashSet<>();
int len = strValue.length() - 1;
boolean needKeyword = true;
@@ -147,7 +148,7 @@ public class DseTypeSyntaxChecker extend
if ( pos == i )
{
// No keyword : error
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -157,14 +158,14 @@ public class DseTypeSyntaxChecker extend
if ( !DSE_BITS.contains( keyword ) )
{
// Unknown keyword
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
// Check that the keyword has not been met
if ( keywords.contains( keyword ) )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -190,7 +191,7 @@ public class DseTypeSyntaxChecker extend
// We are done
if ( needKeyword )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
}
else
{
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/EnhancedGuideSyntaxChecker.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/EnhancedGuideSyntaxChecker.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/EnhancedGuideSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/EnhancedGuideSyntaxChecker.java Tue May 31 09:32:09 2016
@@ -53,6 +53,7 @@ public class EnhancedGuideSyntaxChecker
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
LOG.debug( "Syntax valid for '{}'", value );
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/FacsimileTelephoneNumberSyntaxChecker.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/FacsimileTelephoneNumberSyntaxChecker.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/FacsimileTelephoneNumberSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/FacsimileTelephoneNumberSyntaxChecker.java Tue May 31 09:32:09 2016
@@ -66,7 +66,7 @@ public class FacsimileTelephoneNumberSyn
private static final String UNCOMPRESSED = "uncompressed";
/** A set which contaons all the possible fax parameters values */
- private static Set<String> faxParameters = new HashSet<String>();
+ private static Set<String> faxParameters = new HashSet<>();
/** Initialization of the fax parameters set of values */
static
@@ -94,9 +94,10 @@ public class FacsimileTelephoneNumberSyn
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
- String strValue = null;
+ String strValue;
if ( value == null )
{
@@ -119,7 +120,7 @@ public class FacsimileTelephoneNumberSyn
if ( strValue.length() == 0 )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -138,7 +139,7 @@ public class FacsimileTelephoneNumberSyn
}
else
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
}
return result;
@@ -149,18 +150,18 @@ public class FacsimileTelephoneNumberSyn
{
if ( !super.isValidSyntax( strValue.substring( 0, dollarPos - 1 ) ) )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_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<>();
while ( dollarPos > 0 )
{
- String faxParam = null;
+ String faxParam;
int newDollar = strValue.indexOf( '$', dollarPos + 1 );
if ( newDollar == -1 )
@@ -175,7 +176,7 @@ public class FacsimileTelephoneNumberSyn
if ( faxParam.length() == 0 )
{
// Not allowed
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -185,13 +186,13 @@ public class FacsimileTelephoneNumberSyn
if ( !faxParameters.contains( faxParam ) )
{
// This parameter is not in the possible set
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
else if ( paramsSeen.contains( faxParam ) )
{
// We have the same parameters twice...
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
else
@@ -209,7 +210,7 @@ public class FacsimileTelephoneNumberSyn
}
// We must have a valid telephone number !
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/FaxSyntaxChecker.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/FaxSyntaxChecker.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/FaxSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/FaxSyntaxChecker.java Tue May 31 09:32:09 2016
@@ -53,6 +53,7 @@ public class FaxSyntaxChecker extends Bi
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
LOG.debug( "Syntax valid for '{}'", value );
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=1746258&r1=1746257&r2=1746258&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 Tue May 31 09:32:09 2016
@@ -110,9 +110,10 @@ public class GeneralizedTimeSyntaxChecke
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
- String strValue = null;
+ String strValue;
if ( value == null )
{
@@ -136,7 +137,7 @@ public class GeneralizedTimeSyntaxChecke
// A generalized time must have a minimal length of 11
if ( strValue.length() < 11 )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -149,7 +150,7 @@ public class GeneralizedTimeSyntaxChecke
}
else
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, 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=1746258&r1=1746257&r2=1746258&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 Tue May 31 09:32:09 2016
@@ -52,6 +52,7 @@ public class GuideSyntaxChecker extends
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
LOG.debug( "Syntax valid for '{}'", value );
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=1746258&r1=1746257&r2=1746258&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 Tue May 31 09:32:09 2016
@@ -54,9 +54,10 @@ public class Ia5StringSyntaxChecker exte
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
- String strValue = null;
+ String strValue;
if ( value == null )
{
@@ -85,7 +86,7 @@ public class Ia5StringSyntaxChecker exte
}
else
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, 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=1746258&r1=1746257&r2=1746258&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 Tue May 31 09:32:09 2016
@@ -63,9 +63,10 @@ public class IntegerSyntaxChecker extend
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
- String strValue = null;
+ String strValue;
if ( value == null )
{
@@ -88,7 +89,7 @@ public class IntegerSyntaxChecker extend
if ( strValue.length() == 0 )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -103,14 +104,14 @@ public class IntegerSyntaxChecker extend
}
else if ( !Chars.isDigit( c ) )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
else if ( c == '0' )
{
if ( strValue.length() > 1 )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
else
@@ -123,12 +124,12 @@ public class IntegerSyntaxChecker extend
// We must have at least a digit which is not '0'
if ( !Chars.isDigit( strValue, pos ) )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
else if ( Strings.isCharASCII( strValue, pos, '0' ) )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
else
@@ -141,7 +142,7 @@ public class IntegerSyntaxChecker extend
pos++;
}
- boolean result = ( pos == strValue.length() );
+ boolean result = pos == strValue.length();
if ( result )
{
@@ -149,7 +150,7 @@ public class IntegerSyntaxChecker extend
}
else
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, 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=1746258&r1=1746257&r2=1746258&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 Tue May 31 09:32:09 2016
@@ -65,9 +65,10 @@ public class JavaByteSyntaxChecker exten
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
- String strValue = null;
+ String strValue;
if ( value == null )
{
@@ -90,7 +91,7 @@ public class JavaByteSyntaxChecker exten
if ( strValue.length() == 0 )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -105,14 +106,14 @@ public class JavaByteSyntaxChecker exten
}
else if ( !Chars.isDigit( c ) )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
else if ( c == '0' )
{
if ( strValue.length() > 1 )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
else
@@ -125,12 +126,12 @@ public class JavaByteSyntaxChecker exten
// We must have at least a digit which is not '0'
if ( !Chars.isDigit( strValue, pos ) )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
else if ( Strings.isCharASCII( strValue, pos, '0' ) )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
else
@@ -145,7 +146,7 @@ public class JavaByteSyntaxChecker exten
if ( pos != strValue.length() )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -158,7 +159,7 @@ public class JavaByteSyntaxChecker exten
}
catch ( NumberFormatException e )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, 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=1746258&r1=1746257&r2=1746258&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 Tue May 31 09:32:09 2016
@@ -65,9 +65,10 @@ public class JavaIntegerSyntaxChecker ex
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
- String strValue = null;
+ String strValue;
if ( value == null )
{
@@ -90,7 +91,7 @@ public class JavaIntegerSyntaxChecker ex
if ( strValue.length() == 0 )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -105,7 +106,7 @@ public class JavaIntegerSyntaxChecker ex
}
else if ( !Chars.isDigit( c ) )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
else if ( c == '0' )
@@ -118,7 +119,7 @@ public class JavaIntegerSyntaxChecker ex
}
else
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
}
return result;
@@ -127,12 +128,12 @@ public class JavaIntegerSyntaxChecker ex
// We must have at least a digit which is not '0'
if ( !Chars.isDigit( strValue, pos ) )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
else if ( Strings.isCharASCII( strValue, pos, '0' ) )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
else
@@ -147,7 +148,7 @@ public class JavaIntegerSyntaxChecker ex
if ( pos != strValue.length() )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -159,7 +160,7 @@ public class JavaIntegerSyntaxChecker ex
}
catch ( NumberFormatException e )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, 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=1746258&r1=1746257&r2=1746258&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 Tue May 31 09:32:09 2016
@@ -65,9 +65,10 @@ public class JavaLongSyntaxChecker exten
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
- String strValue = null;
+ String strValue;
if ( value == null )
{
@@ -90,7 +91,7 @@ public class JavaLongSyntaxChecker exten
if ( strValue.length() == 0 )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -105,14 +106,14 @@ public class JavaLongSyntaxChecker exten
}
else if ( !Chars.isDigit( c ) )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
else if ( c == '0' )
{
if ( strValue.length() > 1 )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
else
@@ -125,12 +126,12 @@ public class JavaLongSyntaxChecker exten
// We must have at least a digit which is not '0'
if ( !Chars.isDigit( strValue, pos ) )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
else if ( Strings.isCharASCII( strValue, pos, '0' ) )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
else
@@ -145,7 +146,7 @@ public class JavaLongSyntaxChecker exten
if ( pos != strValue.length() )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -158,7 +159,7 @@ public class JavaLongSyntaxChecker exten
}
catch ( NumberFormatException e )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, 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=1746258&r1=1746257&r2=1746258&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 Tue May 31 09:32:09 2016
@@ -65,9 +65,10 @@ public class JavaShortSyntaxChecker exte
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
- String strValue = null;
+ String strValue;
if ( value == null )
{
@@ -90,7 +91,7 @@ public class JavaShortSyntaxChecker exte
if ( strValue.length() == 0 )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -105,14 +106,14 @@ public class JavaShortSyntaxChecker exte
}
else if ( !Chars.isDigit( c ) )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
else if ( c == '0' )
{
if ( strValue.length() > 1 )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
else
@@ -125,12 +126,12 @@ public class JavaShortSyntaxChecker exte
// We must have at least a digit which is not '0'
if ( !Chars.isDigit( strValue, pos ) )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
else if ( Strings.isCharASCII( strValue, pos, '0' ) )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
else
@@ -145,7 +146,7 @@ public class JavaShortSyntaxChecker exte
if ( pos != strValue.length() )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -158,7 +159,7 @@ public class JavaShortSyntaxChecker exte
}
catch ( NumberFormatException e )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, 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=1746258&r1=1746257&r2=1746258&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 Tue May 31 09:32:09 2016
@@ -60,6 +60,7 @@ public class JpegSyntaxChecker extends S
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
if ( value == null )
@@ -71,7 +72,7 @@ public class JpegSyntaxChecker extends S
// The value must be a byte array
if ( !( value instanceof byte[] ) )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -80,7 +81,7 @@ public class JpegSyntaxChecker extends S
// The header must be at least 11 bytes long
if ( bytes.length < 11 )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -113,7 +114,7 @@ public class JpegSyntaxChecker extends S
}
}
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, 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=1746258&r1=1746257&r2=1746258&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 Tue May 31 09:32:09 2016
@@ -50,7 +50,7 @@ public class LdapSyntaxDescriptionSyntax
private static final Logger LOG = LoggerFactory.getLogger( LdapSyntaxDescriptionSyntaxChecker.class );
/** The schema parser used to parse the LdapSyntax description Syntax */
- private LdapSyntaxDescriptionSchemaParser schemaParser = new LdapSyntaxDescriptionSchemaParser();
+ private transient LdapSyntaxDescriptionSchemaParser schemaParser = new LdapSyntaxDescriptionSchemaParser();
/**
@@ -67,9 +67,10 @@ public class LdapSyntaxDescriptionSyntax
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
- String strValue = null;
+ String strValue;
if ( value == null )
{
@@ -99,7 +100,7 @@ public class LdapSyntaxDescriptionSyntax
}
catch ( ParseException pe )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, 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=1746258&r1=1746257&r2=1746258&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 Tue May 31 09:32:09 2016
@@ -69,9 +69,10 @@ public class MailPreferenceSyntaxChecker
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
- String strValue = null;
+ String strValue;
if ( value == null )
{
@@ -94,12 +95,12 @@ public class MailPreferenceSyntaxChecker
if ( ( strValue.length() < 8 ) || ( strValue.length() > 18 ) )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, 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 )
{
@@ -107,7 +108,7 @@ public class MailPreferenceSyntaxChecker
}
else
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, 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=1746258&r1=1746257&r2=1746258&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 Tue May 31 09:32:09 2016
@@ -51,6 +51,7 @@ public class MasterAndShadowAccessPointS
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
LOG.debug( "Syntax valid for '{}'", value );
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=1746258&r1=1746257&r2=1746258&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 Tue May 31 09:32:09 2016
@@ -57,7 +57,7 @@ public class MatchingRuleDescriptionSynt
private static final Logger LOG = LoggerFactory.getLogger( MatchingRuleDescriptionSyntaxChecker.class );
/** The schema parser used to parse the MatchingRuleDescription Syntax */
- private MatchingRuleDescriptionSchemaParser schemaParser = new MatchingRuleDescriptionSchemaParser();
+ private transient MatchingRuleDescriptionSchemaParser schemaParser = new MatchingRuleDescriptionSchemaParser();
/**
@@ -74,9 +74,10 @@ public class MatchingRuleDescriptionSynt
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
- String strValue = null;
+ String strValue;
if ( value == null )
{
@@ -106,7 +107,7 @@ public class MatchingRuleDescriptionSynt
}
catch ( ParseException pe )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, 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=1746258&r1=1746257&r2=1746258&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 Tue May 31 09:32:09 2016
@@ -54,7 +54,7 @@ public class MatchingRuleUseDescriptionS
private static final Logger LOG = LoggerFactory.getLogger( MatchingRuleUseDescriptionSyntaxChecker.class );
/** The schema parser used to parse the MatchingRuleUseDescription Syntax */
- private MatchingRuleUseDescriptionSchemaParser schemaParser = new MatchingRuleUseDescriptionSchemaParser();
+ private transient MatchingRuleUseDescriptionSchemaParser schemaParser = new MatchingRuleUseDescriptionSchemaParser();
/**
@@ -71,9 +71,10 @@ public class MatchingRuleUseDescriptionS
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
- String strValue = null;
+ String strValue;
if ( value == null )
{
@@ -103,7 +104,7 @@ public class MatchingRuleUseDescriptionS
}
catch ( ParseException pe )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, 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=1746258&r1=1746257&r2=1746258&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 Tue May 31 09:32:09 2016
@@ -51,6 +51,7 @@ public class MhsOrAddressSyntaxChecker e
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
LOG.debug( "Syntax valid for '{}'", value );
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=1746258&r1=1746257&r2=1746258&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 Tue May 31 09:32:09 2016
@@ -61,9 +61,10 @@ public class NameAndOptionalUIDSyntaxChe
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
- String strValue = null;
+ String strValue;
if ( value == null )
{
@@ -86,7 +87,7 @@ public class NameAndOptionalUIDSyntaxChe
if ( strValue.length() == 0 )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -100,7 +101,7 @@ public class NameAndOptionalUIDSyntaxChe
{
// Yes, we have one : this is not allowed, it should have been
// escaped.
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -122,7 +123,7 @@ public class NameAndOptionalUIDSyntaxChe
}
else
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
}
return result;
@@ -131,14 +132,14 @@ public class NameAndOptionalUIDSyntaxChe
else
{
// The Dn must not be null ?
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
}
else
{
// We have found a '#' but no UID part.
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
}
@@ -154,7 +155,7 @@ public class NameAndOptionalUIDSyntaxChe
}
else
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, 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=1746258&r1=1746257&r2=1746258&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 Tue May 31 09:32:09 2016
@@ -55,7 +55,7 @@ public class NameFormDescriptionSyntaxCh
private static final Logger LOG = LoggerFactory.getLogger( NameFormDescriptionSyntaxChecker.class );
/** The schema parser used to parse the DITContentRuleDescription Syntax */
- private NameFormDescriptionSchemaParser schemaParser = new NameFormDescriptionSchemaParser();
+ private transient NameFormDescriptionSchemaParser schemaParser = new NameFormDescriptionSchemaParser();
/**
@@ -72,9 +72,10 @@ public class NameFormDescriptionSyntaxCh
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
- String strValue = null;
+ String strValue;
if ( value == null )
{
@@ -102,7 +103,7 @@ public class NameFormDescriptionSyntaxCh
}
catch ( ParseException pe )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
}
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=1746258&r1=1746257&r2=1746258&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 Tue May 31 09:32:09 2016
@@ -57,9 +57,10 @@ public class NumberSyntaxChecker extends
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
- String strValue = null;
+ String strValue;
if ( value == null )
{
@@ -83,7 +84,7 @@ public class NumberSyntaxChecker extends
// We should have at least one char
if ( strValue.length() == 0 )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -105,7 +106,7 @@ public class NumberSyntaxChecker extends
continue;
default:
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
}
@@ -114,7 +115,7 @@ public class NumberSyntaxChecker extends
{
// A number can't start with a '0' unless it's the only
// number
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
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=1746258&r1=1746257&r2=1746258&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 Tue May 31 09:32:09 2016
@@ -62,9 +62,10 @@ public class NumericOidSyntaxChecker ext
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
- String strValue = null;
+ String strValue;
if ( value == null )
{
@@ -87,7 +88,7 @@ public class NumericOidSyntaxChecker ext
if ( strValue.length() == 0 )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -100,7 +101,7 @@ public class NumericOidSyntaxChecker ext
}
else
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, 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=1746258&r1=1746257&r2=1746258&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 Tue May 31 09:32:09 2016
@@ -61,9 +61,10 @@ public class NumericStringSyntaxChecker
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
- String strValue = null;
+ String strValue;
if ( value == null )
{
@@ -87,7 +88,7 @@ public class NumericStringSyntaxChecker
// We should have at least one char
if ( strValue.length() == 0 )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -110,7 +111,7 @@ public class NumericStringSyntaxChecker
continue;
default:
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
}
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=1746258&r1=1746257&r2=1746258&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 Tue May 31 09:32:09 2016
@@ -61,7 +61,7 @@ public class ObjectClassDescriptionSynta
private static final Logger LOG = LoggerFactory.getLogger( ObjectClassDescriptionSyntaxChecker.class );
/** The schema parser used to parse the ObjectClassDescription Syntax */
- private ObjectClassDescriptionSchemaParser schemaParser = new ObjectClassDescriptionSchemaParser();
+ private transient ObjectClassDescriptionSchemaParser schemaParser = new ObjectClassDescriptionSchemaParser();
/**
@@ -76,9 +76,10 @@ public class ObjectClassDescriptionSynta
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
- String strValue = null;
+ String strValue;
if ( value == null )
{
@@ -107,7 +108,7 @@ public class ObjectClassDescriptionSynta
}
catch ( ParseException pe )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, 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=1746258&r1=1746257&r2=1746258&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 Tue May 31 09:32:09 2016
@@ -52,9 +52,10 @@ public class ObjectClassTypeSyntaxChecke
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
- String strValue = null;
+ String strValue;
if ( value == null )
{
@@ -77,7 +78,7 @@ public class ObjectClassTypeSyntaxChecke
if ( strValue.length() < 8 || strValue.length() > 10 )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -85,17 +86,17 @@ public class ObjectClassTypeSyntaxChecke
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( INVALID_SYNTAX_FOR, value );
return false;
- case ( 'S' ):
+ case 'S':
boolean result = "STRUCTURAL".equals( strValue );
if ( result )
@@ -104,13 +105,13 @@ public class ObjectClassTypeSyntaxChecke
}
else
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
}
return result;
default:
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, 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=1746258&r1=1746257&r2=1746258&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 Tue May 31 09:32:09 2016
@@ -69,6 +69,7 @@ public class ObjectNameSyntaxChecker ext
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
String strValue;
@@ -94,7 +95,7 @@ public class ObjectNameSyntaxChecker ext
if ( strValue.length() == 0 )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -109,7 +110,7 @@ public class ObjectNameSyntaxChecker ext
}
else
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, 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=1746258&r1=1746257&r2=1746258&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 Tue May 31 09:32:09 2016
@@ -61,6 +61,7 @@ public class OctetStringSyntaxChecker ex
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
// Always true.
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/OidLenSyntaxChecker.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/OidLenSyntaxChecker.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/OidLenSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/OidLenSyntaxChecker.java Tue May 31 09:32:09 2016
@@ -68,9 +68,10 @@ public class OidLenSyntaxChecker extends
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
- String strValue = null;
+ String strValue;
if ( value == null )
{
@@ -93,7 +94,7 @@ public class OidLenSyntaxChecker extends
if ( strValue.length() == 0 )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -111,7 +112,7 @@ public class OidLenSyntaxChecker extends
}
else
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
}
return result;
@@ -123,7 +124,7 @@ public class OidLenSyntaxChecker extends
if ( !Oid.isOid( oid ) )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -133,7 +134,7 @@ public class OidLenSyntaxChecker extends
if ( len.charAt( len.length() - 1 ) != '}' )
{
// No final '}'
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -154,7 +155,7 @@ public class OidLenSyntaxChecker extends
break;
default:
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
}
@@ -163,7 +164,7 @@ public class OidLenSyntaxChecker extends
{
// A number can't start with a '0' unless it's the only
// number
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/OidSyntaxChecker.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/OidSyntaxChecker.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/OidSyntaxChecker.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/OidSyntaxChecker.java Tue May 31 09:32:09 2016
@@ -69,9 +69,10 @@ public class OidSyntaxChecker extends Sy
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValidSyntax( Object value )
{
- String strValue = null;
+ String strValue;
if ( value == null )
{
@@ -94,7 +95,7 @@ public class OidSyntaxChecker extends Sy
if ( strValue.length() == 0 )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
@@ -104,7 +105,7 @@ public class OidSyntaxChecker extends Sy
{
if ( !Oid.isOid( strValue ) )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
else
@@ -124,7 +125,7 @@ public class OidSyntaxChecker extends Sy
if ( !Chars.isAlphaDigitMinus( c ) )
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
}
@@ -134,7 +135,7 @@ public class OidSyntaxChecker extends Sy
}
else
{
- LOG.debug( "Syntax invalid for '{}'", value );
+ LOG.debug( INVALID_SYNTAX_FOR, value );
return false;
}
}
Modified: directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/OpenLdapObjectIdentifierMacro.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/OpenLdapObjectIdentifierMacro.java?rev=1746258&r1=1746257&r2=1746258&view=diff
==============================================================================
--- directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/OpenLdapObjectIdentifierMacro.java (original)
+++ directory/shared/branches/shared-value/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/syntaxCheckers/OpenLdapObjectIdentifierMacro.java Tue May 31 09:32:09 2016
@@ -126,6 +126,7 @@ public class OpenLdapObjectIdentifierMac
}
+ @Override
public String toString()
{
if ( isResolved() )