You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by ja...@apache.org on 2011/11/15 14:19:15 UTC
svn commit: r1202174 - in
/incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller:
NewAccountController.java PageController.java UserProfileController.java
Author: jasha
Date: Tue Nov 15 13:19:14 2011
New Revision: 1202174
URL: http://svn.apache.org/viewvc?rev=1202174&view=rev
Log:
code formatting, make loggers private and use the log message formatting of slf4j
Modified:
incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/NewAccountController.java
incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/PageController.java
incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/UserProfileController.java
Modified: incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/NewAccountController.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/NewAccountController.java?rev=1202174&r1=1202173&r2=1202174&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/NewAccountController.java (original)
+++ incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/NewAccountController.java Tue Nov 15 13:19:14 2011
@@ -38,57 +38,56 @@ import org.springframework.web.bind.anno
@Controller
public class NewAccountController {
+ private final Logger logger = LoggerFactory.getLogger(getClass());
- protected final Logger logger=LoggerFactory.getLogger(getClass());
-
- private final NewAccountService newAccountService;
- private final NewAccountValidator newAccountValidator;
+ private final NewAccountService newAccountService;
+ private final NewAccountValidator newAccountValidator;
@Autowired
- public NewAccountController(NewAccountService newAccountService, NewAccountValidator newAccountValidator) {
- this.newAccountService=newAccountService;
- this.newAccountValidator=newAccountValidator;
+ public NewAccountController(NewAccountService newAccountService, NewAccountValidator newAccountValidator) {
+ this.newAccountService = newAccountService;
+ this.newAccountValidator = newAccountValidator;
+ }
+
+ @RequestMapping(value = "/newaccount.jsp")
+ public void setUpForm(ModelMap model) {
+ logger.debug("Initializing form");
+ model.addAttribute(ModelKeys.NEW_USER, new NewUser());
}
- @RequestMapping(value ="/newaccount.jsp")
- public void setUpForm(ModelMap model) {
- logger.debug("Initializing form");
- model.addAttribute(ModelKeys.NEW_USER,new NewUser());
- }
-
- @RequestMapping(value = { "/newaccount","/newacount/*"}, method = RequestMethod.POST)
- public String create(@ModelAttribute NewUser newUser, BindingResult results, Model model){
- logger.debug("Creating a new user account");
- model.addAttribute(ModelKeys.NEW_USER,newUser);
-
- newAccountValidator.validate(newUser,results);
- if (results.hasErrors()){
- logger.info("newaccount.jsp: shows validation errors");
- return ViewNames.NEW_ACCOUNT;
- }
-
- //Now attempt to create the account.
- try {
- logger.debug("newaccount.jsp: passed form validation");
- newAccountService.createNewAccount(newUser);
- return ViewNames.REDIRECT;
- } catch (org.springframework.dao.IncorrectResultSizeDataAccessException ex) {
- //This exception is thrown if the account already exists.
- logger.info("Account creation failed: ", ex);
- results.reject("Account already exists","Unable to create account");
- return ViewNames.NEW_ACCOUNT;
-
- } catch (Exception ex) {
- //TODO RAVE-241 need to handle more specific exceptions
- if (logger.isDebugEnabled()) {
- logger.error("Account creation failed: ", ex);
- } else {
- logger.error("Account creation failed: {}", ex.getMessage());
- }
- results.reject("Unable to create account:"+ex.getMessage(),"Unable to create account");
- return ViewNames.NEW_ACCOUNT;
- }
-
- }
+ @RequestMapping(value = {"/newaccount", "/newacount/*"}, method = RequestMethod.POST)
+ public String create(@ModelAttribute NewUser newUser, BindingResult results, Model model) {
+ logger.debug("Creating a new user account");
+ model.addAttribute(ModelKeys.NEW_USER, newUser);
+
+ newAccountValidator.validate(newUser, results);
+ if (results.hasErrors()) {
+ logger.info("newaccount.jsp: shows validation errors");
+ return ViewNames.NEW_ACCOUNT;
+ }
+
+ //Now attempt to create the account.
+ try {
+ logger.debug("newaccount.jsp: passed form validation");
+ newAccountService.createNewAccount(newUser);
+ return ViewNames.REDIRECT;
+ } catch (org.springframework.dao.IncorrectResultSizeDataAccessException ex) {
+ //This exception is thrown if the account already exists.
+ logger.info("Account creation failed: ", ex);
+ results.reject("Account already exists", "Unable to create account");
+ return ViewNames.NEW_ACCOUNT;
+
+ } catch (Exception ex) {
+ //TODO RAVE-241 need to handle more specific exceptions
+ if (logger.isDebugEnabled()) {
+ logger.error("Account creation failed: ", ex);
+ } else {
+ logger.error("Account creation failed: {}", ex.getMessage());
+ }
+ results.reject("Unable to create account:" + ex.getMessage(), "Unable to create account");
+ return ViewNames.NEW_ACCOUNT;
+ }
+
+ }
}
\ No newline at end of file
Modified: incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/PageController.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/PageController.java?rev=1202174&r1=1202173&r2=1202174&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/PageController.java (original)
+++ incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/PageController.java Tue Nov 15 13:19:14 2011
@@ -22,6 +22,7 @@ import org.apache.rave.portal.model.Page
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.service.PageService;
import org.apache.rave.portal.service.UserService;
+import org.apache.rave.portal.web.controller.util.ControllerUtils;
import org.apache.rave.portal.web.util.ModelKeys;
import org.apache.rave.portal.web.util.ViewNames;
import org.slf4j.Logger;
@@ -33,9 +34,8 @@ import org.springframework.web.bind.anno
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
-import java.util.List;
import javax.servlet.http.HttpServletRequest;
-import org.apache.rave.portal.web.controller.util.ControllerUtils;
+import java.util.List;
/**
* Page Controller
@@ -44,7 +44,7 @@ import org.apache.rave.portal.web.contro
*/
@Controller
public class PageController {
- protected final Logger logger = LoggerFactory.getLogger(getClass());
+ private final Logger logger = LoggerFactory.getLogger(getClass());
private PageService pageService;
private UserService userService;
@@ -66,7 +66,7 @@ public class PageController {
@RequestMapping(value = "/page/view/{pageId}", method = RequestMethod.GET)
public String view(@PathVariable Long pageId, Model model, HttpServletRequest request) {
User user = userService.getAuthenticatedUser();
- logger.debug("attempting to get pageId " + pageId + " for " + user);
+ logger.debug("attempting to get pageId {} for {}", pageId, user);
List<Page> pages = getAllPagesForAuthenticatedUser();
Page page = pageService.getPageFromList(pageId, pages);
@@ -82,7 +82,7 @@ public class PageController {
List<Page> pages = pageService.getAllPages(userId);
if (pages.isEmpty()) {
// create a new default page for the user
- logger.info("user " + user.getUsername() + " does not have any pages - creating default page");
+ logger.info("User {} does not have any pages - creating default page", user.getUsername());
pageService.addNewDefaultPage(userId);
// refresh the pages list which will now have the new page
pages = pageService.getAllPages(userId);
@@ -93,13 +93,6 @@ public class PageController {
private String getDeviceAppropriateView(HttpServletRequest request) {
// return the appropriate View name based on the request. It
// checks to see if the user is on a mobile device or not
- String viewName = null;
- if (ControllerUtils.isMobileDevice(request)) {
- viewName = ViewNames.MOBILE_HOME;
- } else {
- viewName = ViewNames.HOME;
- }
-
- return viewName;
+ return ControllerUtils.isMobileDevice(request) ? ViewNames.MOBILE_HOME : ViewNames.HOME;
}
}
\ No newline at end of file
Modified: incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/UserProfileController.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/UserProfileController.java?rev=1202174&r1=1202173&r2=1202174&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/UserProfileController.java (original)
+++ incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/UserProfileController.java Tue Nov 15 13:19:14 2011
@@ -40,48 +40,48 @@ import org.springframework.web.bind.anno
@Controller
public class UserProfileController {
- protected final Logger logger=LoggerFactory.getLogger(getClass());
+ private final Logger logger = LoggerFactory.getLogger(getClass());
- private final UserService userService;
- private final UserProfileValidator userProfileValidator;
+ private final UserService userService;
+ private final UserProfileValidator userProfileValidator;
@Autowired
- public UserProfileController(UserService userService, UserProfileValidator userProfileValidator) {
- this.userService=userService;
- this.userProfileValidator=userProfileValidator;
+ public UserProfileController(UserService userService, UserProfileValidator userProfileValidator) {
+ this.userService = userService;
+ this.userProfileValidator = userProfileValidator;
}
// TODO RAVE-154 why .jsp?
- @RequestMapping(value ="/userProfile.jsp")
- public void setUpForm(ModelMap model) {
- logger.debug("Initializing form");
- User user=userService.getAuthenticatedUser();
- model.addAttribute(ModelKeys.USER_PROFILE,user);
- }
-
- @RequestMapping(value = { "/updateUserProfile","/updateUserProfile/*"}, method = RequestMethod.POST)
- public String create(@ModelAttribute User user, BindingResult results, Model model,@RequestParam String username, @RequestParam String password){
- logger.debug("Updating user profile.");
- model.addAttribute(ModelKeys.USER_PROFILE,user);
-
- userProfileValidator.validate(user,results);
- if(results.hasErrors()){
- logger.info("userProfile.jsp: shows validation errors");
- return ViewNames.USER_PROFILE;
- }
-
- //Now attempt to update the account.
- try {
- logger.debug("userprofile: passed form validation");
- userService.updateUserProfile(user);
- return ViewNames.REDIRECT;
- }
- //TODO RAVE-154 need to handle more specific exceptions
- catch (Exception ex) {
- logger.info("Account creation failed: {}", ex.getMessage());
- results.reject("Unable to create account:"+ex.getMessage(),"Unable to create account");
- return ViewNames.USER_PROFILE;
- }
- }
+ @RequestMapping(value = "/userProfile.jsp")
+ public void setUpForm(ModelMap model) {
+ logger.debug("Initializing form");
+ User user = userService.getAuthenticatedUser();
+ model.addAttribute(ModelKeys.USER_PROFILE, user);
+ }
+
+ @RequestMapping(value = {"/updateUserProfile", "/updateUserProfile/*"}, method = RequestMethod.POST)
+ public String create(@ModelAttribute User user, BindingResult results, Model model, @RequestParam String username, @RequestParam String password) {
+ logger.debug("Updating user profile.");
+ model.addAttribute(ModelKeys.USER_PROFILE, user);
+
+ userProfileValidator.validate(user, results);
+ if (results.hasErrors()) {
+ logger.info("userProfile.jsp: shows validation errors");
+ return ViewNames.USER_PROFILE;
+ }
+
+ //Now attempt to update the account.
+ try {
+ logger.debug("userprofile: passed form validation");
+ userService.updateUserProfile(user);
+ return ViewNames.REDIRECT;
+ }
+ //TODO RAVE-154 need to handle more specific exceptions
+ catch (Exception ex) {
+ logger.info("Account creation failed: {}", ex.getMessage());
+ results.reject("Unable to create account:" + ex.getMessage(), "Unable to create account");
+ return ViewNames.USER_PROFILE;
+ }
+ }
}
\ No newline at end of file