Uses global-allowed-methods config para
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/fd22e3a1 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/fd22e3a1 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/fd22e3a1 Branch: refs/heads/master Commit: fd22e3a16c88ef0528c1e26e0d6bdfdf1c02c755 Parents: ce884e9 Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Mon Aug 31 14:35:16 2015 +0200 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Mon Aug 31 14:35:16 2015 +0200 ---------------------------------------------------------------------- .../xwork2/config/entities/PackageConfig.java | 22 +++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/fd22e3a1/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java ---------------------------------------------------------------------- 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 index c9ef12d..19ce36f 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java +++ b/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java @@ -40,6 +40,7 @@ public class PackageConfig extends Located implements Comparable, Serializable, protected Map<String, ActionConfig> actionConfigs; protected Map<String, ResultConfig> globalResultConfigs; + protected Set<String> globalAllowedMethods; protected Map<String, Object> interceptorConfigs; protected Map<String, ResultTypeConfig> resultTypeConfigs; protected List<ExceptionMappingConfig> globalExceptionMappingConfigs; @@ -57,6 +58,7 @@ public class PackageConfig extends Located implements Comparable, Serializable, this.name = name; actionConfigs = new LinkedHashMap<>(); globalResultConfigs = new LinkedHashMap<>(); + globalAllowedMethods = new HashSet<>(); interceptorConfigs = new LinkedHashMap<>(); resultTypeConfigs = new LinkedHashMap<>(); globalExceptionMappingConfigs = new ArrayList<>(); @@ -74,6 +76,7 @@ public class PackageConfig extends Located implements Comparable, Serializable, this.needsRefresh = orig.needsRefresh; this.actionConfigs = new LinkedHashMap<>(orig.actionConfigs); this.globalResultConfigs = new LinkedHashMap<>(orig.globalResultConfigs); + this.globalAllowedMethods = new LinkedHashSet<>(orig.globalAllowedMethods); this.interceptorConfigs = new LinkedHashMap<>(orig.interceptorConfigs); this.resultTypeConfigs = new LinkedHashMap<>(orig.resultTypeConfigs); this.globalExceptionMappingConfigs = new ArrayList<>(orig.globalExceptionMappingConfigs); @@ -445,7 +448,6 @@ public class PackageConfig extends Located implements Comparable, Serializable, public static class Builder implements InterceptorLocator { protected PackageConfig target; - private boolean strictDMI; public Builder(String name) { target = new PackageConfig(name); @@ -528,6 +530,15 @@ public class PackageConfig extends Located implements Comparable, Serializable, return this; } + public Set<String> getGlobalAllowedMethods() { + return target.globalAllowedMethods; + } + + public Builder addGlobalAllowedMethods(Set<String> allowedMethods) { + target.globalAllowedMethods.addAll(allowedMethods); + return this; + } + public Builder addExceptionMappingConfig(ExceptionMappingConfig exceptionMappingConfig) { target.globalExceptionMappingConfigs.add(exceptionMappingConfig); return this; @@ -591,15 +602,6 @@ public class PackageConfig extends Located implements Comparable, Serializable, return target.getAllInterceptorConfigs().get(name); } - public Builder strictMethodInvocation(boolean strict) { - strictDMI = strict; - return this; - } - - public boolean isStrictMethodInvocation() { - return strictDMI; - } - public PackageConfig build() { embalmTarget(); PackageConfig result = target;
