add GlobalAllowedMethods getter to PackageConfig and modified getActi…

…onConfig method in ConventionUnknownHandler to reference it
apache · Jun 10, 2016 · dd3b80f · dd3b80f
1 parent 0d92fd0
commit dd3b80f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java b/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
@@ -346,6 +346,13 @@ public List<ExceptionMappingConfig> getGlobalExceptionMappingConfigs() {
         return globalExceptionMappingConfigs;
     }
 
+    /**
+     * gets the GlobalAllowedMethods local to this package
+     *
+     * @return a Set of method names allowed to be executed if strict method invocation is enabled
+     */
+    public Set<String> getGlobalAllowedMethods() { return globalAllowedMethods; }
+
     public boolean isStrictMethodInvocation() {
         return strictMethodInvocation;
     }

diff --git a/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java b/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
@@ -221,7 +221,7 @@ protected ActionConfig buildActionConfig(String path, ResultTypeConfig resultTyp
         return new ActionConfig.Builder(defaultParentPackageName, "execute", ActionSupport.class.getName()).
                 addInterceptors(interceptors).
                 addResultConfigs(results).
-                addAllowedMethod(allowedMethods).
+                addAllowedMethod(pkg.getGlobalAllowedMethods()).
                 build();
     }