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/12/29 04:32:32 UTC
svn commit: r1426698 - in /rave/branches/mongo:
rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/
rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/
rave-components/rave-mongodb/src/main/ja...
Author: mfranklin
Date: Sat Dec 29 03:32:31 2012
New Revision: 1426698
URL: http://svn.apache.org/viewvc?rev=1426698&view=rev
Log:
Fixed issues with String ID
Modified:
rave/branches/mongo/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageUserImpl.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageConverter.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/TagImplConverter.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbMapReduceStatisticsAggregator.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageRepository.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbTagRepository.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/main/java/org/apache/rave/portal/repository/impl/MongoModelTemplate.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/resources/org/apache/rave/WidgetRatingsMap.js
rave/branches/mongo/rave-components/rave-mongodb/src/main/resources/org/apache/rave/WidgetUsersMap.js
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp
Modified: rave/branches/mongo/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageUserImpl.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageUserImpl.java?rev=1426698&r1=1426697&r2=1426698&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageUserImpl.java (original)
+++ rave/branches/mongo/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageUserImpl.java Sat Dec 29 03:32:31 2012
@@ -107,4 +107,33 @@ public class PageUserImpl implements Pag
public void setPageStatus(PageInvitationStatus pageStatus) {
this.pageStatus = pageStatus;
}
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof PageUserImpl)) return false;
+
+ PageUserImpl pageUser = (PageUserImpl) o;
+
+ if (editor != pageUser.editor) return false;
+ if (id != null ? !id.equals(pageUser.id) : pageUser.id != null) return false;
+ if (page != null ? !page.equals(pageUser.page) : pageUser.page != null) return false;
+ if (pageStatus != pageUser.pageStatus) return false;
+ if (renderSequence != null ? !renderSequence.equals(pageUser.renderSequence) : pageUser.renderSequence != null)
+ return false;
+ if (userId != null ? !userId.equals(pageUser.userId) : pageUser.userId != null) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = id != null ? id.hashCode() : 0;
+ result = 31 * result + (userId != null ? userId.hashCode() : 0);
+ result = 31 * result + (editor ? 1 : 0);
+ result = 31 * result + (renderSequence != null ? renderSequence.hashCode() : 0);
+ result = 31 * result + (pageStatus != null ? pageStatus.hashCode() : 0);
+ result = 31 * result + (page != null ? page.hashCode() : 0);
+ return result;
+ }
}
Modified: rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageConverter.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageConverter.java?rev=1426698&r1=1426697&r2=1426698&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageConverter.java (original)
+++ rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageConverter.java Sat Dec 29 03:32:31 2012
@@ -73,6 +73,9 @@ public class MongoDbPageConverter implem
if (sourcePage.getSubPages() != null) {
List<Page> convertedPages = Lists.newArrayList();
for (Page subPage : sourcePage.getSubPages()) {
+ if(subPage.getId() == null) {
+ subPage.setId(generateId());
+ }
convertedPages.add(convert(subPage));
}
page.setSubPages(convertedPages);
Modified: rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/TagImplConverter.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/TagImplConverter.java?rev=1426698&r1=1426697&r2=1426698&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/TagImplConverter.java (original)
+++ rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/TagImplConverter.java Sat Dec 29 03:32:31 2012
@@ -3,7 +3,9 @@ package org.apache.rave.portal.model.con
import org.apache.rave.portal.model.Tag;
import org.apache.rave.portal.model.conversion.HydratingModelConverter;
import org.apache.rave.portal.model.impl.TagImpl;
+import org.springframework.stereotype.Component;
+@Component
public class TagImplConverter implements HydratingModelConverter<Tag, TagImpl> {
@Override
public void hydrate(TagImpl dehydrated) {
Modified: rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbMapReduceStatisticsAggregator.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbMapReduceStatisticsAggregator.java?rev=1426698&r1=1426697&r2=1426698&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbMapReduceStatisticsAggregator.java (original)
+++ rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbMapReduceStatisticsAggregator.java Sat Dec 29 03:32:31 2012
@@ -47,7 +47,7 @@ public class MongoDbMapReduceStatisticsA
public static final String RATINGS_REDUCE = "classpath:/org/apache/rave/WidgetRatingsReduce.js";
public static final String USERS_MAP = "classpath:/org/apache/rave/WidgetUsersMap.js";
public static final String USERS_REDUCE = "classpath:/org/apache/rave/WidgetUsersReduce.js";
- public static final int DEFAULT_RESULT_VALIDITY = 60000;
+ public static final int DEFAULT_RESULT_VALIDITY = 60;
public static final String ID = "metadata";
private final MongoOperations mongoOperations;
@@ -97,7 +97,7 @@ public class MongoDbMapReduceStatisticsA
public void run() {
buildStats();
}
- }, 0, DEFAULT_RESULT_VALIDITY, TimeUnit.MILLISECONDS);
+ }, 0, DEFAULT_RESULT_VALIDITY, TimeUnit.SECONDS);
}
public void buildStats() {
Modified: rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageRepository.java?rev=1426698&r1=1426697&r2=1426698&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageRepository.java (original)
+++ rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageRepository.java Sat Dec 29 03:32:31 2012
@@ -36,6 +36,7 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
+import static org.bson.types.ObjectId.massageToObjectId;
import static org.springframework.data.mongodb.core.query.Criteria.where;
import static org.springframework.data.mongodb.core.query.Query.query;
@@ -107,7 +108,7 @@ public class MongoDbPageRepository imple
@Override
public void delete(Page item) {
- template.remove(query(where("_id").is(item.getId())));
+ template.remove(query(where("_id").is(massageToObjectId(item.getId()))));
}
private List<Page> sort(List<Page> pages, final String userId) {
Modified: rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbTagRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbTagRepository.java?rev=1426698&r1=1426697&r2=1426698&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbTagRepository.java (original)
+++ rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbTagRepository.java Sat Dec 29 03:32:31 2012
@@ -30,6 +30,7 @@ import org.springframework.stereotype.Re
import java.util.List;
+import static org.bson.types.ObjectId.massageToObjectId;
import static org.springframework.data.mongodb.core.query.Criteria.where;
import static org.springframework.data.mongodb.core.query.Query.query;
@@ -71,7 +72,7 @@ public class MongoDbTagRepository implem
@Override
public void delete(Tag item) {
- template.remove(query(where("_id").is(item.getId())));
+ template.remove(query(where("_id").is(massageToObjectId(item.getId()))));
}
public void setWidgetTemplate(MongoTagOperations tagTemplate) {
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=1426698&r1=1426697&r2=1426698&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 Sat Dec 29 03:32:31 2012
@@ -37,6 +37,7 @@ import java.util.List;
import java.util.Set;
import java.util.regex.Pattern;
+import static org.bson.types.ObjectId.massageToObjectId;
import static org.springframework.data.mongodb.core.query.Criteria.where;
import static org.springframework.data.mongodb.core.query.Query.query;
@@ -123,7 +124,7 @@ public class MongoDbUserRepository imple
@Override
public void delete(User item) {
- template.remove(query(where("_id").is(item.getId())));
+ template.remove(query(where("_id").is(massageToObjectId(item.getId()))));
}
private List<User> getUsersById(Collection<String> userIds) {
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=1426698&r1=1426697&r2=1426698&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 Sat Dec 29 03:32:31 2012
@@ -39,6 +39,7 @@ import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
+import static org.bson.types.ObjectId.massageToObjectId;
import static org.springframework.data.mongodb.core.query.Criteria.where;
import static org.springframework.data.mongodb.core.query.Query.query;
import static org.springframework.data.mongodb.core.query.Update.update;
@@ -181,7 +182,7 @@ public class MongoDbWidgetRepository imp
@Override
public void delete(Widget item) {
- template.remove(new Query(where("_id").is(item.getId())));
+ template.remove(new Query(where("_id").is(massageToObjectId(item.getId()))));
}
/*
Modified: rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoModelTemplate.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoModelTemplate.java?rev=1426698&r1=1426697&r2=1426698&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoModelTemplate.java (original)
+++ rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoModelTemplate.java Sat Dec 29 03:32:31 2012
@@ -23,6 +23,8 @@ import com.mongodb.WriteResult;
import org.apache.rave.portal.model.conversion.HydratingConverterFactory;
import org.apache.rave.portal.repository.MongoModelOperations;
import org.apache.rave.util.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.data.mongodb.core.mapreduce.MapReduceResults;
@@ -35,6 +37,8 @@ import java.util.List;
*/
public class MongoModelTemplate<T, E extends T> implements MongoModelOperations<T> {
+ private static final Logger logger = LoggerFactory.getLogger(MongoModelTemplate.class);
+
@Autowired
protected MongoOperations mongoTemplate;
@@ -65,7 +69,7 @@ public class MongoModelTemplate<T, E ext
public T get(String id) {
E fromDb = mongoTemplate.findById(id, dbType, collection);
if(fromDb == null) {
- throw new IllegalStateException(String.format("Could not find requested %2$s instance: %1$s", id, dbType));
+ logger.warn(String.format("Could not find requested %2$s instance: %1$s", id, dbType));
}
return hydrate(fromDb);
}
Modified: rave/branches/mongo/rave-components/rave-mongodb/src/main/resources/org/apache/rave/WidgetRatingsMap.js
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/resources/org/apache/rave/WidgetRatingsMap.js?rev=1426698&r1=1426697&r2=1426698&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-mongodb/src/main/resources/org/apache/rave/WidgetRatingsMap.js (original)
+++ rave/branches/mongo/rave-components/rave-mongodb/src/main/resources/org/apache/rave/WidgetRatingsMap.js Sat Dec 29 03:32:31 2012
@@ -21,7 +21,7 @@ function () {
var self = this;
this.ratings.forEach(function(rating){
var userMap = {};
- userMap[rating.userId.floatApprox] = rating.score;
+ userMap[rating.userId] = rating.score;
emit(self._id, {
like:rating.score == 10 ? 1 : 0,
dislike:rating.score == 0 ? 1 : 0,
Modified: rave/branches/mongo/rave-components/rave-mongodb/src/main/resources/org/apache/rave/WidgetUsersMap.js
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/resources/org/apache/rave/WidgetUsersMap.js?rev=1426698&r1=1426697&r2=1426698&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-mongodb/src/main/resources/org/apache/rave/WidgetUsersMap.js (original)
+++ rave/branches/mongo/rave-components/rave-mongodb/src/main/resources/org/apache/rave/WidgetUsersMap.js Sat Dec 29 03:32:31 2012
@@ -29,7 +29,7 @@ function () {
if (!widgetMap[regionWidget.widgetId]) {
widgetMap[regionWidget.widgetId] = true;
var userMap = {};
- userMap[self.ownerId.floatApprox] = 1;
+ userMap[self.ownerId] = 1;
emit(regionWidget.widgetId, userMap);
}
})
Modified: rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp?rev=1426698&r1=1426697&r2=1426698&view=diff
==============================================================================
--- rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp (original)
+++ rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp Sat Dec 29 03:32:31 2012
@@ -100,7 +100,7 @@
</li>
</c:when>
<c:otherwise>
- <li id="tab-${userPage.id}" onclick="rave.viewPage(${userPage.id});">
+ <li id="tab-${userPage.id}" onclick="rave.viewPage('${userPage.id}');">
<c:choose>
<c:when test="${isSharedToMe}">
<a href="#" class="rave-ui-tab-shared-to-me">
Modified: rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp?rev=1426698&r1=1426697&r2=1426698&view=diff
==============================================================================
--- rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp (original)
+++ rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp Sat Dec 29 03:32:31 2012
@@ -100,7 +100,7 @@
<div id="widgetAdded_${widget.id}" class="storeButton">
<button class="btn btn-small btn-primary" id="addWidget_${widget.id}"
- onclick="rave.api.rpc.addWidgetToPage({widgetId: ${widget.id}, pageId: ${referringPageId}, buttonId: this.id});"
+ onclick="rave.api.rpc.addWidgetToPage({widgetId: '${widget.id}', pageId: '${referringPageId}', buttonId: this.id});"
data-success="<fmt:message key="page.widget.addedToPage"/>">
<fmt:message key="page.widget.addToPage"/>
</button>
Modified: rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp?rev=1426698&r1=1426697&r2=1426698&view=diff
==============================================================================
--- rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp (original)
+++ rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp Sat Dec 29 03:32:31 2012
@@ -218,12 +218,12 @@
</span>
<c:if test="${userProfile.id eq comment.userId}">
<button id="comment-delete-${comment.id}" class="btn btn-danger btn-mini commentDeleteButton"
- value="Delete" title="Delete comment" data-widgetid="<c:out value="${comment.widgetId}"/>">
+ value="Delete" title="Delete comment" data-widgetid="<c:out value="${widget.id}"/>">
<i class="icon-remove icon-white"></i>
</button>
<button id="comment-edit-${comment.id}" class="btn btn-mini commentEditButton"
value="Edit" title="Edit comment"
- data-widgetid="<c:out value="${comment.widgetId}"/>"
+ data-widgetid="<c:out value="${widget.id}"/>"
data-toggle="modal" data-target="#editComment-dialog">
<i class="icon-pencil"></i>
</button>