You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2012/01/24 18:44:32 UTC
svn commit: r1235374 [23/27] - in /directory/shared/trunk:
ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/
ldap/model/src/main/java/org/apache/directory/shared/ldap/model/csn/
ldap/model/src/main/java/org/apache/directory/sha...
Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/NameFormDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/NameFormDescriptionSchemaParserTest.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/NameFormDescriptionSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/NameFormDescriptionSchemaParserTest.java Tue Jan 24 17:44:03 2012
@@ -37,6 +37,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+
/**
* Tests the NameFormDescriptionSchemaParser class.
*
@@ -48,7 +49,8 @@ public class NameFormDescriptionSchemaPa
{
/** the parser instance */
private NameFormDescriptionSchemaParser parser;
-
+
+
@Before
public void setUp() throws Exception
{
@@ -521,7 +523,7 @@ public class NameFormDescriptionSchemaPa
"( 2.5.15.3 NAME 'orgNameForm' OC organization MUST o )",
"( 2.5.15.3 NAME 'orgNameForm' OC organization MUST o )",
"( 1.2.3.4.5.6.7.8.9.0 NAME ( 'abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789' 'test' ) DESC 'Descripton \u00E4\u00F6\u00FC\u00DF \u90E8\u9577' OBSOLETE OC bcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789a MUST ( 3.4.5.6.7.8.9.0.1.2 $ cdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789ab ) MAY ( 4.5.6.7.8.9.0.1.2.3 $ defghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789abc ) X-TEST-a ('test1-1' 'test1-2') X-TEST-b ('test2-1' 'test2-2') )" };
- SchemaParserTestUtils.testMultiThreaded(parser, testValues);
+ SchemaParserTestUtils.testMultiThreaded( parser, testValues );
}
Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/NormalizerDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/NormalizerDescriptionSchemaParserTest.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/NormalizerDescriptionSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/NormalizerDescriptionSchemaParserTest.java Tue Jan 24 17:44:03 2012
@@ -65,7 +65,7 @@ public class NormalizerDescriptionSchema
@Test
public void testNumericOid() throws ParseException
{
- SchemaParserTestUtils.testNumericOid(parser, "FQCN org.apache.directory.SimpleNormalizer");
+ SchemaParserTestUtils.testNumericOid( parser, "FQCN org.apache.directory.SimpleNormalizer" );
}
Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/ObjectClassDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/ObjectClassDescriptionSchemaParserTest.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/ObjectClassDescriptionSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/ObjectClassDescriptionSchemaParserTest.java Tue Jan 24 17:44:03 2012
@@ -461,7 +461,8 @@ public class ObjectClassDescriptionSchem
assertEquals( "1.2.3.4.5.6.7.8.9.0", objectClass.getOid() );
assertEquals( 2, objectClass.getNames().size() );
- assertEquals( "abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789", objectClass.getNames().get( 0 ) );
+ assertEquals( "abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789", objectClass.getNames()
+ .get( 0 ) );
assertEquals( "test", objectClass.getNames().get( 1 ) );
assertEquals( "Descripton \u00E4\u00F6\u00FC\u00DF \u90E8\u9577", objectClass.getDescription() );
assertTrue( objectClass.isObsolete() );
@@ -472,11 +473,13 @@ public class ObjectClassDescriptionSchem
assertEquals( ObjectClassTypeEnum.STRUCTURAL, objectClass.getType() );
assertEquals( 2, objectClass.getMustAttributeTypeOids().size() );
assertEquals( "3.4.5.6.7.8.9.0.1.2", objectClass.getMustAttributeTypeOids().get( 0 ) );
- assertEquals( "abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789", objectClass.getMustAttributeTypeOids()
+ assertEquals( "abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789", objectClass
+ .getMustAttributeTypeOids()
.get( 1 ) );
assertEquals( 2, objectClass.getMayAttributeTypeOids().size() );
assertEquals( "4.5.6.7.8.9.0.1.2.3", objectClass.getMayAttributeTypeOids().get( 0 ) );
- assertEquals( "abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789", objectClass.getMayAttributeTypeOids()
+ assertEquals( "abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789", objectClass
+ .getMayAttributeTypeOids()
.get( 1 ) );
assertEquals( 2, objectClass.getExtensions().size() );
assertNotNull( objectClass.getExtensions().get( "X-TEST-a" ) );
@@ -503,7 +506,7 @@ public class ObjectClassDescriptionSchem
"( 1.1 SUP test1 SUP test2 )", "( 1.1 STRUCTURAL STRUCTURAL )", "( 1.1 ABSTRACT ABSTRACT )",
"( 1.1 AUXILIARY AUXILIARY )", "( 1.1 STRUCTURAL AUXILIARY AUXILIARY )",
"( 1.1 MUST test1 MUST test2 )", "( 1.1 MAY test1 MAY test2 )", "( 1.1 X-TEST 'test1' X-TEST 'test2' )" };
- SchemaParserTestUtils.testUnique(parser, testValues);
+ SchemaParserTestUtils.testUnique( parser, testValues );
}
@@ -701,7 +704,8 @@ public class ObjectClassDescriptionSchem
// X-NDS_ACL_TEMPLATES '2#entry#[Root Template]#member'
assertNotNull( objectClass.getExtensions().get( "X-NDS_ACL_TEMPLATES" ) );
assertEquals( 1, objectClass.getExtensions().get( "X-NDS_ACL_TEMPLATES" ).size() );
- assertEquals( "2#entry#[Root Template]#member", objectClass.getExtensions().get( "X-NDS_ACL_TEMPLATES" ).get( 0 ) );
+ assertEquals( "2#entry#[Root Template]#member", objectClass.getExtensions().get( "X-NDS_ACL_TEMPLATES" )
+ .get( 0 ) );
}
Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java Tue Jan 24 17:44:03 2012
@@ -57,7 +57,7 @@ public class SchemaParserTestUtils
try
{
parser.parse( value );
- fail("Exception expected, null");
+ fail( "Exception expected, null" );
}
catch ( ParseException pe )
{
@@ -69,7 +69,7 @@ public class SchemaParserTestUtils
try
{
parser.parse( value );
- fail("Exception expected, no NUMERICOID");
+ fail( "Exception expected, no NUMERICOID" );
}
catch ( ParseException pe )
{
@@ -79,44 +79,44 @@ public class SchemaParserTestUtils
// simple
value = "( 0.1.2.3.4.5.6.7.8.9 " + required + " )";
asd = parser.parse( value );
- assertEquals("0.1.2.3.4.5.6.7.8.9", asd.getOid());
+ assertEquals( "0.1.2.3.4.5.6.7.8.9", asd.getOid() );
// simple
value = "( 123.4567.890 " + required + ")";
asd = parser.parse( value );
- assertEquals("123.4567.890", asd.getOid());
+ assertEquals( "123.4567.890", asd.getOid() );
// simple with multiple spaces
value = "( 0.1.2.3.4.5.6.7.8.9 " + required + " )";
asd = parser.parse( value );
- assertEquals("0.1.2.3.4.5.6.7.8.9", asd.getOid());
+ assertEquals( "0.1.2.3.4.5.6.7.8.9", asd.getOid() );
// simple w/o spaces
value = "(0.1.2.3.4.5.6.7.8.9 " + required + ")";
asd = parser.parse( value );
- assertEquals("0.1.2.3.4.5.6.7.8.9", asd.getOid());
+ assertEquals( "0.1.2.3.4.5.6.7.8.9", asd.getOid() );
// simple with tabs, newline, comment.
value = "(\t0.1.2.3.4.5.6.7.8.9\n#comment\n" + required + "\r\n)\r";
asd = parser.parse( value );
- assertEquals("0.1.2.3.4.5.6.7.8.9", asd.getOid());
+ assertEquals( "0.1.2.3.4.5.6.7.8.9", asd.getOid() );
// quoted OID
value = "( '0.1.2.3.4.5.6.7.8.9' " + required + " )";
asd = parser.parse( value );
- assertEquals("0.1.2.3.4.5.6.7.8.9", asd.getOid());
+ assertEquals( "0.1.2.3.4.5.6.7.8.9", asd.getOid() );
// quoted OID in parentheses
value = "( ('0.1.2.3.4.5.6.7.8.9') " + required + " )";
asd = parser.parse( value );
- assertEquals("0.1.2.3.4.5.6.7.8.9", asd.getOid());
+ assertEquals( "0.1.2.3.4.5.6.7.8.9", asd.getOid() );
// too short
value = "( 1 " + required + " )";
try
{
parser.parse( value );
- fail("Exception expected, invalid NUMERICOID 1");
+ fail( "Exception expected, invalid NUMERICOID 1" );
}
catch ( ParseException pe )
{
@@ -128,7 +128,7 @@ public class SchemaParserTestUtils
try
{
parser.parse( value );
- fail("Exception expected, invalid NUMERICOID .");
+ fail( "Exception expected, invalid NUMERICOID ." );
}
catch ( ParseException pe )
{
@@ -140,7 +140,7 @@ public class SchemaParserTestUtils
try
{
parser.parse( value );
- fail("Exception expected, invalid NUMERICOID 1.1.");
+ fail( "Exception expected, invalid NUMERICOID 1.1." );
}
catch ( ParseException pe )
{
@@ -152,7 +152,7 @@ public class SchemaParserTestUtils
try
{
parser.parse( value );
- fail("Exception expected, invalid multiple OIDs not allowed.)");
+ fail( "Exception expected, invalid multiple OIDs not allowed.)" );
}
catch ( ParseException pe )
{
@@ -166,7 +166,7 @@ public class SchemaParserTestUtils
try
{
parser.parse( value );
- fail("Exception expected, invalid NUMERICOID test");
+ fail( "Exception expected, invalid NUMERICOID test" );
}
catch ( ParseException pe )
{
@@ -178,7 +178,7 @@ public class SchemaParserTestUtils
try
{
parser.parse( value );
- fail("Exception expected, invalid NUMERICOID 01.1 (leading zero)");
+ fail( "Exception expected, invalid NUMERICOID 01.1 (leading zero)" );
}
catch ( ParseException pe )
{
@@ -190,7 +190,7 @@ public class SchemaParserTestUtils
try
{
parser.parse( value );
- fail("Exception expected, invalid NUMERICOID 1.2.a.4 (alpha not allowed)");
+ fail( "Exception expected, invalid NUMERICOID 1.2.a.4 (alpha not allowed)" );
}
catch ( ParseException pe )
{
@@ -214,86 +214,86 @@ public class SchemaParserTestUtils
// alpha
value = "( " + oid + " " + required + " NAME 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' )";
asd = parser.parse( value );
- assertEquals(1, asd.getNames().size());
- assertEquals("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", asd.getNames().get(0));
+ assertEquals( 1, asd.getNames().size() );
+ assertEquals( "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", asd.getNames().get( 0 ) );
// alpha-num-hypen
value = "( " + oid + " " + required
+ " NAME 'abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789' )";
asd = parser.parse( value );
- assertEquals(1, asd.getNames().size());
- assertEquals("abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789", asd.getNames().get(0));
+ assertEquals( 1, asd.getNames().size() );
+ assertEquals( "abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789", asd.getNames().get( 0 ) );
// with parentheses
value = "( " + oid + " " + required + " NAME ( 'a-z-0-9' ) )";
asd = parser.parse( value );
- assertEquals(1, asd.getNames().size());
- assertEquals("a-z-0-9", asd.getNames().get(0));
+ assertEquals( 1, asd.getNames().size() );
+ assertEquals( "a-z-0-9", asd.getNames().get( 0 ) );
// with parentheses, without space
value = "(" + oid + " " + required + " NAME('a-z-0-9'))";
asd = parser.parse( value );
- assertEquals(1, asd.getNames().size());
- assertEquals("a-z-0-9", asd.getNames().get(0));
+ assertEquals( 1, asd.getNames().size() );
+ assertEquals( "a-z-0-9", asd.getNames().get( 0 ) );
// multi with space
value = " ( " + oid + " " + required + " NAME ( 'test1' 'test2' ) ) ";
asd = parser.parse( value );
- assertEquals(2, asd.getNames().size());
- assertEquals("test1", asd.getNames().get(0));
- assertEquals("test2", asd.getNames().get(1));
+ assertEquals( 2, asd.getNames().size() );
+ assertEquals( "test1", asd.getNames().get( 0 ) );
+ assertEquals( "test2", asd.getNames().get( 1 ) );
// multi without space
value = "(" + oid + " " + required + " NAME('test1''test2''test3'))";
asd = parser.parse( value );
- assertEquals(3, asd.getNames().size());
- assertEquals("test1", asd.getNames().get(0));
- assertEquals("test2", asd.getNames().get(1));
- assertEquals("test3", asd.getNames().get(2));
+ assertEquals( 3, asd.getNames().size() );
+ assertEquals( "test1", asd.getNames().get( 0 ) );
+ assertEquals( "test2", asd.getNames().get( 1 ) );
+ assertEquals( "test3", asd.getNames().get( 2 ) );
// multi with many spaces
value = "( " + oid + " " + required
+ " NAME ( 'test1' 'test2' 'test3' ) )";
asd = parser.parse( value );
- assertEquals(3, asd.getNames().size());
- assertEquals("test1", asd.getNames().get(0));
- assertEquals("test2", asd.getNames().get(1));
- assertEquals("test3", asd.getNames().get(2));
+ assertEquals( 3, asd.getNames().size() );
+ assertEquals( "test1", asd.getNames().get( 0 ) );
+ assertEquals( "test2", asd.getNames().get( 1 ) );
+ assertEquals( "test3", asd.getNames().get( 2 ) );
// multi with tabs, newline, comment, etc.
value = "(\r\n" + oid + "\r" + required
+ "\nNAME\t(\t\t\t'test1'\t\n\t'test2'\t\r\t'test3'\t\r\n\t)\n#comment\n)";
asd = parser.parse( value );
- assertEquals(3, asd.getNames().size());
- assertEquals("test1", asd.getNames().get(0));
- assertEquals("test2", asd.getNames().get(1));
- assertEquals("test3", asd.getNames().get(2));
+ assertEquals( 3, asd.getNames().size() );
+ assertEquals( "test1", asd.getNames().get( 0 ) );
+ assertEquals( "test2", asd.getNames().get( 1 ) );
+ assertEquals( "test3", asd.getNames().get( 2 ) );
// lowercase NAME
value = "( " + oid + " " + required + " name 'test' )";
asd = parser.parse( value );
- assertEquals(1, asd.getNames().size());
- assertEquals("test", asd.getNames().get(0));
+ assertEquals( 1, asd.getNames().size() );
+ assertEquals( "test", asd.getNames().get( 0 ) );
// unquoted NAME value
value = "( " + oid + " " + required + " NAME test )";
asd = parser.parse( value );
- assertEquals(1, asd.getNames().size());
- assertEquals("test", asd.getNames().get(0));
+ assertEquals( 1, asd.getNames().size() );
+ assertEquals( "test", asd.getNames().get( 0 ) );
// multi unquoted NAME values
value = " ( " + oid + " " + required + " NAME (test1 test2) ) ";
asd = parser.parse( value );
- assertEquals(2, asd.getNames().size());
- assertEquals("test1", asd.getNames().get(0));
- assertEquals("test2", asd.getNames().get(1));
+ assertEquals( 2, asd.getNames().size() );
+ assertEquals( "test1", asd.getNames().get( 0 ) );
+ assertEquals( "test2", asd.getNames().get( 1 ) );
// NAM unknown
value = "( " + oid + " " + required + " NAM 'test' )";
try
{
parser.parse( value );
- fail("Exception expected, invalid token NAM");
+ fail( "Exception expected, invalid token NAM" );
}
catch ( ParseException pe )
{
@@ -307,7 +307,7 @@ public class SchemaParserTestUtils
try
{
parser.parse( value );
- fail("Exception expected, invalid NAME 1test (starts with number)");
+ fail( "Exception expected, invalid NAME 1test (starts with number)" );
}
catch ( ParseException pe )
{
@@ -319,7 +319,7 @@ public class SchemaParserTestUtils
try
{
parser.parse( value );
- fail("Exception expected, invalid NAME -test (starts with hypen)");
+ fail( "Exception expected, invalid NAME -test (starts with hypen)" );
}
catch ( ParseException pe )
{
@@ -331,7 +331,7 @@ public class SchemaParserTestUtils
try
{
parser.parse( value );
- fail("Exception expected, invalid NAME te_st (contains invalid character)");
+ fail( "Exception expected, invalid NAME te_st (contains invalid character)" );
}
catch ( ParseException pe )
{
@@ -343,7 +343,7 @@ public class SchemaParserTestUtils
try
{
parser.parse( value );
- fail("Exception expected, invalid NAME te_st (contains invalid character)");
+ fail( "Exception expected, invalid NAME te_st (contains invalid character)" );
}
catch ( ParseException pe )
{
@@ -367,58 +367,58 @@ public class SchemaParserTestUtils
// simple
value = "(" + oid + " " + required + " DESC 'Descripton')";
asd = parser.parse( value );
- assertEquals("Descripton", asd.getDescription());
+ assertEquals( "Descripton", asd.getDescription() );
// simple with tabs, newline, comment, etc.
value = "(" + oid + "\n" + required + "\tDESC#comment\n\n\r\n\r\t'Descripton')";
asd = parser.parse( value );
- assertEquals("Descripton", asd.getDescription());
+ assertEquals( "Descripton", asd.getDescription() );
// simple w/o space
value = "(" + oid + " " + required + " DESC'Descripton')";
asd = parser.parse( value );
- assertEquals("Descripton", asd.getDescription());
+ assertEquals( "Descripton", asd.getDescription() );
// simple parentheses and quotes
value = "(" + oid + " " + required + " DESC ('Descripton') )";
asd = parser.parse( value );
- assertEquals("Descripton", asd.getDescription());
+ assertEquals( "Descripton", asd.getDescription() );
// unicode
value = "( " + oid + " " + required + " DESC 'Descripton \u00E4\u00F6\u00FC\u00DF \u90E8\u9577' )";
asd = parser.parse( value );
- assertEquals("Descripton \u00E4\u00F6\u00FC\u00DF \u90E8\u9577", asd.getDescription());
+ assertEquals( "Descripton \u00E4\u00F6\u00FC\u00DF \u90E8\u9577", asd.getDescription() );
// escaped characters
value = "( " + oid + " " + required + " DESC 'test\\5Ctest' )";
asd = parser.parse( value );
- assertEquals("test\\test", asd.getDescription());
+ assertEquals( "test\\test", asd.getDescription() );
value = "( " + oid + " " + required + " DESC 'test\\5ctest' )";
asd = parser.parse( value );
- assertEquals("test\\test", asd.getDescription());
+ assertEquals( "test\\test", asd.getDescription() );
value = "( " + oid + " " + required + " DESC 'test\\27test' )";
asd = parser.parse( value );
- assertEquals("test'test", asd.getDescription());
+ assertEquals( "test'test", asd.getDescription() );
value = "( " + oid + " " + required + " DESC '\\5C\\27\\5c' )";
asd = parser.parse( value );
- assertEquals("\\'\\", asd.getDescription());
+ assertEquals( "\\'\\", asd.getDescription() );
// lowercase DESC
value = "( " + oid + " " + required + " desc 'Descripton' )";
asd = parser.parse( value );
- assertEquals("Descripton", asd.getDescription());
+ assertEquals( "Descripton", asd.getDescription() );
// empty DESC
value = "( " + oid + " " + required + " DESC '' )";
asd = parser.parse( value );
- assertEquals("", asd.getDescription());
+ assertEquals( "", asd.getDescription() );
// multiple not allowed
value = "(" + oid + " " + required + " DESC ( 'Descripton1' 'Description 2' ) )";
try
{
parser.parse( value );
- fail("Exception expected, invalid multiple DESC not allowed.)");
+ fail( "Exception expected, invalid multiple DESC not allowed.)" );
}
catch ( ParseException pe )
{
@@ -440,88 +440,88 @@ public class SchemaParserTestUtils
// no extension
value = "( " + oid + " " + required + " )";
asd = parser.parse( value );
- assertEquals(0, asd.getExtensions().size());
+ assertEquals( 0, asd.getExtensions().size() );
// single extension with one value
value = "( " + oid + " " + required + " X-TEST 'test' )";
asd = parser.parse( value );
- assertEquals(1, asd.getExtensions().size());
- assertNotNull(asd.getExtensions().get("X-TEST"));
- assertEquals(1, asd.getExtensions().get("X-TEST").size());
- assertEquals("test", asd.getExtensions().get("X-TEST").get(0));
+ assertEquals( 1, asd.getExtensions().size() );
+ assertNotNull( asd.getExtensions().get( "X-TEST" ) );
+ assertEquals( 1, asd.getExtensions().get( "X-TEST" ).size() );
+ assertEquals( "test", asd.getExtensions().get( "X-TEST" ).get( 0 ) );
// single extension with multiple values
value = "( " + oid + " " + required
+ " X-TEST-ABC ('test1' 'test \u00E4\u00F6\u00FC\u00DF' 'test \u90E8\u9577' ) )";
asd = parser.parse( value );
- assertEquals(1, asd.getExtensions().size());
- assertNotNull(asd.getExtensions().get("X-TEST-ABC"));
- assertEquals(3, asd.getExtensions().get("X-TEST-ABC").size());
- assertEquals("test1", asd.getExtensions().get("X-TEST-ABC").get(0));
- assertEquals("test \u00E4\u00F6\u00FC\u00DF", asd.getExtensions().get("X-TEST-ABC").get(1));
- assertEquals("test \u90E8\u9577", asd.getExtensions().get("X-TEST-ABC").get(2));
+ assertEquals( 1, asd.getExtensions().size() );
+ assertNotNull( asd.getExtensions().get( "X-TEST-ABC" ) );
+ assertEquals( 3, asd.getExtensions().get( "X-TEST-ABC" ).size() );
+ assertEquals( "test1", asd.getExtensions().get( "X-TEST-ABC" ).get( 0 ) );
+ assertEquals( "test \u00E4\u00F6\u00FC\u00DF", asd.getExtensions().get( "X-TEST-ABC" ).get( 1 ) );
+ assertEquals( "test \u90E8\u9577", asd.getExtensions().get( "X-TEST-ABC" ).get( 2 ) );
// multiple extensions
value = "(" + oid + " " + required + " X-TEST-a ('test1-1' 'test1-2') X-TEST-b ('test2-1' 'test2-2'))";
asd = parser.parse( value );
- assertEquals(2, asd.getExtensions().size());
- assertNotNull(asd.getExtensions().get("X-TEST-a"));
- assertEquals(2, asd.getExtensions().get("X-TEST-a").size());
- assertEquals("test1-1", asd.getExtensions().get("X-TEST-a").get(0));
- assertEquals("test1-2", asd.getExtensions().get("X-TEST-a").get(1));
- assertNotNull(asd.getExtensions().get("X-TEST-b"));
- assertEquals(2, asd.getExtensions().get("X-TEST-b").size());
- assertEquals("test2-1", asd.getExtensions().get("X-TEST-b").get(0));
- assertEquals("test2-2", asd.getExtensions().get("X-TEST-b").get(1));
+ assertEquals( 2, asd.getExtensions().size() );
+ assertNotNull( asd.getExtensions().get( "X-TEST-a" ) );
+ assertEquals( 2, asd.getExtensions().get( "X-TEST-a" ).size() );
+ assertEquals( "test1-1", asd.getExtensions().get( "X-TEST-a" ).get( 0 ) );
+ assertEquals( "test1-2", asd.getExtensions().get( "X-TEST-a" ).get( 1 ) );
+ assertNotNull( asd.getExtensions().get( "X-TEST-b" ) );
+ assertEquals( 2, asd.getExtensions().get( "X-TEST-b" ).size() );
+ assertEquals( "test2-1", asd.getExtensions().get( "X-TEST-b" ).get( 0 ) );
+ assertEquals( "test2-2", asd.getExtensions().get( "X-TEST-b" ).get( 1 ) );
// multiple extensions, no spaces
value = "(" + oid + " " + required + " X-TEST-a('test1-1''test1-2')X-TEST-b('test2-1''test2-2'))";
asd = parser.parse( value );
- assertEquals(2, asd.getExtensions().size());
- assertNotNull(asd.getExtensions().get("X-TEST-a"));
- assertEquals(2, asd.getExtensions().get("X-TEST-a").size());
- assertEquals("test1-1", asd.getExtensions().get("X-TEST-a").get(0));
- assertEquals("test1-2", asd.getExtensions().get("X-TEST-a").get(1));
- assertNotNull(asd.getExtensions().get("X-TEST-b"));
- assertEquals(2, asd.getExtensions().get("X-TEST-b").size());
- assertEquals("test2-1", asd.getExtensions().get("X-TEST-b").get(0));
- assertEquals("test2-2", asd.getExtensions().get("X-TEST-b").get(1));
+ assertEquals( 2, asd.getExtensions().size() );
+ assertNotNull( asd.getExtensions().get( "X-TEST-a" ) );
+ assertEquals( 2, asd.getExtensions().get( "X-TEST-a" ).size() );
+ assertEquals( "test1-1", asd.getExtensions().get( "X-TEST-a" ).get( 0 ) );
+ assertEquals( "test1-2", asd.getExtensions().get( "X-TEST-a" ).get( 1 ) );
+ assertNotNull( asd.getExtensions().get( "X-TEST-b" ) );
+ assertEquals( 2, asd.getExtensions().get( "X-TEST-b" ).size() );
+ assertEquals( "test2-1", asd.getExtensions().get( "X-TEST-b" ).get( 0 ) );
+ assertEquals( "test2-2", asd.getExtensions().get( "X-TEST-b" ).get( 1 ) );
// multiple extensions, tabs, newline, comments
value = "(" + oid + "\n#comment\n" + required
+ "\nX-TEST-a\n(\t'test1-1'\t\n'test1-2'\n\r)\tX-TEST-b\n(\n'test2-1'\t'test2-2'\t)\r)";
asd = parser.parse( value );
- assertEquals(2, asd.getExtensions().size());
- assertNotNull(asd.getExtensions().get("X-TEST-a"));
- assertEquals(2, asd.getExtensions().get("X-TEST-a").size());
- assertEquals("test1-1", asd.getExtensions().get("X-TEST-a").get(0));
- assertEquals("test1-2", asd.getExtensions().get("X-TEST-a").get(1));
- assertNotNull(asd.getExtensions().get("X-TEST-b"));
- assertEquals(2, asd.getExtensions().get("X-TEST-b").size());
- assertEquals("test2-1", asd.getExtensions().get("X-TEST-b").get(0));
- assertEquals("test2-2", asd.getExtensions().get("X-TEST-b").get(1));
+ assertEquals( 2, asd.getExtensions().size() );
+ assertNotNull( asd.getExtensions().get( "X-TEST-a" ) );
+ assertEquals( 2, asd.getExtensions().get( "X-TEST-a" ).size() );
+ assertEquals( "test1-1", asd.getExtensions().get( "X-TEST-a" ).get( 0 ) );
+ assertEquals( "test1-2", asd.getExtensions().get( "X-TEST-a" ).get( 1 ) );
+ assertNotNull( asd.getExtensions().get( "X-TEST-b" ) );
+ assertEquals( 2, asd.getExtensions().get( "X-TEST-b" ).size() );
+ assertEquals( "test2-1", asd.getExtensions().get( "X-TEST-b" ).get( 0 ) );
+ assertEquals( "test2-2", asd.getExtensions().get( "X-TEST-b" ).get( 1 ) );
// some more complicated
value = "(" + oid + " " + required
+ " X-_-abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ ('\\5C\\27\\5c'))";
asd = parser.parse( value );
- assertEquals(1, asd.getExtensions().size());
- assertNotNull(asd.getExtensions().get("X-_-abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"));
- assertEquals(1, asd.getExtensions().get("X-_-abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
- .size());
- assertEquals("\\'\\", asd.getExtensions().get(
- "X-_-abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ").get(0));
+ assertEquals( 1, asd.getExtensions().size() );
+ assertNotNull( asd.getExtensions().get( "X-_-abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" ) );
+ assertEquals( 1, asd.getExtensions().get( "X-_-abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" )
+ .size() );
+ assertEquals( "\\'\\", asd.getExtensions().get(
+ "X-_-abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" ).get( 0 ) );
// invalid extension, no number allowed
value = "( " + oid + " " + required + " X-TEST1 'test' )";
try
{
asd = parser.parse( value );
- fail("Exception expected, invalid extension X-TEST1 (no number allowed)");
+ fail( "Exception expected, invalid extension X-TEST1 (no number allowed)" );
}
catch ( ParseException pe )
{
- assertTrue(true);
+ assertTrue( true );
}
}
@@ -540,34 +540,34 @@ public class SchemaParserTestUtils
// not obsolete
value = "( " + oid + " " + required + " )";
asd = parser.parse( value );
- assertFalse(asd.isObsolete());
+ assertFalse( asd.isObsolete() );
// not obsolete
value = "( " + oid + " " + required + " NAME 'test' DESC 'Descripton' )";
asd = parser.parse( value );
- assertFalse(asd.isObsolete());
+ assertFalse( asd.isObsolete() );
// obsolete
value = "(" + oid + " " + required + " NAME 'test' DESC 'Descripton' OBSOLETE)";
asd = parser.parse( value );
- assertTrue(asd.isObsolete());
+ assertTrue( asd.isObsolete() );
// obsolete
value = "(" + oid + " " + required + " OBSOLETE)";
asd = parser.parse( value );
- assertTrue(asd.isObsolete());
+ assertTrue( asd.isObsolete() );
// lowercased obsolete
value = "(" + oid + " " + required + " obsolete)";
asd = parser.parse( value );
- assertTrue(asd.isObsolete());
+ assertTrue( asd.isObsolete() );
// invalid
value = "(" + oid + " " + required + " NAME 'test' DESC 'Descripton' OBSOLET )";
try
{
asd = parser.parse( value );
- fail("Exception expected, invalid OBSOLETE value");
+ fail( "Exception expected, invalid OBSOLETE value" );
}
catch ( ParseException pe )
{
@@ -579,11 +579,11 @@ public class SchemaParserTestUtils
try
{
asd = parser.parse( value );
- fail("Exception expected, trailing value ('true') now allowed");
+ fail( "Exception expected, trailing value ('true') now allowed" );
}
catch ( ParseException pe )
{
- assertTrue(true);
+ assertTrue( true );
}
}
@@ -602,11 +602,11 @@ public class SchemaParserTestUtils
try
{
parser.parse( testValue );
- fail("Exception expected, element appears twice in " + testValue);
+ fail( "Exception expected, element appears twice in " + testValue );
}
catch ( ParseException pe )
{
- assertTrue(true);
+ assertTrue( true );
}
}
@@ -648,7 +648,7 @@ public class SchemaParserTestUtils
while ( hasLiveThreads );
// check that no one thread failed to parse and generate a SS object
- assertTrue(isSuccessMultithreaded[0]);
+ assertTrue( isSuccessMultithreaded[0] );
}
@@ -662,29 +662,29 @@ public class SchemaParserTestUtils
{
String value = null;
SchemaObject asd = null;
-
+
parser.setQuirksMode( true );
-
+
// alphanum OID
value = "( abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ_0123456789 " + required + " )";
asd = parser.parse( value );
- assertEquals("abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ_0123456789", asd
- .getOid());
+ assertEquals( "abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ_0123456789", asd
+ .getOid() );
// start with hypen
value = "( -oid " + required + " )";
asd = parser.parse( value );
- assertEquals("-oid", asd.getOid());
+ assertEquals( "-oid", asd.getOid() );
// start with number
value = "( 1oid " + required + " )";
asd = parser.parse( value );
- assertEquals("1oid", asd.getOid());
+ assertEquals( "1oid", asd.getOid() );
// start with dot
value = "( .oid " + required + " )";
asd = parser.parse( value );
- assertEquals(".oid", asd.getOid());
+ assertEquals( ".oid", asd.getOid() );
}
finally
{
Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/SyntaxCheckerDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/SyntaxCheckerDescriptionSchemaParserTest.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/SyntaxCheckerDescriptionSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/SyntaxCheckerDescriptionSchemaParserTest.java Tue Jan 24 17:44:03 2012
@@ -35,6 +35,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+
/**
* Tests the SyntaxCheckerDescriptionSchemaParser class.
*
@@ -77,7 +78,7 @@ public class SyntaxCheckerDescriptionSch
@Test
public void testDescription() throws ParseException
{
- SchemaParserTestUtils.testDescription(parser, "1.1", "FQCN org.apache.directory.SimpleSyntaxChecker");
+ SchemaParserTestUtils.testDescription( parser, "1.1", "FQCN org.apache.directory.SimpleSyntaxChecker" );
}
Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/url/LdapUrlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/url/LdapUrlTest.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/url/LdapUrlTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/url/LdapUrlTest.java Tue Jan 24 17:44:03 2012
@@ -95,7 +95,7 @@ public class LdapUrlTest
/**
* test a LdapUrl with a bad port
*/
- @Test( expected=LdapURLEncodingException.class )
+ @Test(expected = LdapURLEncodingException.class)
public void testDnBadPort() throws LdapURLEncodingException
{
new LdapUrl( "ldap://directory.apache.org:/" );
@@ -105,7 +105,7 @@ public class LdapUrlTest
/**
* test a LdapUrl with a bad port 2
*/
- @Test( expected=LdapURLEncodingException.class )
+ @Test(expected = LdapURLEncodingException.class)
public void testDnBadPort2() throws LdapURLEncodingException
{
new LdapUrl( "ldap://directory.apache.org:-1/" );
@@ -115,7 +115,7 @@ public class LdapUrlTest
/**
* test a LdapUrl with a bad port 3
*/
- @Test( expected=LdapURLEncodingException.class )
+ @Test(expected = LdapURLEncodingException.class)
public void testDnBadPort3() throws LdapURLEncodingException
{
new LdapUrl( "ldap://directory.apache.org:abc/" );
@@ -125,7 +125,7 @@ public class LdapUrlTest
/**
* test a LdapUrl with a bad port 4
*/
- @Test( expected=LdapURLEncodingException.class )
+ @Test(expected = LdapURLEncodingException.class)
public void testDnBadPort4() throws LdapURLEncodingException
{
new LdapUrl( "ldap://directory.apache.org:65536/" );
@@ -145,7 +145,7 @@ public class LdapUrlTest
/**
* test a LdapUrl with a bad host 2
*/
- @Test( expected=LdapURLEncodingException.class )
+ @Test(expected = LdapURLEncodingException.class)
public void testDnBadHost2() throws LdapURLEncodingException
{
new LdapUrl( "ldap://./" );
@@ -155,7 +155,7 @@ public class LdapUrlTest
/**
* test a LdapUrl with a bad host 3
*/
- @Test( expected=LdapURLEncodingException.class )
+ @Test(expected = LdapURLEncodingException.class)
public void testDnBadHost3() throws LdapURLEncodingException
{
new LdapUrl( "ldap://a..b/" );
@@ -165,7 +165,7 @@ public class LdapUrlTest
/**
* test a LdapUrl with a bad host 4
*/
- @Test( expected=LdapURLEncodingException.class )
+ @Test(expected = LdapURLEncodingException.class)
public void testDnBadHost4() throws LdapURLEncodingException
{
new LdapUrl( "ldap://-/" );
@@ -175,7 +175,7 @@ public class LdapUrlTest
/**
* test a LdapUrl with a bad host 5
*/
- @Test( expected=LdapURLEncodingException.class )
+ @Test(expected = LdapURLEncodingException.class)
public void testDnBadHost5() throws LdapURLEncodingException
{
new LdapUrl( "ldap://a.b.c-/" );
@@ -185,7 +185,7 @@ public class LdapUrlTest
/**
* test a LdapUrl with a bad host 6
*/
- @Test( expected=LdapURLEncodingException.class )
+ @Test(expected = LdapURLEncodingException.class)
public void testDnBadHost6() throws LdapURLEncodingException
{
new LdapUrl( "ldap://a.b.-c/" );
@@ -195,7 +195,7 @@ public class LdapUrlTest
/**
* test a LdapUrl with a bad host 7
*/
- @Test( expected=LdapURLEncodingException.class )
+ @Test(expected = LdapURLEncodingException.class)
public void testDnBadHost7() throws LdapURLEncodingException
{
new LdapUrl( "ldap://a.-.c/" );
@@ -225,7 +225,7 @@ public class LdapUrlTest
/**
* test a LdapUrl with a bad IP host 1
*/
- @Test( expected=LdapURLEncodingException.class )
+ @Test(expected = LdapURLEncodingException.class)
public void testDnBadHostIP1() throws LdapURLEncodingException
{
new LdapUrl( "ldap://1.1.1/" );
@@ -235,7 +235,7 @@ public class LdapUrlTest
/**
* test a LdapUrl with a bad IP host 2
*/
- @Test( expected=LdapURLEncodingException.class )
+ @Test(expected = LdapURLEncodingException.class)
public void testDnBadHostIP2() throws LdapURLEncodingException
{
new LdapUrl( "ldap://1.1.1./" );
@@ -245,7 +245,7 @@ public class LdapUrlTest
/**
* test a LdapUrl with a bad IP host 3
*/
- @Test( expected=LdapURLEncodingException.class )
+ @Test(expected = LdapURLEncodingException.class)
public void testDnBadHostIP3() throws LdapURLEncodingException
{
new LdapUrl( "ldap://1.1.1.100000/" );
@@ -255,7 +255,7 @@ public class LdapUrlTest
/**
* test a LdapUrl with a bad IP host 4
*/
- @Test( expected=LdapURLEncodingException.class )
+ @Test(expected = LdapURLEncodingException.class)
public void testDnBadHostIP4() throws LdapURLEncodingException
{
new LdapUrl( "ldap://1.1.1.1.1/" );
@@ -308,7 +308,7 @@ public class LdapUrlTest
/**
* test a LdapUrl with an invalid Dn
*/
- @Test( expected=LdapURLEncodingException.class )
+ @Test(expected = LdapURLEncodingException.class)
public void testDnInvalidDN() throws LdapURLEncodingException
{
new LdapUrl( "ldap://directory.apache.org:389/dc=example%202,dc : org" );
@@ -318,7 +318,7 @@ public class LdapUrlTest
/**
* test a LdapUrl with an invalid Dn 2
*/
- @Test( expected=LdapURLEncodingException.class )
+ @Test(expected = LdapURLEncodingException.class)
public void testDnInvalidDN2() throws LdapURLEncodingException
{
new LdapUrl( "ldap://directory.apache.org:389/dc=example%202,dc = org," );
@@ -361,7 +361,7 @@ public class LdapUrlTest
/**
* test a LdapUrl with invalid attributes
*/
- @Test( expected=LdapURLEncodingException.class )
+ @Test(expected = LdapURLEncodingException.class)
public void testLdapInvalideAttributes() throws LdapURLEncodingException
{
new LdapUrl( "ldap://directory.apache.org:389/dc=example,dc=org?ou=,dc" );
@@ -374,7 +374,8 @@ public class LdapUrlTest
@Test
public void testLdapNoDNAttributes() throws LdapURLEncodingException
{
- assertEquals( "ldap://directory.apache.org:389/?ou,dc", new LdapUrl( "ldap://directory.apache.org:389/?ou,dc" ).toString() );
+ assertEquals( "ldap://directory.apache.org:389/?ou,dc",
+ new LdapUrl( "ldap://directory.apache.org:389/?ou,dc" ).toString() );
}
@@ -722,7 +723,7 @@ public class LdapUrlTest
* test a LdapUrl with no host, a port, and a Dn
*
*/
- @Test( expected=LdapURLEncodingException.class )
+ @Test(expected = LdapURLEncodingException.class)
public void testLdapURLNoHostPortDN() throws LdapURLEncodingException
{
new LdapUrl( "ldap://:123/ou=system" );
Modified: directory/shared/trunk/ldap/net/mina/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolCodecFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/net/mina/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolCodecFactory.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/net/mina/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolCodecFactory.java (original)
+++ directory/shared/trunk/ldap/net/mina/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolCodecFactory.java Tue Jan 24 17:44:03 2012
@@ -42,7 +42,7 @@ public class LdapProtocolCodecFactory im
/** The LdapEncoder key */
public static final String LDAP_ENCODER = "LDAP_ENCODER";
-
+
/**
* Get the LDAP decoder.
*
Modified: directory/shared/trunk/ldap/net/mina/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/net/mina/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolDecoder.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/net/mina/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolDecoder.java (original)
+++ directory/shared/trunk/ldap/net/mina/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolDecoder.java Tue Jan 24 17:44:03 2012
@@ -58,7 +58,7 @@ public class LdapProtocolDecoder impleme
/** The ASN 1 decoder instance */
private Asn1Decoder asn1Decoder;
-
+
/**
* Creates a new instance of LdapProtocolEncoder.
*
@@ -77,7 +77,7 @@ public class LdapProtocolDecoder impleme
{
@SuppressWarnings("unchecked")
LdapMessageContainer<MessageDecorator<? extends Message>> messageContainer =
- (LdapMessageContainer<MessageDecorator<? extends Message>> )
+ ( LdapMessageContainer<MessageDecorator<? extends Message>> )
session.getAttribute( "messageContainer" );
if ( session.containsAttribute( "maxPDUSize" ) )
@@ -91,7 +91,7 @@ public class LdapProtocolDecoder impleme
ByteBuffer buf = in.buf();
decode( buf, messageContainer, decodedMessages );
-
+
for ( Message message : decodedMessages )
{
out.write( message );
@@ -110,7 +110,8 @@ public class LdapProtocolDecoder impleme
* @param decodedMessages The list of decoded messages
* @throws Exception If the decoding failed
*/
- private void decode( ByteBuffer buffer, LdapMessageContainer<MessageDecorator<? extends Message>> messageContainer, List<Message> decodedMessages ) throws DecoderException
+ private void decode( ByteBuffer buffer, LdapMessageContainer<MessageDecorator<? extends Message>> messageContainer,
+ List<Message> decodedMessages ) throws DecoderException
{
buffer.mark();
@@ -128,7 +129,7 @@ public class LdapProtocolDecoder impleme
byte[] array = new byte[pduLength];
- System.arraycopy(buffer.array(), position, array, 0, pduLength);
+ System.arraycopy( buffer.array(), position, array, 0, pduLength );
buffer.position( size );
@@ -138,7 +139,7 @@ public class LdapProtocolDecoder impleme
}
else
{
- LOG.debug( Strings.dumpBytes(array) );
+ LOG.debug( Strings.dumpBytes( array ) );
}
buffer.reset();
@@ -182,7 +183,7 @@ public class LdapProtocolDecoder impleme
}
}
-
+
/**
* {@inheritDoc}
*/
Modified: directory/shared/trunk/ldap/net/mina/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolEncoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/net/mina/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolEncoder.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/net/mina/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolEncoder.java (original)
+++ directory/shared/trunk/ldap/net/mina/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolEncoder.java Tue Jan 24 17:44:03 2012
@@ -40,8 +40,8 @@ public class LdapProtocolEncoder impleme
{
/** The stateful encoder */
private LdapEncoder encoder;
-
-
+
+
/**
* Creates a new instance of LdapProtocolEncoder.
*
Modified: directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/shared/converter/schema/AttributeTypeHolder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/shared/converter/schema/AttributeTypeHolder.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/shared/converter/schema/AttributeTypeHolder.java (original)
+++ directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/shared/converter/schema/AttributeTypeHolder.java Tue Jan 24 17:44:03 2012
@@ -402,11 +402,11 @@ public class AttributeTypeHolder extends
StringBuilder sb = new StringBuilder();
String dn = "m-oid=" + oid + ", " + SchemaConstants.ATTRIBUTE_TYPES_PATH + ", cn="
- + Rdn.escapeValue(schemaName) + ", ou=schema";
+ + Rdn.escapeValue( schemaName ) + ", ou=schema";
// First dump the Dn only
Entry entry = new DefaultEntry( dn );
- sb.append( LdifUtils.convertToLdif(entry) );
+ sb.append( LdifUtils.convertToLdif( entry ) );
return sb.toString();
}
Modified: directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/shared/converter/schema/ObjectClassHolder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/shared/converter/schema/ObjectClassHolder.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/shared/converter/schema/ObjectClassHolder.java (original)
+++ directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/shared/converter/schema/ObjectClassHolder.java Tue Jan 24 17:44:03 2012
@@ -217,11 +217,11 @@ public class ObjectClassHolder extends S
StringBuilder sb = new StringBuilder();
String dn = "m-oid=" + oid + ", " + SchemaConstants.OBJECT_CLASSES_PATH + ", cn="
- + Rdn.escapeValue(schemaName) + ", ou=schema";
+ + Rdn.escapeValue( schemaName ) + ", ou=schema";
// First dump the Dn only
Entry entry = new DefaultEntry( dn );
- sb.append( LdifUtils.convertToLdif(entry) );
+ sb.append( LdifUtils.convertToLdif( entry ) );
return sb.toString();
}
Modified: directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/shared/converter/schema/SchemaElement.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/shared/converter/schema/SchemaElement.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/shared/converter/schema/SchemaElement.java (original)
+++ directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/shared/converter/schema/SchemaElement.java Tue Jan 24 17:44:03 2012
@@ -47,7 +47,7 @@ public interface SchemaElement
*
* @param isObsolete The value to be set
*/
- void setObsolete(boolean isObsolete);
+ void setObsolete( boolean isObsolete );
/**
@@ -66,7 +66,7 @@ public interface SchemaElement
* Set the schema element's description
* @param description The schema element's description
*/
- void setDescription(String description);
+ void setDescription( String description );
/**
@@ -79,7 +79,7 @@ public interface SchemaElement
* Set a list of names for a schemaElement
* @param names The list of names of this schemaElement
*/
- void setNames(List<String> names);
+ void setNames( List<String> names );
/**
@@ -92,14 +92,14 @@ public interface SchemaElement
* @param key the Extension key
* @return The list of a values for a given extension
*/
- List<String> getExtension(String key);
+ List<String> getExtension( String key );
/**
* Set a list of extensions for a schemaElement
* @param extensions The list of extensions of this schemaElement
*/
- void setExtensions(Map<String, List<String>> extensions);
+ void setExtensions( Map<String, List<String>> extensions );
/**
@@ -109,5 +109,5 @@ public interface SchemaElement
* @return A string representing the schemaElement as a Ldif formated String
* @throws org.apache.directory.shared.ldap.model.exception.LdapException If any error occurs.
*/
- String toLdif(String schemaName) throws LdapException;
+ String toLdif( String schemaName ) throws LdapException;
}
Modified: directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/shared/converter/schema/SchemaElementImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/shared/converter/schema/SchemaElementImpl.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/shared/converter/schema/SchemaElementImpl.java (original)
+++ directory/shared/trunk/ldap/schema/converter/src/main/java/org/apache/directory/shared/converter/schema/SchemaElementImpl.java Tue Jan 24 17:44:03 2012
@@ -125,7 +125,7 @@ public abstract class SchemaElementImpl
/**
* {@inheritDoc}
*/
- public List<String> getExtension( String key)
+ public List<String> getExtension( String key )
{
return extensions.get( key );
}
@@ -180,7 +180,7 @@ public abstract class SchemaElementImpl
entry.put( attribute );
- return LdifUtils.convertAttributesToLdif(entry);
+ return LdifUtils.convertAttributesToLdif( entry );
}
}
@@ -191,7 +191,7 @@ public abstract class SchemaElementImpl
*/
private String descToLdif() throws LdapException
{
- if ( Strings.isEmpty(description) )
+ if ( Strings.isEmpty( description ) )
{
return "";
}