directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1074174 - in /directory: apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/ apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/ apacheds/trunk/jdbm-partition/src/test/java/org/apache/...
Date Thu, 24 Feb 2011 14:45:27 GMT
Author: elecharny
Date: Thu Feb 24 14:45:27 2011
New Revision: 1074174

URL: http://svn.apache.org/viewvc?rev=1074174&view=rev
Log:
o Removed the serialVersionUid from many helper classes
o Updated some other serialVersion Uid when used

Modified:
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
    directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java
    directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/KeyOnlyComparator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/LongComparator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdnComparator.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/BogusSyntax.java
    directory/shared/trunk/ldap-extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemSyntaxChecker.java

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java?rev=1074174&r1=1074173&r2=1074174&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java
(original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java
Thu Feb 24 14:45:27 2011
@@ -64,8 +64,6 @@ public class TestServerEntryUtils
      */
     static class MR extends MatchingRule
     {
-        private static final long serialVersionUID = 0L;
-
         protected MR( String oid )
         {
             super( oid );
@@ -104,8 +102,6 @@ public class TestServerEntryUtils
 
         syntax.setSyntaxChecker( new SyntaxChecker( "1.1.2.1" )
         {
-            private static final long serialVersionUID = 0L;
-
             public boolean isValidSyntax( Object value )
             {
                 if ( !( value instanceof String ) )
@@ -132,8 +128,6 @@ public class TestServerEntryUtils
 
         matchingRule.setLdapComparator( new LdapComparator<String>( matchingRule.getOid()
)
         {
-            private static final long serialVersionUID = 0L;
-
             public int compare( String o1, String o2 )
             {
                 return ( o1 == null ? 
@@ -162,8 +156,6 @@ public class TestServerEntryUtils
         
         Normalizer normalizer = new Normalizer( "1.1.1" )
         {
-            private static final long serialVersionUID = 0L;
-
             public Value<?> normalize( Value<?> value ) throws LdapException
             {
                 if ( !value.isBinary() )
@@ -198,8 +190,6 @@ public class TestServerEntryUtils
 
         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) ;
@@ -212,8 +202,6 @@ public class TestServerEntryUtils
 
         matchingRule.setLdapComparator( new LdapComparator<String>( matchingRule.getOid()
)
         {
-            private static final long serialVersionUID = 0L;
-
             public int compare( String o1, String o2 )
             {
                 return ( ( o1 == null ) ? 
@@ -238,8 +226,6 @@ public class TestServerEntryUtils
 
         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 );
@@ -253,9 +239,6 @@ public class TestServerEntryUtils
         
         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/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java?rev=1074174&r1=1074173&r2=1074174&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
(original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
Thu Feb 24 14:45:27 2011
@@ -80,8 +80,6 @@ public class MetaComparatorHandlerIT ext
             super( OID );
             addName( "dummy" );
         }
-
-        private static final long serialVersionUID = 1L;
     }
 
 

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java?rev=1074174&r1=1074173&r2=1074174&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
(original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
Thu Feb 24 14:45:27 2011
@@ -660,7 +660,5 @@ public class MetaNormalizerHandlerIT ext
             super( OID );
             addName( "dummy" );
         }
-
-        private static final long serialVersionUID = 1L;
     }
 }

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java?rev=1074174&r1=1074173&r2=1074174&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
(original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
Thu Feb 24 14:45:27 2011
@@ -624,9 +624,6 @@ public class MetaSyntaxCheckerHandlerIT 
 
     public static class BogusSyntaxChecker extends SyntaxChecker
     {
-        private static final long serialVersionUID = 1L;
-
-
         public BogusSyntaxChecker()
         {
             super( OID );
@@ -641,9 +638,6 @@ public class MetaSyntaxCheckerHandlerIT 
 
     class DummySyntax extends LdapSyntax
     {
-        private static final long serialVersionUID = 1L;
-
-
         public DummySyntax()
         {
             super( OID );

Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java?rev=1074174&r1=1074173&r2=1074174&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java
(original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java
Thu Feb 24 14:45:27 2011
@@ -95,17 +95,16 @@ public class KeyTupleBTreeCursorTest
     @Before
     public void createTree() throws Exception
     {
-      comparator = new Comparator<String>() 
-      {
-
-          public int compare( String i1, String i2 )
-          {
-              return i1.compareTo( i2 );
-          }
-        
+        comparator = new Comparator<String>() 
+        {
+            public int compare( String i1, String i2 )
+            {
+                return i1.compareTo( i2 );
+            }
         };
 
         File tmpDir = null;
+        
         if ( System.getProperty( TEST_OUTPUT_PATH, null ) != null )
         {
             tmpDir = new File( System.getProperty( TEST_OUTPUT_PATH ) );

Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java?rev=1074174&r1=1074173&r2=1074174&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java
(original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java
Thu Feb 24 14:45:27 2011
@@ -42,9 +42,6 @@ class MockComparatorRegistry extends Def
 
     private LdapComparator<Integer> comparator = new LdapComparator<Integer>(
"1.1.1" )
     {
-        private static final long serialVersionUID = -4049615866911565018L;
-
-
         public int compare( Integer i1, Integer i2 )
         {
             return i1.compareTo( i2 );

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/KeyOnlyComparator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/KeyOnlyComparator.java?rev=1074174&r1=1074173&r2=1074174&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/KeyOnlyComparator.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/KeyOnlyComparator.java
Thu Feb 24 14:45:27 2011
@@ -20,8 +20,6 @@
 package org.apache.directory.server.core.partition.impl.btree;
 
 
-import java.io.Serializable;
-
 import org.apache.directory.shared.ldap.model.schema.comparators.SerializableComparator;
 
 
@@ -30,7 +28,7 @@ import org.apache.directory.shared.ldap.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class KeyOnlyComparator<K, V> implements TupleComparator<K, V>, Serializable
+public class KeyOnlyComparator<K, V> implements TupleComparator<K, V>
 {
     private static final long serialVersionUID = 3544956549803161397L;
 

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/LongComparator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/LongComparator.java?rev=1074174&r1=1074173&r2=1074174&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/LongComparator.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/LongComparator.java
Thu Feb 24 14:45:27 2011
@@ -30,8 +30,9 @@ import org.apache.directory.shared.ldap.
 public class LongComparator extends SerializableComparator<Long>
 {
     public static final LongComparator INSTANCE = new LongComparator();
-    private static final long serialVersionUID = 3690478030414165816L;
 
+    /** The serial version UID */
+    private static final long serialVersionUID = 2L;
 
     public LongComparator()
     {

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdnComparator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdnComparator.java?rev=1074174&r1=1074173&r2=1074174&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdnComparator.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdnComparator.java
Thu Feb 24 14:45:27 2011
@@ -31,8 +31,8 @@ import org.apache.directory.shared.ldap.
  */
 public class ParentIdAndRdnComparator<ID extends Comparable<ID>> extends SerializableComparator<ParentIdAndRdn<ID>>
 {
-    private static final long serialVersionUID = 5414960421568991202L;
-
+    /** The serial version UID */
+    private static final long serialVersionUID = 2L;
 
     /**
      * Creates a new instance of ParentIdAndRdnComparator.

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/BogusSyntax.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/BogusSyntax.java?rev=1074174&r1=1074173&r2=1074174&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/BogusSyntax.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/BogusSyntax.java
Thu Feb 24 14:45:27 2011
@@ -32,9 +32,6 @@ import org.apache.directory.shared.ldap.
  */
 public class BogusSyntax extends LdapSyntax
 {
-    private static final long serialVersionUID = 1L;
-
-
     protected BogusSyntax( int oidVal )
     {
         super( "1.3.6.1.4.1.18060.0.4.1.1.100000." + oidVal );

Modified: directory/shared/trunk/ldap-extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemSyntaxChecker.java?rev=1074174&r1=1074173&r2=1074174&view=diff
==============================================================================
--- directory/shared/trunk/ldap-extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemSyntaxChecker.java
(original)
+++ directory/shared/trunk/ldap-extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemSyntaxChecker.java
Thu Feb 24 14:45:27 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;
 



Mime
View raw message