- * An example of this would be a remote proxy, where the layer between XWork and the action might be RMI or SOAP. - *
- * - * @author Jason Carreira - */ -public interface ActionProxy { - - /** - * Gets the Action instance for this Proxy. - * - * @return the Action instance - */ - Object getAction(); - - /** - * Gets the alias name this ActionProxy is mapped to. - * - * @return the alias name - */ - String getActionName(); - - /** - * Gets the ActionConfig this ActionProxy is built from. - * - * @return the ActionConfig - */ - ActionConfig getConfig(); - - /** - * Sets whether this ActionProxy should also execute the Result after executing the Action. - * - * @param executeResult true to also execute the Result. - */ - void setExecuteResult(boolean executeResult); - - /** - * Gets the status of whether the ActionProxy is set to execute the Result after the Action is executed. - * - * @return the status - */ - boolean getExecuteResult(); - - /** - * Gets the ActionInvocation associated with this ActionProxy. - * - * @return the ActionInvocation - */ +@Deprecated +public interface ActionProxy extends org.apache.struts2.ActionProxy { + + @Override ActionInvocation getInvocation(); - /** - * Gets the namespace the ActionConfig for this ActionProxy is mapped to. - * - * @return the namespace - */ - String getNamespace(); - - /** - * Execute this ActionProxy. This will set the ActionContext from the ActionInvocation into the ActionContext - * ThreadLocal before invoking the ActionInvocation, then set the old ActionContext back into the ThreadLocal. - * - * @return the result code returned from executing the ActionInvocation - * @throws Exception can be thrown. - * @see ActionInvocation - */ - String execute() throws Exception; - - /** - * Gets the method name to execute, or null if no method has been specified (meaningexecute will be invoked).
- *
- * @return the method to execute
- */
- String getMethod();
-
- /**
- * Gets status of the method value's initialization.
- *
- * @return true if the method returned by getMethod() is not a default initializer value.
- */
- boolean isMethodSpecified();
-
+ static ActionProxy adapt(org.apache.struts2.ActionProxy actualProxy) {
+ return actualProxy != null ? new LegacyAdapter(actualProxy) : null;
+ }
+
+ class LegacyAdapter implements ActionProxy {
+
+ private final org.apache.struts2.ActionProxy adaptee;
+
+ private LegacyAdapter(org.apache.struts2.ActionProxy adaptee) {
+ this.adaptee = adaptee;
+ }
+
+ @Override
+ public Object getAction() {
+ return adaptee.getAction();
+ }
+
+ @Override
+ public String getActionName() {
+ return adaptee.getActionName();
+ }
+
+ @Override
+ public ActionConfig getConfig() {
+ return adaptee.getConfig();
+ }
+
+ @Override
+ public void setExecuteResult(boolean executeResult) {
+ adaptee.setExecuteResult(executeResult);
+ }
+
+ @Override
+ public boolean getExecuteResult() {
+ return adaptee.getExecuteResult();
+ }
+
+ @Override
+ public ActionInvocation getInvocation() {
+ return ActionInvocation.adapt(adaptee.getInvocation());
+ }
+
+ @Override
+ public String getNamespace() {
+ return adaptee.getNamespace();
+ }
+
+ @Override
+ public String execute() throws Exception {
+ return adaptee.execute();
+ }
+
+ @Override
+ public String getMethod() {
+ return adaptee.getMethod();
+ }
+
+ @Override
+ public boolean isMethodSpecified() {
+ return adaptee.isMethodSpecified();
+ }
+ }
}
diff --git a/core/src/main/java/org/apache/struts2/ActionInvocation.java b/core/src/main/java/org/apache/struts2/ActionInvocation.java
index 14e930a501..e3d446bc05 100644
--- a/core/src/main/java/org/apache/struts2/ActionInvocation.java
+++ b/core/src/main/java/org/apache/struts2/ActionInvocation.java
@@ -19,7 +19,6 @@
package org.apache.struts2;
import com.opensymphony.xwork2.ActionChainResult;
-import com.opensymphony.xwork2.ActionProxy;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.interceptor.PreResultListener;
@@ -176,6 +175,6 @@ public interface ActionInvocation {
*/
void setActionEventListener(ActionEventListener listener);
- void init(ActionProxy proxy) ;
+ void init(ActionProxy proxy);
}
diff --git a/core/src/main/java/org/apache/struts2/ActionProxy.java b/core/src/main/java/org/apache/struts2/ActionProxy.java
new file mode 100644
index 0000000000..d5e19e44da
--- /dev/null
+++ b/core/src/main/java/org/apache/struts2/ActionProxy.java
@@ -0,0 +1,102 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.struts2;
+
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+
+/**
+ * ActionProxy is an extra layer between XWork and the action so that different proxies are possible.
+ *
+ * + * An example of this would be a remote proxy, where the layer between XWork and the action might be RMI or SOAP. + *
+ * + * @author Jason Carreira + */ +public interface ActionProxy { + + /** + * Gets the Action instance for this Proxy. + * + * @return the Action instance + */ + Object getAction(); + + /** + * Gets the alias name this ActionProxy is mapped to. + * + * @return the alias name + */ + String getActionName(); + + /** + * Gets the ActionConfig this ActionProxy is built from. + * + * @return the ActionConfig + */ + ActionConfig getConfig(); + + /** + * Sets whether this ActionProxy should also execute the Result after executing the Action. + * + * @param executeResult true to also execute the Result. + */ + void setExecuteResult(boolean executeResult); + + /** + * Gets the status of whether the ActionProxy is set to execute the Result after the Action is executed. + * + * @return the status + */ + boolean getExecuteResult(); + + ActionInvocation getInvocation(); + + /** + * Gets the namespace the ActionConfig for this ActionProxy is mapped to. + * + * @return the namespace + */ + String getNamespace(); + + /** + * Execute this ActionProxy. This will set the ActionContext from the ActionInvocation into the ActionContext + * ThreadLocal before invoking the ActionInvocation, then set the old ActionContext back into the ThreadLocal. + * + * @return the result code returned from executing the ActionInvocation + * @throws Exception can be thrown. + * @see ActionInvocation + */ + String execute() throws Exception; + + /** + * Gets the method name to execute, or null if no method has been specified (meaningexecute will be invoked).
+ *
+ * @return the method to execute
+ */
+ String getMethod();
+
+ /**
+ * Gets status of the method value's initialization.
+ *
+ * @return true if the method returned by getMethod() is not a default initializer value.
+ */
+ boolean isMethodSpecified();
+
+}