Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-06-28 14:52:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary @SuppressWarnings and inline dependency from ELRequestMatcher (util package) to core ExpressionUtils.

Browse Source
This commit is contained in:
Luke Taylor 2010-02-14 23:29:27 +00:00
parent dbee91002e
commit d30e31d816
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/src/main/java/org/springframework/security/web/util/ELRequestMatcher.java
View File

@ -19,10 +19,10 @@ package org.springframework.security.web.util;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import org.springframework.expression.EvaluationContext; import org.springframework.expression.EvaluationContext;
import org.springframework.expression.EvaluationException;
import org.springframework.expression.Expression; import org.springframework.expression.Expression;
import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.expression.spel.standard.SpelExpressionParser;
import org.springframework.expression.spel.support.StandardEvaluationContext; import org.springframework.expression.spel.support.StandardEvaluationContext;
import org.springframework.security.access.expression.ExpressionUtils;
import org.springframework.security.web.authentication.DelegatingAuthenticationEntryPoint; import org.springframework.security.web.authentication.DelegatingAuthenticationEntryPoint;
/** /**
@ -36,7 +36,6 @@ import org.springframework.security.web.authentication.DelegatingAuthenticationE
* *
* @author Mike Wiesner * @author Mike Wiesner
* @since 3.0.2 * @since 3.0.2
* @version $Id:$
*/ */
public class ELRequestMatcher implements RequestMatcher { public class ELRequestMatcher implements RequestMatcher {
@ -49,7 +48,7 @@ public class ELRequestMatcher implements RequestMatcher {
public boolean matches(HttpServletRequest request) { public boolean matches(HttpServletRequest request) {
EvaluationContext context = createELContext(request); EvaluationContext context = createELContext(request);
return ExpressionUtils.evaluateAsBoolean(expression, context); return evaluateAsBoolean(expression, context);
} }
/** /**
@ -61,4 +60,11 @@ public class ELRequestMatcher implements RequestMatcher {
return new StandardEvaluationContext(new ELRequestMatcherContext(request)); return new StandardEvaluationContext(new ELRequestMatcherContext(request));
} }
private boolean evaluateAsBoolean(Expression expr, EvaluationContext ctx) {
try {
return ((Boolean) expr.getValue(ctx, Boolean.class)).booleanValue();
} catch (EvaluationException e) {
throw new IllegalArgumentException("Failed to evaluate expression '" + expr.getExpressionString() + "'", e);
}
}
} }

2
web/src/main/java/org/springframework/security/web/util/ELRequestMatcherContext.java
View File

@ -28,12 +28,10 @@ class ELRequestMatcherContext {
this.request = request; this.request = request;
} }
@SuppressWarnings("unused")
public boolean hasIpAddress(String ipAddress) { public boolean hasIpAddress(String ipAddress) {
return (new IpAddressMatcher(ipAddress).matches(request)); return (new IpAddressMatcher(ipAddress).matches(request));
} }
@SuppressWarnings("unused")
public boolean hasHeader(String headerName, String value) { public boolean hasHeader(String headerName, String value) {
String header = request.getHeader(headerName); String header = request.getHeader(headerName);
if (StringUtils.hasText(header) == false) { if (StringUtils.hasText(header) == false) {