You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by ss...@apache.org on 2013/10/15 13:59:39 UTC
svn commit: r1532298 - in /shindig/branches/2.5.0-updateX/java:
common/src/main/java/org/apache/shindig/protocol/
common/src/main/java/org/apache/shindig/protocol/conversion/xstream/
common/src/test/java/org/apache/shindig/protocol/ social-api/src/main...
Author: ssievers
Date: Tue Oct 15 11:59:39 2013
New Revision: 1532298
URL: http://svn.apache.org/r1532298
Log:
SHINDIG-1938 | DataCollection should store Objects to match app data
Modified:
shindig/branches/2.5.0-updateX/java/common/src/main/java/org/apache/shindig/protocol/DataCollection.java
shindig/branches/2.5.0-updateX/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/DataCollectionConverter.java
shindig/branches/2.5.0-updateX/java/common/src/test/java/org/apache/shindig/protocol/DataCollectionTest.java
shindig/branches/2.5.0-updateX/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomFeed.java
shindig/branches/2.5.0-updateX/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
shindig/branches/2.5.0-updateX/java/social-api/src/test/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialServiceTest.java
Modified: shindig/branches/2.5.0-updateX/java/common/src/main/java/org/apache/shindig/protocol/DataCollection.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.5.0-updateX/java/common/src/main/java/org/apache/shindig/protocol/DataCollection.java?rev=1532298&r1=1532297&r2=1532298&view=diff
==============================================================================
--- shindig/branches/2.5.0-updateX/java/common/src/main/java/org/apache/shindig/protocol/DataCollection.java (original)
+++ shindig/branches/2.5.0-updateX/java/common/src/main/java/org/apache/shindig/protocol/DataCollection.java Tue Oct 15 11:59:39 2013
@@ -24,17 +24,17 @@ import java.util.Map;
* Wrapper class used for data responses.
*/
public class DataCollection {
- private Map<String, Map<String, String>> entry;
+ private Map<String, Map<String, Object>> entry;
- public DataCollection(Map<String, Map<String, String>> entry) {
+ public DataCollection(Map<String, Map<String, Object>> entry) {
this.entry = entry;
}
- public Map<String, Map<String, String>> getEntry() {
+ public Map<String, Map<String, Object>> getEntry() {
return entry;
}
- public void setEntry(Map<String, Map<String, String>> entry) {
+ public void setEntry(Map<String, Map<String, Object>> entry) {
this.entry = entry;
}
Modified: shindig/branches/2.5.0-updateX/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/DataCollectionConverter.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.5.0-updateX/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/DataCollectionConverter.java?rev=1532298&r1=1532297&r2=1532298&view=diff
==============================================================================
--- shindig/branches/2.5.0-updateX/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/DataCollectionConverter.java (original)
+++ shindig/branches/2.5.0-updateX/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/DataCollectionConverter.java Tue Oct 15 11:59:39 2013
@@ -67,21 +67,21 @@ public class DataCollectionConverter ext
public void marshal(Object source, HierarchicalStreamWriter writer, MarshallingContext context) {
DataCollection collection = (DataCollection) source;
- Map<String, Map<String, String>> internalMap = collection.getEntry();
+ Map<String, Map<String, Object>> internalMap = collection.getEntry();
- for (Entry<String, Map<String, String>> eo : internalMap.entrySet()) {
+ for (Entry<String, Map<String, Object>> eo : internalMap.entrySet()) {
writer.startNode("entry");
writer.startNode("key");
writer.setValue(eo.getKey());
writer.endNode();
writer.startNode("value");
- for (Entry<String, String> ei : eo.getValue().entrySet()) {
+ for (Entry<String, Object> ei : eo.getValue().entrySet()) {
writer.startNode("entry");
writer.startNode("key");
writer.setValue(ei.getKey());
writer.endNode();
writer.startNode("value");
- writer.setValue(ei.getValue());
+ writer.setValue(ei.getValue().toString());
writer.endNode();
writer.endNode();
}
@@ -150,14 +150,14 @@ public class DataCollectionConverter ext
nonmap = true;
}
}
- Map<String, Map<String, String>> fm = Maps.newHashMap();
+ Map<String, Map<String, Object>> fm = Maps.newHashMap();
if (nonmap) {
for (Entry<String, Object> e : m.entrySet()) {
if (e.getValue() instanceof Map) {
- fm.put(e.getKey(), (Map<String, String>) e.getValue());
+ fm.put(e.getKey(), (Map<String, Object>) e.getValue());
} else {
// not certain that this makes sense, but can't see how else.
- Map<String, String> mv = Maps.newHashMap();
+ Map<String, Object> mv = Maps.newHashMap();
mv.put(e.getKey(), (String) e.getValue());
fm.put(e.getKey(), mv);
}
@@ -165,7 +165,7 @@ public class DataCollectionConverter ext
} else {
for (Entry<String, Object> e : m.entrySet()) {
- fm.put(e.getKey(), (Map<String, String>) e.getValue());
+ fm.put(e.getKey(), (Map<String, Object>) e.getValue());
}
}
return new DataCollection(fm);
Modified: shindig/branches/2.5.0-updateX/java/common/src/test/java/org/apache/shindig/protocol/DataCollectionTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.5.0-updateX/java/common/src/test/java/org/apache/shindig/protocol/DataCollectionTest.java?rev=1532298&r1=1532297&r2=1532298&view=diff
==============================================================================
--- shindig/branches/2.5.0-updateX/java/common/src/test/java/org/apache/shindig/protocol/DataCollectionTest.java (original)
+++ shindig/branches/2.5.0-updateX/java/common/src/test/java/org/apache/shindig/protocol/DataCollectionTest.java Tue Oct 15 11:59:39 2013
@@ -29,12 +29,12 @@ public class DataCollectionTest extends
@Test
public void testBasicMethods() throws Exception {
- Map<String, Map<String, String>> entry = Maps.newHashMap();
+ Map<String, Map<String, Object>> entry = Maps.newHashMap();
DataCollection collection = new DataCollection(entry);
assertEquals(entry, collection.getEntry());
- Map<String, Map<String, String>> newEntry = Maps.newHashMap();
- Map<String, String> value = Maps.newHashMap();
+ Map<String, Map<String, Object>> newEntry = Maps.newHashMap();
+ Map<String, Object> value = Maps.newHashMap();
value.put("knock knock", "who's there?");
value.put("banana", "banana who?");
value.put("banana!", "banana who?");
Modified: shindig/branches/2.5.0-updateX/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomFeed.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.5.0-updateX/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomFeed.java?rev=1532298&r1=1532297&r2=1532298&view=diff
==============================================================================
--- shindig/branches/2.5.0-updateX/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomFeed.java (original)
+++ shindig/branches/2.5.0-updateX/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomFeed.java Tue Oct 15 11:59:39 2013
@@ -97,7 +97,7 @@ public class AtomFeed {
} else if ( obj instanceof DataCollection ) {
DataCollection dc = (DataCollection) obj;
entry = Lists.newArrayList();
- for ( Entry<String, Map<String,String>> o : dc.getEntry().entrySet()) {
+ for ( Entry<String, Map<String,Object>> o : dc.getEntry().entrySet()) {
entry.add(new AtomEntry(o));
}
startIndex = 0;
Modified: shindig/branches/2.5.0-updateX/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.5.0-updateX/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java?rev=1532298&r1=1532297&r2=1532298&view=diff
==============================================================================
--- shindig/branches/2.5.0-updateX/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java (original)
+++ shindig/branches/2.5.0-updateX/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java Tue Oct 15 11:59:39 2013
@@ -498,7 +498,7 @@ public class JsonDbOpensocialService imp
public Future<DataCollection> getPersonData(Set<UserId> userIds, GroupId groupId, String appId,
Set<String> fields, SecurityToken token) throws ProtocolException {
try {
- Map<String, Map<String, String>> idToData = Maps.newHashMap();
+ Map<String, Map<String, Object>> idToData = Maps.newHashMap();
Set<String> idSet = getIdSet(userIds, groupId, token);
for (String id : idSet) {
JSONObject personData;
@@ -518,7 +518,7 @@ public class JsonDbOpensocialService imp
// JSONObject keys are always strings
@SuppressWarnings("unchecked")
Iterator<String> keys = personData.keys();
- Map<String, String> data = Maps.newHashMap();
+ Map<String, Object> data = Maps.newHashMap();
while (keys.hasNext()) {
String key = keys.next();
data.put(key, personData.getString(key));
Modified: shindig/branches/2.5.0-updateX/java/social-api/src/test/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialServiceTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.5.0-updateX/java/social-api/src/test/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialServiceTest.java?rev=1532298&r1=1532297&r2=1532298&view=diff
==============================================================================
--- shindig/branches/2.5.0-updateX/java/social-api/src/test/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialServiceTest.java (original)
+++ shindig/branches/2.5.0-updateX/java/social-api/src/test/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialServiceTest.java Tue Oct 15 11:59:39 2013
@@ -289,7 +289,7 @@ public class JsonDbOpensocialServiceTest
assertTrue(responseItem.getEntry().get(CANONICAL_USER_ID).containsKey("newvalue"));
assertEquals("20", responseItem.getEntry().get(CANONICAL_USER_ID).get("newvalue"));
assertTrue(responseItem.getEntry().get(CANONICAL_USER_ID).containsKey("isValid"));
- assertEquals(true, Boolean.valueOf(responseItem.getEntry().get(CANONICAL_USER_ID).get("isValid")));
+ assertEquals(true, Boolean.valueOf(responseItem.getEntry().get(CANONICAL_USER_ID).get("isValid").toString()));
}
@Test