SEC-2781: Remove deprecations

Author: Rob Winch

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

@@ -73,16 +73,6 @@ public AclImpl(ObjectIdentity objectIdentity, Serializable id, AclAuthorizationS
  this.permissionGrantingStrategy = new DefaultPermissionGrantingStrategy(auditLogger);
  }
 
- /**
- * @deprecated Use the version which takes a {@code PermissionGrantingStrategy} argument instead.
- */
- @Deprecated
- public AclImpl(ObjectIdentity objectIdentity, Serializable id, AclAuthorizationStrategy aclAuthorizationStrategy,
- AuditLogger auditLogger, Acl parentAcl, List<Sid> loadedSids, boolean entriesInheriting, Sid owner) {
- this(objectIdentity, id, aclAuthorizationStrategy, new DefaultPermissionGrantingStrategy(auditLogger),
- parentAcl, loadedSids, entriesInheriting, owner);
- }
-
  /**
  * Full constructor, which should be used by persistence tools that do not
  * provide field-level access features.

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

@@ -46,15 +46,6 @@ public class EhCacheBasedAclCache implements AclCache {
 
  //~ Constructors ===================================================================================================
 
- /**
- * @deprecated use the second constructor which injects the strategy objects. See SEC-1498.
- */
- @Deprecated
- public EhCacheBasedAclCache(Ehcache cache) {
- Assert.notNull(cache, "Cache required");
- this.cache = cache;
- }
-
  public EhCacheBasedAclCache(Ehcache cache, PermissionGrantingStrategy permissionGrantingStrategy,
  AclAuthorizationStrategy aclAuthorizationStrategy) {
  Assert.notNull(cache, "Cache required");

acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java

@@ -131,15 +131,20 @@ public class BasicLookupStrategy implements LookupStrategy {
  * @param dataSource to access the database
  * @param aclCache the cache where fully-loaded elements can be stored
  * @param aclAuthorizationStrategy authorization strategy (required)
- *
- * @deprecated Use the version which takes a {@code PermissionGrantingStrategy} argument instead.
  */
- @Deprecated
  public BasicLookupStrategy(DataSource dataSource, AclCache aclCache,
  AclAuthorizationStrategy aclAuthorizationStrategy, AuditLogger auditLogger) {
  this(dataSource, aclCache, aclAuthorizationStrategy, new DefaultPermissionGrantingStrategy(auditLogger));
  }
 
+ /**
+ * Creates a new instance
+ *
+ * @param dataSource to access the database
+ * @param aclCache the cache where fully-loaded elements can be stored
+ * @param aclAuthorizationStrategy authorization strategy (required)
+ * @param grantingStrategy the PermissionGrantingStrategy
+ */
  public BasicLookupStrategy(DataSource dataSource, AclCache aclCache,
  AclAuthorizationStrategy aclAuthorizationStrategy, PermissionGrantingStrategy grantingStrategy) {
  Assert.notNull(dataSource, "DataSource required");

acl/src/test/java/org/springframework/security/acls/domain/AclImplTests.java

@@ -77,7 +77,7 @@ public void constructorsRejectNullId() throws Exception {
  @Test(expected=IllegalArgumentException.class)
  public void constructorsRejectNullAclAuthzStrategy() throws Exception {
  try {
- new AclImpl(objectIdentity, 1, null, mockAuditLogger, null, null, true, new PrincipalSid("joe"));
+ new AclImpl(objectIdentity, 1, null, new DefaultPermissionGrantingStrategy(mockAuditLogger), null, null, true, new PrincipalSid("joe"));
  fail("It should have thrown IllegalArgumentException");
  }
  catch (IllegalArgumentException expected) {

acl/src/test/java/org/springframework/security/acls/domain/AclImplementationSecurityCheckTests.java

@@ -223,7 +223,6 @@ public void testSecurityCheckWithInheritableACEs() throws Exception {
  }
  }
 
- @SuppressWarnings("deprecation")
  @Test
  public void testSecurityCheckPrincipalOwner() throws Exception {
  Authentication auth = new TestingAuthenticationToken("user", "password", "ROLE_ONE");
@@ -235,7 +234,7 @@ public void testSecurityCheckPrincipalOwner() throws Exception {
  new SimpleGrantedAuthority("ROLE_OWNERSHIP"), new SimpleGrantedAuthority("ROLE_AUDITING"),
  new SimpleGrantedAuthority("ROLE_GENERAL"));
 
- Acl acl = new AclImpl(identity, 1, aclAuthorizationStrategy, new ConsoleAuditLogger(), null, null,
+ Acl acl = new AclImpl(identity, 1, aclAuthorizationStrategy, new DefaultPermissionGrantingStrategy(new ConsoleAuditLogger()), null, null,
  false, new PrincipalSid(auth));
  try {
  aclAuthorizationStrategy.securityCheck(acl, AclAuthorizationStrategy.CHANGE_GENERAL);

acl/src/test/java/org/springframework/security/acls/jdbc/BasicLookupStrategyTests.java

@@ -84,7 +84,7 @@ public void populateDatabase() {
 
  @Before
  public void initializeBeans() {
- EhCacheBasedAclCache cache = new EhCacheBasedAclCache(getCache());
+ EhCacheBasedAclCache cache = new EhCacheBasedAclCache(getCache(), new DefaultPermissionGrantingStrategy(new ConsoleAuditLogger()), new AclAuthorizationStrategyImpl(new SimpleGrantedAuthority("ROLE_USER")));
  AclAuthorizationStrategy authorizationStrategy = new AclAuthorizationStrategyImpl(new SimpleGrantedAuthority("ROLE_ADMINISTRATOR"));
  strategy = new BasicLookupStrategy(dataSource, cache, authorizationStrategy,
  new DefaultPermissionGrantingStrategy(new ConsoleAuditLogger()));

acl/src/test/java/org/springframework/security/acls/jdbc/EhCacheBasedAclCacheTests.java

@@ -29,16 +29,12 @@
 import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
-import org.springframework.security.acls.domain.AclAuthorizationStrategy;
-import org.springframework.security.acls.domain.AclAuthorizationStrategyImpl;
-import org.springframework.security.acls.domain.AclImpl;
-import org.springframework.security.acls.domain.ConsoleAuditLogger;
-import org.springframework.security.acls.domain.EhCacheBasedAclCache;
-import org.springframework.security.acls.domain.ObjectIdentityImpl;
+import org.springframework.security.acls.domain.*;
 import org.springframework.security.acls.model.MutableAcl;
 import org.springframework.security.acls.model.ObjectIdentity;
 import org.springframework.security.authentication.TestingAuthenticationToken;
 import org.springframework.security.core.Authentication;
+import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.util.FieldUtils;
@@ -65,7 +61,7 @@ public class EhCacheBasedAclCacheTests {
 
  @Before
  public void setup() {
- myCache = new EhCacheBasedAclCache(cache);
+ myCache = new EhCacheBasedAclCache(cache, new DefaultPermissionGrantingStrategy(new ConsoleAuditLogger()), new AclAuthorizationStrategyImpl(new SimpleGrantedAuthority("ROLE_USER")));
 
  ObjectIdentity identity = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(100));
  AclAuthorizationStrategy aclAuthorizationStrategy = new AclAuthorizationStrategyImpl(
@@ -82,7 +78,7 @@ public void cleanup() {
 
  @Test(expected=IllegalArgumentException.class)
  public void constructorRejectsNullParameters() throws Exception {
- new EhCacheBasedAclCache(null);
+ new EhCacheBasedAclCache(null, new DefaultPermissionGrantingStrategy(new ConsoleAuditLogger()), new AclAuthorizationStrategyImpl(new SimpleGrantedAuthority("ROLE_USER")));
  }
 
  @Test

acl/src/test/resources/jdbcMutableAclServiceTests-context.xml

@@ -22,6 +22,25 @@
  <property name="cacheName" value="aclCache"/>
  </bean>
  </constructor-arg>
+ <constructor-arg>
+ <bean class="org.springframework.security.acls.domain.DefaultPermissionGrantingStrategy">
+ <constructor-arg>
+ <bean class="org.springframework.security.acls.domain.ConsoleAuditLogger"/>
+ </constructor-arg>
+ </bean>
+ </constructor-arg>
+ <constructor-arg>
+ <bean class="org.springframework.security.acls.domain.AclAuthorizationStrategyImpl">
+ <constructor-arg>
+ <list>
+ <bean class="org.springframework.security.core.authority.SimpleGrantedAuthority">
+ <constructor-arg value="ROLE_USER"/>
+ </bean>
+ </list>
+ </constructor-arg>
+ </bean>
+ </constructor-arg>
+
  </bean>
 
  <bean id="lookupStrategy" class="org.springframework.security.acls.jdbc.BasicLookupStrategy">

aspects/src/test/java/org/springframework/security/access/intercept/aspectj/aspect/AnnotationSecurityAspectTests.java

@@ -53,10 +53,9 @@ public class AnnotationSecurityAspectTests {
  public final void setUp() throws Exception {
  MockitoAnnotations.initMocks(this);
  interceptor = new AspectJMethodSecurityInterceptor();
- adm = new AffirmativeBased();
  AccessDecisionVoter[] voters = new AccessDecisionVoter[]
  {new RoleVoter(), new PreInvocationAuthorizationAdviceVoter(new ExpressionBasedPreInvocationAdvice())};
- adm.setDecisionVoters(Arrays.<AccessDecisionVoter<? extends Object>>asList(voters));
+ adm = new AffirmativeBased(Arrays.<AccessDecisionVoter<? extends Object>>asList(voters));
  interceptor.setAccessDecisionManager(adm);
  interceptor.setAuthenticationManager(authman);
  interceptor.setSecurityMetadataSource(new SecuredAnnotationSecurityMetadataSource());

cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationProvider.java

@@ -185,15 +185,15 @@ protected UserDetails loadUserByAssertion(final Assertion assertion) {
  return this.authenticationUserDetailsService.loadUserDetails(token);
  }
 
- @Deprecated
  @SuppressWarnings("unchecked")
  /**
- * @deprecated as of 3.0. Use the {@link org.springframework.security.cas.authentication.CasAuthenticationProvider#setAuthenticationUserDetailsService(org.springframework.security.core.userdetails.AuthenticationUserDetailsService)} instead.
+ * Sets the UserDetailsService to use. This is a convenience method to invoke
  */
  public void setUserDetailsService(final UserDetailsService userDetailsService) {
  this.authenticationUserDetailsService = new UserDetailsByNameServiceWrapper(userDetailsService);
  }
 
+
  public void setAuthenticationUserDetailsService(final AuthenticationUserDetailsService<CasAssertionAuthenticationToken> authenticationUserDetailsService) {
  this.authenticationUserDetailsService = authenticationUserDetailsService;
  }