Skip to content

WW-2963 fix(core): resolve default-action-ref via wildcard matching #1623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lukaszlenart wants to merge 1 commit into
base: release/struts-6-8-x
Choose a base branch
from
+44 −0
Open

WW-2963 fix(core): resolve default-action-ref via wildcard matching #1623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,6 +622,9 @@ private ActionConfig findActionConfigInNamespace(String namespace, String name)
String defaultActionRef = namespaceConfigs.get(namespace);
if (defaultActionRef != null) {
config = actions.get(defaultActionRef);
if (config == null) {
config = namespaceActionConfigMatchers.get(namespace).match(defaultActionRef);
}
}
}
}
Expand Down
20 changes: 20 additions & 0 deletions core/src/test/java/com/opensymphony/xwork2/config/ConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,26 @@ public void testPackageExtension() {
}


public void testDefaultActionRefWithWildcard() {
RuntimeConfiguration runtimeConfiguration = configurationManager.getConfiguration().getRuntimeConfiguration();
ActionConfig config = runtimeConfiguration.getActionConfig("/wildcard-default", "unmatchedAction");
assertNotNull("Wildcard default action ref should resolve via wildcard matching", config);
assertEquals("com.opensymphony.xwork2.SimpleAction", config.getClassName());
}

public void testDefaultActionRefWithExactMatch() {
RuntimeConfiguration runtimeConfiguration = configurationManager.getConfiguration().getRuntimeConfiguration();
ActionConfig config = runtimeConfiguration.getActionConfig("/exact-default", "unmatchedAction");
assertNotNull("Exact default action ref should resolve via exact matching", config);
assertEquals("com.opensymphony.xwork2.SimpleAction", config.getClassName());
}

public void testDefaultActionRefWithWildcardNoMatch() {
RuntimeConfiguration runtimeConfiguration = configurationManager.getConfiguration().getRuntimeConfiguration();
ActionConfig config = runtimeConfiguration.getActionConfig("/wildcard-default-nomatch", "unmatchedAction");
assertNull("Default action ref with no matching action should return null", config);
}

@Override
protected void setUp() throws Exception {
super.setUp();
Expand Down
21 changes: 21 additions & 0 deletions core/src/test/resources/xwork-sample.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,5 +295,26 @@
<!-- default-class-ref is expected to be inherited -->
</package>

<package name="wildcardDefault" extends="default" namespace="/wildcard-default">
<default-action-ref name="movie-input" />
<action name="movie-*" class="com.opensymphony.xwork2.SimpleAction">
<result name="success" type="mock">/movie/{1}.jsp</result>
</action>
</package>

<package name="exactDefault" extends="default" namespace="/exact-default">
<default-action-ref name="home" />
<action name="home" class="com.opensymphony.xwork2.SimpleAction">
<result name="success" type="mock">/home.jsp</result>
</action>
</package>

<package name="wildcardDefaultNoMatch" extends="default" namespace="/wildcard-default-nomatch">
<default-action-ref name="nonExistentAction" />
<action name="movie-*" class="com.opensymphony.xwork2.SimpleAction">
<result name="success" type="mock">/movie/{1}.jsp</result>
</action>
</package>

<include file="includeTest.xml"/>
</struts>
Loading