directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r502497 - in /directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core: authz/AuthorizationService.java exception/ExceptionService.java normalization/NormalizationService.java referral/ReferralService.java
Date Fri, 02 Feb 2007 05:06:53 GMT
Author: akarasulu
Date: Thu Feb  1 21:06:52 2007
New Revision: 502497

URL: http://svn.apache.org/viewvc?view=rev&rev=502497
Log:
cleanup some warnings in eclipse around type safty and generics

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/exception/ExceptionService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.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?view=diff&rev=502497&r1=502496&r2=502497
==============================================================================
--- 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 Feb  1 21:06:52 2007
@@ -89,20 +89,20 @@
      */
     private static final String AC_SUBENTRY_ATTR = "accessControlSubentries";
 
-    private static final Collection ADD_PERMS;
-    private static final Collection READ_PERMS;
-    private static final Collection COMPARE_PERMS;
-    private static final Collection SEARCH_ENTRY_PERMS;
-    private static final Collection SEARCH_ATTRVAL_PERMS;
-    private static final Collection REMOVE_PERMS;
-    private static final Collection MATCHEDNAME_PERMS;
-    private static final Collection BROWSE_PERMS;
-    private static final Collection LOOKUP_PERMS;
-    private static final Collection REPLACE_PERMS;
-    private static final Collection RENAME_PERMS;
-    private static final Collection EXPORT_PERMS;
-    private static final Collection IMPORT_PERMS;
-    private static final Collection MOVERENAME_PERMS;
+    private static final Collection<MicroOperation> ADD_PERMS;
+    private static final Collection<MicroOperation> READ_PERMS;
+    private static final Collection<MicroOperation> COMPARE_PERMS;
+    private static final Collection<MicroOperation> SEARCH_ENTRY_PERMS;
+    private static final Collection<MicroOperation> SEARCH_ATTRVAL_PERMS;
+    private static final Collection<MicroOperation> REMOVE_PERMS;
+    private static final Collection<MicroOperation> MATCHEDNAME_PERMS;
+    private static final Collection<MicroOperation> BROWSE_PERMS;
+    private static final Collection<MicroOperation> LOOKUP_PERMS;
+    private static final Collection<MicroOperation> REPLACE_PERMS;
+    private static final Collection<MicroOperation> RENAME_PERMS;
+    private static final Collection<MicroOperation> EXPORT_PERMS;
+    private static final Collection<MicroOperation> IMPORT_PERMS;
+    private static final Collection<MicroOperation> MOVERENAME_PERMS;
 
     static
     {
@@ -508,7 +508,7 @@
             Collections.singleton( MicroOperation.MODIFY ), tuples, entry );
 
         NamingEnumeration attrList = mods.getAll();
-        Collection perms = null;
+        Collection<MicroOperation> perms = null;
         switch ( modOp )
         {
             case ( DirContext.ADD_ATTRIBUTE  ):
@@ -572,7 +572,7 @@
         engine.checkPermission( proxy, userGroups, principalDn, principal.getAuthenticationLevel(),
name, null, null,
             Collections.singleton( MicroOperation.MODIFY ), tuples, entry );
 
-        Collection perms = null;
+        Collection<MicroOperation> perms = null;
         for ( int ii = 0; ii < mods.length; ii++ )
         {
             switch ( mods[ii].getModificationOp() )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java?view=diff&rev=502497&r1=502496&r2=502497
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java
Thu Feb  1 21:06:52 2007
@@ -47,6 +47,7 @@
 import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.schema.OidNormalizer;
 
 
 /**
@@ -66,7 +67,7 @@
     /**
      * The OIDs normalizer map
      */
-    private Map normalizerMap;
+    private Map<String, OidNormalizer> normalizerMap;
 
     /**
      * Creates an interceptor that is also the exception handling service.

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java?view=diff&rev=502497&r1=502496&r2=502497
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java
Thu Feb  1 21:06:52 2007
@@ -392,7 +392,7 @@
     }
     
     
-    public void bind( NextInterceptor next, LdapDN bindDn, byte[] credentials, List mechanisms,
String saslAuthId ) 
+    public void bind( NextInterceptor next, LdapDN bindDn, byte[] credentials, List<String>
mechanisms, String saslAuthId ) 
         throws NamingException
     {
         bindDn = LdapDN.normalize( bindDn, attributeRegistry.getNormalizerMapping() );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java?view=diff&rev=502497&r1=502496&r2=502497
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java
Thu Feb  1 21:06:52 2007
@@ -91,7 +91,7 @@
     private static final String FOLLOW = "follow";
     private static final String REFERRAL_OC = "referral";
     private static final String OBJCLASS_ATTR = "objectClass";
-    private static final Collection SEARCH_BYPASS;
+    private static final Collection<String> SEARCH_BYPASS;
     private static final String REF_ATTR = "ref";
 
     private ReferralLut lut = new ReferralLut();
@@ -107,7 +107,7 @@
          * These are the services that we will bypass while searching for referrals in
          * partitions of the system during startup and during add/remove partition ops
          */
-        Collection c = new HashSet();
+        Collection<String> c = new HashSet<String>();
         c.add( "normalizationService" );
         c.add( "authenticationService" );
         c.add( "authorizationService" );
@@ -977,7 +977,7 @@
     public void doReferralExceptionOnSearchBase( LdapDN base, Attribute refs, int scope )
throws NamingException
     {
         // handle referral here
-        List list = new ArrayList( refs.size() );
+        List<String> list = new ArrayList<String>( refs.size() );
         for ( int ii = 0; ii < refs.size(); ii++ )
         {
             String val = ( String ) refs.get( ii );
@@ -1038,7 +1038,7 @@
         throws NamingException
     {
         // handle referral here
-        List list = new ArrayList( refs.size() );
+        List<String> list = new ArrayList<String>( refs.size() );
         for ( int ii = 0; ii < refs.size(); ii++ )
         {
             String val = ( String ) refs.get( ii );



Mime
View raw message