directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r575351 - in /directory/apacheds/trunk/core/src: main/java/org/apache/directory/server/core/authz/ main/java/org/apache/directory/server/core/authz/support/ main/java/org/apache/directory/server/core/enumeration/ main/java/org/apache/direct...
Date Thu, 13 Sep 2007 16:05:53 GMT
Author: elecharny
Date: Thu Sep 13 09:05:47 2007
New Revision: 575351

URL: http://svn.apache.org/viewvc?rev=575351&view=rev
Log:
Removed warnings by using generics, cleaning the antlr .g files from useless imports, removed
useless casts.

Modified:
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/enumeration/ReferralHandlingEnumeration.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/enumeration/SearchResultFilteringEnumeration.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/ASTNode.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaDitContentRuleHandler.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaDitStructureRuleHandler.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaMatchingRuleUseHandler.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaNameFormHandler.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaSchemaHandler.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaManager.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/java/LdapJavaStoredProcClassLoader.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubtreeEvaluator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AbstractStoredProcedureParameterInjector.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AddStoredProcedureParameterInjector.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java?rev=575351&r1=575350&r2=575351&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java
Thu Sep 13 09:05:47 2007
@@ -428,7 +428,7 @@
         
         while ( attrList.hasMore() )
         {
-            subentryAttrs.put( ( Attribute ) attrList.next() );
+            subentryAttrs.put( attrList.next() );
         }
 
         // Assemble all the information required to make an access control decision
