SEC-1012: Adding generics and general tidying up of tests etc

acl/src/main/java/org/springframework/security/acls/domain/BasePermission.java

@@ -19,12 +19,12 @@ import org.springframework.security.acls.Permission;
 
 /**
  * A set of standard permissions.
- * 
+ *
  * <p>
  * You may subclass this class to add additional permissions, or use this class as a guide
  * for creating your own permission classes.
  * </p>
- * 
+ *
  * @author Ben Alex
  * @version $Id$
  */
@@ -34,25 +34,25 @@ public class BasePermission extends AbstractPermission {
     public static final Permission CREATE = new BasePermission(1 << 2, 'C'); // 4
     public static final Permission DELETE = new BasePermission(1 << 3, 'D'); // 8
     public static final Permission ADMINISTRATION = new BasePermission(1 << 4, 'A'); // 16
-    
-	protected static DefaultPermissionFactory defaultPermissionFactory = new DefaultPermissionFactory();
 
-	/**
+    protected static DefaultPermissionFactory defaultPermissionFactory = new DefaultPermissionFactory();
+
+    /**
      * Registers the public static permissions defined on this class. This is mandatory so
      * that the static methods will operate correctly.
      */
     static {
-    	registerPermissionsFor(BasePermission.class);
+        registerPermissionsFor(BasePermission.class);
     }
 
     protected BasePermission(int mask, char code) {
-    	super(mask, code);
+        super(mask, code);
     }
 
-    protected final static void registerPermissionsFor(Class subClass) {
-    	defaultPermissionFactory.registerPublicPermissions(subClass);
+    protected final static void registerPermissionsFor(Class<?> subClass) {
+        defaultPermissionFactory.registerPublicPermissions(subClass);
     }
-    
+
     public final static Permission buildFromMask(int mask) {
         return defaultPermissionFactory.buildFromMask(mask);
     }
@@ -62,11 +62,11 @@ public class BasePermission extends AbstractPermission {
     }
 
     public final static Permission buildFromName(String name) {
-    	return defaultPermissionFactory.buildFromName(name);
+        return defaultPermissionFactory.buildFromName(name);
     }
 
     public final static Permission[] buildFromName(String[] names) {
         return defaultPermissionFactory.buildFromName(names);
     }
 
-}
+}

acl/src/main/java/org/springframework/security/afterinvocation/AbstractAclProvider.java

@@ -43,7 +43,7 @@ public abstract class AbstractAclProvider implements AfterInvocationProvider {
     //~ Instance fields ================================================================================================
 
     protected AclService aclService;
-    protected Class processDomainObjectClass = Object.class;
+    protected Class<?> processDomainObjectClass = Object.class;
     protected ObjectIdentityRetrievalStrategy objectIdentityRetrievalStrategy = new ObjectIdentityRetrievalStrategyImpl();
     protected SidRetrievalStrategy sidRetrievalStrategy = new SidRetrievalStrategyImpl();
     protected String processConfigAttribute;
@@ -66,7 +66,7 @@ public abstract class AbstractAclProvider implements AfterInvocationProvider {
 
     //~ Methods ========================================================================================================
 
-    protected Class getProcessDomainObjectClass() {
+    protected Class<?> getProcessDomainObjectClass() {
         return processDomainObjectClass;
     }
 
@@ -99,7 +99,7 @@ public abstract class AbstractAclProvider implements AfterInvocationProvider {
         this.processConfigAttribute = processConfigAttribute;
     }
 
-    public void setProcessDomainObjectClass(Class processDomainObjectClass) {
+    public void setProcessDomainObjectClass(Class<?> processDomainObjectClass) {
         Assert.notNull(processDomainObjectClass, "processDomainObjectClass cannot be set to null");
         this.processDomainObjectClass = processDomainObjectClass;
     }
@@ -120,7 +120,7 @@ public abstract class AbstractAclProvider implements AfterInvocationProvider {
      *
      * @return always <code>true</code>
      */
-    public boolean supports(Class<? extends Object> clazz) {
+    public boolean supports(Class<?> clazz) {
         return true;
     }
 }

acl/src/main/java/org/springframework/security/vote/AclEntryVoter.java

@@ -173,7 +173,7 @@ public class AclEntryVoter extends AbstractAclVoter {
             // Evaluate if we are required to use an inner domain object
             if (StringUtils.hasText(internalMethod)) {
                 try {
-                    Class clazz = domainObject.getClass();
+                    Class<?> clazz = domainObject.getClass();
                     Method method = clazz.getMethod(internalMethod, new Class[0]);
                     domainObject = method.invoke(domainObject, new Object[0]);
                 } catch (NoSuchMethodException nsme) {