You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2015/09/28 20:53:15 UTC
[26/33] struts git commit: Drops support for
handleUnknownAllowedMethod as it was added to satisfy test
Drops support for handleUnknownAllowedMethod as it was added to satisfy test
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/a61a3692
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/a61a3692
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/a61a3692
Branch: refs/heads/master
Commit: a61a3692241d0da833139b9e4eab10a4a3e496aa
Parents: e9e6ae9
Author: Lukasz Lenart <lu...@gmail.com>
Authored: Sun Sep 6 10:36:51 2015 +0200
Committer: Lukasz Lenart <lu...@gmail.com>
Committed: Sun Sep 6 10:36:51 2015 +0200
----------------------------------------------------------------------
.../java/com/opensymphony/xwork2/DefaultActionProxy.java | 4 +---
.../opensymphony/xwork2/DefaultUnknownHandlerManager.java | 9 ---------
.../main/java/com/opensymphony/xwork2/UnknownHandler.java | 10 ----------
.../com/opensymphony/xwork2/UnknownHandlerManager.java | 2 --
.../com/opensymphony/xwork2/ActionInvocationTest.java | 7 +++----
.../xwork2/config/providers/SomeUnknownHandler.java | 5 -----
.../struts2/convention/ConventionUnknownHandler.java | 4 ----
7 files changed, 4 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/a61a3692/core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java b/core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java
index 6b8749e..72c6e9e 100644
--- a/core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java
+++ b/core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java
@@ -194,9 +194,7 @@ public class DefaultActionProxy implements ActionProxy, Serializable {
resolveMethod();
- if (config.isAllowedMethod(method) ||
- (unknownHandlerManager.hasUnknownHandlers() && unknownHandlerManager.isAllowedMethod(method, config))
- ) {
+ if (config.isAllowedMethod(method)) {
invocation.init(this);
} else {
throw new ConfigurationException("This method: " + method + " for action " + actionName + " is not allowed!");
http://git-wip-us.apache.org/repos/asf/struts/blob/a61a3692/core/src/main/java/com/opensymphony/xwork2/DefaultUnknownHandlerManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/DefaultUnknownHandlerManager.java b/core/src/main/java/com/opensymphony/xwork2/DefaultUnknownHandlerManager.java
index 04ac430..46af876 100644
--- a/core/src/main/java/com/opensymphony/xwork2/DefaultUnknownHandlerManager.java
+++ b/core/src/main/java/com/opensymphony/xwork2/DefaultUnknownHandlerManager.java
@@ -146,13 +146,4 @@ public class DefaultUnknownHandlerManager implements UnknownHandlerManager {
return unknownHandlers;
}
- @Override
- public boolean isAllowedMethod(String allowedMethod, ActionConfig config) {
- for (UnknownHandler unknownHandler : unknownHandlers) {
- if (unknownHandler.isAllowedMethod(allowedMethod, config)) {
- return true;
- }
- }
- return false;
- }
}
http://git-wip-us.apache.org/repos/asf/struts/blob/a61a3692/core/src/main/java/com/opensymphony/xwork2/UnknownHandler.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/UnknownHandler.java b/core/src/main/java/com/opensymphony/xwork2/UnknownHandler.java
index 1e6f5aa..51556d6 100644
--- a/core/src/main/java/com/opensymphony/xwork2/UnknownHandler.java
+++ b/core/src/main/java/com/opensymphony/xwork2/UnknownHandler.java
@@ -60,14 +60,4 @@ public interface UnknownHandler {
*/
Object handleUnknownActionMethod(Object action, String methodName);
- /**
- * Handles the case when an action method is unknown and cannot be validated if it is allowed to be executed.
- *
- * @since 2.5
- * @param allowedMethod The method's name
- * @param actionConfig The config of actions
- * @return true if allowedMethod can be executed, false otherwise
- */
- boolean isAllowedMethod(String allowedMethod, ActionConfig actionConfig);
-
}
http://git-wip-us.apache.org/repos/asf/struts/blob/a61a3692/core/src/main/java/com/opensymphony/xwork2/UnknownHandlerManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/UnknownHandlerManager.java b/core/src/main/java/com/opensymphony/xwork2/UnknownHandlerManager.java
index caf63b3..d8cce9f 100644
--- a/core/src/main/java/com/opensymphony/xwork2/UnknownHandlerManager.java
+++ b/core/src/main/java/com/opensymphony/xwork2/UnknownHandlerManager.java
@@ -44,6 +44,4 @@ public interface UnknownHandlerManager {
List<UnknownHandler> getUnknownHandlers();
- boolean isAllowedMethod(String allowedMethod, ActionConfig actionConfig);
-
}
http://git-wip-us.apache.org/repos/asf/struts/blob/a61a3692/core/src/test/java/com/opensymphony/xwork2/ActionInvocationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/ActionInvocationTest.java b/core/src/test/java/com/opensymphony/xwork2/ActionInvocationTest.java
index 37aa2a5..a1182cc 100644
--- a/core/src/test/java/com/opensymphony/xwork2/ActionInvocationTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/ActionInvocationTest.java
@@ -48,7 +48,9 @@ public class ActionInvocationTest extends XWorkTestCase {
UnknownHandler unknownHandler = new UnknownHandler() {
public ActionConfig handleUnknownAction(String namespace, String actionName) throws XWorkException {
- return new ActionConfig.Builder("test", actionName, ActionSupport.class.getName()).build();
+ return new ActionConfig.Builder("test", actionName, ActionSupport.class.getName())
+ .addAllowedMethod("unknownmethod")
+ .build();
}
public Result handleUnknownResult(ActionContext actionContext, String actionName, ActionConfig actionConfig, String resultCode) throws XWorkException {
return new MockResult();
@@ -60,9 +62,6 @@ public class ActionInvocationTest extends XWorkTestCase {
return null;
}
}
- public boolean isAllowedMethod(String allowedMethod, ActionConfig actionConfig) {
- return "unknownmethod".equals(allowedMethod);
- }
};
UnknownHandlerManagerMock uhm = new UnknownHandlerManagerMock();
http://git-wip-us.apache.org/repos/asf/struts/blob/a61a3692/core/src/test/java/com/opensymphony/xwork2/config/providers/SomeUnknownHandler.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/com/opensymphony/xwork2/config/providers/SomeUnknownHandler.java b/core/src/test/java/com/opensymphony/xwork2/config/providers/SomeUnknownHandler.java
index 5e922e0..312f4c9 100644
--- a/core/src/test/java/com/opensymphony/xwork2/config/providers/SomeUnknownHandler.java
+++ b/core/src/test/java/com/opensymphony/xwork2/config/providers/SomeUnknownHandler.java
@@ -38,11 +38,6 @@ public class SomeUnknownHandler implements UnknownHandler{
return null;
}
- @Override
- public boolean isAllowedMethod(String allowedMethod, ActionConfig actionConfig) {
- return false;
- }
-
public void setActionConfig(ActionConfig actionConfig) {
this.actionConfig = actionConfig;
}
http://git-wip-us.apache.org/repos/asf/struts/blob/a61a3692/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
----------------------------------------------------------------------
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
index 78c1956..b7c7acf 100644
--- a/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
+++ b/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
@@ -404,8 +404,4 @@ public class ConventionUnknownHandler implements UnknownHandler {
}
}
- @Override
- public boolean isAllowedMethod(String allowedMethod, ActionConfig actionConfig) {
- return false;
- }
}