Author: lindner
Date: Tue Dec 9 16:26:50 2008
New Revision: 724939
URL: http://svn.apache.org/viewvc?rev=724939&view=rev
Log:
SHINDIG-774 - upgrade to google collections 0.8 snapshot
Modified:
incubator/shindig/trunk/java/common/pom.xml
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/BlobCrypterSecurityTokenDecoderTest.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/JsonConversionUtilTest.java
incubator/shindig/trunk/java/gadgets/pom.xml
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetFeatureRegistryTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseBuilderTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/ConcurrentPreloaderServiceTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingContentRewriterTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/VariableSubstituterTest.java
incubator/shindig/trunk/java/social-api/pom.xml
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServletFetcher.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/StandardHandlerDispatcher.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleContainerOAuthLookupService.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonRpcServletTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialServiceTest.java
incubator/shindig/trunk/pom.xml
Modified: incubator/shindig/trunk/java/common/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/pom.xml?rev=724939&r1=724938&r2=724939&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/pom.xml (original)
+++ incubator/shindig/trunk/java/common/pom.xml Tue Dec 9 16:26:50 2008
@@ -76,8 +76,8 @@
<artifactId>guice</artifactId>
</dependency>
<dependency>
- <groupId>com.google.code.google-collections</groupId>
- <artifactId>google-collect</artifactId>
+ <groupId>com.google.collections</groupId>
+ <artifactId>google-collections</artifactId>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
Modified:
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/BlobCrypterSecurityTokenDecoderTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/BlobCrypterSecurityTokenDecoderTest.java?rev=724939&r1=724938&r2=724939&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/BlobCrypterSecurityTokenDecoderTest.java
(original)
+++
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/BlobCrypterSecurityTokenDecoderTest.java
Tue Dec 9 16:26:50 2008
@@ -29,6 +29,7 @@
import org.apache.shindig.common.util.CharsetUtil;
import org.apache.shindig.common.util.FakeTimeSource;
+import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@@ -113,7 +114,7 @@
String encrypted = t.encrypt();
SecurityToken t2 = decoder.createToken(
- Maps.immutableMap(SecurityTokenDecoder.SECURITY_TOKEN_NAME,
encrypted));
+ ImmutableMap.of(SecurityTokenDecoder.SECURITY_TOKEN_NAME, encrypted));
assertEquals("http://www.example.com/gadget.xml";, t2.getAppId());
assertEquals("http://www.example.com/gadget.xml";, t2.getAppUrl());
@@ -137,7 +138,7 @@
encrypted = encrypted.replace("container:", "other:");
try {
-
decoder.createToken(Maps.immutableMap(SecurityTokenDecoder.SECURITY_TOKEN_NAME,
encrypted));
+
decoder.createToken(ImmutableMap.of(SecurityTokenDecoder.SECURITY_TOKEN_NAME,
encrypted));
fail("should have reported that container was unknown");
} catch (SecurityTokenException e) {
assertTrue(e.getMessage(), e.getMessage().contains("Unknown container"));
@@ -157,7 +158,7 @@
encrypted = encrypted.replace("container:", "example:");
try {
-
decoder.createToken(Maps.immutableMap(SecurityTokenDecoder.SECURITY_TOKEN_NAME,
encrypted));
+
decoder.createToken(ImmutableMap.of(SecurityTokenDecoder.SECURITY_TOKEN_NAME,
encrypted));
fail("should have tried to decrypt with wrong key");
} catch (SecurityTokenException e) {
assertTrue(e.getMessage(), e.getMessage().contains("Invalid token
signature"));
@@ -177,7 +178,7 @@
timeSource.incrementSeconds(3600 + 181); // one hour plus clock skew
try {
-
decoder.createToken(Maps.immutableMap(SecurityTokenDecoder.SECURITY_TOKEN_NAME,
encrypted));
+
decoder.createToken(ImmutableMap.of(SecurityTokenDecoder.SECURITY_TOKEN_NAME,
encrypted));
fail("should have expired");
} catch (SecurityTokenException e) {
assertTrue(e.getMessage(), e.getMessage().contains("Blob expired"));
@@ -187,7 +188,7 @@
@Test
public void testMalformed() throws Exception {
try {
-
decoder.createToken(Maps.immutableMap(SecurityTokenDecoder.SECURITY_TOKEN_NAME,
"foo"));
+
decoder.createToken(ImmutableMap.of(SecurityTokenDecoder.SECURITY_TOKEN_NAME,
"foo"));
fail("should have tried to decrypt with wrong key");
} catch (SecurityTokenException e) {
assertTrue(e.getMessage(), e.getMessage().contains("Invalid security
token foo"));
@@ -197,10 +198,10 @@
@Test
public void testAnonymous() throws Exception {
SecurityToken t = decoder.createToken(
- Maps.immutableMap(SecurityTokenDecoder.SECURITY_TOKEN_NAME, " "));
+ ImmutableMap.of(SecurityTokenDecoder.SECURITY_TOKEN_NAME, " "));
assertTrue(t.isAnonymous());
- Map<String, String> empty = Maps.immutableMap();
+ Map<String, String> empty = ImmutableMap.of();
t = decoder.createToken(empty);
assertTrue(t.isAnonymous());
}
Modified:
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java?rev=724939&r1=724938&r2=724939&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java
(original)
+++
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java
Tue Dec 9 16:26:50 2008
@@ -22,6 +22,7 @@
import static org.junit.Assert.assertTrue;
import com.google.common.collect.Maps;
+import com.google.common.collect.ImmutableMap;
import org.apache.commons.lang.StringUtils;
import org.json.JSONArray;
@@ -50,7 +51,7 @@
@Test
public void serializeSimpleMap() throws Exception {
- Map<String, String> map = Maps.immutableMap("hello", "world", "foo",
"bar");
+ Map<String, String> map = ImmutableMap.of("hello", "world", "foo", "bar");
assertTrue("Did not produce results matching reference implementation.",
jsonEquals(new JSONObject(map).toString(),
JsonSerializer.serialize(map)));
}
@@ -75,11 +76,11 @@
@Test
public void serializeMixedObjects() throws Exception {
- Map<String, ? extends Object> map = Maps.immutableMap(
+ Map<String, ? extends Object> map = ImmutableMap.of(
"integer", Integer.valueOf(100),
"double", Double.valueOf(233333333333.7d),
"boolean", Boolean.TRUE,
- "map", Maps.immutableMap("hello", "world", "foo", "bar"),
+ "map", ImmutableMap.of("hello", "world", "foo", "bar"),
"string", "hello!");
assertTrue("Did not produce results matching reference implementation.",
jsonEquals(new JSONObject(map).toString(),
JsonSerializer.serialize(map)));
Modified:
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/JsonConversionUtilTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/JsonConversionUtilTest.java?rev=724939&r1=724938&r2=724939&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/JsonConversionUtilTest.java
(original)
+++
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/JsonConversionUtilTest.java
Tue Dec 9 16:26:50 2008
@@ -19,6 +19,7 @@
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
+import com.google.common.collect.ImmutableMap;
import org.json.JSONArray;
import org.json.JSONException;
@@ -73,26 +74,26 @@
public void testParameterMapToJsonParsing()
throws Exception {
-
assertJsonEquals(JsonConversionUtil.parametersToJsonObject(Maps.immutableMap("a.b.c",
"1")),
+
assertJsonEquals(JsonConversionUtil.parametersToJsonObject(ImmutableMap.of("a.b.c",
"1")),
new JSONObject("{a:{b:{c:1}}}"));
assertJsonEquals(
- JsonConversionUtil.parametersToJsonObject(Maps.immutableMap("a.b.c",
"\"1\"")),
+ JsonConversionUtil.parametersToJsonObject(ImmutableMap.of("a.b.c",
"\"1\"")),
new JSONObject("{a:{b:{c:\"1\"}}}"));
-
assertJsonEquals(JsonConversionUtil.parametersToJsonObject(Maps.immutableMap("a.b.c",
"true")),
+
assertJsonEquals(JsonConversionUtil.parametersToJsonObject(ImmutableMap.of("a.b.c",
"true")),
new JSONObject("{a:{b:{c:true}}}"));
assertJsonEquals(
- JsonConversionUtil.parametersToJsonObject(Maps.immutableMap("a.b.c",
"false")),
+ JsonConversionUtil.parametersToJsonObject(ImmutableMap.of("a.b.c",
"false")),
new JSONObject("{a:{b:{c:false}}}"));
-
assertJsonEquals(JsonConversionUtil.parametersToJsonObject(Maps.immutableMap("a.b.c",
"null")),
+
assertJsonEquals(JsonConversionUtil.parametersToJsonObject(ImmutableMap.of("a.b.c",
"null")),
new JSONObject("{a:{b:{c:null}}}"));
assertJsonEquals(JsonConversionUtil.parametersToJsonObject(
- Maps.immutableMap("a.b(0).c", "hello", "a.b(1).c", "hello")),
+ ImmutableMap.of("a.b(0).c", "hello", "a.b(1).c", "hello")),
new JSONObject("{a:{b:[{c:\"hello\"},{c:\"hello\"}]}}"));
assertJsonEquals(JsonConversionUtil.parametersToJsonObject(
- Maps.immutableMap("a.b.c", "hello, true, false, null, 1,2, \"null\",
\"()\"")),
+ ImmutableMap.of("a.b.c", "hello, true, false, null, 1,2, \"null\",
\"()\"")),
new
JSONObject("{a:{b:{c:[\"hello\",true,false,null,1,2,\"null\",\"()\"]}}}"));
assertJsonEquals(JsonConversionUtil.parametersToJsonObject(
- Maps.immutableMap("a.b.c", "\"hello, true, false, null, 1,2\"")),
+ ImmutableMap.of("a.b.c", "\"hello, true, false, null, 1,2\"")),
new JSONObject("{a:{b:{c:\"hello, true, false, null, 1,2\"}}}"));
}
Modified: incubator/shindig/trunk/java/gadgets/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/pom.xml?rev=724939&r1=724938&r2=724939&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/pom.xml (original)
+++ incubator/shindig/trunk/java/gadgets/pom.xml Tue Dec 9 16:26:50 2008
@@ -140,8 +140,8 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>com.google.code.google-collections</groupId>
- <artifactId>google-collect</artifactId>
+ <groupId>com.google.collections</groupId>
+ <artifactId>google-collections</artifactId>
</dependency>
<dependency>
<groupId>com.google.code.guice</groupId>
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetFeatureRegistryTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetFeatureRegistryTest.java?rev=724939&r1=724938&r2=724939&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetFeatureRegistryTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetFeatureRegistryTest.java
Tue Dec 9 16:26:50 2008
@@ -23,6 +23,7 @@
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
+import com.google.common.collect.ImmutableSortedSet;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
@@ -102,7 +103,7 @@
registry.register(makeFeature("feat0", CONTENT, DEP_NAME));
registry.register(makeFeature("feat1", CONTENT, DEP_NAME));
- Set<String> setKeys = Sets.immutableSortedSet("feat0", "feat1");
+ Set<String> setKeys = ImmutableSortedSet.of("feat0", "feat1");
List<String> listKeys = Lists.newLinkedList("feat0", "feat1");
Collection<String> collectKeys
= Collections.unmodifiableCollection(Lists.newArrayList("feat0",
"feat1"));
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseBuilderTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseBuilderTest.java?rev=724939&r1=724938&r2=724939&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseBuilderTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseBuilderTest.java
Tue Dec 9 16:26:50 2008
@@ -17,6 +17,7 @@
*/
package org.apache.shindig.gadgets.http;
+import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import static org.junit.Assert.assertEquals;
@@ -56,7 +57,7 @@
@Test
public void addHeadersMap() {
- Map<String, String> headers = Maps.immutableMap("foo", "bar", "blah",
"blah");
+ Map<String, String> headers = ImmutableMap.of("foo", "bar", "blah",
"blah");
HttpResponseBuilder builder = new HttpResponseBuilder()
.addHeaders(headers);
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/ConcurrentPreloaderServiceTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/ConcurrentPreloaderServiceTest.java?rev=724939&r1=724938&r2=724939&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/ConcurrentPreloaderServiceTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/ConcurrentPreloaderServiceTest.java
Tue Dec 9 16:26:50 2008
@@ -26,6 +26,7 @@
import org.apache.shindig.gadgets.GadgetContext;
import org.apache.shindig.gadgets.spec.GadgetSpec;
+import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
import org.junit.Test;
@@ -45,7 +46,7 @@
private static final String PRELOAD_STRING_VALUE = "Some random string";
private static final Integer PRELOAD_NUMERIC_VALUE = 5;
private static final Map<String, String> PRELOAD_MAP_VALUE
- = Maps.immutableMap("foo", "bar", "baz", "blah");
+ = ImmutableMap.of("foo", "bar", "baz", "blah");
private final TestPreloader preloader = new TestPreloader();
private final TestPreloader preloader2 = new TestPreloader();
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java?rev=724939&r1=724938&r2=724939&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java
Tue Dec 9 16:26:50 2008
@@ -35,6 +35,7 @@
import org.apache.shindig.gadgets.http.HttpResponseBuilder;
import org.apache.shindig.gadgets.spec.GadgetSpec;
+import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@@ -57,7 +58,7 @@
private static final String PRELOAD_CONTENT = "Preloaded data";
private static final String CONTAINER = "some-container";
private static final Uri GADGET_URL =
Uri.parse("http://example.org/gadget.xml";);
- private static final Map<String, String> PRELOAD_METADATA =
Maps.immutableMap("foo", "bar");
+ private static final Map<String, String> PRELOAD_METADATA =
ImmutableMap.of("foo", "bar");
private final RecordingHttpFetcher plainFetcher = new RecordingHttpFetcher();
private final RecordingHttpFetcher oauthFetcher = new RecordingHttpFetcher();
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingContentRewriterTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingContentRewriterTest.java?rev=724939&r1=724938&r2=724939&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingContentRewriterTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingContentRewriterTest.java
Tue Dec 9 16:26:50 2008
@@ -37,6 +37,7 @@
import org.apache.shindig.gadgets.spec.View;
import com.google.caja.util.Join;
+import com.google.common.collect.ImmutableSortedSet;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -240,7 +241,7 @@
String rewritten = rewrite(gadget, "");
Set<String> actual = getInjectedScript(rewritten);
- Set<String> expected = Sets.immutableSortedSet("foo", "bar", "baz");
+ Set<String> expected = ImmutableSortedSet.of("foo", "bar", "baz");
assertEquals(expected, actual);
}
@@ -293,7 +294,7 @@
String rewritten = rewrite(gadget, "");
Set<String> actual = getInjectedScript(rewritten);
- Set<String> expected = Sets.immutableSortedSet("bar", "baz");
+ Set<String> expected = ImmutableSortedSet.of("bar", "baz");
assertEquals(expected, actual);
assertTrue("Requested scripts not inlined.",
rewritten.contains("foo_content();"));
}
@@ -380,7 +381,7 @@
String rewritten = rewrite(gadget, "");
Set<String> actual = getInjectedScript(rewritten);
- Set<String> expected = Sets.immutableSortedSet("baz");
+ Set<String> expected = ImmutableSortedSet.of("baz");
assertEquals(expected, actual);
assertTrue("Requested scripts not inlined.",
rewritten.contains("foo_content();"));
assertTrue("Forced external file not forced.",
@@ -632,7 +633,7 @@
throw new PreloadException("broken");
}
public Set<String> getKeys() {
- return Sets.immutableSortedSet("foo");
+ return ImmutableSortedSet.of("foo");
}
};
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/VariableSubstituterTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/VariableSubstituterTest.java?rev=724939&r1=724938&r2=724939&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/VariableSubstituterTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/VariableSubstituterTest.java
Tue Dec 9 16:26:50 2008
@@ -29,6 +29,7 @@
import org.apache.shindig.gadgets.spec.LocaleSpec;
import org.apache.shindig.gadgets.spec.MessageBundle;
+import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
import org.junit.Test;
@@ -86,7 +87,7 @@
GadgetContext context = new GadgetContext() {
@Override
public UserPrefs getUserPrefs() {
- return new UserPrefs(Maps.immutableMap("foo", "shindig"));
+ return new UserPrefs(ImmutableMap.of("foo", "shindig"));
}
};
Modified: incubator/shindig/trunk/java/social-api/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/pom.xml?rev=724939&r1=724938&r2=724939&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/pom.xml (original)
+++ incubator/shindig/trunk/java/social-api/pom.xml Tue Dec 9 16:26:50 2008
@@ -92,8 +92,8 @@
<artifactId>guice</artifactId>
</dependency>
<dependency>
- <groupId>com.google.code.google-collections</groupId>
- <artifactId>google-collect</artifactId>
+ <groupId>com.google.collections</groupId>
+ <artifactId>google-collections</artifactId>
</dependency>
<dependency>
<artifactId>commons-lang</artifactId>
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java?rev=724939&r1=724938&r2=724939&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java
Tue Dec 9 16:26:50 2008
@@ -21,6 +21,7 @@
import org.apache.shindig.social.opensocial.spi.DataCollection;
import org.apache.shindig.social.opensocial.spi.RestfulCollection;
+import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
import java.io.IOException;
@@ -107,7 +108,7 @@
Object response = responseItem.getResponse();
// TODO: ugliness resulting from not using RestfulItem
if (!(response instanceof DataCollection) && !(response instanceof
RestfulCollection)) {
- response = Maps.immutableMap("entry", response);
+ response = ImmutableMap.of("entry", response);
}
writer.write(converter.convertToString(response));
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServletFetcher.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServletFetcher.java?rev=724939&r1=724938&r2=724939&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServletFetcher.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServletFetcher.java
Tue Dec 9 16:26:50 2008
@@ -20,7 +20,7 @@
import org.apache.shindig.auth.SecurityTokenDecoder;
import org.apache.shindig.common.servlet.ParameterFetcher;
-import com.google.common.collect.Maps;
+import com.google.common.collect.ImmutableMap;
import java.util.Map;
@@ -33,7 +33,7 @@
public class DataServiceServletFetcher implements ParameterFetcher {
public Map<String, String> fetch(HttpServletRequest req) {
- return Maps.immutableMap(SecurityTokenDecoder.SECURITY_TOKEN_NAME,
req.getParameter("st"));
+ return ImmutableMap.of(SecurityTokenDecoder.SECURITY_TOKEN_NAME,
req.getParameter("st"));
}
}
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/StandardHandlerDispatcher.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/StandardHandlerDispatcher.java?rev=724939&r1=724938&r2=724939&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/StandardHandlerDispatcher.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/StandardHandlerDispatcher.java
Tue Dec 9 16:26:50 2008
@@ -20,6 +20,8 @@
import com.google.inject.Inject;
import com.google.inject.Provider;
+
+import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
import java.util.Map;
@@ -41,7 +43,7 @@
public StandardHandlerDispatcher(Provider<PersonHandler>
personHandlerProvider,
Provider<ActivityHandler> activityHandlerProvider,
Provider<AppDataHandler> appDataHandlerProvider) {
- this(Maps.immutableMap(
+ this(ImmutableMap.of(
DataServiceServlet.PEOPLE_ROUTE, personHandlerProvider,
DataServiceServlet.ACTIVITY_ROUTE, activityHandlerProvider,
DataServiceServlet.APPDATA_ROUTE, appDataHandlerProvider));
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleContainerOAuthLookupService.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleContainerOAuthLookupService.java?rev=724939&r1=724938&r2=724939&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleContainerOAuthLookupService.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleContainerOAuthLookupService.java
Tue Dec 9 16:26:50 2008
@@ -21,6 +21,7 @@
import org.apache.shindig.social.core.oauth.OAuthSecurityToken;
import org.apache.shindig.social.opensocial.oauth.OAuthLookupService;
+import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@@ -39,7 +40,7 @@
public class SampleContainerOAuthLookupService implements OAuthLookupService {
// If we were a real social network this would probably be a function
- private static Map<String, String> sampleContainerUrlToAppIdMap =
Maps.immutableMap(
+ private static Map<String, String> sampleContainerUrlToAppIdMap =
ImmutableMap.of(
"http://localhost:8080/gadgets/files/samplecontainer/examples/SocialHelloWorld.xml";,
"7810",
"http://localhost:8080/gadgets/files/samplecontainer/examples/SocialActivitiesWorld.xml";,
@@ -47,12 +48,12 @@
);
// If we were a real social network we would probably be keeping track of
this in a db somewhere
- private static Map<String, ArrayList<String>> sampleContainerAppInstalls =
Maps.immutableMap(
+ private static Map<String, ArrayList<String>> sampleContainerAppInstalls =
ImmutableMap.of(
"john.doe", Lists.newArrayList("7810", "8355")
);
// If we were a real social network we would establish shared secrets with
each of our gadgets
- private static Map<String, String> sampleContainerSharedSecrets =
Maps.immutableMap(
+ private static Map<String, String> sampleContainerSharedSecrets =
ImmutableMap.of(
"7810", "SocialHelloWorldSharedSecret",
"8355", "SocialActivitiesWorldSharedSecret"
);
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java?rev=724939&r1=724938&r2=724939&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
Tue Dec 9 16:26:50 2008
@@ -35,6 +35,7 @@
import org.apache.shindig.social.opensocial.spi.SocialSpiException;
import org.apache.shindig.social.opensocial.spi.UserId;
+import com.google.common.collect.ImmutableSortedSet;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -380,7 +381,7 @@
String userId = user.getUserId(token);
if (group == null) {
- return Sets.newLinkedHashSet(userId);
+ return ImmutableSortedSet.of(userId);
}
Set<String> returnVal = Sets.newLinkedHashSet();
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java?rev=724939&r1=724938&r2=724939&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java
Tue Dec 9 16:26:50 2008
@@ -31,6 +31,7 @@
import org.apache.shindig.social.core.util.xstream.XStream081Configuration;
import org.apache.shindig.social.opensocial.spi.SocialSpiException;
+import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
import com.google.inject.Guice;
import com.google.inject.Injector;
@@ -159,7 +160,7 @@
EasyMock.expect(handler.handleItem(EasyMock.isA(RequestItem.class)));
EasyMock.expectLastCall().andReturn(ImmediateFuture.newInstance(jsonObject));
- EasyMock.expect(jsonConverter.convertToString(Maps.immutableMap("entry",
jsonObject)))
+ EasyMock.expect(jsonConverter.convertToString(ImmutableMap.of("entry",
jsonObject)))
.andReturn("{ 'entry' : " + jsonObject + " }");
PrintWriter writerMock = EasyMock.createMock(PrintWriter.class);
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonRpcServletTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonRpcServletTest.java?rev=724939&r1=724938&r2=724939&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonRpcServletTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonRpcServletTest.java
Tue Dec 9 16:26:50 2008
@@ -25,7 +25,9 @@
import org.apache.shindig.social.core.util.BeanXStreamConverter;
import org.apache.shindig.social.core.util.BeanXmlConverter;
+import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
+
import com.google.inject.Provider;
import junit.framework.TestCase;
@@ -157,11 +159,11 @@
EasyMock.expectLastCall().andReturn(ImmediateFuture.newInstance(resultObject));
EasyMock.expect(jsonConverter.convertToJson(resultObject))
- .andReturn(new JSONObject(Maps.immutableMap("foo", "bar")));
+ .andReturn(new JSONObject(ImmutableMap.of("foo", "bar")));
JSONObject result = new JSONObject();
result.put("id", "id");
- result.put("data", Maps.immutableMap("foo", "bar"));
+ result.put("data", ImmutableMap.of("foo", "bar"));
PrintWriter writerMock = EasyMock.createMock(PrintWriter.class);
EasyMock.expect(res.getWriter()).andReturn(writerMock);
writerMock.write(EasyMock.eq(result.toString()));
@@ -186,7 +188,7 @@
EasyMock.expectLastCall().andReturn(responseItemFuture);
EasyMock.expect(jsonConverter.convertToJson(resultObject))
- .andStubReturn(new JSONObject(Maps.immutableMap("foo", "bar")));
+ .andStubReturn(new JSONObject(ImmutableMap.of("foo", "bar")));
JSONArray result = new JSONArray("[{id:'1',data:{foo:'bar'}}," +
"{id:'2',data:{foo:'bar'}}]");
PrintWriter writerMock = EasyMock.createMock(PrintWriter.class);
@@ -202,7 +204,7 @@
public void testGetExecution() throws Exception {
EasyMock.expect(req.getParameterMap()).andStubReturn(
- Maps.immutableMap("method", new String[]{"people.get"}, "id", new
String[]{"1"}));
+ ImmutableMap.of("method", new String[]{"people.get"}, "id", new
String[]{"1"}));
EasyMock.expect(req.getMethod()).andStubReturn("GET");
EasyMock.expect(req.getAttribute(EasyMock.isA(String.class))).andReturn(FAKE_GADGET_TOKEN);
EasyMock.expect(req.getCharacterEncoding()).andStubReturn("UTF-8");
@@ -215,7 +217,7 @@
EasyMock.expectLastCall().andReturn(responseItemFuture);
EasyMock.expect(jsonConverter.convertToJson(resultObject))
- .andReturn(new JSONObject(Maps.immutableMap("foo", "bar")));
+ .andReturn(new JSONObject(ImmutableMap.of("foo", "bar")));
JSONObject result = new JSONObject("{id:'1',data:{foo:'bar'}}");
PrintWriter writerMock = EasyMock.createMock(PrintWriter.class);
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java?rev=724939&r1=724938&r2=724939&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java
Tue Dec 9 16:26:50 2008
@@ -30,8 +30,10 @@
import org.apache.shindig.social.opensocial.spi.SocialSpiException;
import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSortedSet;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
+
import junit.framework.TestCase;
import org.easymock.classextension.EasyMock;
@@ -163,7 +165,7 @@
EasyMock.expect(personService.getPeople(
JOHN_DOE,
new GroupId(GroupId.Type.friends, null), options,
- Sets.newLinkedHashSet("money", "fame", "fortune"), token))
+ ImmutableSortedSet.of("money", "fame", "fortune"), token))
.andReturn(ImmediateFuture.newInstance(data));
replay();
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialServiceTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialServiceTest.java?rev=724939&r1=724938&r2=724939&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialServiceTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialServiceTest.java
Tue Dec 9 16:26:50 2008
@@ -32,7 +32,8 @@
import org.apache.shindig.social.opensocial.spi.SocialSpiException;
import org.apache.shindig.social.opensocial.spi.UserId;
-import com.google.common.collect.Maps;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSortedSet;
import com.google.common.collect.Sets;
import com.google.inject.Guice;
import com.google.inject.Injector;
@@ -111,7 +112,7 @@
options.setMax(20);
RestfulCollection<Person> responseItem = db.getPeople(
- Sets.newLinkedHashSet(JOHN_DOE, JANE_DOE), new
GroupId(GroupId.Type.friends, null),
+ ImmutableSortedSet.of(JOHN_DOE, JANE_DOE), new
GroupId(GroupId.Type.friends, null),
options, Collections.<String>emptySet(), token).get();
assertNotNull(responseItem);
assertEquals(responseItem.getTotalResults(), 4);
@@ -207,7 +208,7 @@
public void testUpdateExpectedAppData() throws Exception {
// Delete the data
db.updatePersonData(CANON_USER, SELF_GROUP, APP_ID,
- null, Maps.immutableMap("count", "10", "newvalue", "20"), new
FakeGadgetToken());
+ null, ImmutableMap.of("count", "10", "newvalue", "20"), new
FakeGadgetToken());
// Fetch the remaining and test
DataCollection responseItem = db.getPersonData(
@@ -223,4 +224,4 @@
assertTrue(responseItem.getEntry().get(CANONICAL_USER_ID).containsKey("newvalue"));
assertTrue(responseItem.getEntry().get(CANONICAL_USER_ID).get("newvalue").equals("20"));
}
-}
\ No newline at end of file
+}
Modified: incubator/shindig/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/pom.xml?rev=724939&r1=724938&r2=724939&view=diff
==============================================================================
--- incubator/shindig/trunk/pom.xml (original)
+++ incubator/shindig/trunk/pom.xml Tue Dec 9 16:26:50 2008
@@ -915,9 +915,9 @@
<version>1.0</version>
</dependency>
<dependency>
- <groupId>com.google.code.google-collections</groupId>
- <artifactId>google-collect</artifactId>
- <version>snapshot-20080321</version>
+ <groupId>com.google.collections</groupId>
+ <artifactId>google-collections</artifactId>
+ <version>0.8</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
