Author: mfranklin
Date: Tue Oct 16 00:57:30 2012
New Revision: 1398592
URL: http://svn.apache.org/viewvc?rev=1398592&view=rev
Log:
Completed widget 'vertical'
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbWidgetTag.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/MongoDbWidgetConverter.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbUserRepository.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbWidgetRepository.java
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageRepositoryTest.java
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbWidgetRepositoryTest.java
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbWidgetTag.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbWidgetTag.java?rev=1398592&r1=1398591&r2=1398592&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbWidgetTag.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbWidgetTag.java
Tue Oct 16 00:57:30 2012
@@ -20,7 +20,6 @@
package org.apache.rave.portal.model;
import org.apache.rave.portal.model.impl.WidgetTagImpl;
-import org.apache.rave.portal.repository.TagRepository;
import org.apache.rave.portal.repository.UserRepository;
/**
@@ -28,10 +27,8 @@ import org.apache.rave.portal.repository
public class MongoDbWidgetTag extends WidgetTagImpl {
private UserRepository userRepository;
- private TagRepository tagRepository;
private Long userId;
- private String tagKeyword;
public Long getUserId() {
return userId;
@@ -49,32 +46,6 @@ public class MongoDbWidgetTag extends Wi
this.userRepository = repository;
}
- public TagRepository getTagRepository() {
- return tagRepository;
- }
-
- public void setTagRepository(TagRepository tagRepository) {
- this.tagRepository = tagRepository;
- }
-
- public String getTagKeyword() {
- return tagKeyword;
- }
-
- public void setTagKeyword(String keyword) {
- this.tagKeyword = keyword;
- }
-
- @Override
- public Tag getTag() {
- Tag tag = super.getTag();
- if(tag == null) {
- tag = tagRepository.getByKeyword(tagKeyword);
- super.setTag(tag);
- }
- return tag;
- }
-
@Override
public User getUser() {
User user = super.getUser();
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/MongoDbWidgetConverter.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/MongoDbWidgetConverter.java?rev=1398592&r1=1398591&r2=1398592&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/MongoDbWidgetConverter.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/MongoDbWidgetConverter.java
Tue Oct 16 00:57:30 2012
@@ -22,7 +22,6 @@ package org.apache.rave.portal.model.con
import com.google.common.collect.Lists;
import org.apache.rave.portal.model.*;
import org.apache.rave.portal.repository.CategoryRepository;
-import org.apache.rave.portal.repository.TagRepository;
import org.apache.rave.portal.repository.UserRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -40,77 +39,115 @@ public class MongoDbWidgetConverter impl
@Autowired
private CategoryRepository categoryRepository;
-
- @Autowired
- private TagRepository tagRepository;
+
+ @Override
+ public Class<Widget> getSourceType() {
+ return Widget.class;
+ }
@Override
public void hydrate(MongoDbWidget dehydrated) {
dehydrated.setCategoryRepository(categoryRepository);
dehydrated.setUserRepository(userRepository);
-
- for(WidgetComment comment: dehydrated.getComments()) {
- if(comment instanceof MongoDbWidgetComment) {
-
((MongoDbWidgetComment)comment).setUserRepository(userRepository);
+ if(dehydrated.getComments() != null) {
+ hydrateComments(dehydrated);
+ }
+
+ if(dehydrated.getTags() != null) {
+ hydrateTags(dehydrated);
+ }
+ }
+
+ private void hydrateTags(MongoDbWidget dehydrated) {
+ for (WidgetTag tag : dehydrated.getTags()) {
+ if (tag instanceof MongoDbWidgetTag) {
+ ((MongoDbWidgetTag) tag).setUserRepository(userRepository);
}
- }
-
- for(WidgetTag tag: dehydrated.getTags()) {
- if(tag instanceof MongoDbWidgetTag) {
- ((MongoDbWidgetTag)tag).setUserRepository(userRepository);
- ((MongoDbWidgetTag)tag).setTagRepository(tagRepository);
+ }
+ }
+
+ private void hydrateComments(MongoDbWidget dehydrated) {
+ for (WidgetComment comment : dehydrated.getComments()) {
+ if (comment instanceof MongoDbWidgetComment) {
+ ((MongoDbWidgetComment)
comment).setUserRepository(userRepository);
}
}
}
@Override
public MongoDbWidget convert(Widget source) {
- MongoDbWidget widget = source instanceof MongoDbWidget ?
(MongoDbWidget)source : new MongoDbWidget();
+ MongoDbWidget widget = source instanceof MongoDbWidget ?
(MongoDbWidget) source : new MongoDbWidget();
updateProperties(source, widget);
- widget.setOwnerId(source.getOwner().getId());
+ widget.setOwnerId(source.getOwner() != null ?
source.getOwner().getId() : null);
widget.setOwner(null);
widget.setUserRepository(null);
- List<Long> categoryIds = Lists.<Long>newArrayList();
- for(Category category : source.getCategories()) {
- widget.getCategoryIds().add(category.getId());
+ if (source.getCategories() != null) {
+ convertCategories(source, widget);
+ }
+ if (source.getComments() != null) {
+ convertComments(source, widget);
}
- widget.setCategoryIds(categoryIds);
- widget.setCategories(null);
- widget.setCategoryRepository(null);
+ if(source.getTags() != null) {
+ convertTags(source, widget);
+ }
+ if(source.getRatings() != null) {
+ convertRatings(source, widget);
+ }
+ return widget;
+ }
- List<WidgetComment> convertedComments = Lists.newArrayList();
- for(WidgetComment comment : source.getComments()) {
- convertedComments.add(convert(comment, widget));
+ private void convertRatings(Widget source, MongoDbWidget widget) {
+ List<WidgetRating> ratings = source.getRatings();
+ for(WidgetRating rating : ratings) {
+ rating.setWidgetId(widget.getId());
+ if(rating.getId() == null) {
+ rating.setId(generateId());
+ }
}
- widget.setComments(convertedComments);
+ widget.setRatings(ratings);
+ }
+ private void convertTags(Widget source, MongoDbWidget widget) {
List<WidgetTag> convertedTags = Lists.newArrayList();
- for(WidgetTag tag : source.getTags()) {
+ for (WidgetTag tag : source.getTags()) {
convertedTags.add(convert(tag, widget));
}
widget.setTags(convertedTags);
+ }
- return widget;
+ private void convertComments(Widget source, MongoDbWidget widget) {
+ List<WidgetComment> convertedComments = Lists.newArrayList();
+ for (WidgetComment comment : source.getComments()) {
+ convertedComments.add(convert(comment, widget));
+ }
+ widget.setComments(convertedComments);
+ }
+
+ private void convertCategories(Widget source, MongoDbWidget converted) {
+ List<Long> categoryIds = Lists.<Long>newArrayList();
+ for (Category category : source.getCategories()) {
+ categoryIds.add(category.getId());
+ }
+ converted.setCategoryIds(categoryIds);
+ converted.setCategories(null);
+ converted.setCategoryRepository(null);
}
private MongoDbWidgetTag convert(WidgetTag tag, Widget widget) {
- MongoDbWidgetTag converted = tag instanceof MongoDbWidgetTag ?
((MongoDbWidgetTag)tag) : new MongoDbWidgetTag();
+ MongoDbWidgetTag converted = tag instanceof MongoDbWidgetTag ?
((MongoDbWidgetTag) tag) : new MongoDbWidgetTag();
converted.setUserId(tag.getUser().getId());
converted.setUser(null);
- converted.setTagKeyword(tag.getTag().getKeyword());
- converted.setTag(null);
converted.setUserRepository(null);
- converted.setTagRepository(null);
-
+ converted.setTag(tag.getTag());
converted.setCreatedDate(tag.getCreatedDate());
converted.setWidgetId(widget.getId());
return converted;
}
private MongoDbWidgetComment convert(WidgetComment comment, Widget widget)
{
- MongoDbWidgetComment converted = comment instanceof
MongoDbWidgetComment ? ((MongoDbWidgetComment)comment) : new
MongoDbWidgetComment();
+ MongoDbWidgetComment converted = comment instanceof
MongoDbWidgetComment ? ((MongoDbWidgetComment) comment) : new
MongoDbWidgetComment();
converted.setUserId(comment.getUser().getId());
converted.setUser(null);
converted.setId(comment.getId() == null ? generateId() :
comment.getId());
@@ -123,11 +160,6 @@ public class MongoDbWidgetConverter impl
return converted;
}
- @Override
- public Class<Widget> getSourceType() {
- return Widget.class;
- }
-
private void updateProperties(Widget source, MongoDbWidget converted) {
converted.setId(source.getId() == null ? generateId() :
source.getId());
converted.setUrl(source.getUrl());
@@ -143,7 +175,6 @@ public class MongoDbWidgetConverter impl
converted.setWidgetStatus(source.getWidgetStatus());
converted.setComments(source.getComments());
converted.setDisableRendering(source.isDisableRendering());
- converted.setRatings(source.getRatings());
converted.setFeatured(source.isFeatured());
}
}
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbUserRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbUserRepository.java?rev=1398592&r1=1398591&r2=1398592&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbUserRepository.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbUserRepository.java
Tue Oct 16 00:57:30 2012
@@ -97,7 +97,7 @@ public class MongoDbUserRepository imple
@Override
public User save(User item) {
- template.save(item);
+ template.save(item, "mongoDbUser");
return item;
}
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbWidgetRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbWidgetRepository.java?rev=1398592&r1=1398591&r2=1398592&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbWidgetRepository.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbWidgetRepository.java
Tue Oct 16 00:57:30 2012
@@ -152,7 +152,7 @@ public class MongoDbWidgetRepository imp
@Override
public Widget get(long id) {
- return template.findById(id, MongoDbWidget.class);
+ return hydrateWidget(template.findById(id, MongoDbWidget.class));
}
@Override
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageRepositoryTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageRepositoryTest.java?rev=1398592&r1=1398591&r2=1398592&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageRepositoryTest.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageRepositoryTest.java
Tue Oct 16 00:57:30 2012
@@ -73,11 +73,11 @@ public class MongoDbPageRepositoryTest {
public void save_basic() {
Page page = new PageImpl();
- User user1 = new MongoDbUser(12345L);
+ User user1 = new UserImpl(12345L);
user1.setDisplayName("GEORGE DOE");
userRepository.save(user1);
- User user2 = new MongoDbUser(12345L);
+ User user2 = new UserImpl(12345L);
user2.setDisplayName("JANE DOE");
userRepository.save(user2);
@@ -103,7 +103,7 @@ public class MongoDbPageRepositoryTest {
preference.setValue("PREF_VALUE");
regionWidget.getPreferences().add(preference);
- Widget widget = new MongoDbWidget(13223L);
+ Widget widget = new WidgetImpl(13223L);
widget.setAuthor("FOO");
widget.setDescription("BAR");
widgetRepository.save(widget);
@@ -111,7 +111,7 @@ public class MongoDbPageRepositoryTest {
regionWidget.setWidget(widget);
page.setPageType(PageType.USER);
- PageLayout layout = new MongoDbPageLayout("LAYOUT");
+ PageLayout layout = new PageLayoutImpl("LAYOUT");
page.setPageLayout(layout);
layout.setNumberOfRegions(24L);
pageLayoutRepository.save(layout);
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbWidgetRepositoryTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbWidgetRepositoryTest.java?rev=1398592&r1=1398591&r2=1398592&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbWidgetRepositoryTest.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbWidgetRepositoryTest.java
Tue Oct 16 00:57:30 2012
@@ -70,7 +70,7 @@ public class MongoDbWidgetRepositoryTest
}
@Test
- public void MongoTest() {
+ public void save_basic() {
List<Category> categoryList = Arrays.asList((Category)new
CategoryImpl("GOO"), new CategoryImpl("FOO"));
categoryRepository.save(categoryList.get(0));
categoryRepository.save(categoryList.get(1));
@@ -111,6 +111,7 @@ public class MongoDbWidgetRepositoryTest
tag.setCreatedDate(new Date());
tag.setUser(user2);
tag.setTag(new TagImpl("TEST"));
+ widget.setTags(Arrays.asList(tag));
Widget saved = widgetRepository.save(widget);
