You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by cg...@apache.org on 2012/10/29 05:00:05 UTC
svn commit: r1403166 [8/11] - in /rave/trunk: ./
rave-components/rave-commons/src/main/java/org/apache/rave/persistence/
rave-components/rave-core/src/main/java/org/apache/rave/portal/model/
rave-components/rave-core/src/main/java/org/apache/rave/porta...
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ProfileController.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ProfileController.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ProfileController.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ProfileController.java Mon Oct 29 03:59:56 2012
@@ -19,13 +19,10 @@
package org.apache.rave.portal.web.controller;
-import java.util.List;
-
-import org.apache.rave.portal.model.Page;
-import org.apache.rave.portal.model.Person;
-import org.apache.rave.portal.model.User;
+import org.apache.rave.portal.model.*;
import org.apache.rave.portal.service.PageService;
import org.apache.rave.portal.service.UserService;
+import org.apache.rave.portal.service.WidgetService;
import org.apache.rave.portal.web.controller.util.ControllerUtils;
import org.apache.rave.portal.web.model.NavigationItem;
import org.apache.rave.portal.web.model.NavigationMenu;
@@ -39,11 +36,10 @@ import org.springframework.security.core
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
@Controller
@RequestMapping(value = {"/person/*", "/person"})
@@ -53,11 +49,13 @@ public class ProfileController {
private final UserService userService;
private final PageService pageService;
+ private final WidgetService widgetService;
@Autowired
- public ProfileController(UserService userService, PageService pageService) {
+ public ProfileController(UserService userService, PageService pageService, WidgetService widgetService) {
this.userService = userService;
this.pageService = pageService;
+ this.widgetService = widgetService;
}
/**
@@ -69,7 +67,7 @@ public class ProfileController {
* @return the view name of the user profile page
*/
@RequestMapping(value = {"/{username:.*}"}, method = RequestMethod.GET)
- public String viewProfile(@PathVariable String username, ModelMap model, @RequestParam(required = false) Long referringPageId) {
+ public String viewProfileByUsername(@PathVariable String username, ModelMap model, @RequestParam(required = false) String referringPageId) {
User user = null;
try{
user = userService.getUserByUsername(username);
@@ -91,7 +89,7 @@ public class ProfileController {
* @return the view name of the user profile page
*/
@RequestMapping(value = {"/id/{userid:.*}"}, method = RequestMethod.GET)
- public String viewProfile(@PathVariable Long userid, ModelMap model, @RequestParam(required = false) Long referringPageId) {
+ public String viewProfile(@PathVariable String userid, ModelMap model, @RequestParam(required = false) String referringPageId) {
User user = null;
try{
user = userService.getUserById(userid);
@@ -105,7 +103,7 @@ public class ProfileController {
}
}
- private String viewProfileCommon(User user, ModelMap model, Long referringPageId){
+ private String viewProfileCommon(User user, ModelMap model, String referringPageId){
Page personProfilePage = pageService.getPersonProfilePage(user.getId());
addAttributesToModel(model, user, referringPageId);
model.addAttribute(ModelKeys.PAGE, personProfilePage);
@@ -125,7 +123,7 @@ public class ProfileController {
*/
@RequestMapping(method = RequestMethod.POST)
public String updateProfile(ModelMap model,
- @RequestParam(required = false) Long referringPageId,
+ @RequestParam(required = false) String referringPageId,
@ModelAttribute("updatedUser") UserForm updatedUser) {
User user = userService.getAuthenticatedUser();
@@ -151,13 +149,13 @@ public class ProfileController {
/*
* Function to add attributes to model map
*/
- private void addAttributesToModel(ModelMap model, User user, Long referringPageId) {
+ private void addAttributesToModel(ModelMap model, User user, String referringPageId) {
model.addAttribute(ModelKeys.USER_PROFILE, user);
model.addAttribute(ModelKeys.REFERRING_PAGE_ID, referringPageId);
}
- public static void addNavItemsToModel(String view, ModelMap model, Long referringPageId, User user, List<Person> friendRequests) {
- long refPageId = referringPageId != null ? referringPageId : 0;
+ public static void addNavItemsToModel(String view, ModelMap model, String referringPageId, User user, List<Person> friendRequests) {
+ String refPageId = referringPageId != null ? referringPageId : "";
final NavigationMenu topMenu = new NavigationMenu("topnav");
if(friendRequests != null){
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/RegionWidgetController.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/RegionWidgetController.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/RegionWidgetController.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/RegionWidgetController.java Mon Oct 29 03:59:56 2012
@@ -20,6 +20,7 @@ package org.apache.rave.portal.web.contr
import org.apache.rave.portal.model.RegionWidget;
import org.apache.rave.portal.service.RegionWidgetService;
+import org.apache.rave.portal.service.WidgetService;
import org.apache.rave.portal.web.util.ModelKeys;
import org.apache.rave.portal.web.util.ViewNames;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,15 +34,18 @@ import org.springframework.web.bind.anno
public class RegionWidgetController {
private RegionWidgetService regionWidgetService;
+ private WidgetService widgetService;
@Autowired
- public RegionWidgetController(RegionWidgetService regionWidgetService){
+ public RegionWidgetController(RegionWidgetService regionWidgetService, WidgetService widgetService){
this.regionWidgetService = regionWidgetService;
+ this.widgetService = widgetService;
}
@RequestMapping(value = {"/api/rest/regionwidget/{regionWidgetId}"}, method = RequestMethod.GET)
- public String viewRegionWidget(Model model, @PathVariable Long regionWidgetId){
+ public String viewRegionWidget(Model model, @PathVariable String regionWidgetId){
RegionWidget rw = regionWidgetService.getRegionWidget(regionWidgetId);
+ model.addAttribute(ModelKeys.WIDGET, widgetService.getWidget(rw.getWidgetId()));
model.addAttribute(ModelKeys.REGION_WIDGET, rw);
return ViewNames.REGION_WIDGET;
}
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/WidgetMarketplaceController.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/WidgetMarketplaceController.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/WidgetMarketplaceController.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/WidgetMarketplaceController.java Mon Oct 29 03:59:56 2012
@@ -66,7 +66,7 @@ public class WidgetMarketplaceController
*/
@RequestMapping(value = { "marketplace" }, method = RequestMethod.GET)
public String viewSearchResult(Model model,
- @RequestParam long referringPageId,
+ @RequestParam String referringPageId,
@RequestParam(required = false, defaultValue = "0") int offset) {
final String view = ViewNames.ADD_WIDGET_MARKETPLACE;
@@ -96,7 +96,7 @@ public class WidgetMarketplaceController
*/
@RequestMapping(value = { "marketplace/search" }, method = RequestMethod.GET)
public String viewSearchResult(Model model,
- @RequestParam long referringPageId,
+ @RequestParam String referringPageId,
@RequestParam String searchTerm,
@RequestParam(required = false, defaultValue = "0") int offset) {
@@ -127,7 +127,7 @@ public class WidgetMarketplaceController
*/
@RequestMapping(value = { "category/{category}" }, method = RequestMethod.GET)
public String viewCategory(Model model,
- @RequestParam long referringPageId,
+ @RequestParam String referringPageId,
@PathVariable String category,
@RequestParam(required = false, defaultValue = "0") int offset) {
@@ -160,7 +160,7 @@ public class WidgetMarketplaceController
*/
@RequestMapping(value = {"widget/{widget}"}, method=RequestMethod.GET)
public String viewWidgetDetail(Model model,
- @RequestParam long referringPageId,
+ @RequestParam String referringPageId,
@RequestParam String externalId,
@PathVariable String widget){
@@ -198,7 +198,7 @@ public class WidgetMarketplaceController
* @param user
* Current authenticated User
*/
- private void widgetStoreModelHelper(Model model, long referringPageId,
+ private void widgetStoreModelHelper(Model model, String referringPageId,
User user, String view) {
model.addAttribute(ModelKeys.REFERRING_PAGE_ID, referringPageId);
ControllerUtils.addNavItemsToModel(view, model, referringPageId, user);
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/WidgetStoreController.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/WidgetStoreController.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/WidgetStoreController.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/WidgetStoreController.java Mon Oct 29 03:59:56 2012
@@ -74,7 +74,7 @@ public class WidgetStoreController {
* @return the view name of the main store page
*/
@RequestMapping(method = RequestMethod.GET)
- public String view(Model model, @RequestParam long referringPageId,
+ public String view(Model model, @RequestParam String referringPageId,
@RequestParam(required = false, defaultValue = "0") int offset) {
final String view = ViewNames.STORE;
User user = userService.getAuthenticatedUser();
@@ -84,7 +84,7 @@ public class WidgetStoreController {
}
@RequestMapping(method = RequestMethod.GET, value = "mine")
- public String viewMine(Model model, @RequestParam long referringPageId,
+ public String viewMine(Model model, @RequestParam String referringPageId,
@RequestParam(required = false, defaultValue = "0") int offset) {
final String view = ViewNames.STORE;
User user = userService.getAuthenticatedUser();
@@ -106,7 +106,7 @@ public class WidgetStoreController {
* @return the view name of the widget detail page
*/
@RequestMapping(method = RequestMethod.GET, value = "widget/{widgetId}")
- public String viewWidget(Model model, @PathVariable long widgetId, @RequestParam long referringPageId) {
+ public String viewWidget(Model model, @PathVariable String widgetId, @RequestParam String referringPageId) {
final String view = ViewNames.WIDGET;
final User user = userService.getAuthenticatedUser();
widgetStoreModelHelper(model, referringPageId, user, view);
@@ -130,7 +130,7 @@ public class WidgetStoreController {
* @return the view name of the main store page
*/
@RequestMapping(method = RequestMethod.GET, value = "search")
- public String viewSearchResult(Model model, @RequestParam long referringPageId, @RequestParam String searchTerm,
+ public String viewSearchResult(Model model, @RequestParam String referringPageId, @RequestParam String searchTerm,
@RequestParam(required = false, defaultValue = "0") int offset) {
final String view = ViewNames.STORE;
User user = userService.getAuthenticatedUser();
@@ -156,7 +156,7 @@ public class WidgetStoreController {
* @return the view name of the main store page
*/
@RequestMapping(method = RequestMethod.GET, value = "tag")
- public String viewTagResult(Model model, @RequestParam long referringPageId, @RequestParam String keyword,
+ public String viewTagResult(Model model, @RequestParam String referringPageId, @RequestParam String keyword,
@RequestParam(required = false, defaultValue = "0") int offset) {
final String view = ViewNames.STORE;
User user = userService.getAuthenticatedUser();
@@ -168,13 +168,13 @@ public class WidgetStoreController {
}
@RequestMapping(method = RequestMethod.GET, value = "category")
- public String viewCategoryResult(@RequestParam(required = true) long referringPageId,
- @RequestParam(required = true) long categoryId,
+ public String viewCategoryResult(@RequestParam(required = true) String referringPageId,
+ @RequestParam(required = true) String categoryId,
@RequestParam(required = false, defaultValue = "0") int offset, Model model) {
final String view = ViewNames.STORE;
User authenticatedUser = userService.getAuthenticatedUser();
widgetStoreModelHelper(model, referringPageId, authenticatedUser, view);
- if (categoryId > 0) {
+ if (categoryId != null && !categoryId.isEmpty()) {
model.addAttribute(ModelKeys.WIDGETS, widgetService.getWidgetsByCategory(categoryId, offset, getPageSize()));
} else {
model.addAttribute(ModelKeys.WIDGETS, widgetService.getPublishedWidgets(offset, getPageSize()));
@@ -194,7 +194,7 @@ public class WidgetStoreController {
* @return the view name of the Add new Widget form
*/
@RequestMapping(method = RequestMethod.GET, value = "widget/add")
- public String viewAddWidgetForm(Model model, @RequestParam long referringPageId) {
+ public String viewAddWidgetForm(Model model, @RequestParam String referringPageId) {
final Widget widget = new WidgetImpl();
final String view = ViewNames.ADD_WIDGET_FORM;
model.addAttribute(ModelKeys.MARKETPLACE, this.preferenceService.getPreference(PortalPreferenceKeys.EXTERNAL_MARKETPLACE_URL));
@@ -216,7 +216,7 @@ public class WidgetStoreController {
* @return the view name of the Add new Widget form
*/
@RequestMapping(method = RequestMethod.GET, value = "widget/add/{type}")
- public String viewAddWidgetFormByType(Model model, @RequestParam long referringPageId, @PathVariable String type) {
+ public String viewAddWidgetFormByType(Model model, @RequestParam String referringPageId, @PathVariable String type) {
final Widget widget = new WidgetImpl();
String view;
if (type != null && type.equalsIgnoreCase("w3c")){
@@ -248,7 +248,7 @@ public class WidgetStoreController {
*/
@RequestMapping(method = RequestMethod.POST, value = "widget/add")
public String viewAddWidgetResult(@ModelAttribute WidgetImpl widget, BindingResult results, Model model,
- @RequestParam long referringPageId) {
+ @RequestParam String referringPageId) {
User user = userService.getAuthenticatedUser();
widgetValidator.validate(widget, results);
if (results.hasErrors()) {
@@ -276,7 +276,7 @@ public class WidgetStoreController {
*/
@RequestMapping(method = RequestMethod.POST, value = "widget/add/w3c")
public String viewAddWidgetResultW3c(@ModelAttribute WidgetImpl widget, BindingResult results, Model model,
- @RequestParam long referringPageId) {
+ @RequestParam String referringPageId) {
User user = userService.getAuthenticatedUser();
widgetValidator.validate(widget, results);
if (results.hasErrors()) {
@@ -300,7 +300,7 @@ public class WidgetStoreController {
* the source page ID
* @return a redirection string for the store detail page.
*/
- private String finalizeNewWidget(WidgetImpl widget, User user, long referringPageId){
+ private String finalizeNewWidget(WidgetImpl widget, User user, String referringPageId){
/*
* By default, a new widget has a status of "PREVIEW", however this can be overridden in portal preferences,
* skipping the need for an admin to approve a new widget.
@@ -312,7 +312,7 @@ public class WidgetStoreController {
widget.setWidgetStatus(WidgetStatus.PREVIEW);
}
- widget.setOwner(user);
+ widget.setOwnerId(user.getId());
final Widget storedWidget = widgetService.registerNewWidget(widget);
return "redirect:/app/store/widget/" + storedWidget.getId() + "?referringPageId=" + referringPageId;
@@ -328,7 +328,7 @@ public class WidgetStoreController {
* @param user
* Current authenticated User
*/
- private void widgetStoreModelHelper(Model model, long referringPageId, User user, String view) {
+ private void widgetStoreModelHelper(Model model, String referringPageId, User user, String view) {
model.addAttribute(ModelKeys.REFERRING_PAGE_ID, referringPageId);
model.addAttribute(ModelKeys.WIDGETS_STATISTICS, widgetService.getAllWidgetStatistics(user.getId()));
model.addAttribute(ModelKeys.TAGS, tagService.getAllTags());
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/CategoryController.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/CategoryController.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/CategoryController.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/CategoryController.java Mon Oct 29 03:59:56 2012
@@ -128,7 +128,7 @@ public class CategoryController {
}
@RequestMapping(value = "/admin/category/edit", method = RequestMethod.GET)
- public String editCategory(@RequestParam(required = true) long id, Model model) {
+ public String editCategory(@RequestParam(required = true) String id, Model model) {
addNavigationMenusToModel(SELECTED_ITEM, model);
model.addAttribute(ModelKeys.TOKENCHECK, AdminControllerUtil.generateSessionToken());
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.java Mon Oct 29 03:59:56 2012
@@ -119,7 +119,7 @@ public class UserController {
}
@RequestMapping(value = "/admin/userdetail/{userid}", method = RequestMethod.GET)
- public String viewUserDetail(@PathVariable("userid") Long userid, Model model) {
+ public String viewUserDetail(@PathVariable("userid") String userid, Model model) {
addNavigationMenusToModel(SELECTED_ITEM, model);
model.addAttribute(ModelKeys.USER, userService.getUserById(userid));
model.addAttribute(ModelKeys.TOKENCHECK, AdminControllerUtil.generateSessionToken());
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/WidgetController.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/WidgetController.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/WidgetController.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/WidgetController.java Mon Oct 29 03:59:56 2012
@@ -106,7 +106,7 @@ public class WidgetController {
}
@RequestMapping(value = "/admin/widgetdetail/{widgetid}", method = RequestMethod.GET)
- public String viewWidgetDetail(@PathVariable("widgetid") Long widgetid, Model model) {
+ public String viewWidgetDetail(@PathVariable("widgetid") String widgetid, Model model) {
addNavigationMenusToModel(SELECTED_ITEM, model);
model.addAttribute(ModelKeys.WIDGET, widgetService.getWidget(widgetid));
model.addAttribute(ModelKeys.TOKENCHECK, AdminControllerUtil.generateSessionToken());
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/util/CategoryEditor.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/util/CategoryEditor.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/util/CategoryEditor.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/util/CategoryEditor.java Mon Oct 29 03:59:56 2012
@@ -38,7 +38,7 @@ public class CategoryEditor extends Prop
@Override
public void setAsText(String text) throws IllegalArgumentException {
- setValue(categoryService.get(Long.parseLong(text)));
+ setValue(categoryService.get(text));
}
@Override
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/util/ControllerUtils.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/util/ControllerUtils.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/util/ControllerUtils.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/util/ControllerUtils.java Mon Oct 29 03:59:56 2012
@@ -59,17 +59,17 @@ public class ControllerUtils {
return viewName;
}
- public static void addNavItemsToModel(String view, Model model, long referringPageId, User user) {
+ public static void addNavItemsToModel(String view, Model model, String referringPageId, User user) {
final NavigationMenu topMenu = getTopMenu(view, referringPageId, user, true);
model.addAttribute(topMenu.getName(), topMenu);
}
- public static void addNavItemsToModel(String view, Model model, long referringPageId, User user, boolean addStore) {
+ public static void addNavItemsToModel(String view, Model model, String referringPageId, User user, boolean addStore) {
final NavigationMenu topMenu = getTopMenu(view, referringPageId, user, addStore);
model.addAttribute(topMenu.getName(), topMenu);
}
- public static NavigationMenu getTopMenu(String view, long referringPageId, User user, boolean addStoreLink) {
+ public static NavigationMenu getTopMenu(String view, String referringPageId, User user, boolean addStoreLink) {
NavigationMenu menu = new NavigationMenu("topnav");
if(view.startsWith(ViewNames.PAGE) || view.startsWith(ViewNames.MOBILE_HOME)) {
NavigationItem profile = new NavigationItem("page.profile.title", getDisplayName(user), "/app/person/id/" + user.getId() + "?referringPageId=" + referringPageId);
@@ -132,10 +132,10 @@ public class ControllerUtils {
return (displayName == null || "".equals(displayName)) ? user.getUsername() : displayName;
}
- private static NavigationItem getBackItem(long referringPageId) {
+ private static NavigationItem getBackItem(String referringPageId) {
NavigationItem back = new NavigationItem();
back.setName("page.general.back");
- if (referringPageId > 0) {
+ if (referringPageId != null && !referringPageId.isEmpty()) {
back.setUrl("/app/page/view/" + referringPageId);
} else {
back.setUrl("/");
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/UserForm.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/UserForm.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/UserForm.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/UserForm.java Mon Oct 29 03:59:56 2012
@@ -28,7 +28,7 @@ import java.util.Collection;
*/
public class UserForm {
- private Long id;
+ private String id;
private Collection<AuthorityImpl> authorities;
private String password;
private String username;
@@ -47,7 +47,7 @@ public class UserForm {
private boolean expired;
private boolean enabled;
- public UserForm(Long userid, String username) {
+ public UserForm(String userid, String username) {
this();
this.id = userid;
this.username = username;
@@ -58,11 +58,11 @@ public class UserForm {
}
- public Long getId() {
+ public String getId() {
return id;
}
- public void setId(Long id) {
+ public void setId(String id) {
this.id = id;
}
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/RegionWidgetTag.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/RegionWidgetTag.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/RegionWidgetTag.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/RegionWidgetTag.java Mon Oct 29 03:59:56 2012
@@ -21,10 +21,13 @@ package org.apache.rave.portal.web.tag;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.rave.portal.model.RegionWidget;
+import org.apache.rave.portal.model.Widget;
+import org.apache.rave.portal.repository.WidgetRepository;
import org.apache.rave.portal.web.renderer.RenderScope;
import org.apache.rave.portal.web.renderer.RenderService;
import org.apache.rave.portal.web.renderer.ScriptLocation;
import org.apache.rave.portal.web.renderer.ScriptManager;
+import org.springframework.beans.factory.annotation.Autowired;
import javax.servlet.jsp.JspException;
@@ -34,6 +37,7 @@ import javax.servlet.jsp.JspException;
public class RegionWidgetTag extends AbstractContextAwareSingletonBeanDependentTag<RenderService> {
private RegionWidget regionWidget;
+ private Widget widget;
private static final String REGISTER_DISABLED_WIDGET_KEY = "disabledRegisterWidget";
@@ -45,6 +49,7 @@ public class RegionWidgetTag extends Abs
" collapsed: %4$s," +
" widgetId: %5$s});</script>";
+ @Autowired
public RegionWidgetTag() {
super(RenderService.class);
}
@@ -57,6 +62,14 @@ public class RegionWidgetTag extends Abs
this.regionWidget = regionWidget;
}
+ public Widget getWidget() {
+ return widget;
+ }
+
+ public void setWidget(Widget widget) {
+ this.widget = widget;
+ }
+
/**
* Delegates rendering of the RegionWidget to the RenderService
*
@@ -66,22 +79,26 @@ public class RegionWidgetTag extends Abs
@Override
public int doStartTag() throws JspException {
- if (regionWidget != null && getBean().getSupportedWidgetTypes().contains(regionWidget.getWidget().getType()) ) {
- if ( regionWidget.getWidget().isDisableRendering() ) {
+ if (regionWidget == null) {
+ throw new JspException("RegionWidget not set: " + regionWidget);
+ }
+
+ if (widget != null && getBean().getSupportedWidgetTypes().contains(widget.getType()) ) {
+ if ( widget.isDisableRendering() ) {
ScriptManager scriptManager = getBeanFromContext(ScriptManager.class);
String widgetScript = String.format(DISABLED_SCRIPT_BLOCK, regionWidget.getRegion().getId(),
regionWidget.getId(),
- StringEscapeUtils.escapeJavaScript(regionWidget.getWidget().getDisableRenderingMessage()),
+ StringEscapeUtils.escapeJavaScript(widget.getDisableRenderingMessage()),
regionWidget.isCollapsed(),
- regionWidget.getWidget().getId());
- String key = REGISTER_DISABLED_WIDGET_KEY + "-" + regionWidget.getWidget().getId();
+ widget.getId());
+ String key = REGISTER_DISABLED_WIDGET_KEY + "-" + widget.getId();
scriptManager.registerScriptBlock(key, widgetScript, ScriptLocation.AFTER_RAVE, RenderScope.CURRENT_REQUEST, getContext());
} else {
writeString(getBean().render(regionWidget, getContext()));
}
}
else {
- throw new JspException("Unsupported regionWidget type or regionWidget not set: " + regionWidget);
+ throw new JspException("Unsupported regionWidget type: " + regionWidget);
}
//Certain JSP implementations use tag pools. Setting the regionWidget to null ensures that there is no chance a given tag
//will accidentally re-use a region widget if the attribute in the JSP is empty
Modified: rave/trunk/rave-components/rave-web/src/main/resources/META-INF/rave.tld
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/resources/META-INF/rave.tld?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/resources/META-INF/rave.tld (original)
+++ rave/trunk/rave-components/rave-web/src/main/resources/META-INF/rave.tld Mon Oct 29 03:59:56 2012
@@ -26,6 +26,30 @@
<uri>http://www.apache.org/rave/tags</uri>
<tag>
+ <description>Allows access to a org.apache.rave.model.Person object via the configured variable</description>
+ <name>person</name>
+ <tag-class>org.apache.rave.portal.web.tag.PersonTag</tag-class>
+ <body-content>JSP</body-content>
+ <attribute>
+ <description>The ID of the person to load</description>
+ <name>id</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description>The variable to assign the resulting person to</description>
+ <name>var</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description>The scope under which the assignment is valid</description>
+ <name>scope</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+ <tag>
<description>Renders a given RegionWidget in the page</description>
<name>render-widget</name>
<tag-class>org.apache.rave.portal.web.tag.RegionWidgetTag</tag-class>
@@ -36,6 +60,12 @@
<required>true</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
+ <attribute>
+ <description>The widget to render</description>
+ <name>widget</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
</tag>
<tag>
<description>Renders a set of script blocks for the current location</description>
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/PageApiTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/PageApiTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/PageApiTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/PageApiTest.java Mon Oct 29 03:59:56 2012
@@ -43,7 +43,7 @@ public class PageApiTest {
private OmdlService omdlService;
private MockHttpServletResponse response;
- private final long PAGE_ID = 1L;
+ private final String PAGE_ID = "1";
@Before
public void setUp() {
@@ -67,7 +67,7 @@ public class PageApiTest {
public void getPage_validId_export() {
Page p = new PageImpl();
p.setRegions(new ArrayList<Region>());
- p.setOwner(new UserImpl());
+ p.setOwnerId("");
Region region = new RegionImpl();
region.setRegionWidgets(new ArrayList<RegionWidget>());
RegionWidget w = new RegionWidgetImpl();
@@ -81,7 +81,7 @@ public class PageApiTest {
Page returned = pageApi.getPage(PAGE_ID, true);
assertThat(returned, is(sameInstance(p)));
- assertThat(returned.getOwner(), is(nullValue()));
+ assertThat(returned.getOwnerId(), is(nullValue()));
assertThat(returned.getRegions().get(0).getRegionWidgets().get(0).getPreferences(), is(nullValue()));
}
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/RegionWidgetApiTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/RegionWidgetApiTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/RegionWidgetApiTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/RegionWidgetApiTest.java Mon Oct 29 03:59:56 2012
@@ -38,8 +38,8 @@ public class RegionWidgetApiTest {
private RegionWidgetService regionWidgetService;
private RegionWidgetApi regionWidgetApi;
- private long VALID_REGION_WIDGET_ID = 1l;
- private long INVALID_REGION_WIDGET_ID = 100l;
+ private String VALID_REGION_WIDGET_ID = "1";
+ private String INVALID_REGION_WIDGET_ID = "100";
private String VALID_PREFERENCE_NAME = "color";
private String VALID_PREFERENCE_VALUE = "blue";
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java Mon Oct 29 03:59:56 2012
@@ -29,6 +29,7 @@ import org.springframework.mock.web.Mock
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import static org.easymock.EasyMock.*;
@@ -39,36 +40,32 @@ import static org.junit.Assert.assertTha
public class WidgetApiTest {
private WidgetApi widgetApi;
- private WidgetCommentService widgetCommentService;
- private WidgetRatingService widgetRatingService;
private UserService userService;
- private WidgetTagService widgetTagService;
+ private WidgetService widgetService;
private TagService tagService;
private MockHttpServletResponse response;
- private final Long VALID_USER_ID = 5L;
- private final Long VALID_WIDGET_ID = 10L;
+ private final String VALID_USER_ID = "5";
+ private final String VALID_WIDGET_ID = "10";
private UserImpl user;
private List<Tag> tagList;
@Before
public void setup() {
- widgetCommentService = createMock(WidgetCommentService.class);
- widgetRatingService = createMock(WidgetRatingService.class);
userService = createMock(UserService.class);
tagService = createMock(TagService.class);
- widgetTagService = createMock(WidgetTagService.class);
+ widgetService = createMock(WidgetService.class);
user = new UserImpl();
user.setId(VALID_USER_ID);
tagList = new ArrayList<Tag>();
- tagList.add(new TagImpl("tag1"));
- tagList.add(new TagImpl("tag2"));
+ tagList.add(new TagImpl("1", "tag1"));
+ tagList.add(new TagImpl("2", "tag2"));
response = createMock(MockHttpServletResponse.class);
- widgetApi = new WidgetApi(widgetRatingService, widgetCommentService, userService, tagService, widgetTagService);
+ widgetApi = new WidgetApi(userService, tagService, widgetService);
}
@Test(expected = UnsupportedOperationException.class)
@@ -81,7 +78,7 @@ public class WidgetApiTest {
String comment = "new comment";
WidgetImpl widget = new WidgetImpl();
- widget.setId(1L);
+ widget.setId("1");
widget.setComments(new ArrayList<WidgetComment>());
HttpServletResponse httpServletResponse = createMock(HttpServletResponse.class);
@@ -89,109 +86,105 @@ public class WidgetApiTest {
expect(userService.getAuthenticatedUser()).andReturn(user);
replay(userService, httpServletResponse);
- widgetApi.createWidgetComment(1L, comment, httpServletResponse);
+ widgetApi.createWidgetComment("1", comment, httpServletResponse);
verify(userService, httpServletResponse);
}
@Test
public void getWidgetComment() {
- WidgetComment widgetComment = new WidgetCommentImpl();
- widgetComment.setId(2L);
- expect(widgetCommentService.getWidgetComment(2L)).andReturn(widgetComment);
- replay(widgetCommentService);
+ WidgetComment widgetComment = new WidgetCommentImpl("2");
+ expect(widgetService.getWidgetComment("1", "2")).andReturn(widgetComment);
+ replay(widgetService);
- WidgetComment foundComment = widgetApi.getWidgetComment(1L, 2L);
+ WidgetComment foundComment = widgetApi.getWidgetComment("1", "2");
assertEquals(widgetComment.getId(), foundComment.getId());
- verify(widgetCommentService);
+ verify(widgetService);
}
@Test
public void updateNonExistentWidgetComment() {
String message = "message";
WidgetComment widgetComment = new WidgetCommentImpl();
- widgetComment.setWidgetId(2L);
widgetComment.setText(message);
- widgetComment.setUser(new UserImpl(VALID_USER_ID, "John.Doe"));
+ widgetComment.setUserId(VALID_USER_ID);
expect(userService.getAuthenticatedUser()).andReturn(user);
- expect(widgetCommentService.getWidgetComment(3L)).andReturn(null);
- widgetCommentService.saveWidgetComment(widgetComment);
- replay(userService, widgetCommentService);
+ expect(widgetService.getWidgetComment("2", "3")).andReturn(null);
+ widgetService.createWidgetComment("2", widgetComment);
+ replay(userService, widgetService);
HttpServletResponse httpServletResponse = createMock(HttpServletResponse.class);
httpServletResponse.setStatus(HttpStatus.NO_CONTENT.value());
replay(httpServletResponse);
- widgetApi.updateWidgetComment(2L, 3L, message, httpServletResponse);
+ widgetApi.updateWidgetComment("2", "3", message, httpServletResponse);
- verify(userService, widgetCommentService, httpServletResponse);
+ verify(userService, widgetService, httpServletResponse);
}
@Test
public void updateWidgetComment() {
String message = "updated comment";
- WidgetComment widgetComment = new WidgetCommentImpl();
- widgetComment.setId(2L);
+ WidgetComment widgetComment = new WidgetCommentImpl("2");
- expect(widgetCommentService.getWidgetComment(2L)).andReturn(widgetComment);
- widgetCommentService.saveWidgetComment(widgetComment);
- replay(widgetCommentService);
+ expect(widgetService.getWidgetComment("2", "2")).andReturn(widgetComment);
+ widgetService.updateWidgetComment("2", widgetComment);
+ replay(widgetService);
HttpServletResponse httpServletResponse = createMock(HttpServletResponse.class);
httpServletResponse.setStatus(HttpStatus.NO_CONTENT.value());
replay(httpServletResponse);
- widgetApi.updateWidgetComment(1L, 2L, message, httpServletResponse);
+ widgetApi.updateWidgetComment("2", "2", message, httpServletResponse);
assertEquals(message, widgetComment.getText());
- verify(widgetCommentService, httpServletResponse);
+ verify(widgetService, httpServletResponse);
}
@Test
public void deleteWidgetComment() {
- widgetCommentService.removeWidgetComment(1L);
- replay(widgetCommentService);
+ widgetService.removeWidgetComment("2", "1");
+ replay(widgetService);
HttpServletResponse httpServletResponse = createMock(HttpServletResponse.class);
httpServletResponse.setStatus(HttpStatus.NO_CONTENT.value());
replay(httpServletResponse);
- widgetApi.deleteWidgetComment(2L, 1L, httpServletResponse);
+ widgetApi.deleteWidgetComment("2", "1", httpServletResponse);
- verify(widgetCommentService);
+ verify(widgetService);
verify(httpServletResponse);
}
@Test
public void deleteWidgetRating() {
expect(userService.getAuthenticatedUser()).andReturn(user);
- widgetRatingService.removeWidgetRating(1L, VALID_USER_ID);
+ widgetService.removeWidgetRating("1", VALID_USER_ID);
expectLastCall();
response.setStatus(HttpStatus.NO_CONTENT.value());
- replay(userService, widgetRatingService, response);
- widgetApi.deleteWidgetRating(1L, response);
- verify(widgetRatingService, userService, response);
+ replay(userService, widgetService, response);
+ widgetApi.deleteWidgetRating("1", response);
+ verify(widgetService, userService, response);
}
@Test
public void updateWidgetRating() {
WidgetRating widgetRating = new WidgetRatingImpl();
widgetRating.setScore(5);
- widgetRating.setUserId(5L);
- widgetRating.setWidgetId(1L);
+ widgetRating.setUserId("5");
expect(userService.getAuthenticatedUser()).andReturn(user);
- widgetRatingService.saveWidgetRating(eq(widgetRating));
+ widgetService.saveWidgetRating(eq("1"), eq(widgetRating));
expectLastCall();
response.setStatus(HttpStatus.NO_CONTENT.value());
- replay(userService, widgetRatingService, response);
+ replay(userService, widgetService, response);
- User user = new UserImpl(2L);
- widgetApi.setWidgetRating(1L, 5, response);
+ User user = new UserImpl("2");
+ widgetApi.setWidgetRating("1", 5, response);
- verify(widgetRatingService, userService, response);
+ verify(widgetService, userService, response);
}
@Test
@@ -209,10 +202,17 @@ public class WidgetApiTest {
@Test
public void getTags() {
- expect(tagService.getAvailableTagsByWidgetId(VALID_WIDGET_ID)).andReturn(tagList);
+ WidgetImpl widget = new WidgetImpl(VALID_WIDGET_ID);
+ WidgetTagImpl widgetTag = new WidgetTagImpl(VALID_USER_ID, new Date(), tagList.get(0).getId());
+ widget.getTags().add(widgetTag);
+
+ expect(widgetService.getWidget(VALID_WIDGET_ID)).andReturn(widget);
+ replay(widgetService);
+ expect(tagService.getTagById(tagList.get(0).getId())).andReturn(tagList.get(0));
replay(tagService);
-
- assertThat(widgetApi.getTags(VALID_WIDGET_ID), is(tagList));
+
+ List<Tag> tags = widgetApi.getTags(VALID_WIDGET_ID, response);
+ assertEquals(tags.size(), 1);
verify(tagService);
}
@@ -228,47 +228,41 @@ public class WidgetApiTest {
@Test
public void createWidgetTag_newTag() {
final String TAG_TEXT = "mytag";
- TagImpl tag = new TagImpl();
- tag.setKeyword(TAG_TEXT);
- WidgetTag widgetTag = new WidgetTagImpl();
- widgetTag.setTag(tag);
- widgetTag.setWidgetId(VALID_WIDGET_ID);
+ TagImpl tag = new TagImpl(TAG_TEXT);
+ WidgetTagImpl widgetTag = new WidgetTagImpl(VALID_USER_ID, new Date(), tag.getId());
- expect(widgetTagService.getWidgetTagByWidgetIdAndKeyword(VALID_WIDGET_ID, TAG_TEXT)).andReturn(null);
+ expect(widgetService.getWidgetTagByWidgetIdAndKeyword(VALID_WIDGET_ID, TAG_TEXT)).andReturn(null);
expect(userService.getAuthenticatedUser()).andReturn(user);
expect(tagService.getTagByKeyword(TAG_TEXT)).andReturn(null);
- widgetTagService.createWidgetTag(isA(WidgetTag.class));
+ expect(tagService.save(isA(TagImpl.class))).andReturn(tag);
+ expect(widgetService.createWidgetTag(isA(String.class), isA(WidgetTag.class))).andReturn(widgetTag);
expectLastCall();
- replay(widgetTagService, userService, tagService);
+ replay(widgetService, userService, tagService);
widgetApi.createWidgetTag(VALID_WIDGET_ID, TAG_TEXT, response);
- verify(widgetTagService, userService, tagService);
+ verify(widgetService, userService, tagService);
}
@Test
public void createWidgetTag_newTag_existsForOtherWidget() {
final String TAG_TEXT = "mytag";
- TagImpl tag = new TagImpl();
- tag.setKeyword(TAG_TEXT);
- WidgetTagImpl widgetTag = new WidgetTagImpl();
- widgetTag.setTag(tag);
+ TagImpl tag = new TagImpl(TAG_TEXT);
+ WidgetTagImpl widgetTag = new WidgetTagImpl(VALID_USER_ID, new Date(), tag.getId());
- expect(widgetTagService.getWidgetTagByWidgetIdAndKeyword(VALID_WIDGET_ID, TAG_TEXT)).andReturn(null);
+ expect(widgetService.getWidgetTagByWidgetIdAndKeyword(VALID_WIDGET_ID, TAG_TEXT)).andReturn(null);
expect(userService.getAuthenticatedUser()).andReturn(user);
expect(tagService.getTagByKeyword(TAG_TEXT)).andReturn(tag);
- widgetTagService.createWidgetTag(isA(WidgetTag.class));
+ expect(widgetService.createWidgetTag(isA(String.class), isA(WidgetTag.class))).andReturn(widgetTag);
expectLastCall();
- replay(widgetTagService, userService, tagService);
+ replay(widgetService, userService, tagService);
widgetApi.createWidgetTag(VALID_WIDGET_ID, TAG_TEXT, response);
- verify(widgetTagService, userService, tagService);
+ verify(widgetService, userService, tagService);
}
@Test
public void createWidgetTag_nullText() {
final String TAG_TEXT = null;
- TagImpl tag = new TagImpl();
- tag.setKeyword(TAG_TEXT);
- WidgetTagImpl widgetTag = new WidgetTagImpl();
- widgetTag.setTag(tag);
+ TagImpl tag = new TagImpl(TAG_TEXT);
+ WidgetTagImpl widgetTag = new WidgetTagImpl(VALID_USER_ID, new Date(), tag.getId());
widgetApi.createWidgetTag(VALID_WIDGET_ID, TAG_TEXT, response);
}
@@ -276,10 +270,8 @@ public class WidgetApiTest {
@Test
public void createWidgetTag_emptyText() {
final String TAG_TEXT = " ";
- TagImpl tag = new TagImpl();
- tag.setKeyword(TAG_TEXT);
- WidgetTagImpl widgetTag = new WidgetTagImpl();
- widgetTag.setTag(tag);
+ TagImpl tag = new TagImpl(TAG_TEXT);
+ WidgetTagImpl widgetTag = new WidgetTagImpl(VALID_USER_ID, new Date(), tag.getId());
widgetApi.createWidgetTag(VALID_WIDGET_ID, TAG_TEXT, response);
}
@@ -287,14 +279,12 @@ public class WidgetApiTest {
@Test
public void createWidgetTag_existingTag() {
final String TAG_TEXT = "mytag";
- TagImpl tag = new TagImpl();
- tag.setKeyword(TAG_TEXT);
- WidgetTagImpl widgetTag = new WidgetTagImpl();
- widgetTag.setTag(tag);
+ TagImpl tag = new TagImpl(TAG_TEXT);
+ WidgetTagImpl widgetTag = new WidgetTagImpl(VALID_USER_ID, new Date(), tag.getId());
- expect(widgetTagService.getWidgetTagByWidgetIdAndKeyword(VALID_WIDGET_ID, TAG_TEXT)).andReturn(widgetTag);
- replay(widgetTagService);
+ expect(widgetService.getWidgetTagByWidgetIdAndKeyword(VALID_WIDGET_ID, TAG_TEXT)).andReturn(widgetTag);
+ replay(widgetService);
widgetApi.createWidgetTag(VALID_WIDGET_ID, TAG_TEXT, response);
- verify(widgetTagService);
+ verify(widgetService);
}
}
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rpc/PageApiTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rpc/PageApiTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rpc/PageApiTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rpc/PageApiTest.java Mon Oct 29 03:59:56 2012
@@ -41,10 +41,10 @@ public class PageApiTest {
private PageApi pageApi;
private PageService pageService;
private OmdlService omdlService;
- private final long REGION_WIDGET_ID = 35;
+ private final String REGION_WIDGET_ID = "35";
private final int NEW_POSITION = 3;
- private final long PAGE_ID = 20L;
- private final long PAGE_2_ID = 38L;
+ private final String PAGE_ID = "20";
+ private final String PAGE_2_ID = "30";
private Page page, page2;
@@ -61,8 +61,8 @@ public class PageApiTest {
@Test
public void moveWidgetOnPage_validParams() {
- final long TO_REGION = 1;
- final long FROM_REGION = 2;
+ final String TO_REGION = "1";
+ final String FROM_REGION = "2";
expect(pageService.moveRegionWidget(REGION_WIDGET_ID, NEW_POSITION, TO_REGION, FROM_REGION)).andReturn(new RegionWidgetImpl());
replay(pageService);
@@ -77,8 +77,8 @@ public class PageApiTest {
@Test
public void moveWidgetOnPage_invalidParams() {
- final long TO_REGION = -1;
- final long FROM_REGION = 2;
+ final String TO_REGION = "-1";
+ final String FROM_REGION = "2";
expect(pageService.moveRegionWidget(REGION_WIDGET_ID, NEW_POSITION, TO_REGION, FROM_REGION)).andThrow(new IllegalArgumentException(PARAM_ERROR_MESSAGE));
replay(pageService);
@@ -94,8 +94,8 @@ public class PageApiTest {
@Test
public void moveWidgetOnPage_internalError() {
- final long TO_REGION = 1;
- final long FROM_REGION = 2;
+ final String TO_REGION = "1";
+ final String FROM_REGION = "2";
expect(pageService.moveRegionWidget(REGION_WIDGET_ID, NEW_POSITION, TO_REGION, FROM_REGION)).andThrow(new RuntimeException(INTERNAL_ERROR_MESSAGE));
replay(pageService);
@@ -111,8 +111,8 @@ public class PageApiTest {
@Test
public void addWidget_validParams() {
- final int PAGE_ID = 1;
- final long WIDGET_ID = 2;
+ final String PAGE_ID = "1";
+ final String WIDGET_ID = "2";
expect(pageService.addWidgetToPage(PAGE_ID, WIDGET_ID)).andReturn(new RegionWidgetImpl());
replay(pageService);
@@ -127,8 +127,8 @@ public class PageApiTest {
@Test
public void addWidget_invalidParams() {
- final int PAGE_ID = 1;
- final long WIDGET_ID = 2;
+ final String PAGE_ID = "1";
+ final String WIDGET_ID = "2";
expect(pageService.addWidgetToPage(PAGE_ID, WIDGET_ID)).andThrow(new IllegalArgumentException(PARAM_ERROR_MESSAGE));
replay(pageService);
@@ -143,8 +143,8 @@ public class PageApiTest {
@Test
public void addWidget_internalError() {
- final int PAGE_ID = 1;
- final long WIDGET_ID = 2;
+ final String PAGE_ID = "1";
+ final String WIDGET_ID = "2";
expect(pageService.addWidgetToPage(PAGE_ID, WIDGET_ID)).andThrow(new RuntimeException(INTERNAL_ERROR_MESSAGE));
replay(pageService);
@@ -159,7 +159,7 @@ public class PageApiTest {
@Test
public void deleteWidget_validParams() {
- final long WIDGET_ID = 3;
+ final String WIDGET_ID = "3";
expect(pageService.removeWidgetFromPage(WIDGET_ID)).andReturn(new RegionImpl());
replay(pageService);
@@ -173,7 +173,7 @@ public class PageApiTest {
@Test
public void deleteWidget_invalidParams() {
- final long WIDGET_ID = 2;
+ final String WIDGET_ID = "2";
expect(pageService.removeWidgetFromPage(WIDGET_ID)).andThrow(new IllegalArgumentException(PARAM_ERROR_MESSAGE));
replay(pageService);
@@ -188,7 +188,7 @@ public class PageApiTest {
@Test
public void deleteWidget_internalError() {
- final long WIDGET_ID = 2;
+ final String WIDGET_ID = "2";
expect(pageService.removeWidgetFromPage(WIDGET_ID)).andThrow(new RuntimeException(INTERNAL_ERROR_MESSAGE));
replay(pageService);
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/PageControllerTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/PageControllerTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/PageControllerTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/PageControllerTest.java Mon Oct 29 03:59:56 2012
@@ -30,6 +30,7 @@ import org.apache.rave.portal.model.impl
import org.apache.rave.portal.service.PageLayoutService;
import org.apache.rave.portal.service.PageService;
import org.apache.rave.portal.service.UserService;
+import org.apache.rave.portal.service.WidgetService;
import org.apache.rave.portal.web.controller.util.MockHttpUtil;
import org.apache.rave.portal.web.util.ModelKeys;
import org.apache.rave.portal.web.util.ViewNames;
@@ -52,6 +53,7 @@ public class PageControllerTest {
private PageLayoutService pageLayoutService;
private PageController pageController;
private MockHttpServletRequest request;
+ private WidgetService widgetService;
private Model model;
private Page defaultPage, otherPage;
@@ -59,9 +61,9 @@ public class PageControllerTest {
private List<Page> allPages;
private List<PageLayout> allPageLayouts;
- private final Long DEFAULT_PAGE_ID = 99L;
- private final Long OTHER_PAGE_ID = 22L;
- private final Long USER_ID = 1L;
+ private final String DEFAULT_PAGE_ID = "99";
+ private final String OTHER_PAGE_ID = "22";
+ private final String USER_ID = "1";
private final String VALID_PAGE_LAYOUT_CODE = "layout98";
private UserImpl validUser;
private PageLayout validPageLayout;
@@ -72,28 +74,29 @@ public class PageControllerTest {
userService = createMock(UserService.class);
pageService = createMock(PageService.class);
pageLayoutService = createMock(PageLayoutService.class);
- pageController = new PageController(pageService, userService, pageLayoutService);
+ widgetService = createMock(WidgetService.class);
+ pageController = new PageController(pageService, userService, pageLayoutService, widgetService);
model = new ExtendedModelMap();
request = new MockHttpServletRequest();
validUser = new UserImpl(USER_ID);
validPageLayout = new PageLayoutImpl();
validPageLayout.setCode(VALID_PAGE_LAYOUT_CODE);
- defaultPageUser = new PageUserImpl(validUser, defaultPage, 1L);
+ defaultPageUser = new PageUserImpl(USER_ID, defaultPage, 1L);
defaultPageUser.setPageStatus(PageInvitationStatus.OWNER);
validUser.setDefaultPageLayout(validPageLayout);
- defaultPage = new PageImpl(DEFAULT_PAGE_ID, validUser);
+ defaultPage = new PageImpl(DEFAULT_PAGE_ID, USER_ID);
defaultPage.setPageLayout(validPageLayout);
List<PageUser> members = new ArrayList<PageUser>();
members.add(defaultPageUser);
defaultPage.setMembers(members);
- otherPage = new PageImpl(OTHER_PAGE_ID, validUser);
+ otherPage = new PageImpl(OTHER_PAGE_ID, USER_ID);
otherPage.setPageLayout(validPageLayout);
- otherPageUser = new PageUserImpl(validUser, otherPage, 2L);
+ otherPageUser = new PageUserImpl(USER_ID, otherPage, 2L);
otherPageUser.setPageStatus(PageInvitationStatus.OWNER);
List<PageUser> members2 = new ArrayList<PageUser>();
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ProfileControllerTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ProfileControllerTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ProfileControllerTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ProfileControllerTest.java Mon Oct 29 03:59:56 2012
@@ -39,6 +39,7 @@ import org.apache.rave.portal.model.impl
import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.service.PageService;
import org.apache.rave.portal.service.UserService;
+import org.apache.rave.portal.service.WidgetService;
import org.apache.rave.portal.web.model.UserForm;
import org.apache.rave.portal.web.util.ModelKeys;
import org.apache.rave.portal.web.util.ViewNames;
@@ -57,14 +58,15 @@ public class ProfileControllerTest {
private UserService userService;
private PageService pageService;
+ private WidgetService widgetService;
private Page defaultPage, otherPage;
private List<Page> allProfilePages;
private List<PageLayout> allPageLayouts;
- private final Long DEFAULT_PAGE_ID = 99L;
- private final Long OTHER_PAGE_ID = 22L;
- private final Long USER_ID = 1L;
+ private final String DEFAULT_PAGE_ID = "99";
+ private final String OTHER_PAGE_ID = "22";
+ private final String USER_ID = "1";
private final String VALID_PAGE_LAYOUT_CODE = "layout98";
private PageLayout validPageLayout;
@@ -72,7 +74,8 @@ public class ProfileControllerTest {
public void setup() {
userService = createMock(UserService.class);
pageService = createMock(PageService.class);
- profileController = new ProfileController(userService, pageService);
+ widgetService = createMock(WidgetService.class);
+ profileController = new ProfileController(userService, pageService, widgetService);
validPageLayout = new PageLayoutImpl();
validPageLayout.setCode(VALID_PAGE_LAYOUT_CODE);
@@ -112,7 +115,7 @@ public class ProfileControllerTest {
replay(userService, pageService);
- String view = profileController.viewProfile(username, model, null);
+ String view = profileController.viewProfileByUsername(username, model, null);
//assert that the model is not null
assertThat(model, CoreMatchers.notNullValue());
@@ -188,7 +191,7 @@ public class ProfileControllerTest {
replay(userService, pageService);
- String view = profileController.viewProfile(username, model, null);
+ String view = profileController.viewProfileByUsername(username, model, null);
assertThat(view, is(ViewNames.USER_NOT_FOUND));
verify(userService, pageService);
@@ -199,7 +202,7 @@ public class ProfileControllerTest {
//This test will just show the successful updation of user status
final ModelMap model = new ModelMap();
final int modelSize = 2;
- final long referringPageId = 1L;
+ final String referringPageId = "1";
final String USERNAME = "canonical";
String userProfile = new String(ModelKeys.USER_PROFILE);
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/WidgetStoreControllerTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/WidgetStoreControllerTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/WidgetStoreControllerTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/WidgetStoreControllerTest.java Mon Oct 29 03:59:56 2012
@@ -55,23 +55,23 @@ import static org.junit.Assert.*;
*/
public class WidgetStoreControllerTest {
- private static final long WIDGET_ID = 1L;
- private static final long REFERRER_ID = 35L;
+ private static final String WIDGET_ID = "1";
+ private static final String REFERRER_ID = "35";
private WidgetStoreController controller;
private WidgetService widgetService;
private TagService tagService;
private CategoryService categoryService;
private UserImpl validUser;
private WidgetStatistics widgetStatistics;
- private Map<Long, WidgetStatistics> allWidgetStatisticsMap;
+ private Map<String, WidgetStatistics> allWidgetStatisticsMap;
@Before
public void setup() {
validUser = new UserImpl();
- validUser.setId(1L);
+ validUser.setId("1");
widgetStatistics = new WidgetStatistics();
- allWidgetStatisticsMap = new HashMap<Long, WidgetStatistics>();
+ allWidgetStatisticsMap = new HashMap<String, WidgetStatistics>();
allWidgetStatisticsMap.put(WIDGET_ID, widgetStatistics);
widgetService = createMock(WidgetService.class);
@@ -110,7 +110,7 @@ public class WidgetStoreControllerTest {
assertThat(view, is(equalTo(ViewNames.STORE)));
assertThat(model.containsAttribute(ModelKeys.WIDGETS), is(true));
assertThat(model.containsAttribute(ModelKeys.WIDGETS_STATISTICS), is(true));
- assertThat((Long) model.asMap().get(ModelKeys.REFERRING_PAGE_ID), is(equalTo(REFERRER_ID)));
+ assertThat((String) model.asMap().get(ModelKeys.REFERRING_PAGE_ID), is(equalTo(REFERRER_ID)));
assertThat(widgets, is(sameInstance(emptyResult.getResultSet())));
assertThat(model.containsAttribute(ModelKeys.TAGS), is(true));
assertThat(model.containsAttribute(ModelKeys.CATEGORIES), is(true));
@@ -133,7 +133,7 @@ public class WidgetStoreControllerTest {
assertThat(view, is(equalTo(ViewNames.STORE)));
assertThat(model.containsAttribute(ModelKeys.WIDGETS), is(true));
assertThat(model.containsAttribute(ModelKeys.WIDGETS_STATISTICS), is(true));
- assertThat((Long) model.asMap().get(ModelKeys.REFERRING_PAGE_ID), is(equalTo(REFERRER_ID)));
+ assertThat((String) model.asMap().get(ModelKeys.REFERRING_PAGE_ID), is(equalTo(REFERRER_ID)));
assertThat(widgets, is(sameInstance(emptyResult.getResultSet())));
assertThat(model.containsAttribute(ModelKeys.TAGS), is(true));
assertThat(model.containsAttribute(ModelKeys.CATEGORIES), is(true));
@@ -143,7 +143,7 @@ public class WidgetStoreControllerTest {
@Test
public void viewWidget() {
Model model = new ExtendedModelMap();
- Widget w = new WidgetImpl(1L, "http://example.com/widget.xml");
+ Widget w = new WidgetImpl("1", "http://example.com/widget.xml");
expect(widgetService.getAllWidgetStatistics(validUser.getId())).andReturn(allWidgetStatisticsMap);
expect(tagService.getAllTags()).andReturn(new ArrayList<Tag>());
@@ -169,7 +169,7 @@ public class WidgetStoreControllerTest {
@Test
public void viewCategoryResult_valid() {
Model model = new ExtendedModelMap();
- long categoryId = 1L;
+ String categoryId = "1";
int offset = 0;
int pageSize = 10;
SearchResult<Widget> searchResults = new SearchResult<Widget>(new ArrayList<Widget>(),0);
@@ -203,7 +203,7 @@ public class WidgetStoreControllerTest {
int pagesize = 10;
int totalResults = 2;
WidgetImpl widget = new WidgetImpl();
- widget.setId(1L);
+ widget.setId("1");
List<Widget> widgets = new ArrayList<Widget>();
widgets.add(widget);
SearchResult<Widget> result = new SearchResult<Widget>(widgets, totalResults);
@@ -242,7 +242,7 @@ public class WidgetStoreControllerTest {
final String widgetUrl = "http://example.com/newwidget.xml";
final Model model = new ExtendedModelMap();
final WidgetImpl widget = new WidgetImpl();
- widget.setId(1L);
+ widget.setId("1");
widget.setTitle("Widget title");
widget.setUrl(widgetUrl);
widget.setType("OpenSocial");
@@ -265,7 +265,7 @@ public class WidgetStoreControllerTest {
final Model model = new ExtendedModelMap();
final WidgetImpl existingWidget = new WidgetImpl();
- existingWidget.setId(123L);
+ existingWidget.setId("123");
existingWidget.setTitle("Widget title");
existingWidget.setUrl(widgetUrl);
existingWidget.setType("OpenSocial");
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/CategoryControllerTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/CategoryControllerTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/CategoryControllerTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/CategoryControllerTest.java Mon Oct 29 03:59:56 2012
@@ -201,12 +201,11 @@ public class CategoryControllerTest {
public void updateCategory_valid(){
Model model = new ExtendedModelMap();
User user = new UserImpl();
- long id = 1L;
+ String id = "1";
String categoryText = "Social";
- CategoryImpl category = new CategoryImpl();
- category.setCreatedUser(user);
+ CategoryImpl category = new CategoryImpl(id);
+ category.setCreatedUserId(user.getId());
category.setText(categoryText);
- category.setId(id);
SessionStatus sessionStatus = createMock(SessionStatus.class);
expect(userService.getAuthenticatedUser()).andReturn(user).once();
expect(categoryService.get(id)).andReturn(category);
@@ -224,11 +223,11 @@ public class CategoryControllerTest {
public void updateCategory_invalidToken(){
Model model = new ExtendedModelMap();
User user = new UserImpl();
- long id = 1L;
+ String id = "1";
String categoryText = "Social";
String invalidToken = AdminControllerUtil.generateSessionToken();
CategoryImpl category = new CategoryImpl();
- category.setCreatedUser(user);
+ category.setCreatedUserId(user.getId());
category.setText(categoryText);
category.setId(id);
SessionStatus sessionStatus = createMock(SessionStatus.class);
@@ -247,10 +246,10 @@ public class CategoryControllerTest {
Model model = new ExtendedModelMap();
User user = new UserImpl();
- long id = 1L;
+ String id = "1";
String categoryText = "";
CategoryImpl category = new CategoryImpl();
- category.setCreatedUser(user);
+ category.setCreatedUserId(user.getId());
category.setText(categoryText);
category.setId(id);
SessionStatus sessionStatus = createMock(SessionStatus.class);
@@ -265,11 +264,11 @@ public class CategoryControllerTest {
@Test
public void updateCategory_invalidValidRequest_nullUser(){
Model model = new ExtendedModelMap();
- long id = 1L;
+ String id = "1";
User user = new UserImpl();
String categoryText = "Social";
CategoryImpl category = new CategoryImpl();
- category.setCreatedUser(user);
+ category.setCreatedUserId(user.getId());
category.setText(categoryText);
category.setId(id);
SessionStatus sessionStatus = createMock(SessionStatus.class);
@@ -285,10 +284,10 @@ public class CategoryControllerTest {
public void updateCategory_invalidValidRequest_nullWidgetToUpdate(){
Model model = new ExtendedModelMap();
User user = new UserImpl();
- long id = 1L;
+ String id = "1";
String categoryText = "Social";
CategoryImpl category = new CategoryImpl();
- category.setCreatedUser(user);
+ category.setCreatedUserId(user.getId());
category.setText(categoryText);
category.setId(id);
SessionStatus sessionStatus = createMock(SessionStatus.class);
@@ -305,10 +304,10 @@ public class CategoryControllerTest {
public void deleteCategory_valid(){
Model model = new ExtendedModelMap();
User user = new UserImpl();
- long id = 1L;
+ String id = "1";
String categoryText = "Social";
CategoryImpl category = new CategoryImpl();
- category.setCreatedUser(user);
+ category.setCreatedUserId(user.getId());
category.setText(categoryText);
category.setId(id);
SessionStatus sessionStatus = createMock(SessionStatus.class);
@@ -329,11 +328,11 @@ public class CategoryControllerTest {
public void deleteCategory_invalidToken(){
Model model = new ExtendedModelMap();
User user = new UserImpl();
- long id = 1L;
+ String id = "1";
String categoryText = "Social";
String invalidToken = AdminControllerUtil.generateSessionToken();
CategoryImpl category = new CategoryImpl();
- category.setCreatedUser(user);
+ category.setCreatedUserId(user.getId());
category.setText(categoryText);
category.setId(id);
SessionStatus sessionStatus = createMock(SessionStatus.class);
@@ -353,10 +352,10 @@ public class CategoryControllerTest {
Model model = new ExtendedModelMap();
User user = new UserImpl();
- long id = 1L;
+ String id = "1";
String categoryText = "";
CategoryImpl category = new CategoryImpl();
- category.setCreatedUser(user);
+ category.setCreatedUserId(user.getId());
category.setText(categoryText);
category.setId(id);
SessionStatus sessionStatus = createMock(SessionStatus.class);
@@ -371,11 +370,11 @@ public class CategoryControllerTest {
@Test
public void deleteCategory_invalidValidRequest_nullUser(){
Model model = new ExtendedModelMap();
- long id = 1L;
+ String id = "1";
User user = new UserImpl();
String categoryText = "Social";
CategoryImpl category = new CategoryImpl();
- category.setCreatedUser(user);
+ category.setCreatedUserId(user.getId());
category.setText(categoryText);
category.setId(id);
SessionStatus sessionStatus = createMock(SessionStatus.class);
@@ -391,10 +390,10 @@ public class CategoryControllerTest {
public void deleteCategory_invalidValidRequest_nullWidgetToDelete(){
Model model = new ExtendedModelMap();
User user = new UserImpl();
- long id = 1L;
+ String id = "1";
String categoryText = "Social";
CategoryImpl category = new CategoryImpl();
- category.setCreatedUser(user);
+ category.setCreatedUserId(user.getId());
category.setText(categoryText);
category.setId(id);
SessionStatus sessionStatus = createMock(SessionStatus.class);
@@ -411,10 +410,10 @@ public class CategoryControllerTest {
public void deleteCategory_invalidValidRequest_falseConfirmation(){
Model model = new ExtendedModelMap();
User user = new UserImpl();
- long id = 1L;
+ String id = "1";
String categoryText = "Social";
CategoryImpl category = new CategoryImpl();
- category.setCreatedUser(user);
+ category.setCreatedUserId(user.getId());
category.setText(categoryText);
category.setId(id);
SessionStatus sessionStatus = createMock(SessionStatus.class);
@@ -429,11 +428,11 @@ public class CategoryControllerTest {
@Test
public void editCategory_valid () {
User user = new UserImpl();
- long id = 1L;
+ String id = "1";
String categoryText = "Social";
Model model = new ExtendedModelMap();
CategoryImpl category = new CategoryImpl();
- category.setCreatedUser(user);
+ category.setCreatedUserId(user.getId());
category.setText(categoryText);
category.setId(id);
expect(categoryService.get(id)).andReturn(category).once();
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java Mon Oct 29 03:59:56 2012
@@ -103,7 +103,7 @@ public class UserControllerTest {
@Test
public void viewAdminUserDetail() throws Exception {
Model model = new ExtendedModelMap();
- Long userid = 123L;
+ String userid = "123";
User user = new UserImpl(userid, "john.doe.sr");
expect(userService.getUserById(userid)).andReturn(user);
@@ -121,7 +121,7 @@ public class UserControllerTest {
@Test
public void updateUserDetail_success() {
ModelMap modelMap = new ExtendedModelMap();
- final Long userid = 123L;
+ String userid = "123";
final String email = "john.doe.sr@example.net";
UserImpl user = new UserImpl(userid, "john.doe.sr");
user.setPassword("secrect");
@@ -147,7 +147,7 @@ public class UserControllerTest {
@Test
public void updateUserDetail_withErrors() {
ModelMap modelMap = new ExtendedModelMap();
- Long userid = 123L;
+ String userid = "123";
UserImpl user = new UserImpl(userid, "john.doe.sr");
final BindingResult errors = new BeanPropertyBindingResult(user, "user");
@@ -163,7 +163,7 @@ public class UserControllerTest {
@Test(expected = SecurityException.class)
public void updateUserDetail_wrongToken() {
ModelMap modelMap = new ExtendedModelMap();
- UserImpl user = new UserImpl(123L, "john.doe.sr");
+ UserImpl user = new UserImpl("123", "john.doe.sr");
final BindingResult errors = new BeanPropertyBindingResult(user, "user");
SessionStatus sessionStatus = createMock(SessionStatus.class);
sessionStatus.setComplete();
@@ -182,7 +182,7 @@ public class UserControllerTest {
@Test
public void deleteUserDetail_success() {
ModelMap modelMap = new ExtendedModelMap();
- final Long userid = 123L;
+ String userid = "123";
final String email = "john.doe.sr@example.net";
User user = new UserImpl(userid, "john.doe.sr");
user.setPassword("secrect");
@@ -205,7 +205,7 @@ public class UserControllerTest {
@Test
public void deleteUserDetail_noConfirmChecked() {
ModelMap modelMap = new ExtendedModelMap();
- Long userid = 123L;
+ String userid = "123";
User user = new UserImpl(userid, "john.doe.sr");
SessionStatus sessionStatus = createMock(SessionStatus.class);
@@ -219,7 +219,7 @@ public class UserControllerTest {
@Test(expected = SecurityException.class)
public void deleteUserDetail_wrongToken() {
ModelMap modelMap = new ExtendedModelMap();
- User user = new UserImpl(123L, "john.doe.sr");
+ User user = new UserImpl("123", "john.doe.sr");
SessionStatus sessionStatus = createMock(SessionStatus.class);
sessionStatus.setComplete();
@@ -337,8 +337,8 @@ public class UserControllerTest {
private static SearchResult<User> createSearchResultWithTwoUsers() {
- UserImpl user1 = new UserImpl(123L, "john.doe.sr");
- UserImpl user2 = new UserImpl(456L, "john.doe.jr");
+ UserImpl user1 = new UserImpl("123", "john.doe.sr");
+ UserImpl user2 = new UserImpl("456", "john.doe.jr");
List<User> users = new ArrayList<User>();
users.add(user1);
users.add(user2);
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java Mon Oct 29 03:59:56 2012
@@ -138,7 +138,7 @@ public class WidgetControllerTest {
public void viewAdminWidgetDetail() throws Exception {
Model model = new ExtendedModelMap();
WidgetImpl widget = new WidgetImpl();
- final long entityId = 123L;
+ final String entityId = "123";
widget.setId(entityId);
widget.setTitle("My widget");
@@ -158,7 +158,7 @@ public class WidgetControllerTest {
@Test
public void updateWidget_valid() {
final String widgetUrl = "http://example.com/widget";
- WidgetImpl widget = new WidgetImpl(123L, widgetUrl);
+ WidgetImpl widget = new WidgetImpl("123", widgetUrl);
widget.setTitle("WidgetImpl title");
widget.setType("OpenSocial");
widget.setDescription("Lorem ipsum");
@@ -200,7 +200,7 @@ public class WidgetControllerTest {
@Test
public void updateWidget_invalid() {
- WidgetImpl widget = new WidgetImpl(123L, "http://broken/url");
+ WidgetImpl widget = new WidgetImpl("123", "http://broken/url");
BindingResult errors = new BeanPropertyBindingResult(widget, "widget");
SessionStatus sessionStatus = createMock(SessionStatus.class);
ModelMap modelMap = new ExtendedModelMap();
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/util/CategoryEditorTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/util/CategoryEditorTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/util/CategoryEditorTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/util/CategoryEditorTest.java Mon Oct 29 03:59:56 2012
@@ -32,7 +32,7 @@ import static org.junit.Assert.assertTha
public class CategoryEditorTest {
private CategoryEditor categoryEditor;
private CategoryService categoryService;
- private final Long CATEGORY_ID = 333L;
+ private final String CATEGORY_ID = "333";
private final String CATEGORY_TEXT = "category1";
private Category validCategory;
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapperTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapperTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapperTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapperTest.java Mon Oct 29 03:59:56 2012
@@ -59,7 +59,7 @@ public class LdapUserDetailsContextMappe
DirContextOperations ctx = createMock(DirContextOperations.class);
final String username = "johnldap";
- User user = new UserImpl(123L, username);
+ User user = new UserImpl("123", username);
expect(userService.getUserByUsername(username)).andReturn(null).once();
expect(ctx.attributeExists(MAIL_ATTRIBUTE_NAME)).andReturn(true);
@@ -83,7 +83,7 @@ public class LdapUserDetailsContextMappe
DirContextOperations ctx = createMock(DirContextOperations.class);
final String username = "johnldap";
- User user = new UserImpl(123L, username);
+ User user = new UserImpl("123", username);
expect(userService.getUserByUsername(username)).andReturn(null).once();
expect(ctx.attributeExists(MAIL_ATTRIBUTE_NAME)).andReturn(true);
@@ -152,7 +152,7 @@ public class LdapUserDetailsContextMappe
DirContextOperations ctx = createMock(DirContextOperations.class);
final String username = "johnldap";
- User user = new UserImpl(123L, username);
+ User user = new UserImpl("123", username);
expect(userService.getUserByUsername(username)).andReturn(user);
expectLastCall();
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/RegionWidgetTagTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/RegionWidgetTagTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/RegionWidgetTagTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/RegionWidgetTagTest.java Mon Oct 29 03:59:56 2012
@@ -24,6 +24,7 @@ import org.apache.rave.portal.model.Regi
import org.apache.rave.portal.model.impl.RegionImpl;
import org.apache.rave.portal.model.impl.RegionWidgetImpl;
import org.apache.rave.portal.model.impl.WidgetImpl;
+import org.apache.rave.portal.repository.WidgetRepository;
import org.apache.rave.portal.web.renderer.RenderScope;
import org.apache.rave.portal.web.renderer.RenderService;
import org.apache.rave.portal.web.renderer.ScriptLocation;
@@ -84,8 +85,8 @@ public class RegionWidgetTagTest {
@Test
public void doStartTag_valid() throws IOException, JspException {
RegionWidget regionWidget = new RegionWidgetImpl();
- WidgetImpl widget = new WidgetImpl();
- regionWidget.setWidget(widget);
+ WidgetImpl widget = new WidgetImpl("8");
+ regionWidget.setWidgetId(widget.getId());
widget.setType(WIDGET_TYPE);
Set<String> strings = new HashSet<String>();
@@ -104,6 +105,7 @@ public class RegionWidgetTagTest {
replay(pageContext);
tag.setRegionWidget(regionWidget);
+ tag.setWidget(widget);
int result = tag.doStartTag();
assertThat(result, is(equalTo(1)));
verify(writer);
@@ -120,8 +122,8 @@ public class RegionWidgetTagTest {
public void doStartTag_IOException() throws JspException, IOException {
RegionWidget regionWidget = new RegionWidgetImpl();
- WidgetImpl widget = new WidgetImpl();
- regionWidget.setWidget(widget);
+ WidgetImpl widget = new WidgetImpl("8");
+ regionWidget.setWidgetId(widget.getId());
widget.setType("INVALID");
Set<String> strings = new HashSet<String>();
@@ -146,9 +148,9 @@ public class RegionWidgetTagTest {
replay(pageContext);
RegionWidget regionWidget = new RegionWidgetImpl();
- Region region = new RegionImpl(25L);
- WidgetImpl widget = new WidgetImpl();
- regionWidget.setWidget(widget);
+ Region region = new RegionImpl("25");
+ WidgetImpl widget = new WidgetImpl("8");
+ regionWidget.setWidgetId(widget.getId());
regionWidget.setRegion(region);
widget.setType("INVALID");
@@ -159,6 +161,7 @@ public class RegionWidgetTagTest {
replay(service);
tag.setRegionWidget(regionWidget);
+ tag.setWidget(widget);
tag.doStartTag();
}
@@ -166,16 +169,14 @@ public class RegionWidgetTagTest {
public void doStartTag_disabledWidget() throws IOException, JspException {
final String DISABLED_WIDGET_MESSAGE = "THIS IS DISABLED";
- WidgetImpl widget = new WidgetImpl();
- widget.setId(8L);
+ WidgetImpl widget = new WidgetImpl("8");
widget.setType(WIDGET_TYPE);
widget.setDisableRendering(true);
widget.setDisableRenderingMessage(DISABLED_WIDGET_MESSAGE);
- RegionWidget regionWidget = new RegionWidgetImpl();
- regionWidget.setId(99L);
- regionWidget.setWidget(widget);
- regionWidget.setRegion(new RegionImpl(2L));
+ RegionWidget regionWidget = new RegionWidgetImpl("99");
+ regionWidget.setWidgetId(widget.getId());
+ regionWidget.setRegion(new RegionImpl("2"));
Set<String> strings = new HashSet<String>();
strings.add(WIDGET_TYPE);
@@ -190,6 +191,7 @@ public class RegionWidgetTagTest {
replay(pageContext, writer);
tag.setRegionWidget(regionWidget);
+ tag.setWidget(widget);
int result = tag.doStartTag();
assertThat(result, is(equalTo(1)));
verify(writer);