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 2013/05/01 20:05:34 UTC
svn commit: r1478129 -
/rave/branches/0.21.1/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbActivityStreamsEntryConverter.java
Author: mfranklin
Date: Wed May 1 18:05:34 2013
New Revision: 1478129
URL: http://svn.apache.org/r1478129
Log:
Fixed mongodb issue on start
Modified:
rave/branches/0.21.1/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbActivityStreamsEntryConverter.java
Modified: rave/branches/0.21.1/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbActivityStreamsEntryConverter.java
URL: http://svn.apache.org/viewvc/rave/branches/0.21.1/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbActivityStreamsEntryConverter.java?rev=1478129&r1=1478128&r2=1478129&view=diff
==============================================================================
--- rave/branches/0.21.1/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbActivityStreamsEntryConverter.java (original)
+++ rave/branches/0.21.1/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbActivityStreamsEntryConverter.java Wed May 1 18:05:34 2013
@@ -20,6 +20,7 @@
package org.apache.rave.portal.model.conversion.impl;
import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
import org.apache.rave.model.ActivityStreamsEntry;
import org.apache.rave.model.ActivityStreamsMediaLink;
import org.apache.rave.model.ActivityStreamsObject;
@@ -30,6 +31,7 @@ import org.apache.rave.portal.model.impl
import org.springframework.stereotype.Component;
import java.util.List;
+import java.util.Map;
import static org.apache.rave.portal.model.util.MongoDbModelUtil.generateId;
@@ -71,7 +73,7 @@ public class MongoDbActivityStreamsEntry
converted.setHeight(source.getHeight());
converted.setWidth(source.getWidth());
converted.setUrl(source.getUrl());
- converted.setOpenSocial(source.getOpenSocial());
+ converted.setOpenSocial(getConvertedMap(source.getOpenSocial()));
return converted;
}
return null;
@@ -101,9 +103,9 @@ public class MongoDbActivityStreamsEntry
private void updateSimpleProperties(ActivityStreamsObject source, ActivityStreamsObjectImpl converted) {
converted.setId(source.getId() == null ? generateId() : source.getId());
- converted.setOpenSocial(source.getOpenSocial());
+ converted.setOpenSocial(getConvertedMap(source.getOpenSocial()));
converted.setObjectType(source.getObjectType());
- converted.setExtensions(source.getExtensions());
+ converted.setExtensions(getConvertedMap(source.getExtensions()));
converted.setDisplayName(source.getDisplayName());
converted.setAlias(source.getAlias());
converted.setAttendedBy(source.getAttendedBy());
@@ -143,9 +145,9 @@ public class MongoDbActivityStreamsEntry
private void updateSimpleProperties(ActivityStreamsEntry source, ActivityStreamsEntry converted) {
converted.setId(source.getId() == null ? generateId() : source.getId());
- converted.setOpenSocial(source.getOpenSocial());
+ converted.setOpenSocial(getConvertedMap(source.getOpenSocial()));
converted.setObjectType(source.getObjectType());
- converted.setExtensions(source.getExtensions());
+ converted.setExtensions(getConvertedMap(source.getExtensions()));
converted.setUrl(source.getUrl());
converted.setAppId(source.getAppId());
converted.setBcc(source.getBcc());
@@ -179,4 +181,14 @@ public class MongoDbActivityStreamsEntry
converted.setVerb(source.getVerb());
converted.setUrl(source.getUrl());
}
+
+ @SuppressWarnings("unchecked")
+ private Map getConvertedMap(Map toConvert) {
+ Map converted = null;
+ if(toConvert != null) {
+ converted= Maps.newHashMap();
+ converted.putAll(toConvert);
+ }
+ return converted;
+ }
}