From ee8f5ad0dbd5ddd9ffa6e6f66550f5c0b4ee5fcd Mon Sep 17 00:00:00 2001 From: Calvin Date: Tue, 24 Apr 2012 21:45:22 +0800 Subject: [PATCH] =?UTF-8?q?skip=20Controller=E4=B8=AD=E6=B3=A8=E5=85=A5?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E7=9A=84setter=E5=87=BD=E6=95=B0=EF=BC=8C?= =?UTF-8?q?=E5=9B=A0=E4=B8=BA=E6=97=A0=E9=9C=80unit=20test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../miniweb/web/account/GroupController.java | 6 +----- .../miniweb/web/account/GroupDetailController.java | 6 +----- .../miniweb/web/account/GroupListEditor.java | 8 ++------ .../miniweb/web/account/UserController.java | 13 ++----------- .../miniweb/web/account/UserDetailController.java | 13 ++----------- .../showcase/common/web/GeneralController.java | 1 - .../showcase/common/web/UserController.java | 7 +------ .../showcase/common/web/UserDetailController.java | 7 +------ 8 files changed, 10 insertions(+), 51 deletions(-) diff --git a/examples/mini-web/src/main/java/org/springside/examples/miniweb/web/account/GroupController.java b/examples/mini-web/src/main/java/org/springside/examples/miniweb/web/account/GroupController.java index 91e0383a..75913a9e 100644 --- a/examples/mini-web/src/main/java/org/springside/examples/miniweb/web/account/GroupController.java +++ b/examples/mini-web/src/main/java/org/springside/examples/miniweb/web/account/GroupController.java @@ -17,6 +17,7 @@ import org.springside.examples.miniweb.service.account.AccountManager; @RequestMapping(value = "/account/group") public class GroupController { + @Autowired private AccountManager accountManager; @RequiresPermissions("group:view") @@ -50,9 +51,4 @@ public class GroupController { redirectAttributes.addFlashAttribute("message", "删除权限组成功"); return "redirect:/account/group/"; } - - @Autowired - public void setAccountManager(AccountManager accountManager) { - this.accountManager = accountManager; - } } diff --git a/examples/mini-web/src/main/java/org/springside/examples/miniweb/web/account/GroupDetailController.java b/examples/mini-web/src/main/java/org/springside/examples/miniweb/web/account/GroupDetailController.java index d8587104..da1a8f4a 100644 --- a/examples/mini-web/src/main/java/org/springside/examples/miniweb/web/account/GroupDetailController.java +++ b/examples/mini-web/src/main/java/org/springside/examples/miniweb/web/account/GroupDetailController.java @@ -16,6 +16,7 @@ import org.springside.examples.miniweb.service.account.AccountManager; @RequestMapping(value = "/account/group/") public class GroupDetailController { + @Autowired private AccountManager accountManager; @RequiresPermissions("group:edit") @@ -37,9 +38,4 @@ public class GroupDetailController { public Group getGroup(@PathVariable("id") Long id) { return accountManager.getGroup(id); } - - @Autowired - public void setAccountManager(AccountManager accountManager) { - this.accountManager = accountManager; - } } diff --git a/examples/mini-web/src/main/java/org/springside/examples/miniweb/web/account/GroupListEditor.java b/examples/mini-web/src/main/java/org/springside/examples/miniweb/web/account/GroupListEditor.java index 8888c8e6..62ab7940 100644 --- a/examples/mini-web/src/main/java/org/springside/examples/miniweb/web/account/GroupListEditor.java +++ b/examples/mini-web/src/main/java/org/springside/examples/miniweb/web/account/GroupListEditor.java @@ -18,6 +18,8 @@ import org.springside.modules.utils.Collections3; */ @Component public class GroupListEditor extends PropertyEditorSupport { + + @Autowired private AccountManager accountManager; /** @@ -41,10 +43,4 @@ public class GroupListEditor extends PropertyEditorSupport { public String getAsText() { return Collections3.extractToString((List) getValue(), "id", ","); } - - @Autowired - public void setAccountManager(AccountManager accountManager) { - this.accountManager = accountManager; - } - } diff --git a/examples/mini-web/src/main/java/org/springside/examples/miniweb/web/account/UserController.java b/examples/mini-web/src/main/java/org/springside/examples/miniweb/web/account/UserController.java index e27a569e..24a2b676 100644 --- a/examples/mini-web/src/main/java/org/springside/examples/miniweb/web/account/UserController.java +++ b/examples/mini-web/src/main/java/org/springside/examples/miniweb/web/account/UserController.java @@ -33,8 +33,10 @@ import org.springside.examples.miniweb.service.account.AccountManager; @RequestMapping(value = "/account/user") public class UserController { + @Autowired private AccountManager accountManager; + @Autowired private GroupListEditor groupListEditor; @InitBinder @@ -87,15 +89,4 @@ public class UserController { return "false"; } - - @Autowired - public void setAccountManager(AccountManager accountManager) { - this.accountManager = accountManager; - } - - @Autowired - public void setGroupListEditor(GroupListEditor groupListEditor) { - this.groupListEditor = groupListEditor; - } - } diff --git a/examples/mini-web/src/main/java/org/springside/examples/miniweb/web/account/UserDetailController.java b/examples/mini-web/src/main/java/org/springside/examples/miniweb/web/account/UserDetailController.java index d0445046..37907fdf 100644 --- a/examples/mini-web/src/main/java/org/springside/examples/miniweb/web/account/UserDetailController.java +++ b/examples/mini-web/src/main/java/org/springside/examples/miniweb/web/account/UserDetailController.java @@ -25,8 +25,9 @@ import org.springside.examples.miniweb.service.account.AccountManager; @RequestMapping(value = "/account/user/") public class UserDetailController { + @Autowired private AccountManager accountManager; - + @Autowired private GroupListEditor groupListEditor; @InitBinder @@ -53,14 +54,4 @@ public class UserDetailController { public User getAccount(@PathVariable("id") Long id) { return accountManager.getUser(id); } - - @Autowired - public void setAccountManager(AccountManager accountManager) { - this.accountManager = accountManager; - } - - @Autowired - public void setGroupListEditor(GroupListEditor groupListEditor) { - this.groupListEditor = groupListEditor; - } } diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/common/web/GeneralController.java b/examples/showcase/src/main/java/org/springside/examples/showcase/common/web/GeneralController.java index 7e7355e8..0db88284 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/common/web/GeneralController.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/common/web/GeneralController.java @@ -21,5 +21,4 @@ public class GeneralController { public String mashupClient() { return "web/mashup-client"; } - } diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/common/web/UserController.java b/examples/showcase/src/main/java/org/springside/examples/showcase/common/web/UserController.java index e8265702..4e52d2f5 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/common/web/UserController.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/common/web/UserController.java @@ -13,6 +13,7 @@ import org.springside.examples.showcase.common.service.AccountManager; @RequestMapping(value = "/common/user") public class UserController { + @Autowired private AccountManager accountManager; @RequestMapping(value = { "list", "" }) @@ -21,10 +22,4 @@ public class UserController { model.addAttribute("users", users); return "common/userList"; } - - @Autowired - public void setAccountManager(AccountManager accountManager) { - this.accountManager = accountManager; - } - } diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/common/web/UserDetailController.java b/examples/showcase/src/main/java/org/springside/examples/showcase/common/web/UserDetailController.java index 66877d5c..9ced737e 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/common/web/UserDetailController.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/common/web/UserDetailController.java @@ -26,7 +26,7 @@ import com.google.common.collect.Lists; @Controller @RequestMapping(value = "/common/user/") public class UserDetailController { - + @Autowired private AccountManager accountManager; @RequestMapping(value = "update/{id}") @@ -52,9 +52,4 @@ public class UserDetailController { public User getAccount(@PathVariable("id") Long id) { return accountManager.getUser(id); } - - @Autowired - public void setAccountManager(AccountManager accountManager) { - this.accountManager = accountManager; - } }