Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-05 14:47:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Result annotation name attribute as an array, removed one of ResultInfo constructors

Browse Source
This commit is contained in:
Aleksandr Mashchenko
2016-01-20 18:03:57 +02:00
parent 930f6e4cf7
commit 2a46a6586e
5 changed files with 3 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java
+1 -16
View File
@@ -410,15 +410,7 @@ public class DefaultResultMapBuilder implements ResultMapBuilder {
Class<?> actionClass, Map<String, ResultTypeConfig> resultsByExtension) {
// Check for multiple results on the class
for (Result result : results) {
Set<String> names;
if (",".equals(result.name().trim())) {
names = new HashSet<>(1);
names.add(result.name());
} else {
names = TextParseUtil.commaDelimitedStringToSet(result.name());
}
for (String name : names) {
for (String name : result.name()) {
ResultConfig config = createResultConfig(actionClass, new ResultInfo(
name, result, packageConfig, resultPath, actionClass,
resultsByExtension), packageConfig, result);
@@ -515,13 +507,6 @@ public class DefaultResultMapBuilder implements ResultMapBuilder {
}
}
public ResultInfo(Result result, PackageConfig packageConfig,
String resultPath, Class<?> actionClass,
Map<String, ResultTypeConfig> resultsByExtension) {
this(result.name(), result, packageConfig, resultPath, actionClass,
resultsByExtension);
}
String determineType(String location, PackageConfig packageConfig,
Map<String, ResultTypeConfig> resultsByExtension) {
int indexOfDot = location.lastIndexOf(".");
plugins/convention/src/main/java/org/apache/struts2/convention/annotation/Result.java
+1 -1
View File
@@ -69,7 +69,7 @@ public @interface Result {
* @return The name of the result mapping. This is the value that is returned from the action
* method and is used to associate a location with a return value.
*/
String name() default com.opensymphony.xwork2.Action.SUCCESS;
String[] name() default com.opensymphony.xwork2.Action.SUCCESS;
/**
* @return The location of the result within the web application or anywhere on disk. This location
plugins/convention/src/test/java/org/apache/struts2/convention/DefaultResultMapBuilderTest.java
-46
View File
@@ -522,52 +522,6 @@ public class DefaultResultMapBuilderTest extends TestCase {
EasyMock.verify(context);
}
public void testActionLevelMultipleResultNamesAnnotationErrorInput() throws Exception {
ServletContext context = EasyMock.createStrictMock(ServletContext.class);
// Setup some mock jsps
Set<String> resources = new HashSet<>();
EasyMock.expect(context.getResourcePaths("/WEB-INF/location/namespace/")).andReturn(resources);
EasyMock.replay(context);
PackageConfig packageConfig = createPackageConfigBuilder("/namespace");
this.conventionsService = new ConventionsServiceImpl("/WEB-INF/location");
DefaultResultMapBuilder builder = new DefaultResultMapBuilder(context, container, "dispatcher,velocity,freemarker");
Map<String, ResultConfig> results = builder.build(ActionLevelResultsNamesAction.class, getAnnotation(ActionLevelResultsNamesAction.class, "errorinput", Action.class), "action-level-results", packageConfig);
assertEquals(2, results.size());
assertEquals("error", results.get("error").getName());
assertEquals("input", results.get("input").getName());
assertEquals(3, results.get("error").getParams().size());
assertEquals("/WEB-INF/location/namespace/error.jsp", results.get("error").getParams().get("location"));
assertEquals("org.apache.struts2.result.ServletDispatcherResult", results.get("error").getClassName());
assertEquals(3, results.get("input").getParams().size());
assertEquals("/WEB-INF/location/namespace/error.jsp", results.get("input").getParams().get("location"));
assertEquals("org.apache.struts2.result.ServletDispatcherResult", results.get("input").getClassName());
EasyMock.verify(context);
}
public void testActionLevelMultipleResultNamesAnnotationComma() throws Exception {
ServletContext context = EasyMock.createStrictMock(ServletContext.class);
// Setup some mock jsps
Set<String> resources = new HashSet<>();
EasyMock.expect(context.getResourcePaths("/WEB-INF/location/namespace/")).andReturn(resources);
EasyMock.replay(context);
PackageConfig packageConfig = createPackageConfigBuilder("/namespace");
this.conventionsService = new ConventionsServiceImpl("/WEB-INF/location");
DefaultResultMapBuilder builder = new DefaultResultMapBuilder(context, container, "dispatcher,velocity,freemarker");
Map<String, ResultConfig> results = builder.build(ActionLevelResultsNamesAction.class, getAnnotation(ActionLevelResultsNamesAction.class, "comma", Action.class), "action-level-results", packageConfig);
assertEquals(1, results.size());
assertEquals(" , ", results.get(" , ").getName());
assertEquals(3, results.get(" , ").getParams().size());
assertEquals("/WEB-INF/location/namespace/error.jsp", results.get(" , ").getParams().get("location"));
assertEquals("org.apache.struts2.result.ServletDispatcherResult", results.get(" , ").getClassName());
EasyMock.verify(context);
}
public void testActionLevelMultipleResultNamesAnnotationNoName() throws Exception {
ServletContext context = EasyMock.createStrictMock(ServletContext.class);
plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java
-2
View File
@@ -292,8 +292,6 @@ public class PackageBasedActionConfigBuilderTest extends TestCase {
expect(resultMapBuilder.build(GlobalResultAction.class, null, "global-result", globalResultPkg)).andReturn(results);
expect(resultMapBuilder.build(GlobalResultOverrideAction.class, null, "global-result-override", globalResultPkg)).andReturn(results);
expect(resultMapBuilder.build(ActionLevelResultsNamesAction.class, getAnnotation(ActionLevelResultsNamesAction.class, "execute", Action.class), "action-level-results-names", resultPkg)).andReturn(results);
expect(resultMapBuilder.build(ActionLevelResultsNamesAction.class, getAnnotation(ActionLevelResultsNamesAction.class, "errorinput", Action.class), "action-level-results-names", resultPkg)).andReturn(results);
expect(resultMapBuilder.build(ActionLevelResultsNamesAction.class, getAnnotation(ActionLevelResultsNamesAction.class, "comma", Action.class), "action-level-results-names", resultPkg)).andReturn(results);
expect(resultMapBuilder.build(ActionLevelResultsNamesAction.class, getAnnotation(ActionLevelResultsNamesAction.class, "noname", Action.class), "action-level-results-names", resultPkg)).andReturn(results);
/* org.apache.struts2.convention.actions.resultpath */
plugins/convention/src/test/java/org/apache/struts2/convention/actions/result/ActionLevelResultsNamesAction.java
+1 -15
View File
@@ -30,7 +30,7 @@ import org.apache.struts2.convention.annotation.Result;
*/
public class ActionLevelResultsNamesAction {
@Action(results = {
@Result(name="error, input", location="error.jsp"),
@Result(name={"error", "input"}, location="error.jsp"),
@Result(name="success", location="/WEB-INF/location/namespace/action-success.jsp"),
@Result(name="failure", location="/WEB-INF/location/namespace/action-failure.jsp")
})
@@ -38,20 +38,6 @@ public class ActionLevelResultsNamesAction {
return null;
}
@Action(results = {
@Result(name="error, input, ", location="error.jsp")
})
public String errorinput() {
return null;
}
@Action(results = {
@Result(name=" , ", location="error.jsp")
})
public String comma() {
return null;
}
@Action(results = {
@Result(location="/WEB-INF/location/namespace/action-success.jsp")
})