You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2012/06/26 20:19:38 UTC
svn commit: r1354148 [6/9] - in /rave/trunk: ./ rave-components/
rave-components/rave-commons/
rave-components/rave-commons/src/main/java/org/apache/rave/model/
rave-components/rave-commons/src/main/java/org/apache/rave/persistence/jpa/
rave-components...
Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetServiceTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetServiceTest.java?rev=1354148&r1=1354147&r2=1354148&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetServiceTest.java (original)
+++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetServiceTest.java Tue Jun 26 18:18:57 2012
@@ -21,9 +21,11 @@ package org.apache.rave.portal.service.i
import org.apache.rave.exception.DuplicateItemException;
import org.apache.rave.portal.model.Category;
-import org.apache.rave.portal.model.User;
import org.apache.rave.portal.model.Widget;
import org.apache.rave.portal.model.WidgetStatus;
+import org.apache.rave.portal.model.impl.CategoryImpl;
+import org.apache.rave.portal.model.impl.UserImpl;
+import org.apache.rave.portal.model.impl.WidgetImpl;
import org.apache.rave.portal.model.util.SearchResult;
import org.apache.rave.portal.model.util.WidgetStatistics;
import org.apache.rave.portal.repository.CategoryRepository;
@@ -74,8 +76,8 @@ public class DefaultWidgetServiceTest {
@Test
public void getLimitedListOfWidgets() {
- Widget widget1 = new Widget(1L, "http://example.com/widget1.xml");
- Widget widget2 = new Widget(2L, "http://example.com/widget2.xml");
+ Widget widget1 = new WidgetImpl(1L, "http://example.com/widget1.xml");
+ Widget widget2 = new WidgetImpl(2L, "http://example.com/widget2.xml");
List<Widget> widgets = new ArrayList<Widget>();
widgets.add(widget1);
widgets.add(widget2);
@@ -92,9 +94,9 @@ public class DefaultWidgetServiceTest {
@Test
public void getPublishedWidgets() {
- Widget widget1 = new Widget(1L, "http://example.com/widget1.xml");
+ Widget widget1 = new WidgetImpl(1L, "http://example.com/widget1.xml");
widget1.setWidgetStatus(WidgetStatus.PUBLISHED);
- Widget widget2 = new Widget(2L, "http://example.com/widget2.xml");
+ Widget widget2 = new WidgetImpl(2L, "http://example.com/widget2.xml");
widget2.setWidgetStatus(WidgetStatus.PUBLISHED);
List<Widget> widgets = new ArrayList<Widget>();
widgets.add(widget1);
@@ -112,7 +114,7 @@ public class DefaultWidgetServiceTest {
@Test
public void getWidget() {
- Widget w = new Widget();
+ Widget w = new WidgetImpl();
expect(widgetRepository.get(1L)).andReturn(w);
replay(widgetRepository);
@@ -127,8 +129,8 @@ public class DefaultWidgetServiceTest {
int offset = 0;
int pageSize = 10;
int totalResults = 2;
- Widget widget = new Widget();
- widget.setEntityId(1L);
+ WidgetImpl widget = new WidgetImpl();
+ widget.setId(1L);
List<Widget> widgets = new ArrayList<Widget>();
widgets.add(widget);
@@ -150,9 +152,9 @@ public class DefaultWidgetServiceTest {
int offset = 0;
int pageSize = 10;
int totalResults = 2;
- Widget widget = new Widget();
+ WidgetImpl widget = new WidgetImpl();
widget.setWidgetStatus(WidgetStatus.PUBLISHED);
- widget.setEntityId(1L);
+ widget.setId(1L);
List<Widget> widgets = new ArrayList<Widget>();
widgets.add(widget);
@@ -176,11 +178,11 @@ public class DefaultWidgetServiceTest {
int offset = 0;
int pageSize = 10;
int totalResults = 2;
- Widget widget = new Widget();
+ WidgetImpl widget = new WidgetImpl();
widget.setWidgetStatus(WidgetStatus.PUBLISHED);
final String type = "OpenSocial";
widget.setType(type);
- widget.setEntityId(1L);
+ widget.setId(1L);
List<Widget> widgets = new ArrayList<Widget>();
widgets.add(widget);
@@ -202,19 +204,19 @@ public class DefaultWidgetServiceTest {
public void getWidgetsByOwner() {
final int offset = 0;
final int pageSize = 10;
- final User user = new User(5L);
- expect(userRepository.get(user.getEntityId())).andReturn(user);
+ final UserImpl user = new UserImpl(5L);
+ expect(userRepository.get(user.getId())).andReturn(user);
replay(userRepository);
final List<Widget> widgets = new ArrayList<Widget>();
- final Widget widget = new Widget(3L, "http://www.widgetsRus.com/");
+ final Widget widget = new WidgetImpl(3L, "http://www.widgetsRus.com/");
widgets.add(widget);
expect(widgetRepository.getCountByOwner(user, offset, pageSize)).andReturn(widgets.size());
expect(widgetRepository.getByOwner(user, offset, pageSize)).andReturn(widgets);
replay(widgetRepository);
- SearchResult<Widget> result = widgetService.getWidgetsByOwner(user.getEntityId(), offset, pageSize);
+ SearchResult<Widget> result = widgetService.getWidgetsByOwner(user.getId(), offset, pageSize);
assertNotNull(result);
assertEquals(offset, result.getOffset());
assertEquals(pageSize, result.getPageSize());
@@ -238,7 +240,7 @@ public class DefaultWidgetServiceTest {
public void getWidgetByUrl() {
final String widgetUrl =
"http://hosting.gmodules.com/ig/gadgets/file/112581010116074801021/hamster.xml";
- Widget widget = new Widget();
+ Widget widget = new WidgetImpl();
widget.setUrl(widgetUrl);
expect(widgetRepository.getByUrl(widgetUrl)).andReturn(widget);
replay(widgetRepository);
@@ -253,7 +255,7 @@ public class DefaultWidgetServiceTest {
public void isRegisteredWidget() {
final String widgetUrl =
"http://hosting.gmodules.com/ig/gadgets/file/112581010116074801021/hamster.xml";
- Widget widget = new Widget();
+ Widget widget = new WidgetImpl();
widget.setUrl(widgetUrl);
expect(widgetRepository.getByUrl(widgetUrl)).andReturn(widget);
replay(widgetRepository);
@@ -267,7 +269,7 @@ public class DefaultWidgetServiceTest {
public void isNotRegisteredWidget_() {
final String widgetUrl =
"http://example.com/doesnotexistinrepository.xml";
- Widget widget = new Widget();
+ Widget widget = new WidgetImpl();
widget.setUrl(widgetUrl);
expect(widgetRepository.getByUrl(widgetUrl)).andReturn(null);
replay(widgetRepository);
@@ -280,7 +282,7 @@ public class DefaultWidgetServiceTest {
@Test
public void registerNewWidget() {
final String widgetUrl = "http://example.com/newwidget.xml";
- Widget widget = new Widget();
+ WidgetImpl widget = new WidgetImpl();
widget.setUrl(widgetUrl);
expect(widgetRepository.getByUrl(widgetUrl)).andReturn(null);
expect(widgetRepository.save(widget)).andReturn(widget);
@@ -288,7 +290,7 @@ public class DefaultWidgetServiceTest {
Widget savedWidget = widgetService.registerNewWidget(widget);
assertNotNull(savedWidget);
- assertEquals(widget.getEntityId(), savedWidget.getEntityId());
+ assertEquals(widget.getId(), savedWidget.getId());
verify(widgetRepository);
}
@@ -297,7 +299,7 @@ public class DefaultWidgetServiceTest {
public void registerExistingWidgetAsNew() {
final String widgetUrl =
"http://hosting.gmodules.com/ig/gadgets/file/112581010116074801021/hamster.xml";
- Widget widget = new Widget();
+ WidgetImpl widget = new WidgetImpl();
widget.setUrl(widgetUrl);
expect(widgetRepository.getByUrl(widgetUrl)).andReturn(widget);
replay(widgetRepository);
@@ -311,7 +313,7 @@ public class DefaultWidgetServiceTest {
public void updateWidget() {
final String widgetUrl =
"http://hosting.gmodules.com/ig/gadgets/file/112581010116074801021/hamster.xml";
- Widget widget = new Widget();
+ Widget widget = new WidgetImpl();
widget.setUrl(widgetUrl);
expect(widgetRepository.save(widget)).andReturn(widget).once();
replay(widgetRepository);
@@ -345,15 +347,15 @@ public class DefaultWidgetServiceTest {
public void getWidgetsByCategory_valid(){
long id = 1L;
int offset = 0;
- int pageSize = 10;
+ int pageSize = 10;
String categoryText = "Social";
- Widget w = new Widget();
+ Widget w = new WidgetImpl();
List<Category> categories = new ArrayList<Category>();
- Category c = new Category();
+ Category c = new CategoryImpl();
List<Widget> widgets = new ArrayList<Widget>();
widgets.add(w);
c.setWidgets(widgets);
- c.setEntityId(id);
+ c.setId(id);
c.setText(categoryText);
categories.add(c);
w.setCategories(categories);
@@ -363,7 +365,7 @@ public class DefaultWidgetServiceTest {
verify(categoryRepository);
assertEquals("number of widgets", 1, result.getTotalResults());
assertSame(w, result.getResultSet().get(0));
- assertEquals(c.getEntityId(), result.getResultSet().get(0).getCategories().get(0).getEntityId());
+ assertEquals(c.getId(), result.getResultSet().get(0).getCategories().get(0).getId());
}
}
Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetTagServiceTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetTagServiceTest.java?rev=1354148&r1=1354147&r2=1354148&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetTagServiceTest.java (original)
+++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetTagServiceTest.java Tue Jun 26 18:18:57 2012
@@ -15,8 +15,8 @@
*/
package org.apache.rave.portal.service.impl;
-import org.apache.rave.portal.model.Tag;
-import org.apache.rave.portal.model.WidgetTag;
+import org.apache.rave.portal.model.impl.TagImpl;
+import org.apache.rave.portal.model.impl.WidgetTagImpl;
import org.apache.rave.portal.repository.WidgetTagRepository;
import org.apache.rave.portal.service.WidgetTagService;
import org.junit.Before;
@@ -39,8 +39,7 @@ public class DefaultWidgetTagServiceTest
@Test
public void getWidgetTag() {
- WidgetTag tag = new WidgetTag();
- tag.setEntityId(1L);
+ WidgetTagImpl tag = new WidgetTagImpl();
expect(widgetTagRepository.get(1L)).andReturn(tag);
replay(widgetTagRepository);
@@ -52,9 +51,8 @@ public class DefaultWidgetTagServiceTest
public void saveWidgetTag() {
try {
- WidgetTag wtag = new WidgetTag();
- wtag.setEntityId(3L);
- Tag tag = new Tag(4L, "test");
+ WidgetTagImpl wtag = new WidgetTagImpl();
+ TagImpl tag = new TagImpl();
wtag.setTag(tag);
expect(widgetTagRepository.save(wtag)).andReturn(wtag);
replay(widgetTagRepository);
Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/web/renderer/RenderServiceTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/web/renderer/RenderServiceTest.java?rev=1354148&r1=1354147&r2=1354148&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/web/renderer/RenderServiceTest.java (original)
+++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/web/renderer/RenderServiceTest.java Tue Jun 26 18:18:57 2012
@@ -21,7 +21,8 @@ package org.apache.rave.portal.web.rende
import org.apache.rave.exception.NotSupportedException;
import org.apache.rave.portal.model.RegionWidget;
-import org.apache.rave.portal.model.Widget;
+import org.apache.rave.portal.model.impl.RegionWidgetImpl;
+import org.apache.rave.portal.model.impl.WidgetImpl;
import org.apache.rave.portal.web.renderer.impl.DefaultRenderService;
import org.apache.rave.portal.web.renderer.model.RenderContext;
import org.junit.Before;
@@ -83,10 +84,10 @@ public class RenderServiceTest {
@Test
public void render_supported_foo() {
- Widget w = new Widget();
+ WidgetImpl w = new WidgetImpl();
w.setType(SUPPORTED_TYPE_1);
- RegionWidget rw = new RegionWidget();
+ RegionWidget rw = new RegionWidgetImpl();
rw.setWidget(w);
expect(widgetRenderer1.render(rw, context)).andReturn(RENDERED_TYPE_1);
@@ -98,9 +99,9 @@ public class RenderServiceTest {
@Test
public void render_supported_bar() {
- Widget w = new Widget();
+ WidgetImpl w = new WidgetImpl();
w.setType(SUPPORTED_TYPE_2);
- RegionWidget rw = new RegionWidget();
+ RegionWidget rw = new RegionWidgetImpl();
rw.setWidget(w);
expect(widgetRenderer2.render(rw, context)).andReturn(RENDERED_TYPE_2);
@@ -112,10 +113,10 @@ public class RenderServiceTest {
@Test(expected = NotSupportedException.class)
public void render_invalid() {
- Widget w = new Widget();
+ WidgetImpl w = new WidgetImpl();
w.setType("NONE");
- RegionWidget rw = new RegionWidget();
+ RegionWidget rw = new RegionWidgetImpl();
rw.setWidget(w);
replayMocks();
Modified: rave/trunk/rave-components/rave-core/src/test/resources/test_data.sql
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/resources/test_data.sql?rev=1354148&r1=1354147&r2=1354148&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/resources/test_data.sql (original)
+++ rave/trunk/rave-components/rave-core/src/test/resources/test_data.sql Tue Jun 26 18:18:57 2012
@@ -1003,18 +1003,18 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
set @next_portal_preference_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @portal_preference_seq);
INSERT INTO portal_preference (entity_id, preference_key)
values (@next_portal_preference_id, 'color');
-INSERT INTO portalpreference_values
+INSERT INTO JPAPORTALPREFERENCE_VALUES
values (@next_portal_preference_id, 'red');
-INSERT INTO portalpreference_values
+INSERT INTO JPAPORTALPREFERENCE_VALUES
values (@next_portal_preference_id, 'yellow');
-INSERT INTO portalpreference_values
+INSERT INTO JPAPORTALPREFERENCE_VALUES
values (@next_portal_preference_id, 'blue');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @portal_preference_seq;
set @next_portal_preference_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @portal_preference_seq);
INSERT INTO portal_preference (entity_id, preference_key)
values (@next_portal_preference_id, 'title');
-INSERT INTO portalpreference_values
+INSERT INTO JPAPORTALPREFERENCE_VALUES
values (@next_portal_preference_id, 'Rave');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @portal_preference_seq;
-- end portal preferences
Propchange: rave/trunk/rave-components/rave-jpa/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jun 26 18:18:57 2012
@@ -0,0 +1,6 @@
+*.iml
+target
+.classpath
+.settings
+.project
+
Modified: rave/trunk/rave-components/rave-web/pom.xml
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/pom.xml?rev=1354148&r1=1354147&r2=1354148&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/pom.xml (original)
+++ rave/trunk/rave-components/rave-web/pom.xml Tue Jun 26 18:18:57 2012
@@ -53,6 +53,10 @@
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mrbean</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/WidgetApi.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/WidgetApi.java?rev=1354148&r1=1354147&r2=1354148&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/WidgetApi.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/WidgetApi.java Tue Jun 26 18:18:57 2012
@@ -20,6 +20,10 @@
package org.apache.rave.portal.web.api.rest;
import org.apache.rave.portal.model.*;
+import org.apache.rave.portal.model.impl.TagImpl;
+import org.apache.rave.portal.model.impl.WidgetCommentImpl;
+import org.apache.rave.portal.model.impl.WidgetRatingImpl;
+import org.apache.rave.portal.model.impl.WidgetTagImpl;
import org.apache.rave.portal.service.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -66,7 +70,7 @@ public class WidgetApi extends AbstractR
public void createWidgetComment(@PathVariable long widgetId,
@RequestParam String text,
HttpServletResponse response) {
- WidgetComment widgetComment = new WidgetComment();
+ WidgetComment widgetComment = new WidgetCommentImpl();
widgetComment.setWidgetId(widgetId);
widgetComment.setUser(userService.getAuthenticatedUser());
widgetComment.setText(text);
@@ -92,7 +96,7 @@ public class WidgetApi extends AbstractR
WidgetComment widgetComment = widgetCommentService.getWidgetComment(widgetCommentId);
if (widgetComment == null) {
- widgetComment = new WidgetComment();
+ widgetComment = new WidgetCommentImpl();
widgetComment.setWidgetId(widgetId);
widgetComment.setUser(userService.getAuthenticatedUser());
widgetComment.setCreatedDate(new Date());
@@ -120,7 +124,7 @@ public class WidgetApi extends AbstractR
HttpServletResponse response) {
logger.debug("DELETE WidgetRating received for /api/rest/widgets/{}", widgetId);
- widgetRatingService.removeWidgetRating(widgetId, userService.getAuthenticatedUser().getEntityId());
+ widgetRatingService.removeWidgetRating(widgetId, userService.getAuthenticatedUser().getId());
// send a 204 back for success since there is no content being returned
response.setStatus(HttpStatus.NO_CONTENT.value());
@@ -132,9 +136,9 @@ public class WidgetApi extends AbstractR
HttpServletResponse response) {
logger.debug("POST WidgetRating received for /api/rest/widgets/{} score: {}", widgetId, score);
- WidgetRating widgetRating = new WidgetRating();
+ WidgetRating widgetRating = new WidgetRatingImpl();
widgetRating.setScore(score);
- widgetRating.setUserId(userService.getAuthenticatedUser().getEntityId());
+ widgetRating.setUserId(userService.getAuthenticatedUser().getId());
widgetRating.setWidgetId(widgetId);
widgetRatingService.saveWidgetRating(widgetRating);
@@ -156,7 +160,7 @@ public class WidgetApi extends AbstractR
if (tagText != null && !tagText.trim().isEmpty()) {
WidgetTag existed = widgetTagService.getWidgetTagByWidgetIdAndKeyword(widgetId, tagText);
if (existed == null) {
- WidgetTag widgetTag = new WidgetTag();
+ WidgetTag widgetTag = new WidgetTagImpl();
widgetTag.setWidgetId(widgetId);
widgetTag.setUser(userService.getAuthenticatedUser());
widgetTag.setCreatedDate(new Date());
@@ -186,7 +190,7 @@ public class WidgetApi extends AbstractR
private Tag getTag(String keyword) {
Tag tag = tagService.getTagByKeyword(keyword);
if (tag == null) {
- tag = new Tag();
+ tag = new TagImpl();
tag.setKeyword(keyword);
}
return tag;
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rpc/PageApi.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rpc/PageApi.java?rev=1354148&r1=1354147&r2=1354148&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rpc/PageApi.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rpc/PageApi.java Tue Jun 26 18:18:57 2012
@@ -44,7 +44,7 @@ public class PageApi {
/**
* Adds a widget to the given page
- *
+ *
* @param pageId
* the ID of the {@link org.apache.rave.portal.model.Page} to add
* the widget to
@@ -72,7 +72,7 @@ public class PageApi {
* Moves a widget to a new location
* <p/>
* Moves can take place within a region, region to region, or between pages
- *
+ *
* @param regionWidgetId
* the ID of the
* {@link org.apache.rave.portal.model.RegionWidget} to move
@@ -125,11 +125,11 @@ public class PageApi {
}
}.getResult();
}
-
+
/**
* Adds a new page
- *
+ *
* @param pageName the new page name
* @param pageLayoutCode the layout code for this new page
* @return an {@link RpcOperation} containing the new page or any
@@ -144,7 +144,7 @@ public class PageApi {
public Page execute() {
return pageService.addNewUserPage(pageName, pageLayoutCode);
}
- }.getResult();
+ }.getResult();
}
@ResponseBody
@@ -170,10 +170,10 @@ public class PageApi {
}
}.getResult();
}
-
+
/**
* Moves a page to a new render position
- *
+ *
* @param pageId the pageId to move
* @param moveAfterPageId the pageId to move after in render order
* @return an {@link RpcOperation} containing the updated page or any
@@ -181,7 +181,7 @@ public class PageApi {
*/
@ResponseBody
@RequestMapping(method = RequestMethod.POST, value = "{pageId}/move")
- public RpcResult<Page> movePage(@PathVariable final long pageId,
+ public RpcResult<Page> movePage(@PathVariable final long pageId,
@RequestParam(required=false) final Long moveAfterPageId) {
return new RpcOperation<Page>() {
@Override
@@ -194,7 +194,7 @@ public class PageApi {
}
return page;
}
- }.getResult();
+ }.getResult();
}
/**
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ChangePasswordController.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ChangePasswordController.java?rev=1354148&r1=1354147&r2=1354148&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ChangePasswordController.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ChangePasswordController.java Tue Jun 26 18:18:57 2012
@@ -19,8 +19,11 @@
package org.apache.rave.portal.web.controller;
+import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.service.UserService;
+import org.apache.rave.portal.web.controller.util.ModelUtils;
+import org.apache.rave.portal.web.model.UserForm;
import org.apache.rave.portal.web.util.ModelKeys;
import org.apache.rave.portal.web.util.ViewNames;
import org.apache.rave.portal.web.validator.ChangePasswordValidator;
@@ -42,7 +45,7 @@ import org.springframework.web.servlet.m
* Only requests that have a valid (matched) forgotPasswordHash will be honored
*
* @version "$Id$"
- * @see org.apache.rave.portal.model.User#forgotPasswordHash
+ * @see org.apache.rave.portal.model.User#getForgotPasswordHash()
*/
@Controller
public class ChangePasswordController {
@@ -65,7 +68,7 @@ public class ChangePasswordController {
@RequestMapping(value = {"/changepassword/{passwordHash:.*}"}, method = RequestMethod.GET)
public String initialize(Model model, @PathVariable("passwordHash") String passwordHash) {
log.debug("Requesting user for hash: {}", passwordHash);
- User user = new User();
+ User user = new UserImpl();
model.addAttribute(ModelKeys.USER, user);
user.setForgotPasswordHash(passwordHash);
return ViewNames.PASSWORD_CHANGE;
@@ -73,7 +76,7 @@ public class ChangePasswordController {
@RequestMapping(value = {"/changepassword", "/changepassword/**"}, method = RequestMethod.POST)
- public String update(@ModelAttribute User user, BindingResult results, Model model, RedirectAttributes redirectAttributes) {
+ public String update(@ModelAttribute UserForm user, BindingResult results, Model model, RedirectAttributes redirectAttributes) {
log.debug("updating user password for hash {}", user.getForgotPasswordHash());
model.addAttribute(ModelKeys.USER, user);
passwordValidator.validate(user, results);
@@ -84,7 +87,7 @@ public class ChangePasswordController {
}
try {
log.debug("Submitted passwords were valid");
- userService.updatePassword(user);
+ userService.updatePassword(ModelUtils.convert(user));
redirectAttributes.addFlashAttribute(ModelKeys.REDIRECT_MESSAGE, messagePasswordChanged);
return ViewNames.REDIRECT_LOGIN ;
} catch (Exception ex) {
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/MessageBundleController.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/MessageBundleController.java?rev=1354148&r1=1354147&r2=1354148&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/MessageBundleController.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/MessageBundleController.java Tue Jun 26 18:18:57 2012
@@ -26,6 +26,7 @@ import org.springframework.http.Response
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.i18n.AcceptHeaderLocaleResolver;
import javax.servlet.http.HttpServletRequest;
@@ -68,6 +69,7 @@ public class MessageBundleController {
* @param request The incoming HttpServletRequest
* @return the JavaScript content to load from the client
*/
+ @ResponseBody
@RequestMapping(value = {"/rave_client_messages.js"}, method = RequestMethod.GET)
public ResponseEntity<String> getClientMessages(HttpServletRequest request) {
return new ResponseEntity<String>(getClientMessagesJSForLocale(acceptHeaderLocaleResolver.resolveLocale(request)), clientMessagesResponseHeaders, HttpStatus.OK);
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/NewAccountController.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/NewAccountController.java?rev=1354148&r1=1354147&r2=1354148&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/NewAccountController.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/NewAccountController.java Tue Jun 26 18:18:57 2012
@@ -19,11 +19,11 @@
package org.apache.rave.portal.web.controller;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.rave.portal.model.User;
+import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.service.CaptchaService;
import org.apache.rave.portal.service.NewAccountService;
+import org.apache.rave.portal.web.controller.util.ModelUtils;
+import org.apache.rave.portal.web.model.UserForm;
import org.apache.rave.portal.web.util.ModelKeys;
import org.apache.rave.portal.web.util.ViewNames;
import org.apache.rave.portal.web.validator.NewAccountValidator;
@@ -40,6 +40,8 @@ import org.springframework.web.bind.anno
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+import javax.servlet.http.HttpServletRequest;
+
@Controller
public class NewAccountController {
private final Logger logger = LoggerFactory.getLogger(getClass());
@@ -63,11 +65,11 @@ public class NewAccountController {
public void setUpForm(ModelMap model, HttpServletRequest request) {
logger.debug("Initializing form");
model.addAttribute(ModelKeys.CAPTCHA_HTML, captchaService.createHtml(request));
- model.addAttribute(ModelKeys.NEW_USER, new User());
+ model.addAttribute(ModelKeys.NEW_USER, new UserImpl());
}
@RequestMapping(value = {"/newaccount", "/newaccount/*"}, method = RequestMethod.POST)
- public String create(@ModelAttribute(value = "newUser") User newUser, BindingResult results, Model model, HttpServletRequest request, RedirectAttributes redirectAttributes) {
+ public String create(@ModelAttribute(value = "newUser") UserForm newUser, BindingResult results, Model model, HttpServletRequest request, RedirectAttributes redirectAttributes) {
logger.debug("Creating a new user account");
model.addAttribute(ModelKeys.NEW_USER, newUser);
@@ -83,7 +85,7 @@ public class NewAccountController {
logger.debug("newaccount.jsp: passed form validation");
if (captchaService.isValid(request)) {
- newAccountService.createNewAccount(newUser);
+ newAccountService.createNewAccount(ModelUtils.convert(newUser));
redirectAttributes.addFlashAttribute(ModelKeys.REDIRECT_MESSAGE, messageSuccess);
return ViewNames.REDIRECT_LOGIN;
} else {
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/PageController.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/PageController.java?rev=1354148&r1=1354147&r2=1354148&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/PageController.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/PageController.java Tue Jun 26 18:18:57 2012
@@ -18,17 +18,11 @@
*/
package org.apache.rave.portal.web.controller;
-import org.apache.rave.portal.model.Page;
-import org.apache.rave.portal.model.PageInvitationStatus;
-import org.apache.rave.portal.model.PageLayout;
-import org.apache.rave.portal.model.PageUser;
-import org.apache.rave.portal.model.User;
+import org.apache.rave.portal.model.*;
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.web.controller.util.ControllerUtils;
-import org.apache.rave.portal.web.model.NavigationItem;
-import org.apache.rave.portal.web.model.NavigationMenu;
import org.apache.rave.portal.web.util.ModelKeys;
import org.apache.rave.portal.web.util.ViewNames;
import org.slf4j.Logger;
@@ -84,10 +78,10 @@ public class PageController {
List<PageLayout> pageLayouts = pageLayoutService.getAllUserSelectable();
addAttributesToModel(model, page, currentPageUser, pages, pageLayouts);
String view = ControllerUtils.getDeviceAppropriateView(request, ViewNames.getPageView(page.getPageLayout().getCode()), ViewNames.MOBILE_HOME);
- ControllerUtils.addNavItemsToModel(view, model, page.getEntityId(), userService.getAuthenticatedUser(), currentPageUser.isEditor());
+ ControllerUtils.addNavItemsToModel(view, model, page.getId(), userService.getAuthenticatedUser(), currentPageUser.isEditor());
return view;
}
-
+
@RequestMapping(value = "/page/view/{pageId}", method = RequestMethod.GET)
public String view(@PathVariable Long pageId, Model model, HttpServletRequest request) {
try {
@@ -103,7 +97,7 @@ public class PageController {
List<PageLayout> pageLayouts = pageLayoutService.getAllUserSelectable();
addAttributesToModel(model, page, currentPageUser, pages, pageLayouts);
String view = ControllerUtils.getDeviceAppropriateView(request, ViewNames.getPageView(page.getPageLayout().getCode()), ViewNames.MOBILE_HOME);
- ControllerUtils.addNavItemsToModel(view, model, page.getEntityId(), thisUser, currentPageUser.isEditor());
+ ControllerUtils.addNavItemsToModel(view, model, page.getId(), thisUser, currentPageUser.isEditor());
return view;
} catch (Exception e) {
logger.info("unable to get page - possibly because a shared page was revoked by its owner");
@@ -111,16 +105,16 @@ public class PageController {
// Page could not be found or a shared page was removed, in which case return to default view
return viewDefault(model, request);
}
-
+
private List<Page> getAllPagesForAuthenticatedUser() {
User user = userService.getAuthenticatedUser();
- long userId = user.getEntityId();
+ long userId = user.getId();
List<Page> pages = pageService.getAllUserPages(userId);
// we add pages to this list which the corresponding pageUser object is not set to "refused"
List<Page> viewablePages = new ArrayList<Page>();
for(Page page : pages){
for(PageUser pageUser : page.getMembers()){
- if(pageUser.getUser().equals(user) && !pageUser.getPageStatus().equals(PageInvitationStatus.REFUSED)){
+ if(pageUser != null && pageUser.getUser().equals(user) && !pageUser.getPageStatus().equals(PageInvitationStatus.REFUSED)){
viewablePages.add(page);
}
}
@@ -134,7 +128,7 @@ public class PageController {
}
return viewablePages;
}
-
+
private void addAttributesToModel(Model model, Page page, PageUser pageUser, List<Page> pages, List<PageLayout> pageLayouts) {
model.addAttribute(ModelKeys.PAGE, page);
model.addAttribute(ModelKeys.PAGES, pages);
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=1354148&r1=1354147&r2=1354148&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 Tue Jun 26 18:18:57 2012
@@ -25,12 +25,12 @@ import org.apache.rave.portal.service.Pa
import org.apache.rave.portal.service.UserService;
import org.apache.rave.portal.web.controller.util.ControllerUtils;
import org.apache.rave.portal.web.model.NavigationMenu;
+import org.apache.rave.portal.web.model.UserForm;
import org.apache.rave.portal.web.util.ModelKeys;
import org.apache.rave.portal.web.util.ViewNames;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.ui.ModelMap;
@@ -63,7 +63,7 @@ public class ProfileController {
public String viewProfile(@PathVariable String username, ModelMap model, @RequestParam(required = false) Long referringPageId) {
logger.debug("Viewing person profile for: " + username);
User user = userService.getUserByUsername(username);
- Page personProfilePage = pageService.getPersonProfilePage(user.getEntityId());
+ Page personProfilePage = pageService.getPersonProfilePage(user.getId());
addAttributesToModel(model, user, referringPageId);
model.addAttribute(ModelKeys.PAGE, personProfilePage);
String view = ViewNames.getPersonPageView(personProfilePage.getPageLayout().getCode());
@@ -82,7 +82,7 @@ public class ProfileController {
@RequestMapping(method = RequestMethod.POST)
public String updateProfile(ModelMap model,
@RequestParam(required = false) Long referringPageId,
- @ModelAttribute("updatedUser") User updatedUser) {
+ @ModelAttribute("updatedUser") UserForm updatedUser) {
logger.info("Updating " + updatedUser.getUsername() + " profile information");
User user = userService.getAuthenticatedUser();
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ReminderController.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ReminderController.java?rev=1354148&r1=1354147&r2=1354148&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ReminderController.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ReminderController.java Tue Jun 26 18:18:57 2012
@@ -19,11 +19,12 @@
package org.apache.rave.portal.web.controller;
-import javax.servlet.http.HttpServletRequest;
-
import org.apache.rave.portal.model.User;
+import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.service.CaptchaService;
import org.apache.rave.portal.service.UserService;
+import org.apache.rave.portal.web.controller.util.ModelUtils;
+import org.apache.rave.portal.web.model.UserForm;
import org.apache.rave.portal.web.util.ModelKeys;
import org.apache.rave.portal.web.util.ViewNames;
import org.apache.rave.portal.web.validator.NewPasswordValidator;
@@ -39,6 +40,8 @@ import org.springframework.web.bind.anno
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+import javax.servlet.http.HttpServletRequest;
+
/**
* Handles password ans username reminder requests
*
@@ -65,7 +68,7 @@ public class ReminderController {
@RequestMapping(value = {"/retrieveusername", "/newpassword"})
public void initialize(ModelMap model, HttpServletRequest request) {
model.addAttribute(ModelKeys.CAPTCHA_HTML, captchaService.createHtml(request));
- model.addAttribute(ModelKeys.USER, new User());
+ model.addAttribute(ModelKeys.USER, new UserImpl());
}
@@ -73,9 +76,10 @@ public class ReminderController {
* Processes username requests
*/
@RequestMapping(value = {"/retrieveusername"}, method = RequestMethod.POST)
- public String requestUsername(@ModelAttribute User user, BindingResult results, Model model,
+ public String requestUsername(@ModelAttribute UserForm userForm, BindingResult results, Model model,
HttpServletRequest request, RedirectAttributes redirectAttributes) {
log.debug("Requesting username reminder");
+ User user = ModelUtils.convert(userForm);
if (!validateEmail(user, results, model, request)) {
return captchaRequest(model, request, ViewNames.USERNAME_REQUEST);
}
@@ -97,9 +101,10 @@ public class ReminderController {
* Processes new password requests
*/
@RequestMapping(value = {"/newpassword"}, method = RequestMethod.POST)
- public String requestPassword(@ModelAttribute User user, BindingResult results, Model model,
+ public String requestPassword(@ModelAttribute UserForm userForm, BindingResult results, Model model,
HttpServletRequest request, RedirectAttributes redirectAttributes) {
log.debug("Requesting password reminder");
+ User user = ModelUtils.convert(userForm);
if (!validateEmail(user, results, model, request)) {
return captchaRequest(model, request, ViewNames.NEW_PASSWORD_REQUEST);
}
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/UserProfileController.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/UserProfileController.java?rev=1354148&r1=1354147&r2=1354148&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/UserProfileController.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/UserProfileController.java Tue Jun 26 18:18:57 2012
@@ -21,6 +21,8 @@ package org.apache.rave.portal.web.contr
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.service.UserService;
+import org.apache.rave.portal.web.controller.util.ModelUtils;
+import org.apache.rave.portal.web.model.UserForm;
import org.apache.rave.portal.web.util.ModelKeys;
import org.apache.rave.portal.web.util.ViewNames;
import org.apache.rave.portal.web.validator.UserProfileValidator;
@@ -66,7 +68,7 @@ public class UserProfileController {
}
@RequestMapping(value = {"/updateUserProfile", "/updateUserProfile/*"}, method = RequestMethod.POST)
- public String create(@ModelAttribute User user, BindingResult results, Model model, @RequestParam String username, @RequestParam String password, RedirectAttributes redirectAttributes) {
+ public String create(@ModelAttribute UserForm user, BindingResult results, Model model, @RequestParam String username, @RequestParam String password, RedirectAttributes redirectAttributes) {
logger.debug("Updating user profile.");
model.addAttribute(ModelKeys.USER_PROFILE, user);
@@ -79,7 +81,7 @@ public class UserProfileController {
//Now attempt to update the account.
try {
logger.debug("userprofile: passed form validation");
- userService.updateUserProfile(user);
+ userService.updateUserProfile(ModelUtils.convert(user));
redirectAttributes.addFlashAttribute(ModelKeys.REDIRECT_MESSAGE, profileUpdatedMessage);
return ViewNames.REDIRECT_LOGIN;
}
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=1354148&r1=1354147&r2=1354148&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 Tue Jun 26 18:18:57 2012
@@ -20,10 +20,9 @@
package org.apache.rave.portal.web.controller;
import org.apache.rave.portal.model.*;
+import org.apache.rave.portal.model.impl.WidgetImpl;
import org.apache.rave.portal.service.*;
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;
import org.apache.rave.portal.web.util.ModelKeys;
import org.apache.rave.portal.web.util.PortalPreferenceKeys;
import org.apache.rave.portal.web.util.ViewNames;
@@ -91,7 +90,7 @@ public class WidgetStoreController {
User user = userService.getAuthenticatedUser();
widgetStoreModelHelper(model, referringPageId, user, view);
model.addAttribute(ModelKeys.WIDGETS,
- widgetService.getWidgetsByOwner(user.getEntityId(), offset, getPageSize()));
+ widgetService.getWidgetsByOwner(user.getId(), offset, getPageSize()));
return view;
}
@@ -112,7 +111,7 @@ public class WidgetStoreController {
final User user = userService.getAuthenticatedUser();
widgetStoreModelHelper(model, referringPageId, user, view);
model.addAttribute(ModelKeys.WIDGET, widgetService.getWidget(widgetId));
- model.addAttribute(ModelKeys.WIDGET_STATISTICS, widgetService.getWidgetStatistics(widgetId, user.getEntityId()));
+ model.addAttribute(ModelKeys.WIDGET_STATISTICS, widgetService.getWidgetStatistics(widgetId, user.getId()));
model.addAttribute(ModelKeys.USER_PROFILE, user);
return view;
}
@@ -196,7 +195,7 @@ public class WidgetStoreController {
*/
@RequestMapping(method = RequestMethod.GET, value = "widget/add")
public String viewAddWidgetForm(Model model, @RequestParam long referringPageId) {
- final Widget widget = new Widget();
+ final Widget widget = new WidgetImpl();
final String view = ViewNames.ADD_WIDGET_FORM;
model.addAttribute(ModelKeys.WIDGET, widget);
model.addAttribute(ModelKeys.REFERRING_PAGE_ID, referringPageId);
@@ -208,7 +207,7 @@ public class WidgetStoreController {
* Validates the form input, if valid, tries to store the Widget data
*
* @param widget
- * {@link Widget} as submitted by the user
+ * {@link org.apache.rave.portal.model.Widget} as submitted by the user
* @param results
* {@link BindingResult}
* @param model
@@ -218,7 +217,7 @@ public class WidgetStoreController {
* @return if successful the view name of the widget, otherwise the form
*/
@RequestMapping(method = RequestMethod.POST, value = "widget/add")
- public String viewAddWidgetResult(@ModelAttribute Widget widget, BindingResult results, Model model,
+ public String viewAddWidgetResult(@ModelAttribute WidgetImpl widget, BindingResult results, Model model,
@RequestParam long referringPageId) {
User user = userService.getAuthenticatedUser();
widgetValidator.validate(widget, results);
@@ -233,7 +232,7 @@ public class WidgetStoreController {
widget.setOwner(user);
final Widget storedWidget = widgetService.registerNewWidget(widget);
- return "redirect:/app/store/widget/" + storedWidget.getEntityId() + "?referringPageId=" + referringPageId;
+ return "redirect:/app/store/widget/" + storedWidget.getId() + "?referringPageId=" + referringPageId;
}
/**
@@ -248,7 +247,7 @@ public class WidgetStoreController {
*/
private void widgetStoreModelHelper(Model model, long referringPageId, User user, String view) {
model.addAttribute(ModelKeys.REFERRING_PAGE_ID, referringPageId);
- model.addAttribute(ModelKeys.WIDGETS_STATISTICS, widgetService.getAllWidgetStatistics(user.getEntityId()));
+ model.addAttribute(ModelKeys.WIDGETS_STATISTICS, widgetService.getAllWidgetStatistics(user.getId()));
model.addAttribute(ModelKeys.TAGS, tagService.getAllTags());
model.addAttribute(ModelKeys.CATEGORIES, categoryService.getAll());
ControllerUtils.addNavItemsToModel(view, model, referringPageId, user);
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=1354148&r1=1354147&r2=1354148&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 Tue Jun 26 18:18:57 2012
@@ -17,6 +17,7 @@ package org.apache.rave.portal.web.contr
import org.apache.rave.portal.model.Category;
import org.apache.rave.portal.model.User;
+import org.apache.rave.portal.model.impl.CategoryImpl;
import org.apache.rave.portal.service.CategoryService;
import org.apache.rave.portal.service.UserService;
import org.apache.rave.portal.web.util.ModelKeys;
@@ -24,18 +25,12 @@ import org.apache.rave.portal.web.util.V
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-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.SessionAttributes;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.support.SessionStatus;
import java.util.List;
-import static org.apache.rave.portal.web.controller.admin.AdminControllerUtil.addNavigationMenusToModel;
-import static org.apache.rave.portal.web.controller.admin.AdminControllerUtil.checkTokens;
-import static org.apache.rave.portal.web.controller.admin.AdminControllerUtil.isCreateDeleteOrUpdate;
+import static org.apache.rave.portal.web.controller.admin.AdminControllerUtil.*;
@Controller
@SessionAttributes({ModelKeys.CATEGORY, ModelKeys.TOKENCHECK})
@@ -57,7 +52,7 @@ public class CategoryController {
model.addAttribute("categories", categories);
// put category object in the model to allow creating categories from view
- model.addAttribute(ModelKeys.CATEGORY, new Category());
+ model.addAttribute(ModelKeys.CATEGORY, new CategoryImpl());
// add tokencheck attribute for creating new category
model.addAttribute(ModelKeys.TOKENCHECK, AdminControllerUtil.generateSessionToken());
@@ -69,7 +64,7 @@ public class CategoryController {
}
@RequestMapping(value = {"/admin/category/create"}, method = RequestMethod.POST)
- public String createCategory(@ModelAttribute Category category,
+ public String createCategory(@ModelAttribute CategoryImpl category,
@ModelAttribute(ModelKeys.TOKENCHECK) String sessionToken,
@RequestParam String token,
Model model,
@@ -97,7 +92,7 @@ public class CategoryController {
User currentUser = userService.getAuthenticatedUser();
boolean isValidRequest = validateRequest(category, currentUser);
if (isValidRequest) {
- categoryService.update(category.getEntityId(), category.getText(), currentUser);
+ categoryService.update(category.getId(), category.getText(), currentUser);
} else {
addNavigationMenusToModel(SELECTED_ITEM, model);
return ViewNames.ADMIN_CATEGORY_DETAIL;
@@ -147,7 +142,7 @@ public class CategoryController {
}
private boolean validateRequest(Category category, User modifier){
- return (validateRequest(category.getText(),modifier) && (categoryService.get(category.getEntityId()) != null));
+ return (validateRequest(category.getText(),modifier) && (categoryService.get(category.getId()) != null));
}
public void setUserService(UserService userService) {
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=1354148&r1=1354147&r2=1354148&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 Tue Jun 26 18:18:57 2012
@@ -19,21 +19,15 @@
package org.apache.rave.portal.web.controller.admin;
-import static org.apache.rave.portal.web.controller.admin.AdminControllerUtil.DEFAULT_PAGE_SIZE;
-import static org.apache.rave.portal.web.controller.admin.AdminControllerUtil.addNavigationMenusToModel;
-import static org.apache.rave.portal.web.controller.admin.AdminControllerUtil.checkTokens;
-import static org.apache.rave.portal.web.controller.admin.AdminControllerUtil.isDeleteOrUpdate;
-
-import java.beans.PropertyEditorSupport;
-
-import org.apache.rave.portal.model.Authority;
-import org.apache.rave.portal.model.PortalPreference;
-import org.apache.rave.portal.model.User;
+import org.apache.rave.portal.model.*;
+import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.model.util.SearchResult;
import org.apache.rave.portal.service.AuthorityService;
import org.apache.rave.portal.service.NewAccountService;
import org.apache.rave.portal.service.PortalPreferenceService;
import org.apache.rave.portal.service.UserService;
+import org.apache.rave.portal.web.controller.util.ModelUtils;
+import org.apache.rave.portal.web.model.UserForm;
import org.apache.rave.portal.web.util.ModelKeys;
import org.apache.rave.portal.web.util.PortalPreferenceKeys;
import org.apache.rave.portal.web.util.ViewNames;
@@ -49,16 +43,14 @@ import org.springframework.ui.Model;
import org.springframework.ui.ModelMap;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.WebDataBinder;
-import org.springframework.web.bind.annotation.InitBinder;
-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.SessionAttributes;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.support.SessionStatus;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+import java.beans.PropertyEditorSupport;
+
+import static org.apache.rave.portal.web.controller.admin.AdminControllerUtil.*;
+
/**
* Admin controller to manipulate User data
*/
@@ -129,7 +121,7 @@ public class UserController {
@RequestMapping(value = "/admin/userdetail/{userid}", method = RequestMethod.GET)
public String viewUserDetail(@PathVariable("userid") Long userid, Model model) {
addNavigationMenusToModel(SELECTED_ITEM, model);
- model.addAttribute(userService.getUserById(userid));
+ model.addAttribute(ModelKeys.USER, userService.getUserById(userid));
model.addAttribute(ModelKeys.TOKENCHECK, AdminControllerUtil.generateSessionToken());
return ViewNames.ADMIN_USERDETAIL;
}
@@ -166,7 +158,7 @@ public class UserController {
modelMap.addAttribute("missingConfirm", true);
return ViewNames.ADMIN_USERDETAIL;
}
- userService.deleteUser(user.getEntityId());
+ userService.deleteUser(user.getId());
modelMap.clear();
status.setComplete();
return "redirect:/app/admin/users?action=delete";
@@ -176,13 +168,13 @@ public class UserController {
public String setUpForm(ModelMap model) {
logger.debug("Initializing new account form");
AdminControllerUtil.addNavigationMenusToModel(SELECTED_ITEM, (Model) model);
- model.addAttribute(ModelKeys.NEW_USER, new User());
+ model.addAttribute(ModelKeys.NEW_USER, new UserImpl());
return ViewNames.ADMIN_NEW_ACCOUNT;
}
@RequestMapping(value = {"/admin/newaccount", "/admin/newaccount/*"}, method = RequestMethod.POST)
- public String create(@ModelAttribute(value = "newUser") User newUser, BindingResult results, Model model,
+ public String create(@ModelAttribute(value = "newUser") UserForm newUser, BindingResult results, Model model,
RedirectAttributes redirectAttributes) {
logger.debug("Creating a new user account");
model.addAttribute(ModelKeys.NEW_USER, newUser);
@@ -194,7 +186,7 @@ public class UserController {
}
try {
logger.debug("newaccount.jsp: passed form validation");
- newAccountService.createNewAccount(newUser);
+ newAccountService.createNewAccount(ModelUtils.convert(newUser));
redirectAttributes.addFlashAttribute(ModelKeys.REDIRECT_MESSAGE, messageSuccess);
return "redirect:/app/admin/users";
} catch (org.springframework.dao.IncorrectResultSizeDataAccessException ex) {
@@ -254,7 +246,7 @@ public class UserController {
/**
- * Mapping between the submitted form value and an {@link Authority}
+ * Mapping between the submitted form value and an {@link org.apache.rave.portal.model.Authority}
*/
private class AuthorityEditor extends PropertyEditorSupport {
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=1354148&r1=1354147&r2=1354148&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 Tue Jun 26 18:18:57 2012
@@ -38,23 +38,11 @@ import org.springframework.ui.Model;
import org.springframework.ui.ModelMap;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.WebDataBinder;
-import org.springframework.web.bind.annotation.InitBinder;
-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.SessionAttributes;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.support.SessionStatus;
-import java.beans.PropertyEditorSupport;
-import java.util.ArrayList;
-
import static org.apache.rave.portal.model.WidgetStatus.values;
-import static org.apache.rave.portal.web.controller.admin.AdminControllerUtil.DEFAULT_PAGE_SIZE;
-import static org.apache.rave.portal.web.controller.admin.AdminControllerUtil.addNavigationMenusToModel;
-import static org.apache.rave.portal.web.controller.admin.AdminControllerUtil.checkTokens;
-import static org.apache.rave.portal.web.controller.admin.AdminControllerUtil.isDeleteOrUpdate;
+import static org.apache.rave.portal.web.controller.admin.AdminControllerUtil.*;
/**
* Admin controller to manipulate Widget data
@@ -120,7 +108,7 @@ public class WidgetController {
@RequestMapping(value = "/admin/widgetdetail/{widgetid}", method = RequestMethod.GET)
public String viewWidgetDetail(@PathVariable("widgetid") Long widgetid, Model model) {
addNavigationMenusToModel(SELECTED_ITEM, model);
- model.addAttribute(widgetService.getWidget(widgetid));
+ model.addAttribute(ModelKeys.WIDGET, widgetService.getWidget(widgetid));
model.addAttribute(ModelKeys.TOKENCHECK, AdminControllerUtil.generateSessionToken());
model.addAttribute(ModelKeys.CATEGORIES, categoryService.getAll());
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=1354148&r1=1354147&r2=1354148&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 Tue Jun 26 18:18:57 2012
@@ -35,7 +35,7 @@ public class CategoryEditor extends Prop
public CategoryEditor(CategoryService categoryService) {
this.categoryService = categoryService;
}
-
+
@Override
public void setAsText(String text) throws IllegalArgumentException {
setValue(categoryService.get(Long.parseLong(text)));
@@ -44,6 +44,6 @@ public class CategoryEditor extends Prop
@Override
public String getAsText() {
Category category = (Category)getValue();
- return (category == null) ? null : category.getEntityId().toString();
+ return (category == null) ? null : category.getId().toString();
}
}
\ No newline at end of file
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java?rev=1354148&r1=1354147&r2=1354148&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java Tue Jun 26 18:18:57 2012
@@ -20,6 +20,7 @@
package org.apache.rave.portal.web.model;
import org.apache.rave.portal.model.PortalPreference;
+import org.apache.rave.portal.model.impl.PortalPreferenceImpl;
import java.util.Map;
@@ -45,13 +46,13 @@ public class PortalPreferenceForm {
private void populateMissingPreferences() {
if (getPageSize() == null) {
- preferenceMap.put(PAGE_SIZE, new PortalPreference(PAGE_SIZE, DEFAULT_PAGE_SIZE));
+ preferenceMap.put(PAGE_SIZE, new PortalPreferenceImpl(PAGE_SIZE, DEFAULT_PAGE_SIZE));
}
if (getTitleSuffix() == null) {
- preferenceMap.put(TITLE_SUFFIX, new PortalPreference(TITLE_SUFFIX, DEFAULT_TITLE_SUFFIX));
+ preferenceMap.put(TITLE_SUFFIX, new PortalPreferenceImpl(TITLE_SUFFIX, DEFAULT_TITLE_SUFFIX));
}
if (getJavaScriptDebugMode() == null) {
- preferenceMap.put(JAVASCRIPT_DEBUG_MODE, new PortalPreference(JAVASCRIPT_DEBUG_MODE, DEFAULT_JAVASCRIPT_DEBUG_MODE));
+ preferenceMap.put(JAVASCRIPT_DEBUG_MODE, new PortalPreferenceImpl(JAVASCRIPT_DEBUG_MODE, DEFAULT_JAVASCRIPT_DEBUG_MODE));
}
}
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapper.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapper.java?rev=1354148&r1=1354147&r2=1354148&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapper.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapper.java Tue Jun 26 18:18:57 2012
@@ -19,11 +19,10 @@
package org.apache.rave.portal.web.security;
-import java.util.Collection;
-
import org.apache.commons.lang.RandomStringUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.rave.portal.model.User;
+import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.service.NewAccountService;
import org.apache.rave.portal.service.UserService;
import org.springframework.ldap.core.DirContextAdapter;
@@ -32,6 +31,8 @@ import org.springframework.security.core
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.ldap.userdetails.UserDetailsContextMapper;
+import java.util.Collection;
+
/**
* Mapping class between a Rave User and LDAP user
*/
@@ -86,7 +87,7 @@ public class LdapUserDetailsContextMappe
}
private void createRaveUserFromLdapInfo(DirContextOperations ctx, String username) {
- User newUser = new User();
+ User newUser = new UserImpl();
newUser.setUsername(username);
if (!ctx.attributeExists(mailAttributeName) || StringUtils.isBlank(ctx.getStringAttribute(mailAttributeName))) {
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=1354148&r1=1354147&r2=1354148&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 Tue Jun 26 18:18:57 2012
@@ -67,11 +67,11 @@ public class RegionWidgetTag extends Abs
if (regionWidget != null && getBean().getSupportedWidgetTypes().contains(regionWidget.getWidget().getType()) ) {
if ( regionWidget.getWidget().isDisableRendering() ) {
ScriptManager scriptManager = getBeanFromContext(ScriptManager.class);
- String widgetScript = String.format(DISABLED_SCRIPT_BLOCK, regionWidget.getRegion().getEntityId(),
- regionWidget.getEntityId(),
+ String widgetScript = String.format(DISABLED_SCRIPT_BLOCK, regionWidget.getRegion().getId(),
+ regionWidget.getId(),
StringEscapeUtils.escapeJavaScript(regionWidget.getWidget().getDisableRenderingMessage()),
regionWidget.isCollapsed(),
- regionWidget.getWidget().getEntityId());
+ regionWidget.getWidget().getId());
scriptManager.registerScriptBlock(widgetScript, ScriptLocation.AFTER_RAVE, RenderScope.CURRENT_REQUEST, getContext());
} else {
writeString(getBean().render(regionWidget, getContext()));
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/ChangePasswordValidator.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/ChangePasswordValidator.java?rev=1354148&r1=1354147&r2=1354148&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/ChangePasswordValidator.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/ChangePasswordValidator.java Tue Jun 26 18:18:57 2012
@@ -19,8 +19,8 @@
package org.apache.rave.portal.web.validator;
-import org.apache.rave.portal.model.User;
import org.apache.rave.portal.service.UserService;
+import org.apache.rave.portal.web.model.UserForm;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -49,7 +49,7 @@ public class ChangePasswordValidator ext
@Override
public void validate(Object target, Errors errors) {
log.debug("ChangePasswordValidator validator called");
- User newUser = (User) target;
+ UserForm newUser = (UserForm) target;
boolean validHash = getUserService().isValidReminderRequest(newUser.getForgotPasswordHash(), minutesValid);
if (!validHash) {
errors.rejectValue(FIELD_PASSWORD, "page.changepassword.expired");
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewAccountValidator.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewAccountValidator.java?rev=1354148&r1=1354147&r2=1354148&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewAccountValidator.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewAccountValidator.java Tue Jun 26 18:18:57 2012
@@ -18,12 +18,10 @@
*/
package org.apache.rave.portal.web.validator;
-import java.util.regex.Pattern;
-
import org.apache.commons.lang.StringUtils;
import org.apache.commons.validator.routines.EmailValidator;
-import org.apache.rave.portal.model.User;
import org.apache.rave.portal.service.UserService;
+import org.apache.rave.portal.web.model.UserForm;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +30,8 @@ import org.springframework.validation.Er
import org.springframework.validation.ObjectError;
import org.springframework.validation.Validator;
+import java.util.regex.Pattern;
+
@Component
public class NewAccountValidator implements Validator {
@@ -52,12 +52,12 @@ public class NewAccountValidator impleme
}
public boolean supports(Class<?> aClass) {
- return User.class.isAssignableFrom(aClass);
+ return UserForm.class.isAssignableFrom(aClass);
}
public void validate(Object obj, Errors errors) {
logger.debug("Validator called");
- User newUser = (User) obj;
+ UserForm newUser = (UserForm) obj;
validateUsername(errors, newUser);
validatePassword(errors, newUser);
@@ -67,7 +67,7 @@ public class NewAccountValidator impleme
writeResultToLog(errors);
}
- private void validateUsername(Errors errors, User newUser) {
+ private void validateUsername(Errors errors, UserForm newUser) {
final String username = newUser.getUsername();
if (StringUtils.isBlank(username)) {
errors.rejectValue(FIELD_USERNAME, "username.required");
@@ -85,7 +85,7 @@ public class NewAccountValidator impleme
return userService.getUserByUsername(username) != null;
}
- protected void validatePassword(Errors errors, User newUser) {
+ protected void validatePassword(Errors errors, UserForm newUser) {
if (StringUtils.isBlank(newUser.getPassword())) {
errors.rejectValue(FIELD_PASSWORD, "password.required");
logger.info("Password required");
@@ -95,7 +95,7 @@ public class NewAccountValidator impleme
}
}
- protected void validateConfirmPassword(Errors errors, User newUser) {
+ protected void validateConfirmPassword(Errors errors, UserForm newUser) {
if (StringUtils.isBlank(newUser.getConfirmPassword())) {
errors.rejectValue(FIELD_CONFIRM_PASSWORD, "confirmPassword.required");
logger.info("Confirm Password required");
@@ -105,7 +105,7 @@ public class NewAccountValidator impleme
}
}
- private boolean isConfirmPasswordDifferentThanPassword(User newUser) {
+ private boolean isConfirmPasswordDifferentThanPassword(UserForm newUser) {
return !(newUser.getConfirmPassword().equals(newUser.getPassword()));
}
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewWidgetValidator.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewWidgetValidator.java?rev=1354148&r1=1354147&r2=1354148&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewWidgetValidator.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewWidgetValidator.java Tue Jun 26 18:18:57 2012
@@ -26,7 +26,7 @@ import org.springframework.stereotype.Co
import org.springframework.validation.Errors;
/**
- * Validator for adding a new {@link Widget}
+ * Validator for adding a new {@link org.apache.rave.portal.model.Widget}
*/
@Component
public class NewWidgetValidator extends WidgetValidator {
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/UpdateWidgetValidator.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/UpdateWidgetValidator.java?rev=1354148&r1=1354147&r2=1354148&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/UpdateWidgetValidator.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/UpdateWidgetValidator.java Tue Jun 26 18:18:57 2012
@@ -42,7 +42,7 @@ public class UpdateWidgetValidator exten
@Override
protected final void validateIfWidgetAlreadyExists(Widget widget, Errors errors) {
Widget existing = widgetService.getWidgetByUrl(widget.getUrl());
- if (existing == null || existing.getEntityId().equals(widget.getEntityId())) {
+ if (existing == null || existing.getId().equals(widget.getId())) {
return;
}
errors.rejectValue(FIELD_URL, "widget.url.exists");
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/UserProfileValidator.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/UserProfileValidator.java?rev=1354148&r1=1354147&r2=1354148&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/UserProfileValidator.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/UserProfileValidator.java Tue Jun 26 18:18:57 2012
@@ -95,7 +95,7 @@ public class UserProfileValidator implem
private boolean isExistingEmailAddress(User user, String email) {
final User userByEmail = userService.getUserByEmail(email);
- return userByEmail != null && !userByEmail.equals(user);
+ return userByEmail != null && !userByEmail.getId().equals(user.getId());
}
private void writeResultToLog(Errors errors) {
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/WidgetValidator.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/WidgetValidator.java?rev=1354148&r1=1354147&r2=1354148&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/WidgetValidator.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/WidgetValidator.java Tue Jun 26 18:18:57 2012
@@ -28,7 +28,7 @@ import org.springframework.validation.Va
import org.springframework.validation.Validator;
/**
-Abstract {@link Validator} for {@link Widget}'s
+Abstract {@link Validator} for {@link org.apache.rave.portal.model.Widget}'s
*/
public abstract class WidgetValidator implements Validator {
protected static final String FIELD_URL = "url";
@@ -65,7 +65,7 @@ public abstract class WidgetValidator im
/**
* Checks if a Widget already exists for this URL.
- * @param widget {@link Widget} to validate
+ * @param widget {@link org.apache.rave.portal.model.Widget} to validate
* @param errors {@link Errors}
*/
protected abstract void validateIfWidgetAlreadyExists(Widget widget, Errors errors);
@@ -86,7 +86,7 @@ public abstract class WidgetValidator im
/**
* Validates fields that may contain a URL
*
- * @param widget {@link Widget} to validate
+ * @param widget {@link org.apache.rave.portal.model.Widget} to validate
* @param errors {@link org.springframework.validation.Errors}
*/
private void validateUrlFields(Widget widget, Errors errors) {
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=1354148&r1=1354147&r2=1354148&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 Tue Jun 26 18:18:57 2012
@@ -18,11 +18,8 @@
*/
package org.apache.rave.portal.web.api.rest;
-import java.security.Principal;
-import org.springframework.security.access.AccessDeniedException;
+import org.apache.rave.portal.model.impl.*;
import org.apache.rave.portal.model.*;
-import org.springframework.util.ClassUtils;
-import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.http.HttpStatus;
import org.springframework.mock.web.MockHttpServletResponse;
import org.apache.rave.portal.service.PageService;
@@ -39,23 +36,23 @@ import static org.hamcrest.CoreMatchers.
*
* @author CARLUCCI
*/
-public class PageApiTest {
- private PageApi pageApi;
+public class PageApiTest {
+ private PageApi pageApi;
private PageService pageService;
private MockHttpServletResponse response;
-
+
private final long PAGE_ID = 1L;
-
+
@Before
public void setUp() {
response = new MockHttpServletResponse();
pageService = createMock(PageService.class);
- pageApi = new PageApi(pageService);
+ pageApi = new PageApi(pageService);
}
@Test
public void getPage_validId() {
- Page p = new Page();
+ Page p = new PageImpl();
expect(pageService.getPage(PAGE_ID)).andReturn(p).once();
replay(pageService);
@@ -65,14 +62,14 @@ public class PageApiTest {
@Test
public void getPage_validId_export() {
- Page p = new Page();
+ Page p = new PageImpl();
p.setRegions(new ArrayList<Region>());
- p.setOwner(new User());
- Region region = new Region();
+ p.setOwner(new UserImpl());
+ Region region = new RegionImpl();
region.setRegionWidgets(new ArrayList<RegionWidget>());
- RegionWidget w = new RegionWidget();
+ RegionWidget w = new RegionWidgetImpl();
w.setPreferences(new ArrayList<RegionWidgetPreference>());
- w.getPreferences().add(new RegionWidgetPreference());
+ w.getPreferences().add(new RegionWidgetPreferenceImpl());
region.getRegionWidgets().add(w);
p.getRegions().add(region);
@@ -84,16 +81,16 @@ public class PageApiTest {
assertThat(returned.getOwner(), is(nullValue()));
assertThat(returned.getRegions().get(0).getRegionWidgets().get(0).getPreferences(), is(nullValue()));
}
-
+
@Test
public void testDeletePage() {
pageService.deletePage(PAGE_ID);
expectLastCall();
replay(pageService);
-
+
pageApi.deletePage(PAGE_ID, response);
-
- assertThat(response.getStatus(), is(HttpStatus.NO_CONTENT.value()));
+
+ assertThat(response.getStatus(), is(HttpStatus.NO_CONTENT.value()));
verify(pageService);
- }
+ }
}
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=1354148&r1=1354147&r2=1354148&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 Tue Jun 26 18:18:57 2012
@@ -21,15 +21,17 @@ package org.apache.rave.portal.web.api.r
import org.apache.rave.portal.model.RegionWidget;
import org.apache.rave.portal.model.RegionWidgetPreference;
+import org.apache.rave.portal.model.impl.RegionWidgetImpl;
+import org.apache.rave.portal.model.impl.RegionWidgetPreferenceImpl;
import org.apache.rave.portal.service.RegionWidgetService;
import org.apache.rave.portal.web.model.RegionWidgetPreferenceListWrapper;
-import static org.hamcrest.CoreMatchers.*;
import org.junit.Before;
import org.junit.Test;
import java.util.Arrays;
import static org.easymock.EasyMock.*;
+import static org.hamcrest.CoreMatchers.sameInstance;
import static org.junit.Assert.assertThat;
public class RegionWidgetApiTest {
@@ -50,8 +52,8 @@ public class RegionWidgetApiTest {
@Test
public void replaceAllRegionWidgetPreferences_validParams() {
- RegionWidgetPreferenceListWrapper LIST_WRAPPER = new RegionWidgetPreferenceListWrapper(Arrays.asList(
- new RegionWidgetPreference(), new RegionWidgetPreference()
+ RegionWidgetPreferenceListWrapper LIST_WRAPPER = new RegionWidgetPreferenceListWrapper(Arrays.asList( (RegionWidgetPreference)
+ new RegionWidgetPreferenceImpl(), new RegionWidgetPreferenceImpl()
));
expect(regionWidgetService.saveRegionWidgetPreferences(VALID_REGION_WIDGET_ID, LIST_WRAPPER.getPreferences())).
@@ -67,8 +69,8 @@ public class RegionWidgetApiTest {
@Test(expected = IllegalArgumentException.class)
public void replaceAllRegionWidgetPreferences_invalidParams() {
- RegionWidgetPreferenceListWrapper LIST_WRAPPER = new RegionWidgetPreferenceListWrapper(Arrays.asList(
- new RegionWidgetPreference(), new RegionWidgetPreference()
+ RegionWidgetPreferenceListWrapper LIST_WRAPPER = new RegionWidgetPreferenceListWrapper(Arrays.asList( (RegionWidgetPreference)
+ new RegionWidgetPreferenceImpl(), new RegionWidgetPreferenceImpl()
));
expect(regionWidgetService.saveRegionWidgetPreferences(INVALID_REGION_WIDGET_ID, LIST_WRAPPER.getPreferences())).
@@ -80,7 +82,7 @@ public class RegionWidgetApiTest {
@Test
public void createOrReplaceRegionWidgetPreference_validParams() {
- RegionWidgetPreference PREFERENCE = new RegionWidgetPreference(1L, VALID_REGION_WIDGET_ID, VALID_PREFERENCE_NAME,
+ RegionWidgetPreference PREFERENCE = new RegionWidgetPreferenceImpl(VALID_REGION_WIDGET_ID, VALID_PREFERENCE_NAME,
VALID_PREFERENCE_VALUE);
expect(regionWidgetService.saveRegionWidgetPreference(VALID_REGION_WIDGET_ID, PREFERENCE)).andReturn(PREFERENCE);
@@ -95,7 +97,7 @@ public class RegionWidgetApiTest {
@Test(expected = IllegalArgumentException.class)
public void createOrReplaceRegionWidgetPreference_invalidParams_preferenceName() {
- RegionWidgetPreference PREFERENCE = new RegionWidgetPreference(1L, VALID_REGION_WIDGET_ID, VALID_PREFERENCE_NAME,
+ RegionWidgetPreference PREFERENCE = new RegionWidgetPreferenceImpl(VALID_REGION_WIDGET_ID, VALID_PREFERENCE_NAME,
VALID_PREFERENCE_VALUE);
regionWidgetApi.createOrReplaceRegionWidgetPreference(VALID_REGION_WIDGET_ID, "different", PREFERENCE);
@@ -103,7 +105,7 @@ public class RegionWidgetApiTest {
@Test(expected = IllegalArgumentException.class)
public void createOrReplaceRegionWidgetPreference_invalidParams_regionWidgetId() {
- RegionWidgetPreference PREFERENCE = new RegionWidgetPreference(1L, VALID_REGION_WIDGET_ID, VALID_PREFERENCE_NAME,
+ RegionWidgetPreference PREFERENCE = new RegionWidgetPreferenceImpl(VALID_REGION_WIDGET_ID, VALID_PREFERENCE_NAME,
VALID_PREFERENCE_VALUE);
expect(regionWidgetService.saveRegionWidgetPreference(INVALID_REGION_WIDGET_ID, PREFERENCE)).andThrow(
@@ -117,7 +119,7 @@ public class RegionWidgetApiTest {
public void updateRegionWidgetCollapsedStatus() {
final boolean COLLAPSED = true;
- RegionWidget expectedRegionWidget = new RegionWidget(VALID_REGION_WIDGET_ID);
+ RegionWidget expectedRegionWidget = new RegionWidgetImpl(VALID_REGION_WIDGET_ID);
expectedRegionWidget.setCollapsed(COLLAPSED);
expect(regionWidgetService.saveRegionWidgetCollapsedState(VALID_REGION_WIDGET_ID, COLLAPSED)).andReturn(expectedRegionWidget);