diff --git a/spring-webflow/src/main/java/org/springframework/webflow/expression/WebFlowOgnlExpressionParser.java b/spring-webflow/src/main/java/org/springframework/webflow/expression/WebFlowOgnlExpressionParser.java index 351e43d5..318f4014 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/expression/WebFlowOgnlExpressionParser.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/expression/WebFlowOgnlExpressionParser.java @@ -22,8 +22,6 @@ import ognl.Ognl; import ognl.OgnlException; import ognl.PropertyAccessor; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.support.StaticListableBeanFactory; import org.springframework.binding.collection.MapAdaptable; @@ -43,8 +41,6 @@ import org.springframework.webflow.execution.RequestContext; */ public class WebFlowOgnlExpressionParser extends OgnlExpressionParser { - private static final Log logger = LogFactory.getLog(WebFlowOgnlExpressionParser.class); - /** * Creates a Web Flow OGNL Expression Parser. */ @@ -96,54 +92,27 @@ public class WebFlowOgnlExpressionParser extends OgnlExpressionParser { String property = name.toString(); RequestContext requestContext = (RequestContext) target; if (property.equals("flowRequestContext")) { - if (logger.isDebugEnabled()) { - logger.debug("Successfully resolved the current RequestContext under variable '" + property + "'"); - } return requestContext; } if (property.equals("currentUser")) { - if (logger.isDebugEnabled()) { - logger.debug("Successfully resolved implicit flow variable '" + property + "'"); - } return requestContext.getExternalContext().getCurrentUser(); } if (property.equals("resourceBundle")) { - if (logger.isDebugEnabled()) { - logger.debug("Successfully resolved implicit flow variable '" + property + "'"); - } return requestContext.getActiveFlow().getApplicationContext(); } if (requestContext.getRequestScope().contains(property)) { - if (logger.isDebugEnabled()) { - logger.debug("Successfully resolved request scoped variable '" + property + "'"); - } return requestContext.getRequestScope().get(property); } else if (requestContext.getFlashScope().contains(property)) { - if (logger.isDebugEnabled()) { - logger.debug("Successfully resolved flash scoped variable '" + property + "'"); - } return requestContext.getFlashScope().get(property); } else if (requestContext.inViewState() && requestContext.getViewScope().contains(property)) { - if (logger.isDebugEnabled()) { - logger.debug("Successfully resolved view scoped variable '" + property + "'"); - } return requestContext.getViewScope().get(property); } else if (requestContext.getFlowScope().contains(property)) { - if (logger.isDebugEnabled()) { - logger.debug("Successfully resolved flow scoped variable '" + property + "'"); - } return requestContext.getFlowScope().get(property); } else if (requestContext.getConversationScope().contains(property)) { - if (logger.isDebugEnabled()) { - logger.debug("Successfully resolved conversation scoped variable '" + property + "'"); - } return requestContext.getConversationScope().get(property); } BeanFactory bf = getBeanFactory(requestContext); if (bf.containsBean(property)) { - if (logger.isDebugEnabled()) { - logger.debug("Successfully resolved variable '" + property + "' in Spring BeanFactory"); - } return bf.getBean(property); } return delegate.getProperty(context, target, name); @@ -162,29 +131,14 @@ public class WebFlowOgnlExpressionParser extends OgnlExpressionParser { throw new OgnlException("The 'resourceBundle' variable is not writeable"); } if (requestContext.getRequestScope().contains(property)) { - if (logger.isDebugEnabled()) { - logger.debug("Successfully resolved request scoped variable '" + property + "'"); - } requestContext.getRequestScope().put(property, value); } else if (requestContext.getFlashScope().contains(property)) { - if (logger.isDebugEnabled()) { - logger.debug("Successfully resolved flash scoped variable '" + property + "'"); - } requestContext.getFlashScope().put(property, value); } else if (requestContext.inViewState() && requestContext.getViewScope().contains(property)) { - if (logger.isDebugEnabled()) { - logger.debug("Successfully resolved view scoped variable '" + property + "'"); - } requestContext.getViewScope().put(property, value); } else if (requestContext.getFlowScope().contains(property)) { - if (logger.isDebugEnabled()) { - logger.debug("Successfully resolved flow scoped variable '" + property + "'"); - } requestContext.getFlowScope().put(property, value); } else if (requestContext.getConversationScope().contains(property)) { - if (logger.isDebugEnabled()) { - logger.debug("Successfully resolved conversation scoped variable '" + property + "'"); - } requestContext.getConversationScope().put(property, value); } else { delegate.setProperty(context, target, name, value); diff --git a/spring-webflow/src/main/java/org/springframework/webflow/expression/el/ImplicitFlowVariableELResolver.java b/spring-webflow/src/main/java/org/springframework/webflow/expression/el/ImplicitFlowVariableELResolver.java index 5205a967..09454053 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/expression/el/ImplicitFlowVariableELResolver.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/expression/el/ImplicitFlowVariableELResolver.java @@ -24,8 +24,6 @@ import javax.el.ELContext; import javax.el.ELResolver; import javax.el.PropertyNotWritableException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.springframework.binding.expression.el.DefaultELContext; import org.springframework.webflow.execution.RequestContext; import org.springframework.webflow.execution.RequestContextHolder; @@ -54,8 +52,6 @@ import org.springframework.webflow.execution.RequestContextHolder; */ public class ImplicitFlowVariableELResolver extends ELResolver { - private static final Log logger = LogFactory.getLog(ImplicitFlowVariableELResolver.class); - private RequestContext requestContext; public ImplicitFlowVariableELResolver() { @@ -96,9 +92,6 @@ public class ImplicitFlowVariableELResolver extends ELResolver { return null; } if (ImplicitVariables.matches(property)) { - if (logger.isDebugEnabled()) { - logger.debug("Successfully resolved implicit flow variable '" + property + "'"); - } context.setPropertyResolved(true); return ImplicitVariables.value(context, requestContext, property); } else { diff --git a/spring-webflow/src/main/java/org/springframework/webflow/expression/el/RequestContextELResolver.java b/spring-webflow/src/main/java/org/springframework/webflow/expression/el/RequestContextELResolver.java index bed1150e..9bacae46 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/expression/el/RequestContextELResolver.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/expression/el/RequestContextELResolver.java @@ -21,8 +21,6 @@ import javax.el.ELContext; import javax.el.ELResolver; import javax.el.PropertyNotWritableException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.springframework.webflow.execution.RequestContext; import org.springframework.webflow.execution.RequestContextHolder; @@ -40,8 +38,6 @@ public class RequestContextELResolver extends ELResolver { */ public static final String REQUEST_CONTEXT_VARIABLE_NAME = "flowRequestContext"; - private static final Log logger = LogFactory.getLog(RequestContextELResolver.class); - private RequestContext context; public RequestContextELResolver() { @@ -73,9 +69,6 @@ public class RequestContextELResolver extends ELResolver { public Object getValue(ELContext elContext, Object base, Object property) { if (base == null && REQUEST_CONTEXT_VARIABLE_NAME.equals(property)) { - if (logger.isDebugEnabled()) { - logger.debug("Successfully resolved the current RequestContext under variable '" + property + "'"); - } elContext.setPropertyResolved(true); return getRequestContext(); } else { diff --git a/spring-webflow/src/main/java/org/springframework/webflow/expression/el/ScopeSearchingELResolver.java b/spring-webflow/src/main/java/org/springframework/webflow/expression/el/ScopeSearchingELResolver.java index f7b24c36..5d3c28c8 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/expression/el/ScopeSearchingELResolver.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/expression/el/ScopeSearchingELResolver.java @@ -20,8 +20,6 @@ import java.util.Iterator; import javax.el.ELContext; import javax.el.ELResolver; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.springframework.webflow.execution.RequestContext; import org.springframework.webflow.execution.RequestContextHolder; @@ -36,8 +34,6 @@ import org.springframework.webflow.execution.RequestContextHolder; */ public class ScopeSearchingELResolver extends ELResolver { - private static final Log logger = LogFactory.getLog(ScopeSearchingELResolver.class); - private RequestContext requestContext; public ScopeSearchingELResolver() { @@ -92,33 +88,18 @@ public class ScopeSearchingELResolver extends ELResolver { } String attributeName = property.toString(); if (requestContext.getRequestScope().contains(attributeName)) { - if (logger.isDebugEnabled()) { - logger.debug("Successfully resolved request scoped variable '" + property + "'"); - } elContext.setPropertyResolved(true); return requestContext.getRequestScope().get(attributeName); } else if (requestContext.getFlashScope().contains(attributeName)) { - if (logger.isDebugEnabled()) { - logger.debug("Successfully resolved flash scoped variable '" + property + "'"); - } elContext.setPropertyResolved(true); return requestContext.getFlashScope().get(attributeName); } else if (requestContext.inViewState() && requestContext.getViewScope().contains(attributeName)) { - if (logger.isDebugEnabled()) { - logger.debug("Successfully resolved view scoped variable '" + property + "'"); - } elContext.setPropertyResolved(true); return requestContext.getViewScope().get(attributeName); } else if (requestContext.getFlowScope().contains(attributeName)) { - if (logger.isDebugEnabled()) { - logger.debug("Successfully resolved flow scoped variable '" + property + "'"); - } elContext.setPropertyResolved(true); return requestContext.getFlowScope().get(attributeName); } else if (requestContext.getConversationScope().contains(attributeName)) { - if (logger.isDebugEnabled()) { - logger.debug("Successfully resolved conversation scoped variable '" + property + "'"); - } elContext.setPropertyResolved(true); return requestContext.getConversationScope().get(attributeName); } else { @@ -159,33 +140,18 @@ public class ScopeSearchingELResolver extends ELResolver { } String attributeName = property.toString(); if (requestContext.getRequestScope().contains(attributeName)) { - if (logger.isDebugEnabled()) { - logger.debug("Successfully resolved request scoped variable '" + property + "'"); - } elContext.setPropertyResolved(true); requestContext.getRequestScope().put(attributeName, value); } else if (requestContext.getFlashScope().contains(attributeName)) { - if (logger.isDebugEnabled()) { - logger.debug("Successfully resolved flash scoped variable '" + property + "'"); - } elContext.setPropertyResolved(true); requestContext.getFlashScope().put(attributeName, value); } else if (requestContext.inViewState() && requestContext.getViewScope().contains(attributeName)) { - if (logger.isDebugEnabled()) { - logger.debug("Successfully resolved view scoped variable '" + property + "'"); - } elContext.setPropertyResolved(true); requestContext.getViewScope().put(attributeName, value); } else if (requestContext.getFlowScope().contains(attributeName)) { - if (logger.isDebugEnabled()) { - logger.debug("Successfully resolved flow scoped variable '" + property + "'"); - } elContext.setPropertyResolved(true); requestContext.getFlowScope().put(attributeName, value); } else if (requestContext.getConversationScope().contains(attributeName)) { - if (logger.isDebugEnabled()) { - logger.debug("Successfully resolved conversation scoped variable '" + property + "'"); - } elContext.setPropertyResolved(true); requestContext.getConversationScope().put(attributeName, value); }