From fba57bdf5bf80eaff47873bec4a5bc41bee1d82b Mon Sep 17 00:00:00 2001 From: Luke Taylor Date: Tue, 2 Dec 2008 12:56:04 +0000 Subject: [PATCH] Removed unused MockAccessDecisionManager class --- .../security/MockAccessDecisionManager.java | 58 ------------------- .../MethodSecurityInterceptorTests.java | 10 ---- 2 files changed, 68 deletions(-) delete mode 100644 core/src/test/java/org/springframework/security/MockAccessDecisionManager.java diff --git a/core/src/test/java/org/springframework/security/MockAccessDecisionManager.java b/core/src/test/java/org/springframework/security/MockAccessDecisionManager.java deleted file mode 100644 index 36681f9938..0000000000 --- a/core/src/test/java/org/springframework/security/MockAccessDecisionManager.java +++ /dev/null @@ -1,58 +0,0 @@ -/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.security; - -import java.util.List; - - -/** - * Grants access if the user holds any of the authorities listed in the configuration attributes starting with - * "MOCK_". - * - * @author Ben Alex - * @version $Id$ - */ -public class MockAccessDecisionManager implements AccessDecisionManager { - //~ Methods ======================================================================================================== - - public void decide(Authentication authentication, Object object, List configAttributes) - throws AccessDeniedException { - - for(ConfigAttribute attr : configAttributes) { - if (this.supports(attr)) { - for(GrantedAuthority authority : authentication.getAuthorities()) { - if (attr.getAttribute().equals(authority.getAuthority())) { - return; - } - } - } - } - - throw new AccessDeniedException("Didn't hold required authority"); - } - - public boolean supports(ConfigAttribute attribute) { - if (attribute.getAttribute().startsWith("MOCK_")) { - return true; - } else { - return false; - } - } - - public boolean supports(Class clazz) { - return true; - } -} diff --git a/core/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptorTests.java b/core/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptorTests.java index e7e1b8dc48..f6751e9c1b 100644 --- a/core/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptorTests.java +++ b/core/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptorTests.java @@ -17,7 +17,6 @@ package org.springframework.security.intercept.method.aopalliance; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import java.util.List; @@ -32,27 +31,18 @@ import org.springframework.aop.framework.ProxyFactory; import org.springframework.security.AccessDecisionManager; import org.springframework.security.AccessDeniedException; import org.springframework.security.AfterInvocationManager; -import org.springframework.security.Authentication; import org.springframework.security.AuthenticationCredentialsNotFoundException; import org.springframework.security.AuthenticationException; import org.springframework.security.AuthenticationManager; import org.springframework.security.BadCredentialsException; import org.springframework.security.ConfigAttribute; -import org.springframework.security.GrantedAuthority; -import org.springframework.security.GrantedAuthorityImpl; import org.springframework.security.ITargetObject; -import org.springframework.security.MockAccessDecisionManager; -import org.springframework.security.MockAuthenticationManager; -import org.springframework.security.MockRunAsManager; import org.springframework.security.RunAsManager; import org.springframework.security.SecurityConfig; import org.springframework.security.TargetObject; import org.springframework.security.context.SecurityContextHolder; import org.springframework.security.intercept.method.MethodDefinitionSource; -import org.springframework.security.intercept.method.MockMethodDefinitionSource; import org.springframework.security.providers.TestingAuthenticationToken; -import org.springframework.security.providers.UsernamePasswordAuthenticationToken; -import org.springframework.security.runas.RunAsManagerImpl; import org.springframework.security.runas.RunAsUserToken; /**