From eae670269de6c1fc724b49d31eaab079efe2dca6 Mon Sep 17 00:00:00 2001 From: Luke Taylor Date: Mon, 6 Jul 2009 10:33:57 +0000 Subject: [PATCH] Tidying --- .../security/config/ConfigUtils.java | 17 ----------------- .../config/FilterChainProxyPostProcessor.java | 12 ------------ 2 files changed, 29 deletions(-) diff --git a/config/src/main/java/org/springframework/security/config/ConfigUtils.java b/config/src/main/java/org/springframework/security/config/ConfigUtils.java index 17c333d9fa..a92970a7e6 100644 --- a/config/src/main/java/org/springframework/security/config/ConfigUtils.java +++ b/config/src/main/java/org/springframework/security/config/ConfigUtils.java @@ -141,23 +141,6 @@ abstract class ConfigUtils { // filters.add(filter); // } - /** - * Bean which holds the list of filters which are maintained in the context and modified by calls to - * addHttpFilter. The post processor retrieves these before injecting the list into the FilterChainProxy. - */ - @SuppressWarnings("unchecked") - public static class FilterChainList { - List filters; - - public List getFilters() { - return filters; - } - - public void setFilters(List filters) { - this.filters = filters; - } - } - /** * Checks the value of an XML attribute which represents a redirect URL. * If not empty or starting with "$" (potential placeholder), "/" or "http" it will raise an error. diff --git a/config/src/main/java/org/springframework/security/config/FilterChainProxyPostProcessor.java b/config/src/main/java/org/springframework/security/config/FilterChainProxyPostProcessor.java index fdf5060984..37ebc3a389 100644 --- a/config/src/main/java/org/springframework/security/config/FilterChainProxyPostProcessor.java +++ b/config/src/main/java/org/springframework/security/config/FilterChainProxyPostProcessor.java @@ -1,9 +1,6 @@ package org.springframework.security.config; -import java.util.ArrayList; -import java.util.Collections; import java.util.List; -import java.util.Map; import javax.servlet.Filter; @@ -14,19 +11,10 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.beans.factory.config.BeanPostProcessor; -import org.springframework.core.OrderComparator; -import org.springframework.core.Ordered; -import org.springframework.security.access.ConfigAttribute; -import org.springframework.security.authentication.AnonymousAuthenticationToken; -import org.springframework.security.config.ConfigUtils.FilterChainList; import org.springframework.security.web.FilterChainProxy; import org.springframework.security.web.access.ExceptionTranslationFilter; -import org.springframework.security.web.access.intercept.DefaultFilterInvocationSecurityMetadataSource; import org.springframework.security.web.access.intercept.FilterSecurityInterceptor; -import org.springframework.security.web.authentication.AnonymousProcessingFilter; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationProcessingFilter; -import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint; -import org.springframework.security.web.authentication.ui.DefaultLoginPageGeneratingFilter; import org.springframework.security.web.authentication.www.BasicProcessingFilter; import org.springframework.security.web.context.SecurityContextPersistenceFilter; import org.springframework.security.web.session.SessionFixationProtectionFilter;