directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1087147 - in /directory: apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/ apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/ apacheds/trunk/core/src/main/java/org/apache/directory/server/...
Date Wed, 30 Mar 2011 23:56:58 GMT
Author: elecharny
Date: Wed Mar 30 23:56:57 2011
New Revision: 1087147

URL: http://svn.apache.org/viewvc?rev=1087147&view=rev
Log:
Renamed the instanceOf() method to isInstanceOf()

Modified:
    directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java
    directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntryAttribute.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryAttribute.java

Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.java?rev=1087147&r1=1087146&r2=1087147&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.java
(original)
+++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.java
Wed Mar 30 23:56:57 2011
@@ -1533,12 +1533,12 @@ public class SchemaAwareEntryAttributeTe
     {
         EntryAttribute attr = new DefaultEntryAttribute( atCN );
 
-        assertTrue( attr.instanceOf( "CommonName" ) );
-        assertTrue( attr.instanceOf( "2.5.4.3" ) );
-        assertTrue( attr.instanceOf( "  Cn  " ) );
-        assertFalse( attr.instanceOf( "  " ) );
-        assertFalse( attr.instanceOf( "sn" ) );
-        assertFalse( attr.instanceOf( "name" ) );
+        assertTrue( attr.isInstanceOf( "CommonName" ) );
+        assertTrue( attr.isInstanceOf( "2.5.4.3" ) );
+        assertTrue( attr.isInstanceOf( "  Cn  " ) );
+        assertFalse( attr.isInstanceOf( "  " ) );
+        assertFalse( attr.isInstanceOf( "sn" ) );
+        assertFalse( attr.isInstanceOf( "name" ) );
     }
 
 
@@ -1707,7 +1707,7 @@ public class SchemaAwareEntryAttributeTe
 
         attr.setAttributeType( atSN );
 
-        assertTrue( attr.instanceOf( "Surname" ) );
+        assertTrue( attr.isInstanceOf( "Surname" ) );
         assertEquals( "2.5.4.4", attr.getId() );
         assertEquals( "sn", attr.getUpId() );
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java?rev=1087147&r1=1087146&r2=1087147&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
Wed Mar 30 23:56:57 2011
@@ -253,7 +253,7 @@ public class TupleCache
 
         for ( Modification mod : mods )
         {
-            if ( mod.getAttribute().instanceOf( SchemaConstants.PRESCRIPTIVE_ACI_AT ) )
+            if ( mod.getAttribute().isInstanceOf( SchemaConstants.PRESCRIPTIVE_ACI_AT ) )
             {
                 subentryDeleted( normName, entry );
                 subentryAdded( normName, entry );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java?rev=1087147&r1=1087146&r2=1087147&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java
Wed Mar 30 23:56:57 2011
@@ -65,7 +65,7 @@ public class RefinementEvaluator
             throw new IllegalArgumentException( I18n.err( I18n.ERR_296 ) );
         }
         
-        if ( !objectClasses.instanceOf( SchemaConstants.OBJECT_CLASS_AT ) )
+        if ( !objectClasses.isInstanceOf( SchemaConstants.OBJECT_CLASS_AT ) )
         {
             throw new IllegalArgumentException( I18n.err( I18n.ERR_297 ) );
         }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java?rev=1087147&r1=1087146&r2=1087147&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluator.java
Wed Mar 30 23:56:57 2011
@@ -101,7 +101,7 @@ public class RefinementLeafEvaluator
             throw new IllegalArgumentException( I18n.err( I18n.ERR_303 ) );
         }
         
-        if ( !objectClasses.instanceOf( SchemaConstants.OBJECT_CLASS_AT ) )
+        if ( !objectClasses.isInstanceOf( SchemaConstants.OBJECT_CLASS_AT ) )
         {
             throw new IllegalArgumentException( I18n.err( I18n.ERR_304 ) );
         }

Modified: directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java?rev=1087147&r1=1087146&r2=1087147&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
(original)
+++ directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
Wed Mar 30 23:56:57 2011
@@ -235,7 +235,7 @@ public class KeyDerivationInterceptor ex
 
             EntryAttribute attr = mod.getAttribute();
 
-            if ( attr.instanceOf( SchemaConstants.USER_PASSWORD_AT ) )
+            if ( attr.isInstanceOf( SchemaConstants.USER_PASSWORD_AT ) )
             {
                 Object firstValue = attr.get();
                 String password = null;
@@ -263,7 +263,7 @@ public class KeyDerivationInterceptor ex
                 log.debug( "Got userPassword '{}'.", subContext.getUserPassword() );
             }
 
-            if ( attr.instanceOf( KerberosAttribute.KRB5_PRINCIPAL_NAME_AT ) )
+            if ( attr.isInstanceOf( KerberosAttribute.KRB5_PRINCIPAL_NAME_AT ) )
             {
                 subContext.setPrincipalName( attr.getString() );
                 log.debug( "Got principal '{}'.", subContext.getPrincipalName() );

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntryAttribute.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntryAttribute.java?rev=1087147&r1=1087146&r2=1087147&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntryAttribute.java
(original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntryAttribute.java
Wed Mar 30 23:56:57 2011
@@ -2083,7 +2083,7 @@ public class DefaultEntryAttribute imple
      * @return True if the current attribute is of the expected attributeType
      * @throws LdapInvalidAttributeValueException If there is no AttributeType
      */
-    public boolean instanceOf( String attributeId ) throws LdapInvalidAttributeValueException
+    public boolean isInstanceOf( String attributeId ) throws LdapInvalidAttributeValueException
     {
         String trimmedId = Strings.trim(attributeId);
         

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryAttribute.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryAttribute.java?rev=1087147&r1=1087146&r2=1087147&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryAttribute.java
(original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryAttribute.java
Wed Mar 30 23:56:57 2011
@@ -237,7 +237,7 @@ public interface EntryAttribute extends 
      * @return True if the current attribute is of the expected attributeType
      * @throws LdapInvalidAttributeValueException If there is no AttributeType
      */
-    boolean instanceOf( String attributeId ) throws LdapInvalidAttributeValueException;
+    boolean isInstanceOf( String attributeId ) throws LdapInvalidAttributeValueException;
 
     
     /**



Mime
View raw message