Author: dan.j.allen Date: 2008-09-21 02:32:13 -0400 (Sun, 21 Sep 2008) New Revision: 9069 Modified: branches/community/Seam_2_0/src/main/org/jboss/seam/navigation/Action.java branches/community/Seam_2_0/src/main/org/jboss/seam/navigation/Page.java branches/community/Seam_2_0/src/main/org/jboss/seam/navigation/Pages.java branches/community/Seam_2_0/src/main/org/jboss/seam/pages-2.0.dtd branches/community/Seam_2_0/src/main/org/jboss/seam/pages-2.0.xsd branches/community/Seam_2_0/src/test/unit/META-INF/pagesForPageActionsTest.xml branches/community/Seam_2_0/src/test/unit/org/jboss/seam/test/unit/PageActionsTest.java Log: JBSEAM-2469 Modified: branches/community/Seam_2_0/src/main/org/jboss/seam/navigation/Action.java =================================================================== --- branches/community/Seam_2_0/src/main/org/jboss/seam/navigation/Action.java 2008-09-21 04:23:18 UTC (rev 9068) +++ branches/community/Seam_2_0/src/main/org/jboss/seam/navigation/Action.java 2008-09-21 06:32:13 UTC (rev 9069) @@ -14,11 +14,12 @@ private MethodExpression methodExpression; private ValueExpression valueExpression; private String outcome; + private boolean onPostback = true; - public boolean isExecutable() + public boolean isExecutable(boolean postback) { - return valueExpression==null || - Boolean.TRUE.equals( valueExpression.getValue() ); + return (!postback || (postback && onPostback)) && + (valueExpression == null || Boolean.TRUE.equals( valueExpression.getValue())); } public MethodExpression getMethodExpression() @@ -47,4 +48,14 @@ { this.outcome = outcome; } + + public boolean isOnPostback() + { + return onPostback; + } + + public void setOnPostback(boolean onPostback) + { + this.onPostback = onPostback; + } } Modified: branches/community/Seam_2_0/src/main/org/jboss/seam/navigation/Page.java =================================================================== --- branches/community/Seam_2_0/src/main/org/jboss/seam/navigation/Page.java 2008-09-21 04:23:18 UTC (rev 9068) +++ branches/community/Seam_2_0/src/main/org/jboss/seam/navigation/Page.java 2008-09-21 06:32:13 UTC (rev 9069) @@ -252,7 +252,7 @@ for ( Action action: getActions() ) { - if ( action.isExecutable() ) + if ( action.isExecutable(facesContext.getRenderKit().getResponseStateManager().isPostback(facesContext)) ) { String outcome = action.getOutcome(); String fromAction = outcome; Modified: branches/community/Seam_2_0/src/main/org/jboss/seam/navigation/Pages.java =================================================================== --- branches/community/Seam_2_0/src/main/org/jboss/seam/navigation/Pages.java 2008-09-21 04:23:18 UTC (rev 9068) +++ branches/community/Seam_2_0/src/main/org/jboss/seam/navigation/Pages.java 2008-09-21 06:32:13 UTC (rev 9069) @@ -1074,12 +1074,12 @@ page.setEventType( eventElement.attributeValue("type") ); } - Action action = parseAction(element, "action"); + Action action = parseAction(element, "action", false); if (action!=null) page.getActions().add(action); List<Element> childElements = element.elements("action"); for (Element childElement: childElements) { - page.getActions().add( parseAction(childElement, "execute") ); + page.getActions().add( parseAction(childElement, "execute", true) ); } String bundle = element.attributeValue("bundle"); @@ -1104,7 +1104,7 @@ return page; } - private static Action parseAction(Element element, String actionAtt) + private static Action parseAction(Element element, String actionAtt, boolean conditionalsAllowed) { Action action = new Action(); String methodExpression = element.attributeValue(actionAtt); @@ -1117,10 +1117,15 @@ { action.setOutcome(methodExpression); } - String expression = element.attributeValue("if"); - if (expression!=null) + + if (conditionalsAllowed) { - action.setValueExpression( Expressions.instance().createValueExpression(expression) ); + String expression = element.attributeValue("if"); + if (expression!=null) + { + action.setValueExpression( Expressions.instance().createValueExpression(expression) ); + } + action.setOnPostback(!"false".equals(element.attributeValue("on-postback"))); } return action; } Modified: branches/community/Seam_2_0/src/main/org/jboss/seam/pages-2.0.dtd =================================================================== --- branches/community/Seam_2_0/src/main/org/jboss/seam/pages-2.0.dtd 2008-09-21 04:23:18 UTC (rev 9068) +++ branches/community/Seam_2_0/src/main/org/jboss/seam/pages-2.0.dtd 2008-09-21 06:32:13 UTC (rev 9069) @@ -41,6 +41,7 @@ <!ELEMENT action EMPTY> <!ATTLIST action if CDATA #IMPLIED> +<!ATTLIST action on-postback (true|false) "true"> <!ATTLIST action execute CDATA #REQUIRED> <!ELEMENT restrict (#PCDATA)> Modified: branches/community/Seam_2_0/src/main/org/jboss/seam/pages-2.0.xsd =================================================================== --- branches/community/Seam_2_0/src/main/org/jboss/seam/pages-2.0.xsd 2008-09-21 04:23:18 UTC (rev 9068) +++ branches/community/Seam_2_0/src/main/org/jboss/seam/pages-2.0.xsd 2008-09-21 06:32:13 UTC (rev 9069) @@ -119,6 +119,7 @@ </xs:element> <xs:attributeGroup name="attlist.action"> <xs:attribute name="if"/> + <xs:attribute name="on-postback" type="xs:boolean" default="true"/> <xs:attribute name="execute" use="required"/> </xs:attributeGroup> <xs:element name="restrict" type="xs:string"/> Modified: branches/community/Seam_2_0/src/test/unit/META-INF/pagesForPageActionsTest.xml =================================================================== --- branches/community/Seam_2_0/src/test/unit/META-INF/pagesForPageActionsTest.xml 2008-09-21 04:23:18 UTC (rev 9068) +++ branches/community/Seam_2_0/src/test/unit/META-INF/pagesForPageActionsTest.xml 2008-09-21 06:32:13 UTC (rev 9069) @@ -82,8 +82,13 @@ </rule> </navigation> </page> + + <page view-id="/action-test06.xhtml"> + <action execute="#{testActions.nonNullActionA}"/> + <action execute="#{testActions.nonNullActionB}" on-postback="false"/> + </page> - <!-- The next two page nodes (action-test05*) demonstrate the old + <!-- The next two page nodes (action-test99*) demonstrate the old behavior, where successive actions could trigger navigations on different page nodes because the viewId changes mid-run --> <page view-id="/action-test99a.xhtml"> Modified: branches/community/Seam_2_0/src/test/unit/org/jboss/seam/test/unit/PageActionsTest.java =================================================================== --- branches/community/Seam_2_0/src/test/unit/org/jboss/seam/test/unit/PageActionsTest.java 2008-09-21 04:23:18 UTC (rev 9068) +++ branches/community/Seam_2_0/src/test/unit/org/jboss/seam/test/unit/PageActionsTest.java 2008-09-21 06:32:13 UTC (rev 9069) @@ -17,6 +17,7 @@ import org.jboss.seam.mock.MockApplication; import org.jboss.seam.mock.MockExternalContext; import org.jboss.seam.mock.MockFacesContext; +import org.jboss.seam.mock.MockHttpServletRequest; import org.jboss.seam.navigation.Pages; import org.jboss.seam.test.unit.component.TestActions; import org.jboss.seam.util.Conversions; @@ -25,6 +26,8 @@ import org.testng.annotations.Test; import javax.faces.context.FacesContext; +import javax.faces.render.ResponseStateManager; + import java.util.HashMap; import java.util.List; import java.util.Map; @@ -112,6 +115,11 @@ assertActionCalls(testActions, new String[] { "nonNullActionA", "nonNullActionB" }); } + /** + * This test verifies that an action method with a null return can still match + * a navigation rule and short-circuit the remaining actions. The key is that + * a navigation rule is matched, not what the return value is. + */ @Test(enabled = true) public void testShortCircuitOnNullOutcome() { @@ -129,7 +137,7 @@ * will short circuit the action calls. */ @Test(enabled = true) - public void testShortCircuitOnFirstNonNullOutcome() + public void testShortCircuitOnNonNullOutcomeToSamePage() { FacesContext facesContext = FacesContext.getCurrentInstance(); TestActions testActions = TestActions.instance(); @@ -158,6 +166,23 @@ "Expecting a redirect to /pageA.xhtml but redirected to " + Contexts.getEventContext().get("lastRedirectViewId"); assert facesContext.getResponseComplete() == true : "The response should have been marked as complete"; } + + /** + * Verify that only those actions without on-postback="false" are executed when the + * magic postback parameter (javax.faces.ViewState) is present in the request map. + */ + @Test(enabled = true) + public void testPostbackConditionOnPageAction() + { + FacesContext facesContext = FacesContext.getCurrentInstance(); + simulatePostback(facesContext); + TestActions testActions = TestActions.instance(); + + facesContext.getViewRoot().setViewId("/action-test06.xhtml"); + Pages.instance().preRender(facesContext); + assertViewId(facesContext, "/action-test06.xhtml"); + assertActionCalls(testActions, new String[] { "nonNullActionA" }); + } /** * This test is here (and disabled) to demonstrate the old behavior. All page @@ -236,6 +261,13 @@ appContext.set(Seam.getComponentName(clazz) + ".component", new Component(clazz)); } + private void simulatePostback(FacesContext facesContext) + { + MockHttpServletRequest request = (MockHttpServletRequest) facesContext.getExternalContext().getRequest(); + request.getParameters().put(ResponseStateManager.VIEW_STATE_PARAM, new String[] { "true" }); + assert facesContext.getRenderKit().getResponseStateManager().isPostback(facesContext) == true; + } + @Scope(ScopeType.EVENT) @Name("org.jboss.seam.core.manager") @BypassInterceptors