From ce294b48df537a751ead50d3139eaa5f42234be5 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Sun, 12 Jun 2016 13:02:03 +0200 Subject: [PATCH] Drops unneeded method (cherry picked from commit 3f526d630aa56393233500c874293c29abec54ae) --- .../src/main/java/com/opensymphony/xwork2/ActionSupport.java | 4 ---- .../test/java/com/opensymphony/xwork2/ActionSupportTest.java | 5 ++--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java b/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java index 1506fade0..62f24df5a 100644 --- a/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java +++ b/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java @@ -156,10 +156,6 @@ public class ActionSupport implements Action, Validateable, ValidationAware, Tex return INPUT; } - public String doDefault() throws Exception { - return SUCCESS; - } - /** * A default implementation that does nothing an returns "success". * diff --git a/core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java b/core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java index 2482ca084..cbbd58bc0 100644 --- a/core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java @@ -64,7 +64,6 @@ public class ActionSupportTest extends XWorkTestCase { } assertEquals(Action.INPUT, as.input()); - assertEquals(Action.SUCCESS, as.doDefault()); assertEquals(Action.SUCCESS, as.execute()); try { as.clone(); @@ -157,7 +156,7 @@ public class ActionSupportTest extends XWorkTestCase { ActionContext.getContext().setLocale(new Locale("da")); MyActionSupport mas = new MyActionSupport(); - assertEquals("santa", mas.doDefault()); + assertEquals("santa", mas.execute()); assertNotNull(mas.getTexts()); assertEquals(false, mas.hasActionMessages()); @@ -331,7 +330,7 @@ public class ActionSupportTest extends XWorkTestCase { private Double val; @Override - public String doDefault() throws Exception { + public String execute() throws Exception { return "santa"; }