@@ -450,7 +450,7 @@
         
         while ( attributeList.hasMore() )
         {
-            Attribute attr = ( Attribute ) attributeList.next();
+            Attribute attr = attributeList.next();
         
             for ( int ii = 0; ii < attr.size(); ii++ )
             {
@@ -686,7 +686,7 @@
         NamingEnumeration<? extends Attribute> attributeList = entry.getAll();
         while ( attributeList.hasMore() )
         {
-            Attribute attr = ( Attribute ) attributeList.next();
+            Attribute attr = attributeList.next();
             for ( int ii = 0; ii < attr.size(); ii++ )
             {
                 engine.checkPermission( proxy, userGroups, userName, principal.getAuthenticationLevel(),
dn, attr
@@ -771,8 +771,8 @@
         throws NamingException
     {
         LdapDN oriChildName = moveAndRenameContext.getDn();
-        LdapDN newParentName = ((MoveAndRenameOperationContext)moveAndRenameContext).getParent();
-        String newRn = ((MoveAndRenameOperationContext)moveAndRenameContext).getNewRdn();
+        LdapDN newParentName = moveAndRenameContext.getParent();
+        String newRn = moveAndRenameContext.getNewRdn();
         
         // Access the principal requesting the operation, and bypass checks if it is the
admin
         Invocation invocation = InvocationStack.getInstance().peek();
@@ -827,7 +827,7 @@
         
         while ( attrList.hasMore() )
         {
-            subentryAttrs.put( ( Attribute ) attrList.next() );
+            subentryAttrs.put( attrList.next() );
         }
         
         Collection<ACITuple> destTuples = new HashSet<ACITuple>();
@@ -902,7 +902,7 @@
         
         while ( attrList.hasMore() )
         {
-            subentryAttrs.put( ( Attribute ) attrList.next() );
+            subentryAttrs.put( attrList.next() );
         }
         
         Collection<ACITuple> destTuples = new HashSet<ACITuple>();
@@ -958,7 +958,7 @@
     }
 
     
-    public final boolean isPrincipalAnAdministrator( LdapDN principalDn ) throws NamingException
+    public final boolean isPrincipalAnAdministrator( LdapDN principalDn )
     {
         return groupCache.isPrincipalAnAdministrator( principalDn );
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java?rev=575351&r1=575350&r2=575351&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java
Thu Sep 13 09:05:47 2007
@@ -212,7 +212,7 @@
                 ProtectedItem.MaxValueCount mvc = ( ProtectedItem.MaxValueCount ) item;
                 for ( Iterator<MaxValueCountItem> j = mvc.iterator(); j.hasNext();
)
                 {
-                    MaxValueCountItem mvcItem = ( MaxValueCountItem ) j.next();
+                    MaxValueCountItem mvcItem = j.next();
                     if ( oid.equals( oidRegistry.getOid( mvcItem.getAttributeType() ) ) )
                     {
                         return true;
@@ -237,7 +237,7 @@
                 ProtectedItem.RestrictedBy rb = ( ProtectedItem.RestrictedBy ) item;
                 for ( Iterator<RestrictedByItem> j = rb.iterator(); j.hasNext(); )
                 {
-                    RestrictedByItem rbItem = ( RestrictedByItem ) j.next();
+                    RestrictedByItem rbItem = j.next();
                     if ( oid.equals( oidRegistry.getOid( rbItem.getAttributeType() ) ) )
                     {
                         return true;

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java?rev=575351&r1=575350&r2=575351&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java
Thu Sep 13 09:05:47 2007
@@ -98,7 +98,7 @@
             
                 for ( Iterator<RestrictedByItem> k = rb.iterator(); k.hasNext(); )
                 {
-                    RestrictedByItem rbItem = ( RestrictedByItem ) k.next();
+                    RestrictedByItem rbItem = k.next();
                 
                     // TODO Fix DIRSEVER-832 
                     if ( attrId.equalsIgnoreCase( rbItem.getAttributeType() ) )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/enumeration/ReferralHandlingEnumeration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/enumeration/ReferralHandlingEnumeration.java?rev=575351&r1=575350&r2=575351&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/enumeration/ReferralHandlingEnumeration.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/enumeration/ReferralHandlingEnumeration.java
Thu Sep 13 09:05:47 2007
@@ -86,7 +86,7 @@
     {
         while ( underlying.hasMore() )
         {
-            SearchResult result = ( SearchResult ) underlying.next();
+            SearchResult result = underlying.next();
             LdapDN dn = new LdapDN( result.getName() );
             dn.normalize( normalizerMap );
             
@@ -101,7 +101,7 @@
         }
 
         refIndex++;
-        prefetched = ( SearchResult ) referrals.get( refIndex );
+        prefetched = referrals.get( refIndex );
         if ( doThrow )
         {
             doReferralExceptionOnSearchBase();

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/enumeration/SearchResultFilteringEnumeration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/enumeration/SearchResultFilteringEnumeration.java?rev=575351&r1=575350&r2=575351&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/enumeration/SearchResultFilteringEnumeration.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/enumeration/SearchResultFilteringEnumeration.java
Thu Sep 13 09:05:47 2007
@@ -300,7 +300,7 @@
         outer: while ( decorated.hasMore() )
         {
             boolean accepted = true;
-            tmp = ( SearchResult ) decorated.next();
+            tmp = decorated.next();
 
             // don't waste using a for loop if we got 0 or 1 element
             if ( filters.isEmpty() )
@@ -311,7 +311,7 @@
             }
             else if ( filters.size() == 1 )
             {
-                accepted = ( ( SearchResultFilter ) filters.get( 0 ) ).accept( invocation,
tmp, searchControls );
+                accepted = filters.get( 0 ).accept( invocation, tmp, searchControls );
                 if ( accepted )
                 {
                     this.prefetched = tmp;
@@ -325,7 +325,7 @@
             // apply all filters shorting their application on result denials
             for ( int ii = 0; ii < filters.size(); ii++ )
             {
-                SearchResultFilter filter = ( SearchResultFilter ) filters.get( ii );
+                SearchResultFilter filter = filters.get( ii );
                 accepted &= filter.accept( invocation, tmp, searchControls );
 
                 if ( !accepted )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java?rev=575351&r1=575350&r2=575351&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ExpressionEvaluator.java
Thu Sep 13 09:05:47 2007
@@ -68,7 +68,6 @@
      * @param attributeTypeRegistry the attribtype reg used for value comparison
      */
     public ExpressionEvaluator(OidRegistry oidRegistry, AttributeTypeRegistry attributeTypeRegistry)
-        throws NamingException
     {
         SubstringEvaluator substringEvaluator = null;
         substringEvaluator = new SubstringEvaluator( oidRegistry, attributeTypeRegistry );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java?rev=575351&r1=575350&r2=575351&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java
Thu Sep 13 09:05:47 2007
@@ -72,7 +72,7 @@
      * @param substringEvaluator
      */
     public LeafEvaluator( OidRegistry oidRegistry, AttributeTypeRegistry attributeTypeRegistry,
-        SubstringEvaluator substringEvaluator ) throws NamingException
+        SubstringEvaluator substringEvaluator )
     {
         this.oidRegistry = oidRegistry;
         this.attributeTypeRegistry = attributeTypeRegistry;

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java?rev=575351&r1=575350&r2=575351&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java
Thu Sep 13 09:05:47 2007
@@ -37,7 +37,7 @@
  */
 public class ScopeEvaluator implements Evaluator
 {
-    public ScopeEvaluator() throws NamingException
+    public ScopeEvaluator()
     {
     }
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java?rev=575351&r1=575350&r2=575351&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
Thu Sep 13 09:05:47 2007
@@ -248,7 +248,7 @@
         {
             while ( i.hasNext() )
             {
-                InterceptorConfiguration cfg = ( InterceptorConfiguration ) i.next();
+                InterceptorConfiguration cfg = i.next();
 
                 if ( IS_DEBUG )
                 {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java?rev=575351&r1=575350&r2=575351&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/AbstractContextFactory.java
Thu Sep 13 09:05:47 2007
@@ -91,7 +91,7 @@
     {
         //TM long t0 = System.nanoTime();
         Configuration cfg = Configuration.toConfiguration( env );
-        env = ( Hashtable ) env.clone();
+        env = ( Hashtable<String, Object> ) env.clone();
         
         LdapDN principalDn = null;
         if ( env.containsKey( Context.SECURITY_PRINCIPAL ) )
@@ -158,7 +158,7 @@
     }
 
 
-    public static String getProviderUrl( Hashtable env )
+    public static String getProviderUrl( Hashtable<String, Object> env )
     {
         String providerUrl;
         Object value;
@@ -175,7 +175,7 @@
     }
 
 
-    public static String getAuthentication( Hashtable env )
+    public static String getAuthentication( Hashtable<String, Object> env )
     {
         String authentication;
         Object value = env.get( Context.SECURITY_AUTHENTICATION );
@@ -194,7 +194,7 @@
     }
 
 
-    public static byte[] getCredential( Hashtable env ) throws ConfigurationException
+    public static byte[] getCredential( Hashtable<String, Object> env ) throws ConfigurationException
     {
         byte[] credential;
         Object value = env.get( Context.SECURITY_CREDENTIALS );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=575351&r1=575350&r2=575351&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
Thu Sep 13 09:05:47 2007
@@ -103,7 +103,7 @@
     private final PartitionNexus nexusProxy;
 
     /** The cloned environment used by this Context */
-    private final Hashtable env;
+    private final Hashtable<String, Object> env;
 
     /** The distinguished name of this Context */
     private final LdapDN dn;
@@ -142,7 +142,7 @@
      * @throws NamingException if the environment parameters are not set 
      * correctly.
      */
-    protected ServerContext(DirectoryService service, Hashtable env) throws NamingException
+    protected ServerContext(DirectoryService service, Hashtable<String, Object> env)
throws NamingException
     {
         this.service = service;
 
@@ -150,7 +150,7 @@
         this.nexusProxy = new PartitionNexusProxy( this, service );
 
         DirectoryServiceConfiguration cfg = service.getConfiguration();
-        this.env = ( Hashtable ) cfg.getEnvironment().clone();
+        this.env = ( Hashtable<String, Object> ) cfg.getEnvironment().clone();
         this.env.putAll( env );
         LdapJndiProperties props = LdapJndiProperties.getLdapJndiProperties( this.env );
         dn = props.getProviderDn();
@@ -282,7 +282,7 @@
         
         // do not reset request controls since this is not an external 
         // operation and not do bother setting the response controls either
-        return nexusProxy.getRootDSE( ( GetRootDSEOperationContext ) opCtx );
+        return nexusProxy.getRootDSE( opCtx );
     }
     
     
@@ -522,7 +522,7 @@
     /**
      * @see javax.naming.Context#getEnvironment()
      */
-    public Hashtable getEnvironment()
+    public Hashtable<String, Object> getEnvironment()
     {
         return env;
     }
@@ -638,7 +638,7 @@
     }
 
     
-    private void injectRdnAttributeValues( LdapDN target, Attributes attributes ) throws
NamingException
+    private void injectRdnAttributeValues( LdapDN target, Attributes attributes )
     {
         // Add all the RDN attributes and their values to this entry
         Rdn rdn = target.getRdn( target.size() - 1 );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java?rev=575351&r1=575350&r2=575351&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
Thu Sep 13 09:05:47 2007
@@ -83,7 +83,7 @@
      * @param env the environment used for this context
      * @throws NamingException if something goes wrong
      */
-    public ServerDirContext(DirectoryService service, Hashtable env) throws NamingException
+    public ServerDirContext(DirectoryService service, Hashtable<String, Object> env)
throws NamingException
     {
         super( service, env );
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java?rev=575351&r1=575350&r2=575351&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java
Thu Sep 13 09:05:47 2007
@@ -96,7 +96,7 @@
     /**
      * Override this method to put your initialization code.
      */
-    protected void doInit() throws NamingException
+    protected void doInit()
     {
     }
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?rev=575351&r1=575350&r2=575351&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
Thu Sep 13 09:05:47 2007
@@ -255,7 +255,7 @@
         {
             while ( partitionConfigurations.hasNext() )
             {
-                PartitionConfiguration c = ( PartitionConfiguration ) partitionConfigurations.next();
+                PartitionConfiguration c = partitionConfigurations.next();
                 AddContextPartitionOperationContext opCtx = new AddContextPartitionOperationContext(
c );
                 addContextPartition( opCtx );
                 initializedPartitions.add( opCtx.getPartition() );
@@ -269,7 +269,7 @@
                 Iterator<Partition> i = initializedPartitions.iterator();
                 while ( i.hasNext() )
                 {
-                    Partition partition = ( Partition ) i.next();
+                    Partition partition = i.next();
                     i.remove();
                     try
                     {
@@ -484,7 +484,7 @@
         
         while ( list.hasNext() )
         {
-            Partition partition = ( Partition ) list.next();
+            Partition partition = list.next();
 
             try
             {
@@ -915,7 +915,7 @@
                     for ( NamingEnumeration<? extends Attribute> ii = getRootDSE( null
).getAll(); ii.hasMore(); /**/ )
                     {
                         // add all user attribute
-                        Attribute attr = ( Attribute ) ii.next();
+                        Attribute attr = ii.next();
                         AttributeType type = attrRegistry.lookup( attr.getID() );
                         if ( type.getUsage() == UsageEnum.USER_APPLICATIONS )
                         {
@@ -933,7 +933,7 @@
                     for ( NamingEnumeration<? extends Attribute> ii = getRootDSE( null
).getAll(); ii.hasMore(); /**/ )
                     {
                         // add all operational attributes
-                        Attribute attr = ( Attribute ) ii.next();
+                        Attribute attr = ii.next();
                         AttributeType type = attrRegistry.lookup( attr.getID() );
                         if ( type.getUsage() != UsageEnum.USER_APPLICATIONS )
                         {
@@ -951,7 +951,7 @@
                     for ( NamingEnumeration<? extends Attribute> ii = getRootDSE( null
).getAll(); ii.hasMore(); /**/ )
                     {
                       // add user attributes specifically asked for
-                        Attribute attr = ( Attribute ) ii.next();
+                        Attribute attr = ii.next();
                         AttributeType type = attrRegistry.lookup( attr.getID() );
                         if ( realIds.contains( type.getOid() ) )
                         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/ASTNode.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/ASTNode.java?rev=575351&r1=575350&r2=575351&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/ASTNode.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/ASTNode.java
Thu Sep 13 09:05:47 2007
@@ -98,7 +98,7 @@
 
     public TreeNode getChildAt( int childIndex )
     {
-        return ( TreeNode ) children.get( childIndex );
+        return children.get( childIndex );
     }
 
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaDitContentRuleHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaDitContentRuleHandler.java?rev=575351&r1=575350&r2=575351&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaDitContentRuleHandler.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaDitContentRuleHandler.java
Thu Sep 13 09:05:47 2007
@@ -108,13 +108,13 @@
     }
 
 
-    public void add( DITContentRule dcr ) throws NamingException
+    public void add( DITContentRule dcr )
     {
         // TODO Auto-generated method stub
     }
 
 
-    public void delete( DITContentRule dcr, boolean cascade ) throws NamingException
+    public void delete( DITContentRule dcr, boolean cascade )
     {
         // TODO Auto-generated method stub
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaDitStructureRuleHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaDitStructureRuleHandler.java?rev=575351&r1=575350&r2=575351&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaDitStructureRuleHandler.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaDitStructureRuleHandler.java
Thu Sep 13 09:05:47 2007
@@ -119,13 +119,13 @@
     }
 
 
-    public void add( DITStructureRule dsr ) throws NamingException
+    public void add( DITStructureRule dsr )
     {
         // TODO Auto-generated method stub
     }
 
 
-    public void delete( DITStructureRule dsr, boolean cascade ) throws NamingException
+    public void delete( DITStructureRule dsr, boolean cascade )
     {
         // TODO Auto-generated method stub
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaMatchingRuleUseHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaMatchingRuleUseHandler.java?rev=575351&r1=575350&r2=575351&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaMatchingRuleUseHandler.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaMatchingRuleUseHandler.java
Thu Sep 13 09:05:47 2007
@@ -114,13 +114,13 @@
     }
 
 
-    public void add( MatchingRuleUse mru ) throws NamingException
+    public void add( MatchingRuleUse mru )
     {
         // TODO Auto-generated method stub
     }
 
 
-    public void delete( MatchingRuleUse mru, boolean cascade ) throws NamingException
+    public void delete( MatchingRuleUse mru, boolean cascade )
     {
         // TODO Auto-generated method stub
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaNameFormHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaNameFormHandler.java?rev=575351&r1=575350&r2=575351&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaNameFormHandler.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaNameFormHandler.java
Thu Sep 13 09:05:47 2007
@@ -117,13 +117,13 @@
     }
 
 
-    public void add( NameForm nf ) throws NamingException
+    public void add( NameForm nf )
     {
         // TODO Auto-generated method stub
     }
 
 
-    public void delete( NameForm nf, boolean cascade ) throws NamingException
+    public void delete( NameForm nf, boolean cascade )
     {
         // TODO Auto-generated method stub
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaSchemaHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaSchemaHandler.java?rev=575351&r1=575350&r2=575351&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaSchemaHandler.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaSchemaHandler.java
Thu Sep 13 09:05:47 2007
@@ -417,7 +417,7 @@
     }
 
 
-    private final String getSchemaName( LdapDN schema ) throws NamingException
+    private final String getSchemaName( LdapDN schema )
     {
         return ( String ) schema.getRdn().getValue();
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java?rev=575351&r1=575350&r2=575351&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java
Thu Sep 13 09:05:47 2007
@@ -374,19 +374,19 @@
     }
 
 
-    private void loadDitStructureRules( Schema schema, Registries targetRegistries ) throws
NamingException
+    private void loadDitStructureRules( Schema schema, Registries targetRegistries )
     {
         // TODO Auto-generated method stub
     }
 
 
-    private void loadNameForms( Schema schema, Registries targetRegistries ) throws NamingException
+    private void loadNameForms( Schema schema, Registries targetRegistries )
     {
         // TODO Auto-generated method stub
     }
 
 
-    private void loadDitContentRules( Schema schema, Registries targetRegistries ) throws
NamingException
+    private void loadDitContentRules( Schema schema, Registries targetRegistries )
     {
         // TODO Auto-generated method stub
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaManager.java?rev=575351&r1=575350&r2=575351&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaManager.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaManager.java
Thu Sep 13 09:05:47 2007
@@ -272,7 +272,7 @@
     }
     
     
-    public Registries getRegistries( LdapDN dn ) throws NamingException
+    public Registries getRegistries( LdapDN dn )
     {
         throw new NotImplementedException();
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?rev=575351&r1=575350&r2=575351&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
Thu Sep 13 09:05:47 2007
@@ -397,7 +397,7 @@
      *
      * @param searchCtls The SearchControls we will filter
      */
-    private void filterAttributesToReturn( SearchControls searchCtls ) throws NamingException
+    private void filterAttributesToReturn( SearchControls searchCtls )
     {
         String[] attributes = searchCtls.getReturningAttributes();
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/java/LdapJavaStoredProcClassLoader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/java/LdapJavaStoredProcClassLoader.java?rev=575351&r1=575350&r2=575351&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/java/LdapJavaStoredProcClassLoader.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/java/LdapJavaStoredProcClassLoader.java
Thu Sep 13 09:05:47 2007
@@ -36,7 +36,7 @@
     private Attribute javaByteCodeAttr;
 
 
-    public LdapJavaStoredProcClassLoader( Attribute javaByteCodeAttr ) throws NamingException
+    public LdapJavaStoredProcClassLoader( Attribute javaByteCodeAttr )
     {
         // Critical call to super class constructor. Required for true plumbing of class
loaders.
         super( LdapJavaStoredProcClassLoader.class.getClassLoader() );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubtreeEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubtreeEvaluator.java?rev=575351&r1=575350&r2=575351&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubtreeEvaluator.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubtreeEvaluator.java
Thu Sep 13 09:05:47 2007
@@ -56,7 +56,7 @@
      * @param attrRegistry registry to be looked up
      * @throws NamingException 
      */
-    public SubtreeEvaluator(OidRegistry oidRegistry, AttributeTypeRegistry attrRegistry)
throws NamingException
+    public SubtreeEvaluator(OidRegistry oidRegistry, AttributeTypeRegistry attrRegistry)
     {
         evaluator = new ExpressionEvaluator(oidRegistry, attrRegistry );
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AbstractStoredProcedureParameterInjector.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AbstractStoredProcedureParameterInjector.java?rev=575351&r1=575350&r2=575351&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AbstractStoredProcedureParameterInjector.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AbstractStoredProcedureParameterInjector.java
Thu Sep 13 09:05:47 2007
@@ -42,7 +42,7 @@
     private Invocation invocation;
     private Map<Class, MicroInjector> injectors;
     
-    public AbstractStoredProcedureParameterInjector( Invocation invocation ) throws NamingException
+    public AbstractStoredProcedureParameterInjector( Invocation invocation )
     {
         this.invocation = invocation;
         injectors = new HashMap<Class, MicroInjector>();

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AddStoredProcedureParameterInjector.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AddStoredProcedureParameterInjector.java?rev=575351&r1=575350&r2=575351&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AddStoredProcedureParameterInjector.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AddStoredProcedureParameterInjector.java
Thu Sep 13 09:05:47 2007
@@ -34,7 +34,7 @@
     private LdapDN addedEntryName;
     private Attributes addedEntry;
     
-    public AddStoredProcedureParameterInjector( Invocation invocation, LdapDN addedEntryName,
Attributes addedEntry ) throws NamingException
+    public AddStoredProcedureParameterInjector( Invocation invocation, LdapDN addedEntryName,
Attributes addedEntry )
     {
         super( invocation );
         this.addedEntryName = addedEntryName;

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java?rev=575351&r1=575350&r2=575351&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java
Thu Sep 13 09:05:47 2007
@@ -40,7 +40,7 @@
     private LdapDN newDN;
 
 	public ModifyDNStoredProcedureParameterInjector( Invocation invocation, boolean deleteOldRn,
-        LdapDN oldRDN, LdapDN newRDN, LdapDN oldSuperiorDN, LdapDN newSuperiorDN, LdapDN
oldDN, LdapDN newDN) throws NamingException
+        LdapDN oldRDN, LdapDN newRDN, LdapDN oldSuperiorDN, LdapDN newSuperiorDN, LdapDN
oldDN, LdapDN newDN)
     {
         super( invocation );
         this.deleteOldRn = deleteOldRn;

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java?rev=575351&r1=575350&r2=575351&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java
Thu Sep 13 09:05:47 2007
@@ -146,10 +146,11 @@
     }
 
 
-    private boolean hasPrescriptiveTrigger( Attributes entry ) throws NamingException
+    private boolean hasPrescriptiveTrigger( Attributes entry )
     {
         // only do something if the entry contains prescriptiveTrigger
-        Attribute triggerSpec = entry.get( PRESCRIPTIVE_TRIGGER_ATTR );        
+        Attribute triggerSpec = entry.get( PRESCRIPTIVE_TRIGGER_ATTR );       
+        
         if ( triggerSpec == null )
         {
             return false;
@@ -191,7 +192,7 @@
     }
 
 
-    public void subentryDeleted( LdapDN normName, Attributes entry ) throws NamingException
+    public void subentryDeleted( LdapDN normName, Attributes entry )
     {
         if ( !hasPrescriptiveTrigger( entry ) )
         {

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java?rev=575351&r1=575350&r2=575351&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java
(original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java
Thu Sep 13 09:05:47 2007
@@ -62,15 +62,8 @@
 
     static
     {
-        try
-        {
-            SUBTREE_EVALUATOR = new SubtreeEvaluator( new DummyOidRegistry(), new DummyAttributeTypeRegistry(true)
);
-            filter = new RelatedUserClassFilter( SUBTREE_EVALUATOR );
-        }
-        catch ( NamingException e )
-        {
-            throw new Error();
-        }
+        SUBTREE_EVALUATOR = new SubtreeEvaluator( new DummyOidRegistry(), new DummyAttributeTypeRegistry(true)
);
+        filter = new RelatedUserClassFilter( SUBTREE_EVALUATOR );
         
         try
         {



Mime
View raw message