You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by cn...@apache.org on 2016/01/29 15:53:42 UTC
struts git commit: turned @AllowedMethods into String[]
Repository: struts
Updated Branches:
refs/heads/master d0baa7060 -> cceb89166
turned @AllowedMethods into String[]
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/cceb8916
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/cceb8916
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/cceb8916
Branch: refs/heads/master
Commit: cceb89166785eafee3e6276c60e04f7356e9e4e2
Parents: d0baa70
Author: cnenning <cn...@apache.org>
Authored: Fri Jan 29 15:53:18 2016 +0100
Committer: cnenning <cn...@apache.org>
Committed: Fri Jan 29 15:53:18 2016 +0100
----------------------------------------------------------------------
.../struts2/convention/PackageBasedActionConfigBuilder.java | 6 +++++-
.../apache/struts2/convention/annotation/AllowedMethods.java | 2 +-
.../convention/actions/allowedmethods/package-info.java | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/cceb8916/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
----------------------------------------------------------------------
diff --git a/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java b/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
index c388ee9..fc85d54 100644
--- a/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
+++ b/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
@@ -744,7 +744,11 @@ public class PackageBasedActionConfigBuilder implements ActionConfigBuilder {
if (annotation == null) {
return Collections.emptySet();
} else {
- return TextParseUtil.commaDelimitedStringToSet(annotation.value());
+ Set<String> methods = new HashSet<>();
+ for (String method : annotation.value()) {
+ methods.add(method);
+ }
+ return methods;
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/cceb8916/plugins/convention/src/main/java/org/apache/struts2/convention/annotation/AllowedMethods.java
----------------------------------------------------------------------
diff --git a/plugins/convention/src/main/java/org/apache/struts2/convention/annotation/AllowedMethods.java b/plugins/convention/src/main/java/org/apache/struts2/convention/annotation/AllowedMethods.java
index 8e3c9ab..a21ae92 100644
--- a/plugins/convention/src/main/java/org/apache/struts2/convention/annotation/AllowedMethods.java
+++ b/plugins/convention/src/main/java/org/apache/struts2/convention/annotation/AllowedMethods.java
@@ -25,6 +25,6 @@ import java.lang.annotation.Target;
@Retention(value = RetentionPolicy.RUNTIME)
public @interface AllowedMethods {
- String value() default ActionConfig.DEFAULT_METHOD;
+ String[] value() default ActionConfig.DEFAULT_METHOD;
}
http://git-wip-us.apache.org/repos/asf/struts/blob/cceb8916/plugins/convention/src/test/java/org/apache/struts2/convention/actions/allowedmethods/package-info.java
----------------------------------------------------------------------
diff --git a/plugins/convention/src/test/java/org/apache/struts2/convention/actions/allowedmethods/package-info.java b/plugins/convention/src/test/java/org/apache/struts2/convention/actions/allowedmethods/package-info.java
index 461131f..745a1a6 100644
--- a/plugins/convention/src/test/java/org/apache/struts2/convention/actions/allowedmethods/package-info.java
+++ b/plugins/convention/src/test/java/org/apache/struts2/convention/actions/allowedmethods/package-info.java
@@ -18,6 +18,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-@org.apache.struts2.convention.annotation.AllowedMethods("home,start")
+@org.apache.struts2.convention.annotation.AllowedMethods({"home", "start"})
package org.apache.struts2.convention.actions.allowedmethods;