You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2011/02/25 18:23:52 UTC
svn commit: r1074638 [3/5] - in /directory/shared/branches/akarasulu: ./
all/ asn1-api/src/main/java/org/apache/directory/shared/asn1/util/
asn1-ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/
dsml-parser/ dsml-parser/src/main/java/org/apac...
Modified: directory/shared/branches/akarasulu/integ/src/test/java/org/apache/directory/shared/ldap/name/DnTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/integ/src/test/java/org/apache/directory/shared/ldap/name/DnTest.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/integ/src/test/java/org/apache/directory/shared/ldap/name/DnTest.java (original)
+++ directory/shared/branches/akarasulu/integ/src/test/java/org/apache/directory/shared/ldap/name/DnTest.java Fri Feb 25 17:23:45 2011
@@ -2641,14 +2641,14 @@ public class DnTest
// antlr parser: string value with trailing spaces
Dn dn1 = new Dn( " cn = Amos\\,Tori , ou=system " );
assertEquals( " cn = Amos\\,Tori ", dn1.getRdn().getName() );
- Ava atav1 = dn1.getRdn().getAVA();
+ Ava atav1 = dn1.getRdn().getAva();
assertEquals( "cn", atav1.getUpType() );
assertEquals( "Amos,Tori", atav1.getUpValue().getString() );
// antlr parser: hexstring with trailing spaces
Dn dn3 = new Dn( " cn = #414243 , ou=system " );
assertEquals( " cn = #414243 ", dn3.getRdn().getName() );
- Ava atav3 = dn3.getRdn().getAVA();
+ Ava atav3 = dn3.getRdn().getAva();
assertEquals( "cn", atav3.getUpType() );
assertEquals( "ABC", atav3.getUpValue().getString() );
assertTrue( Arrays.equals( Strings.getBytesUtf8("ABC"), atav3.getNormValue().getBytes() ) );
@@ -2656,7 +2656,7 @@ public class DnTest
// antlr parser:
Dn dn4 = new Dn( " cn = \\41\\42\\43 , ou=system " );
assertEquals( " cn = \\41\\42\\43 ", dn4.getRdn().getName() );
- Ava atav4 = dn4.getRdn().getAVA();
+ Ava atav4 = dn4.getRdn().getAva();
assertEquals( "cn", atav4.getUpType() );
assertEquals( "ABC", atav4.getUpValue().getString() );
assertEquals( "ABC", atav4.getNormValue().getString() );
@@ -2664,7 +2664,7 @@ public class DnTest
// antlr parser: quotestring with trailing spaces
Dn dn5 = new Dn( " cn = \"ABC\" , ou=system " );
assertEquals( " cn = \"ABC\" ", dn5.getRdn().getName() );
- Ava atav5 = dn5.getRdn().getAVA();
+ Ava atav5 = dn5.getRdn().getAva();
assertEquals( "cn", atav5.getUpType() );
assertEquals( "ABC", atav5.getUpValue().getString() );
assertEquals( "ABC", atav5.getNormValue().getString() );
@@ -2672,7 +2672,7 @@ public class DnTest
// fast parser: string value with trailing spaces
Dn dn2 = new Dn( " cn = Amos Tori , ou=system " );
assertEquals( " cn = Amos Tori ", dn2.getRdn().getName() );
- Ava atav2 = dn2.getRdn().getAVA();
+ Ava atav2 = dn2.getRdn().getAva();
assertEquals( "cn", atav2.getUpType() );
assertEquals( "Amos Tori", atav2.getUpValue().getString() );
}
@@ -2770,7 +2770,7 @@ public class DnTest
assertEquals( "Example", rdn.getUpValue().getString() );
assertEquals( " ou = Example ", rdn.getName() );
- Ava atav = rdn.getAVA();
+ Ava atav = rdn.getAva();
assertEquals( "2.5.4.11=example", atav.getNormName() );
assertEquals( "2.5.4.11", atav.getNormType() );
@@ -2801,7 +2801,7 @@ public class DnTest
assertEquals( " ou = Example + ou = TEST ", rdn.getName() );
// The first ATAV
- Ava atav = rdn.getAVA();
+ Ava atav = rdn.getAva();
assertEquals( "2.5.4.11=example", atav.getNormName() );
assertEquals( "2.5.4.11", atav.getNormType() );
@@ -2851,7 +2851,7 @@ public class DnTest
assertEquals( "Ex+mple", rdn.getUpValue().getString() );
assertEquals( " ou = Ex\\+mple ", rdn.getName() );
- Ava atav = rdn.getAVA();
+ Ava atav = rdn.getAva();
assertEquals( "2.5.4.11=ex\\+mple", atav.getNormName() );
assertEquals( "2.5.4.11", atav.getNormType() );
@@ -2886,7 +2886,7 @@ public class DnTest
assertEquals( "Ex+mple", rdn.getNormValue().getString() );
// The first ATAV
- Ava atav = rdn.getAVA();
+ Ava atav = rdn.getAva();
assertEquals( " OU = Ex\\+mple ", atav.getUpName() );
assertEquals( "ou=Ex\\+mple", atav.getNormName() );
@@ -2937,7 +2937,7 @@ public class DnTest
assertEquals( "ex+mple", rdn.getNormValue().getString() );
// The first ATAV
- atav = rdn.getAVA();
+ atav = rdn.getAva();
assertEquals( " OU = Ex\\+mple ", atav.getUpName() );
assertEquals( "2.5.4.11=ex\\+mple", atav.getNormName() );
Modified: directory/shared/branches/akarasulu/integ/src/test/java/org/apache/directory/shared/ldap/name/MultiThreadedTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/integ/src/test/java/org/apache/directory/shared/ldap/name/MultiThreadedTest.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/integ/src/test/java/org/apache/directory/shared/ldap/name/MultiThreadedTest.java (original)
+++ directory/shared/branches/akarasulu/integ/src/test/java/org/apache/directory/shared/ldap/name/MultiThreadedTest.java Fri Feb 25 17:23:45 2011
@@ -76,7 +76,6 @@ public class MultiThreadedTest
referenceAva = new Ava( schemaManager, "ou", "System" );
sharedAva = new Ava( schemaManager, "ou", "System" );
- sharedAva.normalize();
}
@@ -96,7 +95,6 @@ public class MultiThreadedTest
@Test
public void testNormalizeHashCode() throws Exception
{
- sharedAva.normalize();
assertEquals( referenceAva.hashCode(), sharedAva.hashCode() );
sharedRdn.normalize( schemaManager );
@@ -110,7 +108,6 @@ public class MultiThreadedTest
@Test
public void testNormalizeEquals() throws Exception
{
- sharedAva.normalize();
assertEquals( referenceAva, sharedAva );
assertTrue( referenceAva.equals( sharedAva ) );
assertTrue( sharedAva.equals( referenceAva ) );
Propchange: directory/shared/branches/akarasulu/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/Krb5LoginConfiguration.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:23:45 2011
@@ -2,4 +2,4 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/jaas/Krb5LoginConfiguration.java:980138-980936
/directory/shared/branches/milestones/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/Krb5LoginConfiguration.java:1072811-1074633
/directory/shared/branches/shared-config/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/Krb5LoginConfiguration.java:1023444-1029061
-/directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/Krb5LoginConfiguration.java:1066124-1067995,1068025-1072732,1072797-1073546
+/directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/Krb5LoginConfiguration.java:1066124-1067995,1068025-1072732,1072797-1074636
Propchange: directory/shared/branches/akarasulu/ldap-codec/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:23:45 2011
@@ -4,4 +4,4 @@
/directory/shared/branches/shared-dnfactory-experiment/ldap:980352-980933
/directory/shared/branches-dnfactory-experiment/ldap:980350-980351
/directory/shared/trunk/ldap:1066124-1067784
-/directory/shared/trunk/ldap-codec:1067785-1067995,1068025-1072732,1072797-1073546
+/directory/shared/trunk/ldap-codec:1067785-1067995,1068025-1072732,1072797-1074636
Propchange: directory/shared/branches/akarasulu/ldap-codec-standalone/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:23:45 2011
@@ -5,4 +5,4 @@
/directory/shared/branches-dnfactory-experiment/ldap:980350-980351
/directory/shared/trunk/ldap:1066124-1067784
/directory/shared/trunk/ldap-codec:1067785-1067995,1068025-1068227
-/directory/shared/trunk/ldap-codec-standalone:1068228-1072732,1072797-1073546
+/directory/shared/trunk/ldap-codec-standalone:1068228-1072732,1072797-1074636
Modified: directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/api/ResponseCarryingException.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/api/ResponseCarryingException.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/api/ResponseCarryingException.java (original)
+++ directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/api/ResponseCarryingException.java Fri Feb 25 17:23:45 2011
@@ -44,7 +44,7 @@ public class ResponseCarryingException e
private static final long serialVersionUID = 1L;
/** The response with the error cause */
- private transient Message response;
+ private Message response;
/**
* Creates a DecoderException
Propchange: directory/shared/branches/akarasulu/ldap-extras/aci/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:23:45 2011
@@ -4,4 +4,4 @@
/directory/shared/branches/shared-dnfactory-experiment/ldap:980352-980933
/directory/shared/branches-dnfactory-experiment/ldap:980350-980351
/directory/shared/trunk/ldap:1066124-1067995,1068025-1068227
-/directory/shared/trunk/ldap-extras/aci:1068228-1072732,1072797-1073546
+/directory/shared/trunk/ldap-extras/aci:1068228-1072732,1072797-1074636
Modified: directory/shared/branches/akarasulu/ldap-extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemSyntaxChecker.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemSyntaxChecker.java (original)
+++ directory/shared/branches/akarasulu/ldap-extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemSyntaxChecker.java Fri Feb 25 17:23:45 2011
@@ -35,14 +35,12 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
+@SuppressWarnings("serial")
public class ACIItemSyntaxChecker extends SyntaxChecker
{
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( ACIItemSyntaxChecker.class );
- /** The serialVersionUID */
- private static final long serialVersionUID = 1L;
-
/** An instance of ACI Item Checker */
private ACIItemChecker aciItemChecker;
Modified: directory/shared/branches/akarasulu/ldap-extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ItemPermission.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ItemPermission.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ItemPermission.java (original)
+++ directory/shared/branches/akarasulu/ldap-extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ItemPermission.java Fri Feb 25 17:23:45 2011
@@ -33,10 +33,6 @@ import java.util.Collections;
*/
public class ItemPermission extends Permission
{
-
- /** The serialVersionUID. */
- private static final long serialVersionUID = 5530483336917026261L;
-
/** The user classes. */
private final Collection<UserClass> userClasses;
Modified: directory/shared/branches/akarasulu/ldap-extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/Permission.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/Permission.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/Permission.java (original)
+++ directory/shared/branches/akarasulu/ldap-extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/Permission.java Fri Feb 25 17:23:45 2011
@@ -20,7 +20,6 @@
package org.apache.directory.shared.ldap.aci;
-import java.io.Serializable;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
@@ -32,11 +31,8 @@ import java.util.Set;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public abstract class Permission implements Serializable
+public abstract class Permission
{
- /** The serialVersionUID. */
- private static final long serialVersionUID = 8923801399021825709L;
-
/** The precedence. */
private final Integer precedence;
Modified: directory/shared/branches/akarasulu/ldap-extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/UserClass.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/UserClass.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/UserClass.java (original)
+++ directory/shared/branches/akarasulu/ldap-extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/UserClass.java Fri Feb 25 17:23:45 2011
@@ -20,7 +20,6 @@
package org.apache.directory.shared.ldap.aci;
-import java.io.Serializable;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -34,11 +33,8 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public abstract class UserClass implements Serializable
+public abstract class UserClass
{
- /** The serialVersionUID. */
- private static final long serialVersionUID = -123919984184219893L;
-
/**
* Every directory user (with possible requirements for
* authenticationLevel).
@@ -71,10 +67,6 @@ public abstract class UserClass implemen
*/
public static final class AllUsers extends UserClass
{
- /** The serialVersionUID. */
- private static final long serialVersionUID = 8967984720792510292L;
-
-
private AllUsers()
{
}
@@ -97,10 +89,6 @@ public abstract class UserClass implemen
*/
public static final class ThisEntry extends UserClass
{
- /** The serialVersionUID. */
- private static final long serialVersionUID = -8189325270233754470L;
-
-
private ThisEntry()
{
}
@@ -121,10 +109,6 @@ public abstract class UserClass implemen
*/
public static final class ParentOfEntry extends UserClass
{
- /** The serialVersionUID. */
- private static final long serialVersionUID = 5247207736068086476L;
-
-
private ParentOfEntry()
{
}
@@ -146,9 +130,6 @@ public abstract class UserClass implemen
*/
private abstract static class NamedUserClass extends UserClass
{
- /** The serialVersionUID. */
- private static final long serialVersionUID = 8571875984468893621L;
-
/** The names. */
protected final Set<Dn> names;
@@ -257,10 +238,6 @@ public abstract class UserClass implemen
*/
public static class Name extends NamedUserClass
{
- /** The serialVersionUID. */
- private static final long serialVersionUID = -4168412030168359882L;
-
-
/**
* Creates a new instance.
*
@@ -291,10 +268,6 @@ public abstract class UserClass implemen
*/
public static class UserGroup extends NamedUserClass
{
- /** The serialVersionUID. */
- private static final long serialVersionUID = 8887107815072965807L;
-
-
/**
* Creates a new instance.
*
@@ -323,9 +296,6 @@ public abstract class UserClass implemen
*/
public static class Subtree extends UserClass
{
- /** The serialVersionUID. */
- private static final long serialVersionUID = 3949337699049701332L;
-
/** The subtree specifications. */
protected final Set<SubtreeSpecification> subtreeSpecifications;
Modified: directory/shared/branches/akarasulu/ldap-extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/UserPermission.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/UserPermission.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/UserPermission.java (original)
+++ directory/shared/branches/akarasulu/ldap-extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/UserPermission.java Fri Feb 25 17:23:45 2011
@@ -32,9 +32,6 @@ import java.util.Collections;
*/
public class UserPermission extends Permission
{
- /** The serialVersionUID. */
- private static final long serialVersionUID = 3940100745409337694L;
-
/** The protected items. */
private final Collection<ProtectedItem> protectedItems;
Propchange: directory/shared/branches/akarasulu/ldap-extras/codec/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:23:45 2011
@@ -5,4 +5,4 @@
/directory/shared/branches-dnfactory-experiment/ldap:980350-980351
/directory/shared/trunk/ldap:1066124-1067784
/directory/shared/trunk/ldap-codec:1067785-1067995
-/directory/shared/trunk/ldap-extras/codec:1068025-1072732,1072797-1073546
+/directory/shared/trunk/ldap-extras/codec:1068025-1072732,1072797-1074636
Propchange: directory/shared/branches/akarasulu/ldap-extras/codec-api/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:23:45 2011
@@ -7,3 +7,4 @@
/directory/shared/trunk/ldap:1066124-1067784
/directory/shared/trunk/ldap-codec:1067785-1067995
/directory/shared/trunk/ldap-extras/codec:1068025-1072732,1072797-1073546
+/directory/shared/trunk/ldap-extras/codec-api:1073547-1074636
Modified: directory/shared/branches/akarasulu/ldap-extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyDecorator.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyDecorator.java (original)
+++ directory/shared/branches/akarasulu/ldap-extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyDecorator.java Fri Feb 25 17:23:45 2011
@@ -33,8 +33,8 @@ import org.apache.directory.shared.i18n.
import org.apache.directory.shared.ldap.codec.api.ControlDecorator;
import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
import org.apache.directory.shared.ldap.extras.controls.PasswordPolicy;
-import org.apache.directory.shared.ldap.extras.controls.PasswordPolicyResponse;
import org.apache.directory.shared.ldap.extras.controls.PasswordPolicyImpl;
+import org.apache.directory.shared.ldap.extras.controls.PasswordPolicyResponse;
/**
@@ -48,11 +48,11 @@ public class PasswordPolicyDecorator ext
private static final Asn1Decoder decoder = new Asn1Decoder();
// Storage for computed lengths
- private transient int valueLength = 0;
- private transient int ppolicySeqLength = 0;
- private transient int warningLength = 0;
- private transient int timeBeforeExpirationTagLength;
- private transient int graceAuthNsRemainingTagLength;
+ private int valueLength = 0;
+ private int ppolicySeqLength = 0;
+ private int warningLength = 0;
+ private int timeBeforeExpirationTagLength;
+ private int graceAuthNsRemainingTagLength;
public PasswordPolicyDecorator( LdapCodecService codec )
Propchange: directory/shared/branches/akarasulu/ldap-extras/sp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:23:45 2011
@@ -4,4 +4,4 @@
/directory/shared/branches/shared-dnfactory-experiment/ldap:980352-980933
/directory/shared/branches-dnfactory-experiment/ldap:980350-980351
/directory/shared/trunk/ldap:1066124-1067995,1068025-1068227
-/directory/shared/trunk/ldap-extras/sp:1068228-1072732,1072797-1073546
+/directory/shared/trunk/ldap-extras/sp:1068228-1072732,1072797-1074636
Propchange: directory/shared/branches/akarasulu/ldap-extras/trigger/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:23:45 2011
@@ -4,4 +4,4 @@
/directory/shared/branches/shared-dnfactory-experiment/ldap:980352-980933
/directory/shared/branches-dnfactory-experiment/ldap:980350-980351
/directory/shared/trunk/ldap:1066124-1067995,1068025-1068227
-/directory/shared/trunk/ldap-extras/trigger:1068228-1072732,1072797-1073546
+/directory/shared/trunk/ldap-extras/trigger:1068228-1072732,1072797-1074636
Propchange: directory/shared/branches/akarasulu/ldap-extras/util/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:23:45 2011
@@ -4,4 +4,4 @@
/directory/shared/branches/shared-dnfactory-experiment/ldap:980352-980933
/directory/shared/branches-dnfactory-experiment/ldap:980350-980351
/directory/shared/trunk/ldap:1066124-1067995,1068025-1068227
-/directory/shared/trunk/ldap-extras/util:1068228-1072732,1072797-1073546
+/directory/shared/trunk/ldap-extras/util:1068228-1072732,1072797-1074636
Propchange: directory/shared/branches/akarasulu/ldap-model/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:23:45 2011
@@ -4,4 +4,4 @@
/directory/shared/branches/shared-dnfactory-experiment/ldap:980352-980933
/directory/shared/branches-dnfactory-experiment/ldap:980350-980351
/directory/shared/trunk/ldap:1066124-1067491
-/directory/shared/trunk/ldap-model:1067492-1067995,1068025-1072732,1072797-1073546
+/directory/shared/trunk/ldap-model:1067492-1067995,1068025-1072732,1072797-1074636
Propchange: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:23:45 2011
@@ -8,4 +8,4 @@
/directory/shared/branches-dnfactory-experiment/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:980350-980351
/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1066124-1067491
/directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:519076-580502
-/directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1067492-1067995,1068025-1072732,1072797-1073546
+/directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1067492-1067995,1068025-1072732,1072797-1074636
Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/csn/Csn.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/csn/Csn.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/csn/Csn.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/csn/Csn.java Fri Feb 25 17:23:45 2011
@@ -20,7 +20,6 @@
package org.apache.directory.shared.ldap.model.csn;
-import java.io.Serializable;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -55,17 +54,8 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class Csn implements Serializable, Comparable<Csn>
+public class Csn implements Comparable<Csn>
{
- /**
- * Declares the Serial Version Uid.
- *
- * @see <a
- * href="http://c2.com/cgi/wiki?AlwaysDeclareSerialVersionUid">Always
- * Declare Serial Version Uid</a>
- */
- private static final long serialVersionUID = 1L;
-
/** The logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( Csn.class );
@@ -82,10 +72,10 @@ public class Csn implements Serializable
private final int changeCount;
/** Stores the String representation of the CSN */
- private transient String csnStr;
+ private String csnStr;
/** Stores the byte array representation of the CSN */
- private transient byte[] bytes;
+ private byte[] bytes;
/** The Timestamp syntax. The last 'z' is _not_ the Time Zone */
private static final SimpleDateFormat SDF = new SimpleDateFormat( "yyyyMMddHHmmss" );
Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/entry/AbstractValue.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/entry/AbstractValue.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/entry/AbstractValue.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/entry/AbstractValue.java Fri Feb 25 17:23:45 2011
@@ -19,9 +19,8 @@
*/
package org.apache.directory.shared.ldap.model.entry;
-import org.apache.directory.shared.ldap.model.exception.LdapException;
-
import org.apache.directory.shared.i18n.I18n;
+import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.LdapComparator;
import org.apache.directory.shared.ldap.model.schema.MatchingRule;
@@ -42,7 +41,7 @@ public abstract class AbstractValue<T> i
private static final Logger LOG = LoggerFactory.getLogger( AbstractValue.class );
/** reference to the attributeType zssociated with the value */
- protected transient AttributeType attributeType;
+ protected AttributeType attributeType;
/** the wrapped binary value */
protected T wrappedValue;
@@ -57,7 +56,7 @@ public abstract class AbstractValue<T> i
protected Boolean valid;
/** A flag set if the normalized data is different from the wrapped data */
- protected transient boolean same;
+ protected boolean same;
/** The computed hashcode. We don't want to compute it each time the hashcode() method is called */
protected volatile int h;
Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntry.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntry.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntry.java Fri Feb 25 17:23:45 2011
@@ -70,7 +70,7 @@ public class DefaultEntry implements Ent
private Map<String, EntryAttribute> attributes = new HashMap<String, EntryAttribute>();
/** A speedup to get the ObjectClass attribute */
- private static transient AttributeType objectClassAttributeType;
+ private static AttributeType objectClassAttributeType;
/** The SchemaManager */
private SchemaManager schemaManager;
@@ -79,7 +79,7 @@ public class DefaultEntry implements Ent
private volatile int h;
/** A mutex to manage synchronization*/
- private static final transient Object MUTEX = new Object();
+ private static final Object MUTEX = new Object();
//-------------------------------------------------------------------------
Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryUtils.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryUtils.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryUtils.java Fri Feb 25 17:23:45 2011
@@ -62,8 +62,6 @@ public class EntryUtils
*/
static class MR extends MatchingRule
{
- private static final long serialVersionUID = 0L;
-
protected MR( String oid )
{
super( oid );
@@ -85,8 +83,6 @@ public class EntryUtils
}
static class S extends LdapSyntax
{
- private static final long serialVersionUID = 0L;
-
public S( String oid, boolean humanReadible )
{
super( oid, "", humanReadible );
@@ -100,8 +96,6 @@ public class EntryUtils
syntax.setSyntaxChecker( new SyntaxChecker( "1.1.2.1" )
{
- private static final long serialVersionUID = 0L;
-
public boolean isValidSyntax( Object value )
{
if ( !( value instanceof String ) )
@@ -128,8 +122,6 @@ public class EntryUtils
matchingRule.setLdapComparator( new LdapComparator<String>( matchingRule.getOid() )
{
- private static final long serialVersionUID = 0L;
-
public int compare( String o1, String o2 )
{
return ( o1 == null ?
@@ -140,8 +132,6 @@ public class EntryUtils
Normalizer normalizer = new Normalizer( "1.1.1" )
{
- private static final long serialVersionUID = 0L;
-
public Value<?> normalize( Value<?> value ) throws LdapException
{
if ( !value.isBinary() )
@@ -176,8 +166,6 @@ public class EntryUtils
syntax.setSyntaxChecker( new SyntaxChecker( "1.1.2" )
{
- private static final long serialVersionUID = 0L;
-
public boolean isValidSyntax( Object value )
{
return ((String)value == null) || (((String)value).length() < 7) ;
@@ -190,8 +178,6 @@ public class EntryUtils
matchingRule.setLdapComparator( new LdapComparator<String>( matchingRule.getOid() )
{
- private static final long serialVersionUID = 0L;
-
public int compare( String o1, String o2 )
{
return ( ( o1 == null ) ?
@@ -216,8 +202,6 @@ public class EntryUtils
syntax.setSyntaxChecker( new SyntaxChecker( "1.2.1" )
{
- private static final long serialVersionUID = 0L;
-
public boolean isValidSyntax( Object value )
{
return ( value == null ) || ( ((byte[])value).length < 5 );
@@ -231,9 +215,6 @@ public class EntryUtils
matchingRule.setNormalizer( new Normalizer( "1.1.1" )
{
- // The serial UID
- private static final long serialVersionUID = 1L;
-
public Value<?> normalize( Value<?> value ) throws LdapException
{
if ( value.isBinary() )
Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifControl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifControl.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifControl.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifControl.java Fri Feb 25 17:23:45 2011
@@ -32,11 +32,6 @@ import org.apache.directory.shared.util.
*/
public class LdifControl implements Control
{
- /** The serial version UID */
- private static final long serialVersionUID = 1L;
-
- // ~ Instance fields
- // ----------------------------------------------------------------------------
/** The control type */
private String oid;
Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertor.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertor.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertor.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertor.java Fri Feb 25 17:23:45 2011
@@ -500,7 +500,7 @@ public final class LdifRevertor
// Is the new Rdn AVAs contained into the entry?
for ( Ava atav : newRdn )
{
- if ( atav.equals( oldRdn.getAVA() ) )
+ if ( atav.equals( oldRdn.getAva() ) )
{
// They overlap
overlapping = true;
Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/Ava.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/Ava.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/Ava.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/Ava.java Fri Feb 25 17:23:45 2011
@@ -74,7 +74,7 @@ public final class Ava implements Extern
private String normType;
/** The attributeType if the Ava is schemaAware */
- private transient AttributeType attributeType;
+ private AttributeType attributeType;
/** The user provided Name type */
private String upType;
@@ -89,7 +89,7 @@ public final class Ava implements Extern
private String upName;
/** the schema manager */
- private transient SchemaManager schemaManager;
+ private SchemaManager schemaManager;
/**
* Constructs an empty Ava
@@ -605,6 +605,7 @@ public final class Ava implements Extern
return sb.toString();
}
+
/**
* A Normalized String representation of a Ava :
@@ -656,6 +657,7 @@ public final class Ava implements Extern
return result;
}
+
/**
* @see Object#equals(Object)
Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/Dn.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/Dn.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/Dn.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/Dn.java Fri Feb 25 17:23:45 2011
@@ -110,7 +110,7 @@ public final class Dn implements Iterabl
public static final Dn ROOT_DSE = new Dn();
/** the schema manager */
- private transient SchemaManager schemaManager;
+ private SchemaManager schemaManager;
/**
* An iterator over RDNs
@@ -316,7 +316,7 @@ public final class Dn implements Iterabl
if ( schemaManager != null )
{
this.schemaManager = schemaManager;
- normalize( schemaManager.getNormalizerMapping() );
+ normalize( schemaManager );
}
else
{
@@ -390,7 +390,7 @@ public final class Dn implements Iterabl
if ( schemaManager != null )
{
- normalize( schemaManager.getNormalizerMapping() );
+ normalize( schemaManager );
}
else
{
@@ -427,7 +427,7 @@ public final class Dn implements Iterabl
if ( schemaManager != null )
{
- normalize( schemaManager.getNormalizerMapping() );
+ normalize( schemaManager );
}
else
{
@@ -466,7 +466,7 @@ public final class Dn implements Iterabl
if ( this.schemaManager != null )
{
- normalize( schemaManager.getNormalizerMapping() );
+ normalize( schemaManager );
}
normalizeInternal();
@@ -1310,7 +1310,7 @@ public final class Dn implements Iterabl
{
if ( schemaManager != null )
{
- clonedDn.normalize( schemaManager.getNormalizerMapping() );
+ clonedDn.normalize( schemaManager );
normalizeInternal();
}
@@ -1340,13 +1340,13 @@ public final class Dn implements Iterabl
Dn clonedDn = copy();
// We have to parse the nameComponent which is given as an argument
- Rdn newRdn = new Rdn( comp, schemaManager );
+ Rdn newRdn = new Rdn( schemaManager, comp );
clonedDn.rdns.add( 0, newRdn );
if ( schemaManager != null )
{
- clonedDn.normalize( schemaManager.getNormalizerMapping() );
+ clonedDn.normalize( schemaManager );
}
else
{
@@ -1386,7 +1386,7 @@ public final class Dn implements Iterabl
{
if ( schemaManager != null )
{
- clonedDn.normalize( schemaManager.getNormalizerMapping() );
+ clonedDn.normalize( schemaManager );
}
else
{
@@ -1588,23 +1588,13 @@ public final class Dn implements Iterabl
/** No qualifier */
static void rdnOidToName( Rdn rdn, Map<String, OidNormalizer> oidsMap ) throws LdapInvalidDnException
{
- if ( rdn.getNbAtavs() > 1 )
- {
- // We have more than one ATAV for this Rdn. We will loop on all
- // ATAVs
- Rdn rdnCopy = rdn.clone();
- rdn.clear();
+ // We have more than one ATAV for this Rdn. We will loop on all
+ // ATAVs
+ Rdn rdnCopy = rdn.clone();
+ rdn.clear();
- for ( Ava val : rdnCopy )
- {
- Ava newAtav = atavOidToName( val, oidsMap );
- rdn.addAVA( newAtav );
- }
- }
- else
+ for ( Ava val : rdnCopy )
{
- Ava val = rdn.getAVA();
- rdn.clear();
Ava newAtav = atavOidToName( val, oidsMap );
rdn.addAVA( newAtav );
}
@@ -1612,95 +1602,6 @@ public final class Dn implements Iterabl
/**
- * Change the internal Dn, using the OID instead of the first name or other
- * aliases. As we still have the UP name of each Rdn, we will be able to
- * provide both representation of the Dn. example : dn: 2.5.4.3=People,
- * dc=example, domainComponent=com will be transformed to : 2.5.4.3=People,
- * 0.9.2342.19200300.100.1.25=example, 0.9.2342.19200300.100.1.25=com
- * because 2.5.4.3 is the OID for cn and dc is the first
- * alias of the couple of aliases (dc, domaincomponent), which OID is
- * 0.9.2342.19200300.100.1.25.
- * This is really important do have such a representation, as 'cn' and
- * 'commonname' share the same OID.
- *
- * @param dn The Dn to transform.
- * @param oidsMap The mapping between names and oids.
- * @return A normalized form of the Dn.
- * @throws LdapInvalidDnException If something went wrong.
- */
- public static Dn normalize( Dn dn, Map<String, OidNormalizer> oidsMap ) throws LdapInvalidDnException
- {
- if ( ( dn == null ) || ( dn.size() == 0 ) || ( oidsMap == null ) || ( oidsMap.size() == 0 ) )
- {
- return dn;
- }
-
- for ( Rdn rdn : dn.rdns )
- {
- String upName = rdn.getName();
- rdnOidToName( rdn, oidsMap );
- rdn.normalize();
- rdn.setUpName( upName );
- }
-
- dn.normalizeInternal();
-
- dn.normalized.set( true );
- return dn;
- }
-
-
- /**
- * Change the internal Dn, using the OID instead of the first name or other
- * aliases. As we still have the UP name of each Rdn, we will be able to
- * provide both representation of the Dn. example : dn: 2.5.4.3=People,
- * dc=example, domainComponent=com will be transformed to : 2.5.4.3=People,
- * 0.9.2342.19200300.100.1.25=example, 0.9.2342.19200300.100.1.25=com
- * because 2.5.4.3 is the OID for cn and dc is the first
- * alias of the couple of aliases (dc, domaincomponent), which OID is
- * 0.9.2342.19200300.100.1.25.
- * This is really important do have such a representation, as 'cn' and
- * 'commonname' share the same OID.
- *
- * @param oidsMap The mapping between names and oids.
- * @throws LdapInvalidDnException If something went wrong.
- * @return The normalized Dn
- */
- private Dn normalize( Map<String, OidNormalizer> oidsMap ) throws LdapInvalidDnException
- {
- if ( ( oidsMap == null ) || ( oidsMap.isEmpty() ) )
- {
- return this;
- }
-
- if ( normalized.get() )
- {
- return this;
- }
-
- synchronized ( this )
- {
- if ( size() == 0 )
- {
- normalized.set( true );
- return this;
- }
-
- for ( Rdn rdn : rdns )
- {
- rdn.normalize( oidsMap );
- }
-
- normalizeInternal();
-
- normalized.set( true );
-
- return this;
- }
- }
-
-
- /**
* normalizes the Dn @see {@link #normalize(Map)} however
* if the schema manager of the Dn is null then sets the given schema manager
* as the Dn's schema manager.
@@ -1718,7 +1619,30 @@ public final class Dn implements Iterabl
if ( this.schemaManager != null )
{
- return normalize( schemaManager.getNormalizerMapping() );
+ if ( normalized.get() )
+ {
+ return this;
+ }
+
+ synchronized ( this )
+ {
+ if ( size() == 0 )
+ {
+ normalized.set( true );
+ return this;
+ }
+
+ for ( Rdn rdn : rdns )
+ {
+ rdn.normalize( schemaManager );
+ }
+
+ normalizeInternal();
+
+ normalized.set( true );
+
+ return this;
+ }
}
normalizeInternal();
Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/Rdn.java Fri Feb 25 17:23:45 2011
@@ -28,8 +28,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.commons.collections.MultiMap;
import org.apache.commons.collections.map.MultiValueMap;
@@ -115,7 +113,7 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class Rdn implements Cloneable, Externalizable, Iterable<Ava>
+public final class Rdn implements Cloneable, Externalizable, Iterable<Ava>
{
/** The LoggerFactory used by this class */
protected static final Logger LOG = LoggerFactory.getLogger( Rdn.class );
@@ -185,10 +183,10 @@ public class Rdn implements Cloneable, E
public static final int EQUAL = 0;
/** A flag used to tell if the Rdn has been normalized */
- private AtomicBoolean normalized = new AtomicBoolean();
+ private boolean normalized = false;
/** the schema manager */
- private transient SchemaManager schemaManager;
+ private SchemaManager schemaManager;
/**
@@ -206,7 +204,7 @@ public class Rdn implements Cloneable, E
*
* @param schemaManager the schema manager
*/
- public Rdn(SchemaManager schemaManager)
+ public Rdn( SchemaManager schemaManager )
{
// Don't waste space... This is not so often we have multiple
// name-components in a Rdn... So we won't initialize the Map and the
@@ -214,18 +212,18 @@ public class Rdn implements Cloneable, E
this.schemaManager = schemaManager;
upName = "";
normName = "";
- normalized.set( false );
+ normalized = false;
}
/**
* A constructor that parse a String representing a Rdn.
*
- * @param rdn the String containing the Rdn to parse
* @param schemaManager the schema manager
+ * @param rdn the String containing the Rdn to parse
* @throws LdapInvalidDnException if the Rdn is invalid
*/
- public Rdn(String rdn, SchemaManager schemaManager) throws LdapInvalidDnException
+ public Rdn( SchemaManager schemaManager, String rdn ) throws LdapInvalidDnException
{
if ( Strings.isNotEmpty(rdn) )
{
@@ -237,13 +235,13 @@ public class Rdn implements Cloneable, E
if ( schemaManager != null )
{
this.schemaManager = schemaManager;
- normalize( schemaManager.getNormalizerMapping() );
- normalized.set( true );
+ normalize( schemaManager );
+ normalized = true;
}
else
{
normalize();
- normalized.set( false );
+ normalized = false;
}
upName = rdn;
@@ -252,7 +250,7 @@ public class Rdn implements Cloneable, E
{
upName = "";
normName = "";
- normalized.set( false );
+ normalized = false;
}
}
@@ -263,9 +261,9 @@ public class Rdn implements Cloneable, E
* @param rdn the String containing the Rdn to parse
* @throws LdapInvalidDnException if the Rdn is invalid
*/
- public Rdn(String rdn) throws LdapInvalidDnException
+ public Rdn( String rdn ) throws LdapInvalidDnException
{
- this( rdn, ( SchemaManager ) null );
+ this( ( SchemaManager ) null, rdn );
}
@@ -282,7 +280,7 @@ public class Rdn implements Cloneable, E
* @param schemaManager the schema manager
* @throws LdapInvalidDnException if the Rdn is invalid
*/
- public Rdn(String upType, String normType, String upValue, String normValue, SchemaManager schemaManager) throws LdapInvalidDnException
+ public Rdn( SchemaManager schemaManager, String upType, String normType, String upValue, String normValue ) throws LdapInvalidDnException
{
this.schemaManager = schemaManager;
@@ -295,12 +293,12 @@ public class Rdn implements Cloneable, E
if( schemaManager != null )
{
- normalized.set( true );
+ normalized = true;
}
else
{
// As strange as it seems, the Rdn is *not* normalized against the schema at this point
- normalized.set( false );
+ normalized = false;
}
}
@@ -315,9 +313,9 @@ public class Rdn implements Cloneable, E
* @throws LdapInvalidDnException if the Rdn is invalid
* @see #Rdn(String, String, String, String, SchemaManager)
*/
- public Rdn(String upType, String normType, String upValue, String normValue) throws LdapInvalidDnException
+ public Rdn( String upType, String normType, String upValue, String normValue ) throws LdapInvalidDnException
{
- this( upType, normType, upValue, normValue, null );
+ this( null, upType, normType, upValue, normValue );
}
@@ -332,7 +330,7 @@ public class Rdn implements Cloneable, E
* @param schemaManager the schema manager
* @throws LdapInvalidDnException if the Rdn is invalid
*/
- public Rdn(String upType, String upValue, SchemaManager schemaManager) throws LdapInvalidDnException
+ public Rdn( SchemaManager schemaManager, String upType, String upValue ) throws LdapInvalidDnException
{
addAVA( upType, upType, new StringValue( upValue ), new StringValue( upValue ) );
@@ -341,8 +339,8 @@ public class Rdn implements Cloneable, E
if( schemaManager != null )
{
this.schemaManager = schemaManager;
- normalize( schemaManager.getNormalizerMapping() );
- normalized.set( true );
+ normalize( schemaManager );
+ normalized = true;
}
else
{
@@ -350,7 +348,7 @@ public class Rdn implements Cloneable, E
normalize();
// As strange as it seems, the Rdn is *not* normalized against the schema at this point
- normalized.set( false );
+ normalized = false;
}
}
@@ -363,9 +361,9 @@ public class Rdn implements Cloneable, E
* @throws LdapInvalidDnException if the Rdn is invalid
* @see #Rdn(String, String, SchemaManager)
*/
- public Rdn(String upType, String upValue) throws LdapInvalidDnException
+ public Rdn( String upType, String upValue ) throws LdapInvalidDnException
{
- this( upType, upValue, null );
+ this( null, upType, upValue );
}
@@ -381,7 +379,7 @@ public class Rdn implements Cloneable, E
{
this.upName = upName;
this.normName = normName;
- normalized.set( true );
+ normalized = true;
}
@@ -396,7 +394,7 @@ public class Rdn implements Cloneable, E
nbAtavs = rdn.getNbAtavs();
this.normName = rdn.normName;
this.upName = rdn.getName();
- normalized.set(rdn.normalized.get());
+ normalized = rdn.normalized;
switch ( rdn.getNbAtavs() )
{
@@ -472,7 +470,7 @@ public class Rdn implements Cloneable, E
sb.append( '+' );
}
- sb.append( ata.normalize() );
+ sb.append( ata.getNormName() );
}
normName = sb.toString();
@@ -485,32 +483,13 @@ public class Rdn implements Cloneable, E
* Transform a Rdn by changing the value to its OID counterpart and
* normalizing the value accordingly to its type.
*
- * @param sm the SchemaManager
+ * @param schemaManager the SchemaManager
* @return this Rdn, normalized
* @throws org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException if the Rdn is invalid
*/
- public Rdn normalize( SchemaManager sm ) throws LdapInvalidDnException
+ public Rdn normalize( SchemaManager schemaManager ) throws LdapInvalidDnException
{
- return normalize( sm.getNormalizerMapping() );
- }
-
-
- /**
- * Transform a Rdn by changing the value to its OID counterpart and
- * normalizing the value accordingly to its type.
- *
- * @param oidsMap the mapping between names and OIDs
- * @return this Rdn, normalized
- * @throws LdapInvalidDnException if the Rdn is invalid
- */
- public Rdn normalize( Map<String, OidNormalizer> oidsMap ) throws LdapInvalidDnException
- {
- if ( ( oidsMap == null ) || ( oidsMap.isEmpty() ) )
- {
- return this;
- }
-
- if ( normalized.get() )
+ if ( normalized )
{
return this;
}
@@ -518,10 +497,10 @@ public class Rdn implements Cloneable, E
synchronized ( this )
{
String savedUpName = getName();
- Dn.rdnOidToName(this, oidsMap);
+ Dn.rdnOidToName( this, schemaManager.getNormalizerMapping() );
normalize();
this.upName = savedUpName;
- normalized.set( true );
+ normalized = true;
return this;
}
@@ -664,7 +643,7 @@ public class Rdn implements Cloneable, E
nbAtavs = 0;
normName = "";
upName = "";
- normalized.set( false );
+ normalized = false;
}
@@ -817,7 +796,7 @@ public class Rdn implements Cloneable, E
try
{
Rdn rdn = (Rdn) super.clone();
- rdn.normalized = new AtomicBoolean( normalized.get() );
+ rdn.normalized = normalized;
// The AttributeTypeAndValue is immutable. We won't clone it
@@ -900,7 +879,7 @@ public class Rdn implements Cloneable, E
*
* @return The first AttributeTypeAndValue of this Rdn
*/
- public Ava getAVA()
+ public Ava getAva()
{
switch ( nbAtavs )
{
@@ -1402,7 +1381,7 @@ public class Rdn implements Cloneable, E
*/
public boolean isNormalized()
{
- return normalized.get();
+ return normalized;
}
Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/RdnSerializer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/RdnSerializer.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/RdnSerializer.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/RdnSerializer.java Fri Feb 25 17:23:45 2011
@@ -80,10 +80,6 @@ public final class RdnSerializer
case 0 :
break;
- case 1 :
- AvaSerializer.serialize(rdn.getAVA(), out);
- break;
-
default :
for ( Ava atav:rdn )
{
Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/AbstractSchemaObject.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/AbstractSchemaObject.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/AbstractSchemaObject.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/AbstractSchemaObject.java Fri Feb 25 17:23:45 2011
@@ -20,6 +20,7 @@
package org.apache.directory.shared.ldap.model.schema;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -70,10 +71,10 @@ import org.apache.directory.shared.util.
* <b>obsolete</b> : LdapSyntax, Comparator, Normalizer, SyntaxChecker
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public abstract class AbstractSchemaObject implements SchemaObject
+public abstract class AbstractSchemaObject implements SchemaObject, Serializable
{
- /** The serialVersionUID */
- public static final long serialVersionUID = 1L;
+ /** The serial version UID */
+ private static final long serialVersionUID = 2L;
/** The SchemaObject numeric OID */
protected String oid;
Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/AttributeType.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/AttributeType.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/AttributeType.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/AttributeType.java Fri Feb 25 17:23:45 2011
@@ -144,9 +144,6 @@ public class AttributeType extends Abstr
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( AttributeType.class );
- /** The serialVersionUID */
- public static final long serialVersionUID = 1L;
-
/** The syntax OID associated with this AttributeType */
private String syntaxOid;
Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/DITContentRule.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/DITContentRule.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/DITContentRule.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/DITContentRule.java Fri Feb 25 17:23:45 2011
@@ -119,9 +119,6 @@ import org.apache.directory.shared.ldap.
@SuppressWarnings("PMD.OverrideBothEqualsAndHashcode")
public class DITContentRule extends AbstractSchemaObject
{
- /** The serialVersionUID */
- public static final long serialVersionUID = 1L;
-
/** The list of Auxiliary ObjectClass OIDs entries may belong to */
private List<String> auxObjectClassOids;
Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/DITStructureRule.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/DITStructureRule.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/DITStructureRule.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/DITStructureRule.java Fri Feb 25 17:23:45 2011
@@ -84,9 +84,6 @@ import org.apache.directory.shared.util.
@SuppressWarnings("PMD.OverrideBothEqualsAndHashcode")
public class DITStructureRule extends AbstractSchemaObject
{
- /** The serialVersionUID */
- private static final long serialVersionUID = 1L;
-
/** The rule ID. A DSR does not have an OID */
private int ruleId;
Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/LdapComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/LdapComparator.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/LdapComparator.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/LdapComparator.java Fri Feb 25 17:23:45 2011
@@ -20,6 +20,7 @@
package org.apache.directory.shared.ldap.model.schema;
+import java.io.Serializable;
import java.util.Comparator;
@@ -29,11 +30,10 @@ import java.util.Comparator;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public abstract class LdapComparator<T> extends LoadableSchemaObject implements Comparator<T>
+public abstract class LdapComparator<T> extends LoadableSchemaObject implements Comparator<T>, Serializable
{
- /** The serialversionUID */
- private static final long serialVersionUID = 1L;
-
+ /** The serial version UID */
+ private static final long serialVersionUID = 2L;
/**
* Create a new instance of a Comparator
Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/LdapSyntax.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/LdapSyntax.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/LdapSyntax.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/LdapSyntax.java Fri Feb 25 17:23:45 2011
@@ -74,9 +74,6 @@ import org.apache.directory.shared.ldap.
@SuppressWarnings("PMD.OverrideBothEqualsAndHashcode")
public class LdapSyntax extends AbstractSchemaObject
{
- /** The serialVersionUID */
- public static final long serialVersionUID = 1L;
-
/** the human readable flag */
protected boolean isHumanReadable = false;
Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/LoadableSchemaObject.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/LoadableSchemaObject.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/LoadableSchemaObject.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/LoadableSchemaObject.java Fri Feb 25 17:23:45 2011
@@ -36,8 +36,8 @@ import org.apache.directory.shared.util.
@SuppressWarnings("PMD.OverrideBothEqualsAndHashcode")
public abstract class LoadableSchemaObject extends AbstractSchemaObject
{
- /** The serialVersionUID */
- private static final long serialVersionUID = 1L;
+ /** The serial version UID */
+ private static final long serialVersionUID = 2L;
/** The Full Qualified Class Name */
private String fqcn;
Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRule.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRule.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRule.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRule.java Fri Feb 25 17:23:45 2011
@@ -92,9 +92,6 @@ public class MatchingRule extends Abstra
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( MatchingRule.class );
- /** The serialVersionUID */
- private static final long serialVersionUID = 1L;
-
/** The associated Comparator */
protected LdapComparator<? super Object> ldapComparator;
Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRuleUse.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRuleUse.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRuleUse.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRuleUse.java Fri Feb 25 17:23:45 2011
@@ -25,9 +25,8 @@ import java.util.List;
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.ldap.model.exception.LdapException;
-
-import org.apache.directory.shared.ldap.model.schema.registries.Registries;
import org.apache.directory.shared.ldap.model.schema.registries.AttributeTypeRegistry;
+import org.apache.directory.shared.ldap.model.schema.registries.Registries;
/**
@@ -89,9 +88,6 @@ import org.apache.directory.shared.ldap.
@SuppressWarnings("PMD.OverrideBothEqualsAndHashcode")
public class MatchingRuleUse extends AbstractSchemaObject
{
- /** The serialVersionUID */
- private static final long serialVersionUID = 1L;
-
/** The list of attributes types OID the matching rule applies to */
private List<String> applicableAttributeOids;
Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/NameForm.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/NameForm.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/NameForm.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/NameForm.java Fri Feb 25 17:23:45 2011
@@ -26,8 +26,8 @@ import java.util.List;
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.ldap.model.exception.LdapException;
-import org.apache.directory.shared.ldap.model.schema.registries.Registries;
import org.apache.directory.shared.ldap.model.schema.registries.AttributeTypeRegistry;
+import org.apache.directory.shared.ldap.model.schema.registries.Registries;
/**
@@ -98,9 +98,6 @@ import org.apache.directory.shared.ldap.
@SuppressWarnings("PMD.OverrideBothEqualsAndHashcode")
public class NameForm extends AbstractSchemaObject
{
- /** The serialVersionUID */
- private static final long serialVersionUID = 1L;
-
/** The structural object class OID this rule applies to */
private String structuralObjectClassOid;
Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/Normalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/Normalizer.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/Normalizer.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/Normalizer.java Fri Feb 25 17:23:45 2011
@@ -30,13 +30,9 @@ import org.apache.directory.shared.ldap.
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
// super.hashCode is final
-@SuppressWarnings("PMD.OverrideBothEqualsAndHashcode")
+@SuppressWarnings({ "PMD.OverrideBothEqualsAndHashcode", "serial" })
public abstract class Normalizer extends LoadableSchemaObject
{
- /** The serialversionUID */
- private static final long serialVersionUID = 1L;
-
-
/**
* The Normalizer base constructor. We use it's MR OID to
* initialize the SchemaObject instance
Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/ObjectClass.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/ObjectClass.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/ObjectClass.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/ObjectClass.java Fri Feb 25 17:23:45 2011
@@ -79,9 +79,6 @@ import org.apache.directory.shared.ldap.
@SuppressWarnings("PMD.OverrideBothEqualsAndHashcode")
public class ObjectClass extends AbstractSchemaObject
{
- /** The serialVersionUID */
- private static final long serialVersionUID = 1L;
-
/** The ObjectClass type : ABSTRACT, AUXILIARY or STRUCTURAL */
private ObjectClassTypeEnum objectClassType = ObjectClassTypeEnum.STRUCTURAL;
Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaObject.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaObject.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaObject.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaObject.java Fri Feb 25 17:23:45 2011
@@ -20,7 +20,6 @@
package org.apache.directory.shared.ldap.model.schema;
-import java.io.Serializable;
import java.util.List;
import java.util.Map;
@@ -64,7 +63,7 @@ import org.apache.directory.shared.ldap.
* <b>obsolete</b> : LdapSyntax, Comparator, Normalizer, SyntaxChecker
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface SchemaObject extends Serializable
+public interface SchemaObject
{
/**
* Gets usually what is the numeric object identifier assigned to this
Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/SyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/SyntaxChecker.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/SyntaxChecker.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/SyntaxChecker.java Fri Feb 25 17:23:45 2011
@@ -33,13 +33,9 @@ import org.apache.directory.shared.ldap.
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
// super.hashCode is final
-@SuppressWarnings("PMD.OverrideBothEqualsAndHashcode")
+@SuppressWarnings({ "PMD.OverrideBothEqualsAndHashcode", "serial" })
public abstract class SyntaxChecker extends LoadableSchemaObject
{
- /** The serialversionUID */
- private static final long serialVersionUID = 1L;
-
-
/**
* The SyntaxChecker base constructor
* @param oid The associated OID
Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BitStringComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BitStringComparator.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BitStringComparator.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BitStringComparator.java Fri Feb 25 17:23:45 2011
@@ -32,13 +32,12 @@ import org.slf4j.LoggerFactory;
*/
public class BitStringComparator extends LdapComparator<String>
{
+ /** The serial version UID */
+ private static final long serialVersionUID = 2L;
+
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( BitStringComparator.class );
- /** The serialVersionUID */
- private static final long serialVersionUID = 1L;
-
-
/**
* The BitStringComparator constructor. Its OID is the IntegerOrderingMatch matching
* rule OID.
Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BooleanComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BooleanComparator.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BooleanComparator.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BooleanComparator.java Fri Feb 25 17:23:45 2011
@@ -32,13 +32,12 @@ import org.slf4j.LoggerFactory;
*/
public class BooleanComparator extends LdapComparator<String>
{
+ /** The serial version UID */
+ private static final long serialVersionUID = 2L;
+
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( BooleanComparator.class );
- /** The serialVersionUID */
- private static final long serialVersionUID = 1L;
-
-
/**
* The BooleanComparator constructor. Its OID is the BooleanMatch matching
* rule OID.
Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ByteArrayComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ByteArrayComparator.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ByteArrayComparator.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ByteArrayComparator.java Fri Feb 25 17:23:45 2011
@@ -33,12 +33,12 @@ import org.slf4j.LoggerFactory;
*/
public class ByteArrayComparator extends LdapComparator<byte[]>
{
+ /** The serial version UID */
+ private static final long serialVersionUID = 2L;
+
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( ByteArrayComparator.class );
- /** The serialVersionUID */
- private static final long serialVersionUID = 1L;
-
/**
* The ByteArrayComparator constructor. Its OID is the OctetStringMatch matching
* rule OID.
Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ComparableComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ComparableComparator.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ComparableComparator.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ComparableComparator.java Fri Feb 25 17:23:45 2011
@@ -34,13 +34,12 @@ import org.slf4j.LoggerFactory;
*/
public class ComparableComparator<T> extends LdapComparator<Comparable<T>>
{
+ /** The serial version UID */
+ private static final long serialVersionUID = 2L;
+
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( ComparableComparator.class );
- /** The serialVersionUID */
- private static final long serialVersionUID = 1L;
-
-
/**
* The ComparableComparator constructor.
*
Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnComparator.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnComparator.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnComparator.java Fri Feb 25 17:23:45 2011
@@ -39,12 +39,12 @@ import org.slf4j.LoggerFactory;
*/
public class CsnComparator extends LdapComparator<Object>
{
+ /** The serial version UID */
+ private static final long serialVersionUID = 2L;
+
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( CsnComparator.class );
- /** The serialVersionUID */
- private static final long serialVersionUID = 1L;
-
/**
* The CsnComparator constructor. Its OID is the CsnMatch matching
* rule OID.
Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnSidComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnSidComparator.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnSidComparator.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnSidComparator.java Fri Feb 25 17:23:45 2011
@@ -34,12 +34,12 @@ import org.slf4j.LoggerFactory;
*/
public class CsnSidComparator extends LdapComparator<String>
{
+ /** The serial version UID */
+ private static final long serialVersionUID = 2L;
+
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( CsnSidComparator.class );
- /** The serialVersionUID */
- private static final long serialVersionUID = 1L;
-
/**
* The CsnSidComparator constructor. Its OID is the CsnSidMatch matching
* rule OID.
Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DeepTrimCachingNormalizingComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DeepTrimCachingNormalizingComparator.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DeepTrimCachingNormalizingComparator.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DeepTrimCachingNormalizingComparator.java Fri Feb 25 17:23:45 2011
@@ -31,9 +31,9 @@ import org.apache.directory.shared.ldap.
*/
public class DeepTrimCachingNormalizingComparator extends NormalizingComparator
{
- private static final long serialVersionUID = -3462901701103045845L;
+ /** The serial version UID */
+ private static final long serialVersionUID = 2L;
-
@SuppressWarnings({ "rawtypes", "unchecked" })
public DeepTrimCachingNormalizingComparator( String oid )
{
Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DeepTrimToLowerCachingNormalizingComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DeepTrimToLowerCachingNormalizingComparator.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DeepTrimToLowerCachingNormalizingComparator.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DeepTrimToLowerCachingNormalizingComparator.java Fri Feb 25 17:23:45 2011
@@ -31,9 +31,9 @@ import org.apache.directory.shared.ldap.
*/
public class DeepTrimToLowerCachingNormalizingComparator extends NormalizingComparator
{
- private static final long serialVersionUID = -3462901701103045845L;
+ /** The serial version UID */
+ private static final long serialVersionUID = 2L;
-
@SuppressWarnings({ "rawtypes", "unchecked" })
public DeepTrimToLowerCachingNormalizingComparator( String oid )
{
Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DnComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DnComparator.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DnComparator.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DnComparator.java Fri Feb 25 17:23:45 2011
@@ -36,8 +36,11 @@ import org.apache.directory.shared.ldap.
@SuppressWarnings("serial")
public class DnComparator extends LdapComparator<Object>
{
+ /** The serial version UID */
+ private static final long serialVersionUID = 2L;
+
/** A reference to the schema manager */
- private transient SchemaManager schemaManager;
+ private SchemaManager schemaManager;
public DnComparator( String oid )
{
@@ -83,7 +86,7 @@ public class DnComparator extends LdapCo
{
dn = (Dn)obj;
- dn = ( dn.isNormalized() ? dn : Dn.normalize(dn, schemaManager.getNormalizerMapping()) );
+ dn = ( dn.isNormalized() ? dn : dn.normalize( schemaManager ) );
}
else if ( obj instanceof String )
{
Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/GeneralizedTimeComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/GeneralizedTimeComparator.java?rev=1074638&r1=1074637&r2=1074638&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/GeneralizedTimeComparator.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/GeneralizedTimeComparator.java Fri Feb 25 17:23:45 2011
@@ -38,13 +38,12 @@ import org.slf4j.LoggerFactory;
*/
public class GeneralizedTimeComparator extends LdapComparator<String>
{
+ /** The serial version UID */
+ private static final long serialVersionUID = 2L;
+
/** A logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( GeneralizedTimeComparator.class );
- /** The serialVersionUID */
- private static final long serialVersionUID = 1L;
-
-
/**
* The GeneralizedTimeComparator constructor. Its OID is the
* generalizedTimeOrderingMatch matching rule OID.