[maven-release-plugin] copy for tag shindig-project-2.5.0-update1
git-svn-id: https://svn.apache.org/repos/asf/shindig/tags/shindig-project-2.5.0-update1@1532616 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/java/common/src/main/java/org/apache/shindig/protocol/DataCollection.java b/java/common/src/main/java/org/apache/shindig/protocol/DataCollection.java
index c105f75..08cf8c4 100644
--- a/java/common/src/main/java/org/apache/shindig/protocol/DataCollection.java
+++ b/java/common/src/main/java/org/apache/shindig/protocol/DataCollection.java
@@ -24,17 +24,17 @@
* 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;
}
diff --git a/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/DataCollectionConverter.java b/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/DataCollectionConverter.java
index b576918..4fe23b0 100644
--- a/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/DataCollectionConverter.java
+++ b/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/DataCollectionConverter.java
@@ -67,21 +67,21 @@
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 @@
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 @@
} 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);
diff --git a/java/common/src/test/java/org/apache/shindig/protocol/DataCollectionTest.java b/java/common/src/test/java/org/apache/shindig/protocol/DataCollectionTest.java
index a75f448..a9f83d5 100644
--- a/java/common/src/test/java/org/apache/shindig/protocol/DataCollectionTest.java
+++ b/java/common/src/test/java/org/apache/shindig/protocol/DataCollectionTest.java
@@ -29,12 +29,12 @@
@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?");
diff --git a/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2Request.java b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2Request.java
index 530edc4..cf3a597 100644
--- a/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2Request.java
+++ b/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2Request.java
@@ -243,9 +243,9 @@
BasicOAuth2Request.LOG.entering(BasicOAuth2Request.LOG_CLASS, "attemptFetch",
new Object[] { accessor });
BasicOAuth2Request.LOG.log("BasicOAuth2Request.haveAccessToken(accessor) = {0}",
- BasicOAuth2Request.haveAccessToken(accessor) == null);
+ BasicOAuth2Request.haveAccessToken(accessor) != null);
BasicOAuth2Request.LOG.log("BasicOAuth2Request.haveRefreshToken(accessor) = {0}",
- BasicOAuth2Request.haveRefreshToken(accessor) == null);
+ BasicOAuth2Request.haveRefreshToken(accessor) != null);
}
if (this.attemptCounter > BasicOAuth2Request.MAX_ATTEMPTS) {
@@ -759,7 +759,7 @@
private HttpResponseBuilder getErrorResponseBuilder(final Throwable t, final OAuth2Error error,
final String contextMessage) {
- return this.getErrorResponseBuilder(t, error, contextMessage);
+ return this.getErrorResponseBuilder(t, error, contextMessage, null, null);
}
private HttpResponseBuilder getErrorResponseBuilder(final Throwable t, final OAuth2Error error,
diff --git a/java/social-api/src/main/java/org/apache/shindig/social/core/model/MessageImpl.java b/java/social-api/src/main/java/org/apache/shindig/social/core/model/MessageImpl.java
index f2575bb..501c998 100644
--- a/java/social-api/src/main/java/org/apache/shindig/social/core/model/MessageImpl.java
+++ b/java/social-api/src/main/java/org/apache/shindig/social/core/model/MessageImpl.java
@@ -27,7 +27,7 @@
/**
* Default implementation for a {@link org.apache.shindig.social.opensocial.model.Message}
*/
-public final class MessageImpl implements Message {
+public class MessageImpl implements Message {
private String appUrl;
private String body;
diff --git a/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomFeed.java b/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomFeed.java
index d4b6a1a..c977e2f 100644
--- a/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomFeed.java
+++ b/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomFeed.java
@@ -97,7 +97,7 @@
} 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;
diff --git a/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java b/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
index 0d3b4c1..0c0d2d3 100644
--- a/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
+++ b/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
@@ -498,7 +498,7 @@
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 @@
// 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));
diff --git a/java/social-api/src/test/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialServiceTest.java b/java/social-api/src/test/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialServiceTest.java
index 0366fdb..8da24d5 100644
--- a/java/social-api/src/test/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialServiceTest.java
+++ b/java/social-api/src/test/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialServiceTest.java
@@ -289,7 +289,7 @@
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
