Cwikius-Spring/spring-security
1
0
Fork 0
mirror of synced 2026-08-06 02:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

SEC-342: Change ObjectDefinitionSource to return a Collection instead of an Iterator.

Browse Source
This commit is contained in:
Luke Taylor
2008-01-30 15:43:40 +00:00
parent d695f5002c
commit 3b6ce862f3
13 changed files with 49 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/test/java/org/springframework/security/intercept/method/MethodDefinitionSourceEditorTests.java
+1 -1
View File
@@ -137,7 +137,7 @@ public class MethodDefinitionSourceEditorTests extends TestCase {
"org.springframework.security.TargetObject.countLength=ROLE_ONE,ROLE_TWO,RUN_AS_ENTRY\r\norg.springframework.security.TargetObject.make*=ROLE_NINE,ROLE_SUPERVISOR");
MethodDefinitionMap map = (MethodDefinitionMap) editor.getValue();
Iterator iter = map.getConfigAttributeDefinitions();
Iterator iter = map.getConfigAttributeDefinitions().iterator();
int counter = 0;
while (iter.hasNext()) {
core/src/test/java/org/springframework/security/intercept/method/MockMethodDefinitionSource.java
+7 -8
View File
@@ -16,13 +16,12 @@
package org.springframework.security.intercept.method;
import org.springframework.security.ConfigAttributeDefinition;
import org.springframework.security.SecurityConfig;
import java.lang.reflect.Method;
import java.util.Iterator;
import java.util.List;
import java.util.Vector;
import java.util.Collection;
/**
@@ -34,12 +33,12 @@ public class MockMethodDefinitionSource extends AbstractMethodDefinitionSource {
//~ Instance fields ================================================================================================
private List list;
private boolean returnAnIterator;
private boolean returnACollection;
//~ Constructors ===================================================================================================
public MockMethodDefinitionSource(boolean includeInvalidAttributes, boolean returnAnIteratorWhenRequested) {
returnAnIterator = returnAnIteratorWhenRequested;
public MockMethodDefinitionSource(boolean includeInvalidAttributes, boolean returnACollectionWhenRequested) {
returnACollection = returnACollectionWhenRequested;
list = new Vector();
ConfigAttributeDefinition def1 = new ConfigAttributeDefinition("MOCK_LOWER");
@@ -61,9 +60,9 @@ public class MockMethodDefinitionSource extends AbstractMethodDefinitionSource {
//~ Methods ========================================================================================================
public Iterator getConfigAttributeDefinitions() {
if (returnAnIterator) {
return list.iterator();
public Collection getConfigAttributeDefinitions() {
if (returnACollection) {
return list;
} else {
return null;
}
core/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptorTests.java
+2 -2
View File
@@ -48,7 +48,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
import java.lang.reflect.Method;
import java.util.Iterator;
import java.util.Collection;
/**
@@ -447,7 +447,7 @@ public class MethodSecurityInterceptorTests extends TestCase {
}
private class MockObjectDefinitionSourceWhichOnlySupportsStrings extends AbstractMethodDefinitionSource {
public Iterator getConfigAttributeDefinitions() {
public Collection getConfigAttributeDefinitions() {
return null;
}
core/src/test/java/org/springframework/security/intercept/web/FilterInvocationDefinitionSourceEditorTests.java
+1 -1
View File
@@ -145,7 +145,7 @@ public class FilterInvocationDefinitionSourceEditorTests extends TestCase {
editor.setAsText("\\A/secure/super.*\\Z=ROLE_WE_DONT_HAVE\r\n\\A/secure/.*\\Z=ROLE_SUPERVISOR,ROLE_TELLER");
DefaultFilterInvocationDefinitionSource map = (DefaultFilterInvocationDefinitionSource) editor.getValue();
Iterator iter = map.getConfigAttributeDefinitions();
Iterator iter = map.getConfigAttributeDefinitions().iterator();
int counter = 0;
while (iter.hasNext()) {
core/src/test/java/org/springframework/security/intercept/web/FilterSecurityInterceptorTests.java
+2 -6
View File
@@ -29,7 +29,6 @@ import org.springframework.security.MockApplicationContext;
import org.springframework.security.MockAuthenticationManager;
import org.springframework.security.MockRunAsManager;
import org.springframework.security.RunAsManager;
import org.springframework.security.SecurityConfig;
import org.springframework.security.util.AntUrlPathMatcher;
import org.springframework.security.util.RegexUrlPathMatcher;
import org.springframework.security.context.SecurityContextHolder;
@@ -39,10 +38,7 @@ import org.springframework.mock.web.MockHttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.LinkedHashMap;
import java.util.Collection;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
@@ -281,7 +277,7 @@ public class FilterSecurityInterceptorTests extends TestCase {
}
}
public Iterator getConfigAttributeDefinitions() {
public Collection getConfigAttributeDefinitions() {
return null;
}
core/src/test/java/org/springframework/security/intercept/web/MockFilterInvocationDefinitionSource.java
+3 -4
View File
@@ -16,12 +16,11 @@
package org.springframework.security.intercept.web;
import org.springframework.security.ConfigAttributeDefinition;
import org.springframework.security.SecurityConfig;
import org.springframework.security.util.AntUrlPathMatcher;
import java.util.Iterator;
import java.util.List;
import java.util.Vector;
import java.util.Collection;
/**
@@ -62,9 +61,9 @@ public class MockFilterInvocationDefinitionSource extends DefaultFilterInvocatio
//~ Methods ========================================================================================================
public Iterator getConfigAttributeDefinitions() {
public Collection getConfigAttributeDefinitions() {
if (returnAnIterator) {
return list.iterator();
return list;
} else {
return null;
}
core/src/test/java/org/springframework/security/securechannel/ChannelProcessingFilterTests.java
+8 -14
View File
@@ -19,7 +19,6 @@ import junit.framework.TestCase;
import org.springframework.security.ConfigAttribute;
import org.springframework.security.ConfigAttributeDefinition;
import org.springframework.security.SecurityConfig;
import org.springframework.security.intercept.web.FilterInvocation;
import org.springframework.security.intercept.web.FilterInvocationDefinitionSource;
@@ -29,9 +28,9 @@ import org.springframework.mock.web.MockHttpServletResponse;
import java.io.IOException;
import java.util.Iterator;
import java.util.List;
import java.util.Vector;
import java.util.Collection;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
@@ -91,8 +90,7 @@ public class ChannelProcessingFilterTests extends TestCase {
assertTrue(true);
}
public void testDetectsUnsupportedConfigAttribute()
throws Exception {
public void testDetectsUnsupportedConfigAttribute() throws Exception {
ChannelProcessingFilter filter = new ChannelProcessingFilter();
filter.setChannelDecisionManager(new MockChannelDecisionManager(false, "SUPPORTS_MOCK_ONLY"));
@@ -109,8 +107,7 @@ public class ChannelProcessingFilterTests extends TestCase {
}
}
public void testDoFilterWhenManagerDoesCommitResponse()
throws Exception {
public void testDoFilterWhenManagerDoesCommitResponse() throws Exception {
ChannelProcessingFilter filter = new ChannelProcessingFilter();
filter.setChannelDecisionManager(new MockChannelDecisionManager(true, "SOME_ATTRIBUTE"));
@@ -131,8 +128,7 @@ public class ChannelProcessingFilterTests extends TestCase {
assertTrue(true);
}
public void testDoFilterWhenManagerDoesNotCommitResponse()
throws Exception {
public void testDoFilterWhenManagerDoesNotCommitResponse() throws Exception {
ChannelProcessingFilter filter = new ChannelProcessingFilter();
filter.setChannelDecisionManager(new MockChannelDecisionManager(false, "SOME_ATTRIBUTE"));
@@ -175,8 +171,7 @@ public class ChannelProcessingFilterTests extends TestCase {
assertTrue(true);
}
public void testDoFilterWithNonHttpServletRequestDetected()
throws Exception {
public void testDoFilterWithNonHttpServletRequestDetected() throws Exception {
ChannelProcessingFilter filter = new ChannelProcessingFilter();
try {
@@ -186,8 +181,7 @@ public class ChannelProcessingFilterTests extends TestCase {
}
}
public void testDoFilterWithNonHttpServletResponseDetected()
throws Exception {
public void testDoFilterWithNonHttpServletResponseDetected() throws Exception {
ChannelProcessingFilter filter = new ChannelProcessingFilter();
try {
@@ -293,7 +287,7 @@ public class ChannelProcessingFilterTests extends TestCase {
}
}
public Iterator getConfigAttributeDefinitions() {
public Collection getConfigAttributeDefinitions() {
if (!provideIterator) {
return null;
}
@@ -301,7 +295,7 @@ public class ChannelProcessingFilterTests extends TestCase {
List list = new Vector();
list.add(toReturn);
return list.iterator();
return list;
}
public boolean supports(Class clazz) {